From 5e78116212fabce77a92db06216af0195e1fa4e4 Mon Sep 17 00:00:00 2001 From: Bar <51476543+bardabun@users.noreply.github.com> Date: Wed, 19 Jun 2024 17:38:50 +0300 Subject: [PATCH] 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 965a483989ea2752ed79850468d390ac49230976 Merge: f3349ce 525e746 Author: Yotam loewenbach <48534558+yotamloe@users.noreply.github.com> 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 525e74691e17d73e275869e55a61f67fa51110da Author: Yotam loewenbach Date: Wed Jun 19 13:02:53 2024 +0300 Update README.md commit 3feeff05e2d9b1611f26863bfedfdadee328b7b6 Author: Yotam loewenbach Date: Wed Jun 19 12:49:24 2024 +0300 changelog commit b5d1572ef77652359ef40bc1dac91af39dc38e04 Author: Yotam loewenbach Date: Wed Jun 19 12:49:16 2024 +0300 Remove the duplicate label `app.kubernetes.io/managed-by` commit f3349ce261289b1e80c8f8231bca92169e4f73e0 Merge: 0d6dfd1 c65a60e Author: Yotam loewenbach Date: Wed Jun 19 12:46:21 2024 +0300 Merge branch 'master' of https://github.com/logzio/logzio-helm commit 0d6dfd1ba4dff65b5ec43c2b245ee528025382f3 Author: Yotam loewenbach Date: Wed Jun 19 12:46:09 2024 +0300 k8s events changelog commit c65a60eb50cccb533450fd060946fe5e6053969d Merge: 4ebd6cd cc4b540 Author: Yotam loewenbach <48534558+yotamloe@users.noreply.github.com> 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 cc4b54002dcc4fd485bacee2a6671cb0ee9faba8 Author: Yotam loewenbach Date: Wed Jun 19 12:38:41 2024 +0300 Update Chart.yaml commit 5303631b4adafa139e0f63e53e28bb5b405aff16 Author: Yotam loewenbach Date: Wed Jun 19 12:38:39 2024 +0300 remove `pp.kubernetes.io/managed-by` duplicate label commit 4ebd6cd0dd5300364c9a3ab438d991c86edf4099 Author: Ral G <39119258+ralongit@users.noreply.github.com> 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 67f1532a3fe7f549d64df2b1924fc6931e361dc5 Author: Ral G <39119258+ralongit@users.noreply.github.com> Date: Tue Jun 18 17:17:30 2024 +0300 Revert `logzio-logs-collector` - Test fails due to bug in the exporter - https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/33231 commit 8379a756eb4d61d04fa33a5248a1b787e0b25d78 Author: ralongit 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 b0f75d0b981231b48931139b0bccbf541fc045fc Author: Ral G <39119258+ralongit@users.noreply.github.com> Date: Tue Jun 18 17:20:23 2024 +0300 Update changelog commit 686158e8a2e027bd7ceb23832cd690cc60c78e85 Author: Ral G <39119258+ralongit@users.noreply.github.com> Date: Tue Jun 18 17:17:30 2024 +0300 Revert `logzio-logs-collector` - Test fails due to bug in the exporter - https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/33231 commit 1a72f04d93d656ecbd40e9ba0ca9f7c20d9f903f Author: ralongit 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 3d06dd0e20351f5999c9b111ee9c8f647812a822 Author: Ral G <39119258+ralongit@users.noreply.github.com> Date: Tue Jun 18 17:22:41 2024 +0300 Update telemetry chart test trigger path commit 5283fd58299508e631c8a008866eb57643d3e68c Author: Ral G <39119258+ralongit@users.noreply.github.com> Date: Tue Jun 18 15:23:12 2024 +0300 Revert "Upgrade opentelemetry image to v0.102.1" This reverts commit a39596edae4345808bc7360d34bf6e149b08a35d. commit 41ee0f58c9b49992d8a05a69ff9d1f3cc38cb143 Author: Ral G <39119258+ralongit@users.noreply.github.com> Date: Tue Jun 18 15:23:12 2024 +0300 Revert "Update changelog" This reverts commit 7b26c36dabe90b80639e9e97f8d3d22d2ea8d3a2. commit 7b26c36dabe90b80639e9e97f8d3d22d2ea8d3a2 Author: ralongit Date: Tue Jun 18 15:03:06 2024 +0300 Update changelog commit a39596edae4345808bc7360d34bf6e149b08a35d Author: ralongit 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 cc104f49fbab68262f94697ac5d010bd1f3458c4 Merge: 623d936 3b83f35 Author: Yotam loewenbach <48534558+yotamloe@users.noreply.github.com> 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 3b83f358ca69dd68c85b868636804efca41ab489 Merge: 2eee533 dd01b70 Author: Yotam loewenbach 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 2eee5335f4dde3d9b15d6ba797d834ea94b7091b Author: Yotam loewenbach Date: Tue Jun 18 15:11:31 2024 +0300 Change env var name from `token` to `key` commit 623d93604c2ddfd76ef3b2225588151d784250c7 Merge: ab68b71 dd01b70 Author: Yotam loewenbach <48534558+yotamloe@users.noreply.github.com> 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 dd01b7026c6f4fd0b01b90def3459287d91f8c4f Merge: 39c57e2 ab68b71 Author: Yotam loewenbach <48534558+yotamloe@users.noreply.github.com> Date: Tue Jun 18 13:51:27 2024 +0300 Merge branch 'master' into feature/logzio-monitoring-multi-env-tests commit 39c57e252ca3a53ab157f82ec513e27cc329332b Author: Yotam loewenbach Date: Tue Jun 18 13:49:00 2024 +0300 change trigger branch to master commit ab68b71126978404413d0916b8f43d6764b57aaa Author: Yotam loewenbach <48534558+yotamloe@users.noreply.github.com> 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 a0113fb189749e00a58779765f669186d8a12094 Author: Yotam loewenbach Date: Tue Jun 18 12:01:52 2024 +0300 Use `secrets` in workflows commit 899055f3126536d311ef340940489c90b3f174ef Author: Yotam loewenbach Date: Mon Jun 10 15:48:04 2024 +0300 Add api environment variables commit c533c54f786761f4c1f636682d512b15e9cf9da1 Author: Yotam loewenbach Date: Mon Jun 10 15:46:59 2024 +0300 Edit container metrics query commit b931577c3a0a67a7b3f8bab4a82db5f0459ed0d7 Author: Yotam loewenbach Date: Sun Jun 9 17:22:03 2024 +0300 Add files to branch commit 4f5980f36e014afaaee514e641b9e4b57e621d46 Author: Yotam loewenbach Date: Sun Jun 9 17:18:27 2024 +0300 delete from master commit 030f47eb6ff5edb23d637748556a638706847f38 Author: Yotam loewenbach Date: Sun Jun 9 16:34:20 2024 +0300 `env.` -> `secrets.` commit eab735264e24f1c042e16faeb2194824042ee0ed Author: Yotam loewenbach Date: Sun Jun 9 16:32:40 2024 +0300 change cluster name commit 01e6667e9c6170a26ba2b2f51bbd6322b6683b71 Author: Yotam loewenbach Date: Sun Jun 9 16:32:26 2024 +0300 Separate metrics tests commit 143b6e419c94f07e98f6790b4e3534a681c417a0 Author: Yotam loewenbach Date: Sun Jun 9 14:44:36 2024 +0300 add unique id to each run commit 9a26ca2d45075440110ad58c280d287323b51bfc Author: Yotam loewenbach Date: Sun Jun 9 14:44:23 2024 +0300 update log collector test commit 4349afb3b0bcc69e6ad92f2c4b057419aed57874 Author: Yotam loewenbach Date: Thu Jun 6 17:32:29 2024 +0300 Add test for `logzio-k8s-telemetry` commit 766024f23cc5218dfdde5891142e60d3a7c9e619 Author: Yotam loewenbach Date: Thu Jun 6 17:32:26 2024 +0300 Add test for `logzio-k8s-telemetry` commit 058683696a2732075777bb5d9e2cf5234512b7b3 Author: Yotam loewenbach Date: Thu Jun 6 17:32:06 2024 +0300 go mod commit ce271f0fdec00f51c65f1dc525ba817ee2b0f75e Author: Yotam loewenbach Date: Thu Jun 6 17:31:48 2024 +0300 common.go commit 0c463f32cdb4fd49ffe748566a736895e9d71a52 Author: Yotam loewenbach Date: Thu Jun 6 17:31:34 2024 +0300 update e2e tests commit ed60767e40fa124cbd48b991aaedb1a38751979f Author: Yotam loewenbach Date: Thu Jun 6 17:31:23 2024 +0300 test resources commit 6d11e12c65f33bacd1c73c1df4e39db457ba2a68 Author: Yotam loewenbach Date: Thu Jun 6 17:31:12 2024 +0300 Delete unused files commit 6e277bf4a87820864443bb26e61f23de1e965b73 Merge: ea90448 7127169 Author: Yotam loewenbach Date: Thu Jun 6 15:14:18 2024 +0300 Merge remote-tracking branch 'origin/master' into feature/logzio-monitoring-multi-env-tests commit ea90448da56cbba339a492f95f4adae7870c3b82 Merge: 1ebd28d b63e44f Author: Yotam loewenbach Date: Wed May 29 12:38:35 2024 +0300 Merge remote-tracking branch 'origin/master' into feature/logzio-monitoring-multi-env-tests commit 1ebd28dfc9bcc5f205e16bda77a53ac5d6ef692d Author: Yotam loewenbach Date: Wed May 22 22:01:07 2024 +0300 add multi env initial workflow commit 023fc61866554db5b087e054c4f433025826ca06 Author: Yotam loewenbach Date: Wed May 22 21:59:27 2024 +0300 go mod commit 41cf71988788d1af120bc1a9d2ec5a26ac536c98 Author: Yotam loewenbach Date: Wed May 22 21:59:21 2024 +0300 Add e2e tests for logs, metrics, traces commit 993ae742983d1938e9f1561af9323300a621de9a Author: Yotam loewenbach 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 Co-authored-by: Ral G <39119258+ralongit@users.noreply.github.com> --- charts/dotnet-monitor/Chart.yaml | 2 +- charts/dotnet-monitor/README.md | 1 + charts/dotnet-monitor/values.yaml | 1 + charts/logzio-telemetry/Chart.yaml | 4 +++- charts/logzio-telemetry/README.md | 2 ++ charts/logzio-telemetry/ci/test-values.yaml | 1 + charts/logzio-telemetry/values.yaml | 10 +++++++++- charts/logzio-trivy/Chart.yaml | 4 ++-- charts/logzio-trivy/templates/deployment.yaml | 2 ++ charts/logzio-trivy/values.yaml | 2 +- charts/opentelemetry/Chart.yaml | 2 +- charts/opentelemetry/README.md | 5 +++++ charts/opentelemetry/ci/test-values.yaml | 1 + charts/opentelemetry/values.yaml | 1 + 14 files changed, 31 insertions(+), 7 deletions(-) diff --git a/charts/dotnet-monitor/Chart.yaml b/charts/dotnet-monitor/Chart.yaml index facfb92e..d174f2f5 100644 --- 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 index 52693f02..4431fd25 100644 --- 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 index 76b76a4c..d0f2728a 100644 --- 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 index cc618640..6a213c3e 100644 --- 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 index 8a0957f5..85dd6f53 100644 --- 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 index 88e8f5b4..7f5a0b50 100644 --- 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 index 759f2850..9c7c54ac 100644 --- 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,6 +327,7 @@ 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} @@ -332,6 +335,7 @@ metricsConfig: 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,6 +997,7 @@ 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} @@ -998,6 +1005,7 @@ daemonsetConfig: 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 index bc63287f..a0305efe 100644 --- 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 index 09cbd046..721a780c 100644 --- 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 index 0eab58f0..f5a83401 100644 --- 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 index 7b5148ec..dd1441b4 100644 --- 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 index 6ba865ec..58ff9ec4 100644 --- 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 - +
    +
  • Added 'user-agent' header for Prometheus Remote Write
    • +
+ * 0.2.5 -
  • 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 index 88e8f5b4..7f5a0b50 100644 --- 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 index ca9984ea..c1f171d1 100644 --- 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: