From 75f6bfd11ac951791415f21a516ce9d3dc373984 Mon Sep 17 00:00:00 2001
From: tamirmich <tamir.michaeli@logz.io>
Date: Mon, 23 Jan 2023 12:25:53 +0200
Subject: [PATCH] kubernetes templates updates for dedot (#84)

---
 README.md                        | 4 +++-
 configmap.yaml                   | 6 ++++++
 logzio-daemonset-containerd.yaml | 8 ++++----
 logzio-daemonset-rbac.yaml       | 8 ++++----
 logzio-daemonset.yaml            | 8 ++++----
 5 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index fb15f60..ce190b6 100755
--- a/README.md
+++ b/README.md
@@ -204,7 +204,9 @@ By default, latest images launch `prometheus` plugins to monitor fluentd. You ca
 ### Changelog
 **logzio/logzio-fluentd**:
 - v1.3.0:
-  - Added plugin `fluent-plugin-dedot_filter`
+  - Added plugin `fluent-plugin-dedot_filter`.
+  - Updated image in daemonset templates, increased memory and cpu requirements.
+  - Added configuration for dedot plugin in configmp template.
 - v1.2.0:
   - Upgrade fluentd to 1.15.
   - Upgrade plugin `fluent-plugin-kubernetes_metadata_filter` to `3.1.2`([#80](https://github.com/logzio/logzio-k8s/pull/80)).
diff --git a/configmap.yaml b/configmap.yaml
index b1b3494..1581f1e 100644
--- a/configmap.yaml
+++ b/configmap.yaml
@@ -249,6 +249,12 @@ data:
       kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || 'https://' + ENV.fetch('KUBERNETES_SERVICE_HOST') + ':' + ENV.fetch('KUBERNETES_SERVICE_PORT') + '/api'}"
       verify_ssl "#{ENV['KUBERNETES_VERIFY_SSL'] || true}"
     </filter>
+    <filter **>
+      @type             dedot
+      de_dot            true
+      de_dot_separator  _
+      de_dot_nested     true
+    </filter>
 
   system.conf: |
     <system>
diff --git a/logzio-daemonset-containerd.yaml b/logzio-daemonset-containerd.yaml
index 74b47c7..600abc6 100644
--- a/logzio-daemonset-containerd.yaml
+++ b/logzio-daemonset-containerd.yaml
@@ -73,7 +73,7 @@ spec:
               mountPath: /fluentd/etc
       containers:
       - name: fluentd
-        image: logzio/logzio-fluentd:1.2.0
+        image: logzio/logzio-fluentd:1.3.0
         env:
         - name: LOGZIO_LOG_SHIPPING_TOKEN
           valueFrom:
@@ -99,10 +99,10 @@ spec:
           value: "containerd"
         resources:
           limits:
-            memory: 200Mi
+            memory: 500Mi
           requests:
-            cpu: 100m
-            memory: 200Mi
+            cpu: 200m
+            memory: 500Mi
         volumeMounts:
         - name: varlog
           mountPath: /var/log
diff --git a/logzio-daemonset-rbac.yaml b/logzio-daemonset-rbac.yaml
index fd473f0..3fc990b 100755
--- a/logzio-daemonset-rbac.yaml
+++ b/logzio-daemonset-rbac.yaml
@@ -73,7 +73,7 @@ spec:
               mountPath: /fluentd/etc
       containers:
       - name: fluentd
-        image: logzio/logzio-fluentd:1.2.0
+        image: logzio/logzio-fluentd:1.3.0
         env:
         - name: LOGZIO_LOG_SHIPPING_TOKEN
           valueFrom:
@@ -99,10 +99,10 @@ spec:
           value: "docker"
         resources:
           limits:
-            memory: 200Mi
+            memory: 500Mi
           requests:
-            cpu: 100m
-            memory: 200Mi
+            cpu: 200m
+            memory: 500Mi
         volumeMounts:
         - name: varlog
           mountPath: /var/log
diff --git a/logzio-daemonset.yaml b/logzio-daemonset.yaml
index f7be413..9a83c7e 100755
--- a/logzio-daemonset.yaml
+++ b/logzio-daemonset.yaml
@@ -34,7 +34,7 @@ spec:
               mountPath: /fluentd/etc
       containers:
       - name: fluentd
-        image: logzio/logzio-fluentd:1.2.0
+        image: logzio/logzio-fluentd:1.3.0
         env:
         - name: LOGZIO_LOG_SHIPPING_TOKEN
           valueFrom:
@@ -60,10 +60,10 @@ spec:
           value: "docker"
         resources:
           limits:
-            memory: 200Mi
+            memory: 500Mi
           requests:
-            cpu: 100m
-            memory: 200Mi
+            cpu: 200m
+            memory: 500Mi
         volumeMounts:
         - name: varlog
           mountPath: /var/log