From af2afa7551830f9270cc918cc29b80e51f466818 Mon Sep 17 00:00:00 2001 From: Yotam loewenbach Date: Thu, 22 Aug 2024 15:08:39 +0200 Subject: [PATCH 1/6] Add `nest` filter to remove dots from keys --- .../templates/fargate-logging-configmap.yaml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/charts/logzio-logs-collector/templates/fargate-logging-configmap.yaml b/charts/logzio-logs-collector/templates/fargate-logging-configmap.yaml index b9157196..69437a5b 100644 --- a/charts/logzio-logs-collector/templates/fargate-logging-configmap.yaml +++ b/charts/logzio-logs-collector/templates/fargate-logging-configmap.yaml @@ -35,6 +35,25 @@ data: Match * Condition Key_value_does_not_match message (?i)(error|failure|failed|exception|panic|warn|warning) Add log_level INFO + [FILTER] + Name nest + Match * + Operation lift + Nested_under kubernetes + Add_prefix kubernetes_ + [FILTER] + Name nest + Match * + Operation lift + Nested_under kubernetes_labels + Add_prefix kubernetes_labels_ + [FILTER] + Name nest + Match * + Operation lift + Nested_under kubernetes_annotations + Add_prefix kubernetes_annotations_ + output.conf: | [OUTPUT] Name es From d25ab108dffd492b051a0d2da0efc493e1b5e350 Mon Sep 17 00:00:00 2001 From: Yotam loewenbach Date: Thu, 22 Aug 2024 15:12:49 +0200 Subject: [PATCH 2/6] Update Chart.yaml --- charts/logzio-logs-collector/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/logzio-logs-collector/Chart.yaml b/charts/logzio-logs-collector/Chart.yaml index ded492fc..2511e32c 100644 --- a/charts/logzio-logs-collector/Chart.yaml +++ b/charts/logzio-logs-collector/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: logzio-logs-collector -version: 1.0.8 +version: 1.0.9 description: kubernetes logs collection agent for logz.io based on opentelemetry collector type: application home: https://logz.io/ From 3055eebca141cb775309a80b584f2d6a2a02e7dd Mon Sep 17 00:00:00 2001 From: Yotam loewenbach Date: Thu, 22 Aug 2024 15:12:56 +0200 Subject: [PATCH 3/6] Update README.md --- charts/logzio-logs-collector/README.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/charts/logzio-logs-collector/README.md b/charts/logzio-logs-collector/README.md index 026c4f71..97d6599c 100644 --- a/charts/logzio-logs-collector/README.md +++ b/charts/logzio-logs-collector/README.md @@ -142,6 +142,14 @@ Multi line logs configuration The collector supports by default various log formats (including multiline logs) such as `CRI-O` `CRI-Containerd` `Docker` formats. You can configure the chart to parse custom multiline logs pattern according to your needs, please read [Customizing Multiline Log Handling](./examples/multiline.md) guide for more details. ## Change log +* 1.0.9 + - **EKS fargate Breaking changes**: + - Add `nest` filters to remove dots from kubernetes metadata keys. + Changes in fields names: + - `kubernetes.*` -> `kubernetes_*` + - `kubernetes.labels.*` -> `kubernetes_labels_*` + - `kubernetes.annotations.*` -> `kubernetes_annotations_*` + * 1.0.8 - Bug-fix: - Remove comment from `_helpers.tpl` template that breaks aws-logging configmap From dea3b7a0a28d2637ed7099a84d51f2c6528cef91 Mon Sep 17 00:00:00 2001 From: Yotam loewenbach Date: Sun, 25 Aug 2024 11:58:15 +0200 Subject: [PATCH 4/6] Update README.md --- charts/logzio-logs-collector/README.md | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/charts/logzio-logs-collector/README.md b/charts/logzio-logs-collector/README.md index 97d6599c..0ffec207 100644 --- a/charts/logzio-logs-collector/README.md +++ b/charts/logzio-logs-collector/README.md @@ -141,6 +141,25 @@ Multi line logs configuration ----------------------------- The collector supports by default various log formats (including multiline logs) such as `CRI-O` `CRI-Containerd` `Docker` formats. You can configure the chart to parse custom multiline logs pattern according to your needs, please read [Customizing Multiline Log Handling](./examples/multiline.md) guide for more details. +Log collection in eks fargate environemnt +----------------------------- +You can use the `fargateLogRouter.enabled` value to enable log collection in eks fargate environemnt via fluentbit log-router +```sh + helm install logzio-logs-collector -n monitoring \ + --set enabled=true \ + --set secrets.logzioLogsToken=<> \ + --set secrets.logzioRegion=<> \ + --set secrets.env_id=<> \ + --set secrets.logType=<> \ + --set fargateLogRouter.enabled="true" \ + logzio-helm/logzio-logs-collector +``` +### Kubernetes metadata fields naming changes in eks fargate environemnt >= `1.0.9` +Changes in fields names: + - `kubernetes.*` -> `kubernetes_*` + - `kubernetes.labels.*` -> `kubernetes_labels_*` + - `kubernetes.annotations.*` -> `kubernetes_annotations_*` + ## Change log * 1.0.9 - **EKS fargate Breaking changes**: From a7e1e121d56077db09f9ecbee5e9dbeb952b2cc0 Mon Sep 17 00:00:00 2001 From: Yotam loewenbach Date: Sun, 25 Aug 2024 12:30:17 +0200 Subject: [PATCH 5/6] Update Chart.yaml --- charts/logzio-monitoring/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/logzio-monitoring/Chart.yaml b/charts/logzio-monitoring/Chart.yaml index dc51ed37..b92958e2 100644 --- a/charts/logzio-monitoring/Chart.yaml +++ b/charts/logzio-monitoring/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: logzio-monitoring description: logzio-monitoring allows you to ship logs, metrics, traces and security reports from your Kubernetes cluster using the OpenTelemetry collector for metrics and traces, Fluentd for logs, and Trivy for security reports. type: application -version: 6.0.9 +version: 6.1.0 @@ -30,7 +30,7 @@ dependencies: repository: "https://logzio.github.io/logzio-helm/" condition: deployEvents.enabled - name: logzio-logs-collector - version: "1.0.8" + version: "1.0.9" repository: "https://logzio.github.io/logzio-helm/" condition: logs.enabled maintainers: From 863f329011b5915893128d633532676d514e81aa Mon Sep 17 00:00:00 2001 From: Yotam loewenbach Date: Sun, 25 Aug 2024 12:30:26 +0200 Subject: [PATCH 6/6] changelog and readme --- charts/logzio-monitoring/README.md | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/charts/logzio-monitoring/README.md b/charts/logzio-monitoring/README.md index e1feb809..ef39c5bd 100644 --- a/charts/logzio-monitoring/README.md +++ b/charts/logzio-monitoring/README.md @@ -169,7 +169,11 @@ Then use `kubectl port-forward` to accsess the user intefrace in your browser: ```shell kubectl port-forward svc/ezkonnect-ui -n monitoring 31032:31032 ``` - +### Changes in kubernetes metadate fields names from version 6.1.0 +Changes in field names (replacing dots with underscore): + - `kubernetes.*` -> `kubernetes_*` + - `kubernetes.labels.*` -> `kubernetes_labels_*` + - `kubernetes.annotations.*` -> `kubernetes_annotations_*` ### Handling image pull rate limit @@ -224,6 +228,14 @@ There are two possible approaches to the upgrade you can choose from: ## Changelog +- **6.1.0**: + - Upgrade `logzio-logs-collector` chart to `v1.0.9` + - EKS fargate Breaking changes: + - Add nest filters to remove dots from kubernetes metadata keys. + - Changes in fields names: + - `kubernetes.*` -> `kubernetes_*` + - `kubernetes.labels.*` -> `kubernetes_labels_*` + - `kubernetes.annotations.*` -> `kubernetes_annotations_*` - **6.0.9**: - Upgrade `logzio-logs-collector` chart to `v1.0.8` - Bug-fix: Remove comment from `_helpers.tpl` template that breaks `aws-logging` configmap