From 7a83659ea2604a53aa62040fcd4685afaa28056b Mon Sep 17 00:00:00 2001
From: Yotam loewenbach <yotam.loewenbach@logz.io>
Date: Tue, 26 Mar 2024 20:58:37 +0700
Subject: [PATCH 1/8] Add `LogFileRefreshInterval` + `enabled`

---
 charts/fluentd/values.yaml | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/charts/fluentd/values.yaml b/charts/fluentd/values.yaml
index ee0f293c..d3ccba1a 100644
--- a/charts/fluentd/values.yaml
+++ b/charts/fluentd/values.yaml
@@ -1,3 +1,4 @@
+enabled: true
 # Fluentd image in daemonset
 image: logzio/logzio-fluentd
 # Fluentd image tag
@@ -87,6 +88,8 @@ daemonset:
   # Container runtime interface of the cluster. Used to determine which configuration to use when concatenating partial logs.
   # Valid options are: docker, containerd
   cri: containerd
+  # The interval of refreshing the list of watch file for log files.
+  LogFileRefreshInterval: 60s
   # Specifies which plugin to use as the backend
   logzioBufferType: file
   # Path of the buffer
@@ -170,6 +173,8 @@ windowsDaemonset:
   # Container runtime interface of the cluster. Used to determine which configuration to use when concatenating partial logs.
   # Valid options are: docker, containerd
   cri: containerd
+  # The interval of refreshing the list of watch file for log files.
+  LogFileRefreshInterval: 60s
   # Specifies which plugin to use as the backend
   logzioBufferType: file
   # Path of the buffer
@@ -304,6 +309,7 @@ configmap:
       exclude_path "#{ENV['EXCLUDE_PATH'].split(',')}"
       tag logzio.kubernetes.*
       read_from_head true
+      refresh_insterval "#{ENV['LOG_FILE_REFRESH_INTERVAL']}"
       <parse>
         @type multi_format
         <pattern>
@@ -329,6 +335,7 @@ configmap:
       path /var/log/salt/minion
       pos_file /var/log/fluentd-salt.pos
       tag logzio.salt
+      refresh_insterval "#{ENV['LOG_FILE_REFRESH_INTERVAL']}"
       <parse>
         @type regexp
         expression /^(?<time>[^ ]* [^ ,]*)[^\[]*\[[^\]]*\]\[(?<severity>[^ \]]*) *\] (?<message>.*)$/
@@ -342,6 +349,7 @@ configmap:
       path /var/log/startupscript.log
       pos_file /var/log/fluentd-startupscript.log.pos
       tag logzio.startupscript
+      refresh_insterval "#{ENV['LOG_FILE_REFRESH_INTERVAL']}"
       <parse>
         @type syslog
       </parse>
@@ -353,6 +361,7 @@ configmap:
       path /var/log/docker.log
       pos_file /var/log/fluentd-docker.log.pos
       tag logzio.docker
+      refresh_insterval "#{ENV['LOG_FILE_REFRESH_INTERVAL']}"
       <parse>
         @type regexp
         expression /^time="(?<time>[^)]*)" level=(?<severity>[^ ]*) msg="(?<message>[^"]*)"( err="(?<error>[^"]*)")?( statusCode=($<status_code>\d+))?/
@@ -365,6 +374,7 @@ configmap:
       path /var/log/etcd.log
       pos_file /var/log/fluentd-etcd.log.pos
       tag logzio.etcd
+      refresh_insterval "#{ENV['LOG_FILE_REFRESH_INTERVAL']}"
       <parse>
         @type none
       </parse>
@@ -377,6 +387,7 @@ configmap:
       path /var/log/kubelet.log
       pos_file /var/log/fluentd-kubelet.log.pos
       tag logzio.kubelet
+      refresh_insterval "#{ENV['LOG_FILE_REFRESH_INTERVAL']}"
       <parse>
         @type kubernetes
       </parse>
@@ -389,6 +400,7 @@ configmap:
       path /var/log/kube-proxy.log
       pos_file /var/log/fluentd-kube-proxy.log.pos
       tag logzio.kube-proxy
+      refresh_insterval "#{ENV['LOG_FILE_REFRESH_INTERVAL']}"
       <parse>
         @type kubernetes
       </parse>
@@ -401,6 +413,7 @@ configmap:
       path /var/log/kube-apiserver.log
       pos_file /var/log/fluentd-kube-apiserver.log.pos
       tag logzio.kube-apiserver
+      refresh_insterval "#{ENV['LOG_FILE_REFRESH_INTERVAL']}"
       <parse>
         @type kubernetes
       </parse>
@@ -413,6 +426,7 @@ configmap:
       path /var/log/kube-controller-manager.log
       pos_file /var/log/fluentd-kube-controller-manager.log.pos
       tag logzio.kube-controller-manager
+      refresh_insterval "#{ENV['LOG_FILE_REFRESH_INTERVAL']}"
       <parse>
         @type kubernetes
       </parse>
@@ -425,6 +439,7 @@ configmap:
       path /var/log/kube-scheduler.log
       pos_file /var/log/fluentd-kube-scheduler.log.pos
       tag logzio.kube-scheduler
+      refresh_insterval "#{ENV['LOG_FILE_REFRESH_INTERVAL']}"
       <parse>
         @type kubernetes
       </parse>
@@ -437,6 +452,7 @@ configmap:
       path /var/log/rescheduler.log
       pos_file /var/log/fluentd-rescheduler.log.pos
       tag logzio.rescheduler
+      refresh_insterval "#{ENV['LOG_FILE_REFRESH_INTERVAL']}"
       <parse>
         @type kubernetes
       </parse>
@@ -449,6 +465,7 @@ configmap:
       path /var/log/glbc.log
       pos_file /var/log/fluentd-glbc.log.pos
       tag logzio.glbc
+      refresh_insterval "#{ENV['LOG_FILE_REFRESH_INTERVAL']}"
       <parse>
         @type kubernetes
       </parse>
@@ -461,6 +478,7 @@ configmap:
       path /var/log/cluster-autoscaler.log
       pos_file /var/log/fluentd-cluster-autoscaler.log.pos
       tag logzio.cluster-autoscaler
+      refresh_insterval "#{ENV['LOG_FILE_REFRESH_INTERVAL']}"
       <parse>
         @type kubernetes
       </parse>
@@ -586,6 +604,7 @@ configmap:
       path /var/log/kubernetes/kube-apiserver-audit.log
       pos_file /var/log/kube-apiserver-audit.log.pos
       tag logzio.kube-apiserver-audit
+      refresh_insterval "#{ENV['LOG_FILE_REFRESH_INTERVAL']}"
       <parse>
         @type multiline
         format_firstline /^\S+\s+AUDIT:/
@@ -609,6 +628,7 @@ configmap:
       path /var/log/kubernetes/kube-apiserver-audit.log
       pos_file /var/log/kube-apiserver-audit.log.pos
       tag logzio.kube-apiserver-audit
+      refresh_insterval "#{ENV['LOG_FILE_REFRESH_INTERVAL']}"
       <parse>
         @type json
         keep_time_key true

From 00094782e94b1332af34bc6649e6e73ce64f4575 Mon Sep 17 00:00:00 2001
From: Yotam loewenbach <yotam.loewenbach@logz.io>
Date: Tue, 26 Mar 2024 20:58:41 +0700
Subject: [PATCH 2/8] Update Chart.yaml

---
 charts/fluentd/Chart.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/fluentd/Chart.yaml b/charts/fluentd/Chart.yaml
index 7cb09382..fb559040 100644
--- a/charts/fluentd/Chart.yaml
+++ b/charts/fluentd/Chart.yaml
@@ -4,7 +4,7 @@ description: A Helm chart for shipping Kubernetes logs via Fluentd.
 keywords:
   - logging
   - fluentd
-version: 0.29.0
+version: 0.29.1
 appVersion: 1.5.1
 maintainers:
   - name: Miri Bar

From 17f3a78c5bd3d1a68dcc4b92ee05e31a55f22013 Mon Sep 17 00:00:00 2001
From: Yotam loewenbach <yotam.loewenbach@logz.io>
Date: Tue, 26 Mar 2024 20:59:19 +0700
Subject: [PATCH 3/8] add `.values.enabled` to all templates + add env var
 `LOG_FILE_REFRESH_INTERVAL`

---
 charts/fluentd/templates/aws-observability-namespace.yaml | 4 +++-
 charts/fluentd/templates/clusterrole.yaml                 | 4 +++-
 charts/fluentd/templates/clusterrolebinding.yaml          | 4 +++-
 charts/fluentd/templates/configmap-monitoring.yaml        | 4 +++-
 charts/fluentd/templates/configmap.yaml                   | 2 ++
 charts/fluentd/templates/daemonset.yaml                   | 6 ++++++
 charts/fluentd/templates/fargate-logging-configmap.yaml   | 2 ++
 charts/fluentd/templates/secret.yaml                      | 2 ++
 charts/fluentd/templates/serviceaccount.yaml              | 4 +++-
 9 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/charts/fluentd/templates/aws-observability-namespace.yaml b/charts/fluentd/templates/aws-observability-namespace.yaml
index 08618ef1..d04db956 100644
--- a/charts/fluentd/templates/aws-observability-namespace.yaml
+++ b/charts/fluentd/templates/aws-observability-namespace.yaml
@@ -1,3 +1,4 @@
+{{ if .Values.enabled }}
 {{- if .Values.fargateLogRouter.enabled }}
 kind: Namespace
 apiVersion: v1
@@ -5,4 +6,5 @@ metadata:
   name: aws-observability
   labels:
     aws-observability: enabled
-{{- end }}
\ No newline at end of file
+{{- end }}
+{{ end }}
\ No newline at end of file
diff --git a/charts/fluentd/templates/clusterrole.yaml b/charts/fluentd/templates/clusterrole.yaml
index 879007fa..94b816ee 100644
--- a/charts/fluentd/templates/clusterrole.yaml
+++ b/charts/fluentd/templates/clusterrole.yaml
@@ -1,3 +1,4 @@
+{{ if .Values.enabled }}
 {{- if .Values.isRBAC }}
 apiVersion: {{ .Values.apiVersions.clusterRole }}
 kind: ClusterRole
@@ -5,4 +6,5 @@ metadata:
   name: {{ include "fluentd.fullname" . }}
   namespace: {{ .Release.Namespace }}
 rules: {{ toYaml .Values.clusterRole.rules | nindent 2 -}}
-{{- end }}
\ No newline at end of file
+{{- end }}
+{{ end }}
\ No newline at end of file
diff --git a/charts/fluentd/templates/clusterrolebinding.yaml b/charts/fluentd/templates/clusterrolebinding.yaml
index c147b4a3..0af36302 100644
--- a/charts/fluentd/templates/clusterrolebinding.yaml
+++ b/charts/fluentd/templates/clusterrolebinding.yaml
@@ -1,3 +1,4 @@
+{{ if .Values.enabled }}
 {{- if .Values.isRBAC }}
 apiVersion: {{ .Values.apiVersions.clusterRoleBinding }}
 kind: ClusterRoleBinding
@@ -11,4 +12,5 @@ subjects:
 - kind: ServiceAccount
   name: {{ template "fluentd.serviceAccount" . }}
   namespace: {{ .Release.Namespace }}
-{{- end }}
\ No newline at end of file
+{{- end }}
+{{ end }}
\ No newline at end of file
diff --git a/charts/fluentd/templates/configmap-monitoring.yaml b/charts/fluentd/templates/configmap-monitoring.yaml
index 0193085c..18242a2c 100644
--- a/charts/fluentd/templates/configmap-monitoring.yaml
+++ b/charts/fluentd/templates/configmap-monitoring.yaml
@@ -1,3 +1,4 @@
+{{ if .Values.enabled }}
 {{- if or .Values.daemonset.fluentdPrometheusConf .Values.windowsDaemonset.fluentdPrometheusConf }}
 apiVersion: {{ .Values.apiVersions.configmap }}
 kind: ConfigMap
@@ -8,4 +9,5 @@ metadata:
     k8s-app: {{ .Values.k8sApp }}
 data:
   prometheus.conf : {{ toYaml .Values.configmap.prometheus | indent 2 }}
-{{- end }}
\ No newline at end of file
+{{- end }}
+{{ end }}
\ No newline at end of file
diff --git a/charts/fluentd/templates/configmap.yaml b/charts/fluentd/templates/configmap.yaml
index 540ae572..9e3351a5 100644
--- a/charts/fluentd/templates/configmap.yaml
+++ b/charts/fluentd/templates/configmap.yaml
@@ -1,3 +1,4 @@
+{{ if .Values.enabled }}
 apiVersion: {{ .Values.apiVersions.configmap }}
 kind: ConfigMap
 metadata:
@@ -43,3 +44,4 @@ data:
 {{ $value | indent 4 -}}
 {{- end -}}
 {{- end }}
+{{ end }}
diff --git a/charts/fluentd/templates/daemonset.yaml b/charts/fluentd/templates/daemonset.yaml
index 897bafd4..b557129f 100644
--- a/charts/fluentd/templates/daemonset.yaml
+++ b/charts/fluentd/templates/daemonset.yaml
@@ -1,3 +1,4 @@
+{{ if .Values.enabled }}
 apiVersion: {{ .Values.apiVersions.daemonset }}
 kind: DaemonSet
 metadata:
@@ -87,6 +88,8 @@ spec:
             secretKeyRef:
               name: {{ .Values.secretName }}
               key: logzio-log-listener
+        - name: LOG_FILE_REFRESH_INTERVAL
+          value: {{ .Values.daemonset.LogFileRefreshInterval | quote }}
         - name: LOGZIO_BUFFER_TYPE
           value: {{ .Values.daemonset.logzioBufferType | quote }}
         - name: LOGZIO_BUFFER_PATH
@@ -236,6 +239,8 @@ spec:
             secretKeyRef:
               name: {{ .Values.secretName }}
               key: logzio-log-listener
+        - name: LOG_FILE_REFRESH_INTERVAL
+          value: {{ .Values.daemonset.LogFileRefreshInterval | quote }}
         - name: LOGZIO_BUFFER_TYPE
           value: {{ .Values.windowsDaemonset.logzioBufferType | quote }}
         - name: LOGZIO_BUFFER_PATH
@@ -316,3 +321,4 @@ spec:
   updateStrategy: {{ toYaml .Values.windowsDaemonset.updateStrategy | nindent 4 }}
   {{- end }}
 {{- end }}
+{{ end }}
diff --git a/charts/fluentd/templates/fargate-logging-configmap.yaml b/charts/fluentd/templates/fargate-logging-configmap.yaml
index db00d201..1b26ee31 100644
--- a/charts/fluentd/templates/fargate-logging-configmap.yaml
+++ b/charts/fluentd/templates/fargate-logging-configmap.yaml
@@ -1,3 +1,4 @@
+{{ if .Values.enabled }}
 {{ if .Values.fargateLogRouter.enabled }}
 kind: ConfigMap
 apiVersion: v1
@@ -44,4 +45,5 @@ data:
       Port  8070
       Retry_Limit no_retries
       Index logzioCustomerIndex
+{{ end }}
 {{ end }}
\ No newline at end of file
diff --git a/charts/fluentd/templates/secret.yaml b/charts/fluentd/templates/secret.yaml
index d2d86854..1fa87e7e 100644
--- a/charts/fluentd/templates/secret.yaml
+++ b/charts/fluentd/templates/secret.yaml
@@ -1,3 +1,4 @@
+{{ if .Values.enabled }}
 {{- if .Values.secrets.enabled -}}
 apiVersion: {{ .Values.apiVersions.secret }}
 kind: Secret
@@ -9,3 +10,4 @@ stringData:
   logzio-log-shipping-token: {{ required "Logzio shipping token is required!" .Values.secrets.logzioShippingToken }}
   logzio-log-listener: {{ template "logzio.listenerHost" . }}
 {{- end }}
+{{ end }}
diff --git a/charts/fluentd/templates/serviceaccount.yaml b/charts/fluentd/templates/serviceaccount.yaml
index 8c7281a8..ed3b0543 100644
--- a/charts/fluentd/templates/serviceaccount.yaml
+++ b/charts/fluentd/templates/serviceaccount.yaml
@@ -1,7 +1,9 @@
+{{ if .Values.enabled }}
 {{- if .Values.isRBAC }}
 apiVersion: {{ .Values.apiVersions.serviceAccount }}
 kind: ServiceAccount
 metadata:
   name: {{ template "fluentd.serviceAccount" . }}
   namespace: {{ .Release.Namespace }}
-{{- end }}
\ No newline at end of file
+{{- end }}
+{{ end }}
\ No newline at end of file

From 5cdd2e97993497177131e598b301b81eb4cc4a15 Mon Sep 17 00:00:00 2001
From: Yotam loewenbach <yotam.loewenbach@logz.io>
Date: Tue, 26 Mar 2024 21:03:51 +0700
Subject: [PATCH 4/8] docs

---
 charts/fluentd/README.md   | 4 ++++
 charts/fluentd/values.yaml | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/charts/fluentd/README.md b/charts/fluentd/README.md
index a8e5632d..b025bbe6 100644
--- a/charts/fluentd/README.md
+++ b/charts/fluentd/README.md
@@ -91,6 +91,7 @@ helm install -n monitoring \
 | `daemonset.auditLogFormat` | Match Fluentd's format for kube-apiserver audit logs. Set to `audit-json` if your audit logs are in json format. | `audit` |
 | `daemonset.containerdRuntime` | **Deprecated from chart version 0.1.0.** Determines whether to use a configuration for a Containerd runtime. Set to `false` if your cluster doesn't use Containerd as CRI. | `true` |
 | `daemonset.cri` | Container runtime interface of the cluster. Used to determine which configuration to use when concatenating partial logs. Valid options are: `docker`, `containerd`. | `containerd` |
+| `daemonset.LogFileRefreshInterval` | The interval of refreshing the list of watch file for log files.. | `60s` |
 | `daemonset.logzioBufferType` | Specifies which plugin to use as the backend. | `file` |
 | `daemonset.logzioBufferPath` | Path of the buffer. | `/var/log/fluentd-buffers/stackdriver.buffer` |
 | `daemonset.logzioOverflowAction` | Controls the behavior when the queue becomes full. | `block` |
@@ -301,6 +302,9 @@ If needed, the fluentd image can be changed to support windows server 2022 with
 
 
 ## Change log
+ - **0.29.1**:
+   - Added `enabled` value, to conditianly control the deployment of this chart by a parent chart.
+   - Added `daemonset.LogFileRefreshInterval` value, to control list of watched log files refresh interval.
  - **0.29.0**:
    - EKS Fargate logging:
     - Send logs to port `8070` in logzio listener (instead of port `5050`)
diff --git a/charts/fluentd/values.yaml b/charts/fluentd/values.yaml
index d3ccba1a..312deff6 100644
--- a/charts/fluentd/values.yaml
+++ b/charts/fluentd/values.yaml
@@ -88,7 +88,7 @@ daemonset:
   # Container runtime interface of the cluster. Used to determine which configuration to use when concatenating partial logs.
   # Valid options are: docker, containerd
   cri: containerd
-  # The interval of refreshing the list of watch file for log files.
+  # The interval of refreshing the list of watched log files.
   LogFileRefreshInterval: 60s
   # Specifies which plugin to use as the backend
   logzioBufferType: file

From 612907aa26d1ed9f9599c3c2ab6c22ce78c91153 Mon Sep 17 00:00:00 2001
From: Yotam loewenbach <yotam.loewenbach@logz.io>
Date: Tue, 26 Mar 2024 21:05:23 +0700
Subject: [PATCH 5/8] change `maintainers`

---
 charts/fluentd/Chart.yaml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/charts/fluentd/Chart.yaml b/charts/fluentd/Chart.yaml
index fb559040..d2cf132c 100644
--- a/charts/fluentd/Chart.yaml
+++ b/charts/fluentd/Chart.yaml
@@ -7,7 +7,5 @@ keywords:
 version: 0.29.1
 appVersion: 1.5.1
 maintainers:
-  - name: Miri Bar
-    email: miri.ignatiev@logz.io
-  - name: Tamir Michaeli
-    email: tamir.michaeli@logz.io
\ No newline at end of file
+  - name: Yotam loewenbach
+    email: yotam.loewenbach@logz.io
\ No newline at end of file

From 74fc0ebcddf78cb66fa4bf06b1259eb46cfda057 Mon Sep 17 00:00:00 2001
From: Yotam loewenbach <yotam.loewenbach@logz.io>
Date: Wed, 27 Mar 2024 12:08:41 +0700
Subject: [PATCH 6/8] Add `LOG_FILE_REFRESH_INTERVAL` to windows

---
 charts/fluentd/templates/daemonset.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/fluentd/templates/daemonset.yaml b/charts/fluentd/templates/daemonset.yaml
index b557129f..17e1bbe6 100644
--- a/charts/fluentd/templates/daemonset.yaml
+++ b/charts/fluentd/templates/daemonset.yaml
@@ -240,7 +240,7 @@ spec:
               name: {{ .Values.secretName }}
               key: logzio-log-listener
         - name: LOG_FILE_REFRESH_INTERVAL
-          value: {{ .Values.daemonset.LogFileRefreshInterval | quote }}
+          value: {{ .Values.windowsDaemonset.LogFileRefreshInterval | quote }}
         - name: LOGZIO_BUFFER_TYPE
           value: {{ .Values.windowsDaemonset.logzioBufferType | quote }}
         - name: LOGZIO_BUFFER_PATH

From 40ac06ecdb422eee57f357a749fb4a7494174750 Mon Sep 17 00:00:00 2001
From: Yotam loewenbach <yotam.loewenbach@logz.io>
Date: Wed, 27 Mar 2024 12:09:21 +0700
Subject: [PATCH 7/8] Update README.md

---
 charts/fluentd/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/charts/fluentd/README.md b/charts/fluentd/README.md
index b025bbe6..1ddc0a3b 100644
--- a/charts/fluentd/README.md
+++ b/charts/fluentd/README.md
@@ -121,6 +121,7 @@ helm install -n monitoring \
 | `windowsDaemonset.auditLogFormat` | Match Fluentd's format for kube-apiserver audit logs. Set to `audit-json` if your audit logs are in json format. (windows) | `audit` |
 | `windowsDaemonset.containerdRuntime` | **Deprecated from chart version 0.1.0.** Determines whether to use a configuration for a Containerd runtime. Set to `false` if your cluster doesn't use Containerd as CRI. (windows) | `true` |
 | `windowsDaemonset.cri` | Container runtime interface of the cluster. Used to determine which configuration to use when concatenating partial logs (windows). Valid options are: `docker`, `containerd`. | `containerd` |
+| `windowsDaemonset.LogFileRefreshInterval` | The interval of refreshing the list of watch file for log files.. | `60s` |
 | `windowsDaemonset.logzioBufferType` | Specifies which plugin to use as the backend. | `file` |
 | `windowsDaemonset.logzioBufferPath` | Path of the buffer. (windows) | `/var/log/fluentd-buffers/stackdriver.buffer` |
 | `windowsDaemonset.logzioOverflowAction` | Controls the behavior when the queue becomes full. (windows) | `block` |

From c3b4922e60894eb9a71169ae91b229f918c5e127 Mon Sep 17 00:00:00 2001
From: Yotam loewenbach <yotam.loewenbach@logz.io>
Date: Wed, 27 Mar 2024 12:10:20 +0700
Subject: [PATCH 8/8] change log

---
 charts/fluentd/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/fluentd/README.md b/charts/fluentd/README.md
index 1ddc0a3b..d6f9db43 100644
--- a/charts/fluentd/README.md
+++ b/charts/fluentd/README.md
@@ -305,7 +305,7 @@ If needed, the fluentd image can be changed to support windows server 2022 with
 ## Change log
  - **0.29.1**:
    - Added `enabled` value, to conditianly control the deployment of this chart by a parent chart.
-   - Added `daemonset.LogFileRefreshInterval` value, to control list of watched log files refresh interval.
+   - Added `daemonset.LogFileRefreshInterval` and `windowsDaemonset.LogFileRefreshInterval` values, to control list of watched log files refresh interval.
  - **0.29.0**:
    - EKS Fargate logging:
     - Send logs to port `8070` in logzio listener (instead of port `5050`)