added user-agent header (#495)

* added user-agent header * changed header * updated charts version and changelogs * Update Chart.yaml * add env image version and update version in Chart.yaml * Squashed commit of the following: commit 965a483 Merge: f3349ce 525e746 Author: Yotam loewenbach <[email protected]> Date: Wed Jun 19 13:03:13 2024 +0300 Merge pull request #505 from logzio/logzio-monitoring-6.0.3 bugfix/ Logzio monitoring 6.0.3 commit 525e746 Author: Yotam loewenbach <[email protected]> Date: Wed Jun 19 13:02:53 2024 +0300 Update README.md commit 3feeff0 Author: Yotam loewenbach <[email protected]> Date: Wed Jun 19 12:49:24 2024 +0300 changelog commit b5d1572 Author: Yotam loewenbach <[email protected]> Date: Wed Jun 19 12:49:16 2024 +0300 Remove the duplicate label `app.kubernetes.io/managed-by` commit f3349ce Merge: 0d6dfd1 c65a60e Author: Yotam loewenbach <[email protected]> Date: Wed Jun 19 12:46:21 2024 +0300 Merge branch 'master' of https://github.com/logzio/logzio-helm commit 0d6dfd1 Author: Yotam loewenbach <[email protected]> Date: Wed Jun 19 12:46:09 2024 +0300 k8s events changelog commit c65a60e Merge: 4ebd6cd cc4b540 Author: Yotam loewenbach <[email protected]> Date: Wed Jun 19 12:43:57 2024 +0300 Merge pull request #504 from logzio/logzio-k8s-events-0.0.5 Logzio k8s events 0.0.5 commit cc4b540 Author: Yotam loewenbach <[email protected]> Date: Wed Jun 19 12:38:41 2024 +0300 Update Chart.yaml commit 5303631 Author: Yotam loewenbach <[email protected]> Date: Wed Jun 19 12:38:39 2024 +0300 remove `pp.kubernetes.io/managed-by` duplicate label commit 4ebd6cd Author: Ral G <[email protected]> Date: Tue Jun 18 18:20:04 2024 +0300 Upgrade `logzio-monitoring` chart tov v6.0.2 (#503) - Upgrade `logzio-k8s-telemetry` chart to `v4.2.4` - Upgrade `otel/opentelemetry-collector-contrib` image to `v0.102.1` commit 67f1532 Author: Ral G <[email protected]> Date: Tue Jun 18 17:17:30 2024 +0300 Revert `logzio-logs-collector` - Test fails due to bug in the exporter - open-telemetry/opentelemetry-collector-contrib#33231 commit 8379a75 Author: ralongit <[email protected]> Date: Tue Jun 18 15:34:56 2024 +0300 Upgrade opentelemetry image to v0.102.1 - Upgrade `logzio-k8s-telemetry` and `logzio-logs-colector charts` sub charts image version to `v0.102.1` commit b0f75d0 Author: Ral G <[email protected]> Date: Tue Jun 18 17:20:23 2024 +0300 Update changelog commit 686158e Author: Ral G <[email protected]> Date: Tue Jun 18 17:17:30 2024 +0300 Revert `logzio-logs-collector` - Test fails due to bug in the exporter - open-telemetry/opentelemetry-collector-contrib#33231 commit 1a72f04 Author: ralongit <[email protected]> Date: Tue Jun 18 15:34:56 2024 +0300 Upgrade opentelemetry image to v0.102.1 - Upgrade `logzio-k8s-telemetry` and `logzio-logs-colector charts` sub charts image version to `v0.102.1` commit 3d06dd0 Author: Ral G <[email protected]> Date: Tue Jun 18 17:22:41 2024 +0300 Update telemetry chart test trigger path commit 5283fd5 Author: Ral G <[email protected]> Date: Tue Jun 18 15:23:12 2024 +0300 Revert "Upgrade opentelemetry image to v0.102.1" This reverts commit a39596e. commit 41ee0f5 Author: Ral G <[email protected]> Date: Tue Jun 18 15:23:12 2024 +0300 Revert "Update changelog" This reverts commit 7b26c36. commit 7b26c36 Author: ralongit <[email protected]> Date: Tue Jun 18 15:03:06 2024 +0300 Update changelog commit a39596e Author: ralongit <[email protected]> Date: Tue Jun 18 13:46:27 2024 +0300 Upgrade opentelemetry image to v0.102.1 -Upgrade `logzio-k8s-telemetry` and `logzio-logs-colector charts` sub charts image version to `v0.102.1` commit cc104f4 Merge: 623d936 3b83f35 Author: Yotam loewenbach <[email protected]> Date: Tue Jun 18 15:12:57 2024 +0300 Merge pull request #500 from logzio/feature/logzio-monitoring-multi-env-tests Change env var name from `token` to `key` commit 3b83f35 Merge: 2eee533 dd01b70 Author: Yotam loewenbach <[email protected]> Date: Tue Jun 18 15:11:52 2024 +0300 Merge remote-tracking branch 'origin/feature/logzio-monitoring-multi-env-tests' into feature/logzio-monitoring-multi-env-tests commit 2eee533 Author: Yotam loewenbach <[email protected]> Date: Tue Jun 18 15:11:31 2024 +0300 Change env var name from `token` to `key` commit 623d936 Merge: ab68b71 dd01b70 Author: Yotam loewenbach <[email protected]> Date: Tue Jun 18 13:52:02 2024 +0300 Merge pull request #499 from logzio/feature/logzio-monitoring-multi-env-tests Change trigger branch to master commit dd01b70 Merge: 39c57e2 ab68b71 Author: Yotam loewenbach <[email protected]> Date: Tue Jun 18 13:51:27 2024 +0300 Merge branch 'master' into feature/logzio-monitoring-multi-env-tests commit 39c57e2 Author: Yotam loewenbach <[email protected]> Date: Tue Jun 18 13:49:00 2024 +0300 change trigger branch to master commit ab68b71 Author: Yotam loewenbach <[email protected]> Date: Tue Jun 18 13:30:01 2024 +0300 Automated tests for `logzio-k8s-telemetry` and `logzio-logs-colector` charts (#496) * Add files to branch * Edit container metrics query * Add api environment variables * Use `secrets` in workflows commit a0113fb Author: Yotam loewenbach <[email protected]> Date: Tue Jun 18 12:01:52 2024 +0300 Use `secrets` in workflows commit 899055f Author: Yotam loewenbach <[email protected]> Date: Mon Jun 10 15:48:04 2024 +0300 Add api environment variables commit c533c54 Author: Yotam loewenbach <[email protected]> Date: Mon Jun 10 15:46:59 2024 +0300 Edit container metrics query commit b931577 Author: Yotam loewenbach <[email protected]> Date: Sun Jun 9 17:22:03 2024 +0300 Add files to branch commit 4f5980f Author: Yotam loewenbach <[email protected]> Date: Sun Jun 9 17:18:27 2024 +0300 delete from master commit 030f47e Author: Yotam loewenbach <[email protected]> Date: Sun Jun 9 16:34:20 2024 +0300 `env.` -> `secrets.` commit eab7352 Author: Yotam loewenbach <[email protected]> Date: Sun Jun 9 16:32:40 2024 +0300 change cluster name commit 01e6667 Author: Yotam loewenbach <[email protected]> Date: Sun Jun 9 16:32:26 2024 +0300 Separate metrics tests commit 143b6e4 Author: Yotam loewenbach <[email protected]> Date: Sun Jun 9 14:44:36 2024 +0300 add unique id to each run commit 9a26ca2 Author: Yotam loewenbach <[email protected]> Date: Sun Jun 9 14:44:23 2024 +0300 update log collector test commit 4349afb Author: Yotam loewenbach <[email protected]> Date: Thu Jun 6 17:32:29 2024 +0300 Add test for `logzio-k8s-telemetry` commit 766024f Author: Yotam loewenbach <[email protected]> Date: Thu Jun 6 17:32:26 2024 +0300 Add test for `logzio-k8s-telemetry` commit 0586836 Author: Yotam loewenbach <[email protected]> Date: Thu Jun 6 17:32:06 2024 +0300 go mod commit ce271f0 Author: Yotam loewenbach <[email protected]> Date: Thu Jun 6 17:31:48 2024 +0300 common.go commit 0c463f3 Author: Yotam loewenbach <[email protected]> Date: Thu Jun 6 17:31:34 2024 +0300 update e2e tests commit ed60767 Author: Yotam loewenbach <[email protected]> Date: Thu Jun 6 17:31:23 2024 +0300 test resources commit 6d11e12 Author: Yotam loewenbach <[email protected]> Date: Thu Jun 6 17:31:12 2024 +0300 Delete unused files commit 6e277bf Merge: ea90448 7127169 Author: Yotam loewenbach <[email protected]> Date: Thu Jun 6 15:14:18 2024 +0300 Merge remote-tracking branch 'origin/master' into feature/logzio-monitoring-multi-env-tests commit ea90448 Merge: 1ebd28d b63e44f Author: Yotam loewenbach <[email protected]> Date: Wed May 29 12:38:35 2024 +0300 Merge remote-tracking branch 'origin/master' into feature/logzio-monitoring-multi-env-tests commit 1ebd28d Author: Yotam loewenbach <[email protected]> Date: Wed May 22 22:01:07 2024 +0300 add multi env initial workflow commit 023fc61 Author: Yotam loewenbach <[email protected]> Date: Wed May 22 21:59:27 2024 +0300 go mod commit 41cf719 Author: Yotam loewenbach <[email protected]> Date: Wed May 22 21:59:21 2024 +0300 Add e2e tests for logs, metrics, traces commit 993ae74 Author: Yotam loewenbach <[email protected]> Date: Mon May 20 12:43:39 2024 +0300 Delete old and unused test files * Upgrade telemetry chart version to 4.2.5 --------- Co-authored-by: ralongit <[email protected]> Co-authored-by: Ral G <[email protected]>
logzio · Jun 19, 2024 · 5e78116 · 5e78116
1 parent 965a483
commit 5e78116
Show file tree

Hide file tree

Showing 14 changed files with 31 additions and 7 deletions.
diff --git a/charts/dotnet-monitor/Chart.yaml b/charts/dotnet-monitor/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: logzio-dotnet-monitor
 description: A Helm chart for shipping dotnet app runtime metrics using dotnet monitor and OTEL.
-version: 0.0.1
+version: 0.0.2
 appVersion: 1.0.0
 maintainers:
   - name: Shiran Avidov

diff --git a/charts/dotnet-monitor/README.md b/charts/dotnet-monitor/README.md
@@ -105,4 +105,5 @@ kubectl get nodes -o json | jq ".items[]|{name:.metadata.name, taints:.spec.tain
 
 ## Changelog
 
+- 0.0.2: Added 'user-agent' header for Prometheus Remote Write.
 - 0.0.1: Initial release.
diff --git a/charts/dotnet-monitor/values.yaml b/charts/dotnet-monitor/values.yaml
@@ -88,6 +88,7 @@ configMap:
         endpoint: ${LOGZIO_URL}
         headers:
           Authorization: "Bearer ${LOGZIO_TOKEN}"
+          user-agent: "{{ .Chart.Name }}-{{ .Chart.Version }}-helm"
         external_labels:
     service:
       pipelines:

diff --git a/charts/logzio-telemetry/Chart.yaml b/charts/logzio-telemetry/Chart.yaml
@@ -24,7 +24,9 @@ dependencies:
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 4.2.4
+
+version: 4.2.5
+
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/charts/logzio-telemetry/README.md b/charts/logzio-telemetry/README.md
@@ -412,6 +412,8 @@ If you don't want the sub charts to installed add the relevant flag per sub char
 
 
 ## Change log
+* 4.2.5
+  - Added 'user-agent' header for telemetry data.
 * 4.2.4
   - Upgrade `otel/opentelemetry-collector-contrib` image to `v0.102.1`
 * 4.2.3

diff --git a/charts/logzio-telemetry/ci/test-values.yaml b/charts/logzio-telemetry/ci/test-values.yaml
@@ -93,6 +93,7 @@ config:
         p8s_logzio_name: ${P8S_LOGZIO_NAME}
       headers:
         Authorization: "Bearer ${METRICS_TOKEN}"
+        user-agent: "{{ .Chart.Name }}-{{ .Chart.Version }}-helm"
   extensions:
     health_check: {}
   processors:

diff --git a/charts/logzio-telemetry/values.yaml b/charts/logzio-telemetry/values.yaml
@@ -237,6 +237,8 @@ tracesConfig:
       endpoint: ${CUSTOM_TRACING_ENDPOINT}
       region: ${LOGZIO_LISTENER_REGION}
       account_token: ${TRACES_TOKEN}
+      headers:
+        user-agent: "{{ .Chart.Name }}-{{ .Chart.Version }}-helm"
     logging:
       loglevel: info
   extensions:
@@ -325,13 +327,15 @@ metricsConfig:
         p8s_logzio_name: ${P8S_LOGZIO_NAME}
       headers:
         Authorization: "Bearer ${METRICS_TOKEN}"
+        user-agent: "{{ .Chart.Name }}-{{ .Chart.Version }}-helm"
     prometheusremotewrite/infrastructure:
       timeout: 30s
       endpoint: ${LISTENER_URL}
       external_labels:
         p8s_logzio_name: ${P8S_LOGZIO_NAME}
       headers:
         Authorization: "Bearer ${METRICS_TOKEN}"
+        user-agent: "{{ .Chart.Name }}-{{ .Chart.Version }}-helm"
   receivers:
     prometheus/applications:
       config:
@@ -663,7 +667,8 @@ k8sObjectsConfig:
       logzio/object_logs:
         account_token: "${OBJECTS_LOGS_TOKEN}"
         region: "${LOGZIO_LISTENER_REGION}"
-
+        headers:
+          user-agent: "{{ .Chart.Name }}-{{ .Chart.Version }}-helm"
     service:
       pipelines:
         logs/k8sobjects:
@@ -766,6 +771,7 @@ spanMetricsAgregator:
         endpoint: ${LISTENER_URL}
         headers:
           Authorization: Bearer ${SPM_TOKEN}
+          user-agent: "{{ .Chart.Name }}-{{ .Chart.Version }}-helm"
         timeout: 30s
         add_metric_suffixes: false
     receivers:
@@ -991,13 +997,15 @@ daemonsetConfig:
         p8s_logzio_name: ${P8S_LOGZIO_NAME}
       headers:
         Authorization: "Bearer ${METRICS_TOKEN}"
+        user-agent: "{{ .Chart.Name }}-{{ .Chart.Version }}-helm"
     prometheusremotewrite/infrastructure:
       timeout: 30s
       endpoint: ${LISTENER_URL}
       external_labels:
         p8s_logzio_name: ${P8S_LOGZIO_NAME}
       headers:
         Authorization: "Bearer ${METRICS_TOKEN}"
+        user-agent: "{{ .Chart.Name }}-{{ .Chart.Version }}-helm"
   receivers:
     prometheus/applications:
       config:

diff --git a/charts/logzio-trivy/Chart.yaml b/charts/logzio-trivy/Chart.yaml
@@ -5,8 +5,8 @@ keywords:
   - logging
   - trivy
   - security
-version: 0.3.1
-appVersion: 0.2.1
+version: 0.3.3
+appVersion: 0.2.2
 sources:
   - https://github.com/logzio/logzio-helm
 dependencies:

diff --git a/charts/logzio-trivy/templates/deployment.yaml b/charts/logzio-trivy/templates/deployment.yaml
@@ -32,6 +32,8 @@ spec:
               key: logzio-log-listener
         - name: ENV_ID
           value: {{ .Values.env_id | quote }}
+        - name: IMAGE_VERSION
+          value: {{ .Values.imageTag }}
         - name: SCHEDULE
           value: {{ .Values.schedule }}
         - name: LOG_LEVEL

diff --git a/charts/logzio-trivy/values.yaml b/charts/logzio-trivy/values.yaml
@@ -24,7 +24,7 @@ schedule: "07:00"
 # Container image
 image: logzio/trivy-to-logzio
 # Container image tag
-imageTag: 0.2.1
+imageTag: 0.2.2
 # The name for your environment's identifier (cluster name), to easily identify the telemetry data for each environment
 env_id: ""
 # Termination period (in seconds) to wait before killing Fluentd pod process on pod shutdown

diff --git a/charts/opentelemetry/Chart.yaml b/charts/opentelemetry/Chart.yaml
@@ -23,7 +23,7 @@ dependencies:
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.2.5
+version: 0.2.6
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/charts/opentelemetry/README.md b/charts/opentelemetry/README.md
@@ -203,6 +203,11 @@ kubectl get nodes -o json | jq ".items[]|{name:.metadata.name, taints:.spec.tain
 ```
 
 ## Change log
+* 0.2.6 -
+<ul>
+  <li>Added 'user-agent' header for Prometheus Remote Write</li>
+</ul>
+
 * 0.2.5 -
   <ul>
   <li> Added basic metrics filtering for gke,aks and eks clusters (via "enableMetricsFilter" parameter).

diff --git a/charts/opentelemetry/ci/test-values.yaml b/charts/opentelemetry/ci/test-values.yaml
@@ -93,6 +93,7 @@ config:
         p8s_logzio_name: ${P8S_LOGZIO_NAME}
       headers:
         Authorization: "Bearer ${METRICS_TOKEN}"
+        user-agent: "{{ .Chart.Name }}-{{ .Chart.Version }}-helm"
   extensions:
     health_check: {}
   processors:

diff --git a/charts/opentelemetry/values.yaml b/charts/opentelemetry/values.yaml
@@ -106,6 +106,7 @@ config:
         p8s_logzio_name: ${P8S_LOGZIO_NAME}
       headers:
         Authorization: "Bearer ${METRICS_TOKEN}"
+        user-agent: "{{ .Chart.Name }}-{{ .Chart.Version }}-helm"
   extensions:
     health_check: {}
   processors: