feat: add option to disable service enrichment

SumoLogic · Dec 6, 2021 · 9b0ec72 · 9b0ec72
1 parent bbe320e
commit 9b0ec72
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 2 deletions.
diff --git a/deploy/helm/sumologic/README.md b/deploy/helm/sumologic/README.md
@@ -73,6 +73,7 @@ The following table lists the configurable parameters of the Sumo Logic chart an
 | `fluentd.buffer.totalLimitSize`                                           | The size limitation of this buffer plugin instance.                                                                                                                                                                                                                                                                                                                                                                                           | `128m`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            |
 | `fluentd.buffer.filePaths`                                                | File paths to buffer to, if Fluentd buffer type is specified as file above. Each sumologic output plugin buffers to its own unique file.                                                                                                                                                                                                                                                                                                      | `{"events":"/fluentd/buffer/events","logs":{"containers":"/fluentd/buffer/logs.containers","default":"/fluentd/buffer/logs.default","kubelet":"/fluentd/buffer/logs.kubelet","systemd":"/fluentd/buffer/logs.systemd"},"metrics":{"apiserver":"/fluentd/buffer/metrics.apiserver","container":"/fluentd/buffer/metrics.container","controller":"/fluentd/buffer/metrics.controller","default":"/fluentd/buffer/metrics.default","kubelet":"/fluentd/buffer/metrics.kubelet","node":"/fluentd/buffer/metrics.node","scheduler":"/fluentd/buffer/metrics.scheduler","state":"/fluentd/buffer/metrics.state"},"traces":"/fluentd/buffer/traces"}`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |
 | `fluentd.buffer.extraConf`                                                | Additional config for buffer settings                                                                                                                                                                                                                                                                                                                                                                                                         | `Nil`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             |
+| `fluentd.metadata.addService`                                             | Option to control the enrichment of logs and metrics with `service` metadata.                                                                                                                                                                                                                                                                                                                                                                 | `true`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            |
 | `fluentd.metadata.annotation_match`                                       | Option to control capturing of annotations by metadata filter plugin.                                                                                                                                                                                                                                                                                                                                                                         | `['sumologic\.com.*']`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            |
 | `fluentd.metadata.apiGroups`                                              | List of supported kubernetes API groups.                                                                                                                                                                                                                                                                                                                                                                                                      | `['apps/v1']`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |
 | `fluentd.metadata.coreApiVersions`                                        | List of supported kubernetes API versions.                                                                                                                                                                                                                                                                                                                                                                                                    | `['v1']`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          |

diff --git a/deploy/helm/sumologic/conf/logs/fluentd/logs.enhance.k8s.metadata.filter.conf b/deploy/helm/sumologic/conf/logs/fluentd/logs.enhance.k8s.metadata.filter.conf
@@ -6,4 +6,5 @@ in_namespace_path '$.kubernetes.namespace_name'
 in_pod_path '$.kubernetes.pod_name'
 core_api_versions {{ join "," .Values.fluentd.metadata.coreApiVersions }}
 api_groups {{ join "," .Values.fluentd.metadata.apiGroups }}
-data_type logs
+data_type logs
+add_service {{ .Values.fluentd.metadata.addService }}
diff --git a/deploy/helm/sumologic/conf/metrics/fluentd/metrics.conf b/deploy/helm/sumologic/conf/metrics/fluentd/metrics.conf
@@ -45,6 +45,7 @@
     cache_refresh_variation {{ .Values.fluentd.metadata.cacheRefreshVariation | quote }}
     core_api_versions {{ join "," .Values.fluentd.metadata.coreApiVersions }}
     api_groups {{ join "," .Values.fluentd.metadata.apiGroups }}
+    add_service {{ .Values.fluentd.metadata.addService }}
   </filter>
 {{- .Values.fluentd.metrics.extraFilterPluginConf | nindent 4 }}
   <filter prometheus.metrics**>

diff --git a/deploy/helm/sumologic/values.yaml b/deploy/helm/sumologic/values.yaml
@@ -220,7 +220,7 @@ sumologic:
 fluentd:
   image:
     repository: public.ecr.aws/sumologic/kubernetes-fluentd
-    tag: 1.12.2-sumo-10
+    tag: 1.12.2-sumo-11
     pullPolicy: IfNotPresent
 
   ## Specifies whether a PodSecurityPolicy should be created
@@ -351,6 +351,8 @@ fluentd:
     ## Option to specify K8s API groups
     apiGroups:
       - apps/v1
+    ## Option to control the enrichment of logs and metrics with `service` metadata.
+    addService: true
 
   logs:
     enabled: true