From f298aa94817faaef5ad0f42ebebfb80b43e32c17 Mon Sep 17 00:00:00 2001
From: lm-aditya-kadam <aditya.kadam@logicmonitor.com>
Date: Fri, 10 Apr 2026 12:09:49 +0530
Subject: [PATCH 1/4] feat(lm-logs): add custom Fluentd filters and flexible
 volume support

- Add extraFilters field to support custom Fluentd filter blocks for
  include/exclude log filtering after kubernetes metadata enrichment
- Add validation to ensure only <filter> blocks are used, preventing
  accidental use of <match>, <source>, or <label> directives
- Add extraVolumes and extraVolumeMounts fields for users to mount
  additional volumes as needed
- Include practical examples for namespace exclusion and pattern-based
  log filtering
- Bump chart version from 1.0.1 to 1.1.0
---
 charts/lm-logs/Chart.yaml               |  2 +-
 charts/lm-logs/templates/_helpers.tpl   | 17 +++++++++++++++
 charts/lm-logs/templates/configmap.yaml |  5 +++++
 charts/lm-logs/templates/daemonset.yaml |  6 ++++++
 charts/lm-logs/values.schema.json       | 21 +++++++++++++++++++
 charts/lm-logs/values.yaml              | 28 +++++++++++++++++++++++++
 6 files changed, 78 insertions(+), 1 deletion(-)

diff --git a/charts/lm-logs/Chart.yaml b/charts/lm-logs/Chart.yaml
index ffd234e..6f3b68c 100644
--- a/charts/lm-logs/Chart.yaml
+++ b/charts/lm-logs/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 description: A Helm chart for sending k8s logs to Logic Monitor
 name: lm-logs
-version: 1.0.1
+version: 1.1.0
 maintainers:
   - email: dev@logicmonitor.com
     name: LogicMonitor
diff --git a/charts/lm-logs/templates/_helpers.tpl b/charts/lm-logs/templates/_helpers.tpl
index 38581b0..7630e1a 100644
--- a/charts/lm-logs/templates/_helpers.tpl
+++ b/charts/lm-logs/templates/_helpers.tpl
@@ -367,3 +367,20 @@ systemd.conf: ""
 {{- end }}
 {{- end }}
 
+
+{{/*
+Validate fluent.extraFilters: only <filter> blocks allowed, tags must be balanced.
+*/}}
+{{- define "lm-logs.validateExtraFilters" -}}
+{{- $f := .Values.fluent.extraFilters -}}
+{{- if $f -}}
+  {{- if or (contains "<match" $f) (contains "<source" $f) (contains "<label" $f) -}}
+    {{- fail "fluent.extraFilters must only contain <filter> blocks. Found disallowed directive (<match>, <source>, or <label>). Use only <filter> blocks for custom filtering." -}}
+  {{- end -}}
+  {{- $open := regexFindAll "<filter" $f -1 -}}
+  {{- $close := regexFindAll "</filter>" $f -1 -}}
+  {{- if ne (len $open) (len $close) -}}
+    {{- fail "fluent.extraFilters has mismatched <filter>/</filter> tags. Ensure every <filter> has a closing </filter>." -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
diff --git a/charts/lm-logs/templates/configmap.yaml b/charts/lm-logs/templates/configmap.yaml
index 86d6acc..14b6396 100644
--- a/charts/lm-logs/templates/configmap.yaml
+++ b/charts/lm-logs/templates/configmap.yaml
@@ -54,6 +54,11 @@ data:
         skip_namespace_metadata "#{ENV['FLUENT_KUBERNETES_METADATA_SKIP_NAMESPACE_METADATA'] || 'false'}"
       </filter>
 
+      {{- if .Values.fluent.extraFilters }}
+      {{- include "lm-logs.validateExtraFilters" . }}
+{{ .Values.fluent.extraFilters | nindent 6 }}
+      {{- end }}
+
       <filter kubernetes.**>
         @type record_transformer
         enable_ruby
diff --git a/charts/lm-logs/templates/daemonset.yaml b/charts/lm-logs/templates/daemonset.yaml
index 0878f67..8b0bd8e 100644
--- a/charts/lm-logs/templates/daemonset.yaml
+++ b/charts/lm-logs/templates/daemonset.yaml
@@ -59,6 +59,9 @@ spec:
             - name: fluentbuffer
               mountPath: {{ .Values.fluent.buffer.file.mountPath | default "/fluentd/buffer" }}
             {{- end }}
+            {{- with .Values.extraVolumeMounts }}
+            {{- toYaml . | nindent 12 }}
+            {{- end }}
       volumes:
         - name: fluentconf
           configMap:
@@ -71,6 +74,9 @@ spec:
             sizeLimit: {{ .Values.fluent.buffer.file.sizeLimit }}
             {{- end }}
         {{- end }}
+        {{- with .Values.extraVolumes }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
diff --git a/charts/lm-logs/values.schema.json b/charts/lm-logs/values.schema.json
index a7005a5..b3849df 100644
--- a/charts/lm-logs/values.schema.json
+++ b/charts/lm-logs/values.schema.json
@@ -305,6 +305,11 @@
         "resource_type": {
           "type" : "string"
         },
+        "extraFilters": {
+          "type": "string",
+          "default": "",
+          "description": "Raw Fluentd filter config injected after kubernetes_metadata enrichment inside <label @PROCESS_AFTER_CONCAT>. Use for grep include/exclude filters."
+        },
         "buffer": {
           "type": "object",
           "additionalProperties": false,
@@ -441,6 +446,22 @@
       },
       "uniqueItems": true
     },
+    "extraVolumes": {
+      "type": "array",
+      "default": [],
+      "description": "Additional volumes to add to the Fluentd DaemonSet pod.",
+      "items": {
+        "$ref": "#/definitions/io.k8s.api.core.v1.Volume"
+      }
+    },
+    "extraVolumeMounts": {
+      "type": "array",
+      "default": [],
+      "description": "Additional volume mounts to add to the Fluentd container.",
+      "items": {
+        "$ref": "#/definitions/io.k8s.api.core.v1.VolumeMount"
+      }
+    },
     "systemd": {
       "type": ["object", "null"],
       "default": null,
diff --git a/charts/lm-logs/values.yaml b/charts/lm-logs/values.yaml
index 16eff0e..ee2865e 100644
--- a/charts/lm-logs/values.yaml
+++ b/charts/lm-logs/values.yaml
@@ -43,6 +43,31 @@ fluent:
   device_less_logs: false
   include_metadata: true
   resource_type: ""
+
+  # Extra Fluentd filters injected after kubernetes_metadata enrichment,
+  # inside <label @PROCESS_AFTER_CONCAT>. Use for include/exclude filtering.
+  #
+  # Example – drop logs from kube-system namespace:
+  #   extraFilters: |
+  #     <filter kubernetes.**>
+  #       @type grep
+  #       <exclude>
+  #         key $.kubernetes.namespace_name
+  #         pattern /^kube-system$/
+  #       </exclude>
+  #     </filter>
+  #
+  # Example – keep only logs matching a pattern:
+  #   extraFilters: |
+  #     <filter kubernetes.**>
+  #       @type grep
+  #       <regexp>
+  #         key message
+  #         pattern /ERROR|WARN/
+  #       </regexp>
+  #     </filter>
+  extraFilters: ""
+
   buffer:
     type: memory
     memory:
@@ -107,3 +132,6 @@ volumeMounts:
   - name: journal
     mountPath: /var/log/journal
     readOnly: true
+
+extraVolumes: []
+extraVolumeMounts: []

From 1bf2ce095626ff7a5fb978c5442a0687e9ab9853 Mon Sep 17 00:00:00 2001
From: lm-aditya-kadam <aditya.kadam@logicmonitor.com>
Date: Fri, 10 Apr 2026 12:09:49 +0530
Subject: [PATCH 2/4] feat(lm-logs): require kubernetes.cluster_name and align
 configmap

- Fail render when kubernetes.cluster_name is unset in assertInputs
- Use kubernetes.cluster_name only in cluster name helper and log source
- Document required cluster_name in README install examples and parameters
- Deduplicate extraFilters block (single validate + nindent)
- Add cluster_name to ci base-sanity-values for chart-testing
---
 charts/lm-logs/README.md                  |  6 +++++-
 charts/lm-logs/ci/base-sanity-values.yaml |  2 ++
 charts/lm-logs/templates/_helpers.tpl     | 19 +++++++------------
 charts/lm-logs/templates/configmap.yaml   |  6 +++---
 4 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/charts/lm-logs/README.md b/charts/lm-logs/README.md
index f3397c3..8dbcfea 100644
--- a/charts/lm-logs/README.md
+++ b/charts/lm-logs/README.md
@@ -13,6 +13,7 @@ helm install -n <namespace> \
 --set lm_company_name="<lm_company_name>" \
 --set lm_access_id="<lm_access_id>" \
 --set lm_access_key="<lm_access_key>" \
+--set kubernetes.cluster_name="<cluster_name>" \
 lm-logs logicmonitor/lm-logs
 ```
 
@@ -22,11 +23,13 @@ Install the lm-logs chart using a user defined secret for LM credentials.
 # For LMv1
 helm install lm-logs logicmonitor/lm-logs -n <namespace> \
   --set global.userDefinedSecret=lm-logs-credentials \
+  --set kubernetes.cluster_name="<cluster_name>" \
   --set authMode=lmv1
 
 # For Bearer
 helm install lm-logs logicmonitor/lm-logs -n <namespace> \
   --set global.userDefinedSecret=lm-logs-credentials \
+  --set kubernetes.cluster_name="<cluster_name>" \
   --set authMode=bearer
 ```
 
@@ -69,7 +72,7 @@ The following tables lists the configurable parameters of the lm-logs chart and
 | `affinity`                  | Affinity for pod assignment		                | `{}`  (evaluated as a template)                         |
 | `env`                       | Map to add extra environment variables	        | `{}`                                                    |
 | `kubernetes.multiline_start_regexp` | Regexp to match beginning of multiline	| `/^\[(\d{4}-)?\d{2}-\d{2} \d{2}:\d{2}:\d{2}.\d{3}.*\]/` |
-| `kubernetes.cluster_name`       | ClusterName given while adding k8s cluster  	| `""`                                                |
+| `kubernetes.cluster_name`       | (Required) Cluster name given while adding k8s cluster. Must be set for both standalone lm-logs and lm-container with lm-logs.  	| `""`                                                |
 | `kubernetes.multiline_concat_key`       | Key to look for fluentD to concatenate multiline logs   	| `"log"`                     |
 
 
@@ -166,6 +169,7 @@ helm upgrade --install -n <namespace> \
 --set lm_company_name="<company>" \
 --set lm_access_id="<access_id>" \
 --set lm_access_key="<access_key"> \
+--set kubernetes.cluster_name="<cluster_name>" \
 --set env.FLUENT_CONTAINER_TAIL_PARSER_TYPE="cri" \
 --set kubernetes.multiline_concat_key="message" \
 lm-logs logicmonitor/lm-logs
diff --git a/charts/lm-logs/ci/base-sanity-values.yaml b/charts/lm-logs/ci/base-sanity-values.yaml
index f6f3f1d..8cf4ca3 100644
--- a/charts/lm-logs/ci/base-sanity-values.yaml
+++ b/charts/lm-logs/ci/base-sanity-values.yaml
@@ -2,6 +2,8 @@ lm_company_name: "dummy_company"
 lm_access_id: "dummy_id"
 lm_access_key: "dummy_key"
 authMode: "lmv1"
+kubernetes:
+  cluster_name: "dummy-cluster"
 global:
   account: "dummyaccount"
   accessID: "dummyid"
diff --git a/charts/lm-logs/templates/_helpers.tpl b/charts/lm-logs/templates/_helpers.tpl
index 7630e1a..ccad25a 100644
--- a/charts/lm-logs/templates/_helpers.tpl
+++ b/charts/lm-logs/templates/_helpers.tpl
@@ -134,18 +134,18 @@ optional: true
 {{- else -}}
   {{- fail "authMode must be 'lmv1' or 'bearer'." -}}
 {{- end -}}
+
+{{- /* 3) Enforce kubernetes.cluster_name presence (required for resource mapping). No global fallback. */ -}}
+{{- if not (and .Values.kubernetes .Values.kubernetes.cluster_name) -}}
+  {{- fail "kubernetes.cluster_name is required. Set lm-logs.kubernetes.cluster_name (or kubernetes.cluster_name when installing lm-logs standalone)." -}}
+{{- end -}}
 {{- end -}}
 
 {{/*
 Adding validations for clustername for lm-logs to contain only lower alphanumeric or '-' and start and end with an alphanumeric character
 */}}
 {{- define "kubernetes.cluster_name" -}}
-{{- $cluster := "" -}}
-{{- if .Values.kubernetes.cluster_name -}}
-{{- $cluster = .Values.kubernetes.cluster_name -}}
-{{- else if .Values.global.clusterName -}}
-{{- $cluster = .Values.global.clusterName -}}
-{{- end -}}
+{{- $cluster := .Values.kubernetes.cluster_name -}}
 {{- if ne $cluster "" -}}
 {{- if regexMatch "^[a-z0-9][a-z0-9-]*[a-z0-9]$" $cluster }}
 kubernetes.cluster_name {{ $cluster }}
@@ -159,12 +159,7 @@ kubernetes.cluster_name {{ $cluster }}
 User-agent for log-ingest requests
 */}}
 {{- define "logsource.userAgent" -}}
-{{- $cluster := "" -}}
-{{- if .Values.kubernetes.cluster_name -}}
-{{- $cluster = .Values.kubernetes.cluster_name -}}
-{{- else if .Values.global.clusterName -}}
-{{- $cluster = .Values.global.clusterName -}}
-{{- end -}}
+{{- $cluster := .Values.kubernetes.cluster_name -}}
 log_source lm-logs-fluentd (K8S; {{ $cluster }})
 {{- end -}}
 
diff --git a/charts/lm-logs/templates/configmap.yaml b/charts/lm-logs/templates/configmap.yaml
index 14b6396..c8c7daf 100644
--- a/charts/lm-logs/templates/configmap.yaml
+++ b/charts/lm-logs/templates/configmap.yaml
@@ -34,7 +34,7 @@ data:
           {{- if .Values.fluent.device_less_logs }}
           resource.service.name ${ENV['K8S_NODE_NAME']}
           {{- end }}
-          {{- if or .Values.kubernetes.cluster_name .Values.global.clusterName }}
+          {{- if .Values.kubernetes.cluster_name }}
           {{ include "kubernetes.cluster_name" . | nindent 10 }}
           {{- end }}
         </record>
@@ -65,8 +65,8 @@ data:
         <record>
           message ${record["log"]} ${record["message"]}
           timestamp ${record["time"]}
-          {{- if or .Values.kubernetes.cluster_name .Values.global.clusterName }}
-          {{- $cluster := .Values.kubernetes.cluster_name | default .Values.global.clusterName }}
+          {{- if .Values.kubernetes.cluster_name }}
+          {{- $cluster := .Values.kubernetes.cluster_name }}
           kubernetes.cluster_name {{ $cluster }}
           kubernetes ${record["kubernetes"] ? record["kubernetes"].merge({"cluster_name" => "{{ $cluster }}"}) : {"cluster_name" => "{{ $cluster }}"}}
           {{- end }}

From 045bb9410a71877eec70546b7c98f720ace9ff6c Mon Sep 17 00:00:00 2001
From: lm-aditya-kadam <aditya.kadam@logicmonitor.com>
Date: Fri, 10 Apr 2026 12:09:49 +0530
Subject: [PATCH 3/4] fix(lm-logs): mandatory cluster_name and configmap
 updates

---
 charts/lm-logs/ci/base-sanity-values.yaml |  2 --
 charts/lm-logs/templates/_helpers.tpl     | 12 ++++++++++++
 charts/lm-logs/templates/configmap.yaml   |  5 +++++
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/charts/lm-logs/ci/base-sanity-values.yaml b/charts/lm-logs/ci/base-sanity-values.yaml
index 8cf4ca3..f6f3f1d 100644
--- a/charts/lm-logs/ci/base-sanity-values.yaml
+++ b/charts/lm-logs/ci/base-sanity-values.yaml
@@ -2,8 +2,6 @@ lm_company_name: "dummy_company"
 lm_access_id: "dummy_id"
 lm_access_key: "dummy_key"
 authMode: "lmv1"
-kubernetes:
-  cluster_name: "dummy-cluster"
 global:
   account: "dummyaccount"
   accessID: "dummyid"
diff --git a/charts/lm-logs/templates/_helpers.tpl b/charts/lm-logs/templates/_helpers.tpl
index ccad25a..a0b5a2b 100644
--- a/charts/lm-logs/templates/_helpers.tpl
+++ b/charts/lm-logs/templates/_helpers.tpl
@@ -145,6 +145,12 @@ optional: true
 Adding validations for clustername for lm-logs to contain only lower alphanumeric or '-' and start and end with an alphanumeric character
 */}}
 {{- define "kubernetes.cluster_name" -}}
+{{- $cluster := "" -}}
+{{- if .Values.kubernetes.cluster_name -}}
+{{- $cluster = .Values.kubernetes.cluster_name -}}
+{{- else if .Values.global.clusterName -}}
+{{- $cluster = .Values.global.clusterName -}}
+{{- end -}}
 {{- $cluster := .Values.kubernetes.cluster_name -}}
 {{- if ne $cluster "" -}}
 {{- if regexMatch "^[a-z0-9][a-z0-9-]*[a-z0-9]$" $cluster }}
@@ -159,6 +165,12 @@ kubernetes.cluster_name {{ $cluster }}
 User-agent for log-ingest requests
 */}}
 {{- define "logsource.userAgent" -}}
+{{- $cluster := "" -}}
+{{- if .Values.kubernetes.cluster_name -}}
+{{- $cluster = .Values.kubernetes.cluster_name -}}
+{{- else if .Values.global.clusterName -}}
+{{- $cluster = .Values.global.clusterName -}}
+{{- end -}}
 {{- $cluster := .Values.kubernetes.cluster_name -}}
 log_source lm-logs-fluentd (K8S; {{ $cluster }})
 {{- end -}}
diff --git a/charts/lm-logs/templates/configmap.yaml b/charts/lm-logs/templates/configmap.yaml
index c8c7daf..87ec408 100644
--- a/charts/lm-logs/templates/configmap.yaml
+++ b/charts/lm-logs/templates/configmap.yaml
@@ -34,6 +34,7 @@ data:
           {{- if .Values.fluent.device_less_logs }}
           resource.service.name ${ENV['K8S_NODE_NAME']}
           {{- end }}
+          {{- if or .Values.kubernetes.cluster_name .Values.global.clusterName }}
           {{- if .Values.kubernetes.cluster_name }}
           {{ include "kubernetes.cluster_name" . | nindent 10 }}
           {{- end }}
@@ -55,6 +56,8 @@ data:
       </filter>
 
       {{- if .Values.fluent.extraFilters }}
+      {{- include "lm-logs.validateExtraFilters" . -}}
+{{ .Values.fluent.extraFilters | indent 6 }}
       {{- include "lm-logs.validateExtraFilters" . }}
 {{ .Values.fluent.extraFilters | nindent 6 }}
       {{- end }}
@@ -65,6 +68,8 @@ data:
         <record>
           message ${record["log"]} ${record["message"]}
           timestamp ${record["time"]}
+          {{- if or .Values.kubernetes.cluster_name .Values.global.clusterName }}
+          {{- $cluster := .Values.kubernetes.cluster_name | default .Values.global.clusterName }}
           {{- if .Values.kubernetes.cluster_name }}
           {{- $cluster := .Values.kubernetes.cluster_name }}
           kubernetes.cluster_name {{ $cluster }}

From ab955443215ae0f9e61f221411126a047d06030e Mon Sep 17 00:00:00 2001
From: lm-aditya-kadam <aditya.kadam@logicmonitor.com>
Date: Fri, 10 Apr 2026 12:09:49 +0530
Subject: [PATCH 4/4] fix(lm-logs): align mandatory cluster_name templates with
 QA

- Drop global.clusterName fallback; use kubernetes.cluster_name only
- Deduplicate extraFilters (single validate + nindent)
- Restore kubernetes.cluster_name in CI base-sanity-values for ct
---
 charts/lm-logs/ci/base-sanity-values.yaml |  2 ++
 charts/lm-logs/templates/_helpers.tpl     | 12 ------------
 charts/lm-logs/templates/configmap.yaml   |  5 -----
 3 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/charts/lm-logs/ci/base-sanity-values.yaml b/charts/lm-logs/ci/base-sanity-values.yaml
index f6f3f1d..8cf4ca3 100644
--- a/charts/lm-logs/ci/base-sanity-values.yaml
+++ b/charts/lm-logs/ci/base-sanity-values.yaml
@@ -2,6 +2,8 @@ lm_company_name: "dummy_company"
 lm_access_id: "dummy_id"
 lm_access_key: "dummy_key"
 authMode: "lmv1"
+kubernetes:
+  cluster_name: "dummy-cluster"
 global:
   account: "dummyaccount"
   accessID: "dummyid"
diff --git a/charts/lm-logs/templates/_helpers.tpl b/charts/lm-logs/templates/_helpers.tpl
index a0b5a2b..ccad25a 100644
--- a/charts/lm-logs/templates/_helpers.tpl
+++ b/charts/lm-logs/templates/_helpers.tpl
@@ -145,12 +145,6 @@ optional: true
 Adding validations for clustername for lm-logs to contain only lower alphanumeric or '-' and start and end with an alphanumeric character
 */}}
 {{- define "kubernetes.cluster_name" -}}
-{{- $cluster := "" -}}
-{{- if .Values.kubernetes.cluster_name -}}
-{{- $cluster = .Values.kubernetes.cluster_name -}}
-{{- else if .Values.global.clusterName -}}
-{{- $cluster = .Values.global.clusterName -}}
-{{- end -}}
 {{- $cluster := .Values.kubernetes.cluster_name -}}
 {{- if ne $cluster "" -}}
 {{- if regexMatch "^[a-z0-9][a-z0-9-]*[a-z0-9]$" $cluster }}
@@ -165,12 +159,6 @@ kubernetes.cluster_name {{ $cluster }}
 User-agent for log-ingest requests
 */}}
 {{- define "logsource.userAgent" -}}
-{{- $cluster := "" -}}
-{{- if .Values.kubernetes.cluster_name -}}
-{{- $cluster = .Values.kubernetes.cluster_name -}}
-{{- else if .Values.global.clusterName -}}
-{{- $cluster = .Values.global.clusterName -}}
-{{- end -}}
 {{- $cluster := .Values.kubernetes.cluster_name -}}
 log_source lm-logs-fluentd (K8S; {{ $cluster }})
 {{- end -}}
diff --git a/charts/lm-logs/templates/configmap.yaml b/charts/lm-logs/templates/configmap.yaml
index 87ec408..c8c7daf 100644
--- a/charts/lm-logs/templates/configmap.yaml
+++ b/charts/lm-logs/templates/configmap.yaml
@@ -34,7 +34,6 @@ data:
           {{- if .Values.fluent.device_less_logs }}
           resource.service.name ${ENV['K8S_NODE_NAME']}
           {{- end }}
-          {{- if or .Values.kubernetes.cluster_name .Values.global.clusterName }}
           {{- if .Values.kubernetes.cluster_name }}
           {{ include "kubernetes.cluster_name" . | nindent 10 }}
           {{- end }}
@@ -56,8 +55,6 @@ data:
       </filter>
 
       {{- if .Values.fluent.extraFilters }}
-      {{- include "lm-logs.validateExtraFilters" . -}}
-{{ .Values.fluent.extraFilters | indent 6 }}
       {{- include "lm-logs.validateExtraFilters" . }}
 {{ .Values.fluent.extraFilters | nindent 6 }}
       {{- end }}
@@ -68,8 +65,6 @@ data:
         <record>
           message ${record["log"]} ${record["message"]}
           timestamp ${record["time"]}
-          {{- if or .Values.kubernetes.cluster_name .Values.global.clusterName }}
-          {{- $cluster := .Values.kubernetes.cluster_name | default .Values.global.clusterName }}
           {{- if .Values.kubernetes.cluster_name }}
           {{- $cluster := .Values.kubernetes.cluster_name }}
           kubernetes.cluster_name {{ $cluster }}