diff --git a/deploy/helm/sumologic/conf/logs/fluentd/logs.source.default.conf b/deploy/helm/sumologic/conf/logs/fluentd/logs.source.default.conf index 542199085d..90ed2fab34 100644 --- a/deploy/helm/sumologic/conf/logs/fluentd/logs.source.default.conf +++ b/deploy/helm/sumologic/conf/logs/fluentd/logs.source.default.conf @@ -14,14 +14,14 @@ {{- .Values.fluentd.logs.default.extraFilterPluginConf | nindent 4 }} @type kubernetes_sumologic - source_name {{ .Values.fluentd.logs.default.sourceName | quote }} - source_category {{ .Values.fluentd.logs.default.sourceCategory | quote }} - source_category_prefix {{ .Values.fluentd.logs.default.sourceCategoryPrefix | quote }} - source_category_replace_dash {{ .Values.fluentd.logs.default.sourceCategoryReplaceDash | quote }} - exclude_facility_regex {{ .Values.fluentd.logs.default.excludeFacilityRegex | quote }} - exclude_host_regex {{ .Values.fluentd.logs.default.excludeHostRegex | quote }} - exclude_priority_regex {{ .Values.fluentd.logs.default.excludePriorityRegex | quote }} - exclude_unit_regex {{ .Values.fluentd.logs.default.excludeUnitRegex | quote }} + source_name {{ .Values.sumologic.logs.defaultFluentd.sourceName | quote }} + source_category {{ .Values.sumologic.logs.defaultFluentd.sourceCategory | quote }} + source_category_prefix {{ .Values.sumologic.logs.defaultFluentd.sourceCategoryPrefix | quote }} + source_category_replace_dash {{ .Values.sumologic.logs.defaultFluentd.sourceCategoryReplaceDash | quote }} + exclude_facility_regex {{ .Values.sumologic.logs.defaultFluentd.excludeFacilityRegex | quote }} + exclude_host_regex {{ .Values.sumologic.logs.defaultFluentd.excludeHostRegex | quote }} + exclude_priority_regex {{ .Values.sumologic.logs.defaultFluentd.excludePriorityRegex | quote }} + exclude_unit_regex {{ .Values.sumologic.logs.defaultFluentd.excludeUnitRegex | quote }} @type record_modifier diff --git a/deploy/helm/sumologic/values.yaml b/deploy/helm/sumologic/values.yaml index 21595b6a75..3b21b3a62f 100644 --- a/deploy/helm/sumologic/values.yaml +++ b/deploy/helm/sumologic/values.yaml @@ -332,6 +332,30 @@ sumologic: ## Matching unit will be excluded from Sumo. The logs will still be sent to logs metadata provider (FluentD/otelcol). excludeUnitRegex: "" + ## Only for Fluentd - default log configuration (catch-all) + defaultFluentd: + ## Set the _sourceName metadata field in Sumo Logic. + sourceName: "k8s_default" + ## Set the _sourceCategory metadata field in Sumo Logic. + sourceCategory: "default" + ## Set the prefix, for _sourceCategory metadata. + sourceCategoryPrefix: "kubernetes/" + ## Used to replace - with another character. + sourceCategoryReplaceDash: "/" + + ## A regular expression for facility. + ## Matching facility will be excluded from Sumo. The logs will still be sent to FluentD. + excludeFacilityRegex: "" + ## A regular expression for hosts. + ## Matching hosts will be excluded from Sumo. The logs will still be sent to FluentD. + excludeHostRegex: "" + ## A regular expression for priority. + ## Matching priority will be excluded from Sumo. The logs will still be sent to FluentD. + excludePriorityRegex: "" + ## A regular expression for unit. + ## Matching unit will be excluded from Sumo. The logs will still be sent to FluentD. + excludeUnitRegex: "" + ## Fields to be created at Sumo Logic to ensure logs are tagged with ## relevant metadata. ## https://help.sumologic.com/docs/manage/fields/#manage-fields @@ -744,28 +768,6 @@ fluentd: ## Override output section for untagged logs. Leave empty for the default output section. overrideOutputConf: |- - ## Set the _sourceName metadata field in Sumo Logic. - sourceName: "k8s_default" - ## Set the _sourceCategory metadata field in Sumo Logic. - sourceCategory: "default" - ## Set the prefix, for _sourceCategory metadata. - sourceCategoryPrefix: "kubernetes/" - ## Used to replace - with another character. - sourceCategoryReplaceDash: "/" - - ## A regular expression for facility. - ## Matching facility will be excluded from Sumo. The logs will still be sent to FluentD. - excludeFacilityRegex: "" - ## A regular expression for hosts. - ## Matching hosts will be excluded from Sumo. The logs will still be sent to FluentD. - excludeHostRegex: "" - ## A regular expression for priority. - ## Matching priority will be excluded from Sumo. The logs will still be sent to FluentD. - excludePriorityRegex: "" - ## A regular expression for unit. - ## Matching unit will be excluded from Sumo. The logs will still be sent to FluentD. - excludeUnitRegex: "" - ## Extra Environment Values - allows yaml definitions # extraEnvVars: # - name: VALUE_FROM_SECRET diff --git a/tests/helm/metadata_logs_fluentd/static/default_v2.input.yaml b/tests/helm/metadata_logs_fluentd/static/default_v2.input.yaml index 21f1ee6177..f62a21a1f9 100644 --- a/tests/helm/metadata_logs_fluentd/static/default_v2.input.yaml +++ b/tests/helm/metadata_logs_fluentd/static/default_v2.input.yaml @@ -10,14 +10,6 @@ sumologic: sourceHost: # in v2 this parameter is not set in values.yaml sourceName: "%{namespace}.%{pod}.%{container}" sourceCategory: "%{namespace}/%{pod_name}" - sourceCategoryPrefix: "kubernetes/" - sourceCategoryReplaceDash: "/" - excludeContainerRegex: "" - excludeHostRegex: "" - excludeNamespaceRegex: "" - excludePodRegex: "" - perContainerAnnotationsEnabled: false - perContainerAnnotationPrefixes: [] systemd: enabled: true diff --git a/tests/helm/metadata_logs_fluentd/static/templates.input.yaml b/tests/helm/metadata_logs_fluentd/static/templates.input.yaml index 7ad8e180f4..879688fed4 100644 --- a/tests/helm/metadata_logs_fluentd/static/templates.input.yaml +++ b/tests/helm/metadata_logs_fluentd/static/templates.input.yaml @@ -35,3 +35,13 @@ sumologic: excludeHostRegex: my_systemd_excludeHostRegex excludePriorityRegex: my_systemd_excludePriorityRegex excludeUnitRegex: my_systemd_excludeUnitRegex + + defaultFluentd: + sourceName: my_defaultFluentd_sourceName + sourceCategory: my_defaultFluentd_sourceCategory + sourceCategoryPrefix: my_defaultFluentd_sourceCategoryPrefix + sourceCategoryReplaceDash: my_defaultFluentd_sourceCategoryReplaceDash + excludeFacilityRegex: my_defaultFluentd_excludeFacilityRegex + excludeHostRegex: my_defaultFluentd_excludeHostRegex + excludePriorityRegex: my_defaultFluentd_excludePriorityRegex + excludeUnitRegex: my_defaultFluentd_excludeUnitRegex diff --git a/tests/helm/metadata_logs_fluentd/static/templates.output.yaml b/tests/helm/metadata_logs_fluentd/static/templates.output.yaml index 0708ca0521..9e65a7e335 100644 --- a/tests/helm/metadata_logs_fluentd/static/templates.output.yaml +++ b/tests/helm/metadata_logs_fluentd/static/templates.output.yaml @@ -201,14 +201,14 @@ data: @type kubernetes_sumologic - source_name "k8s_default" - source_category "default" - source_category_prefix "kubernetes/" - source_category_replace_dash "/" - exclude_facility_regex "" - exclude_host_regex "" - exclude_priority_regex "" - exclude_unit_regex "" + source_name "my_defaultFluentd_sourceName" + source_category "my_defaultFluentd_sourceCategory" + source_category_prefix "my_defaultFluentd_sourceCategoryPrefix" + source_category_replace_dash "my_defaultFluentd_sourceCategoryReplaceDash" + exclude_facility_regex "my_defaultFluentd_excludeFacilityRegex" + exclude_host_regex "my_defaultFluentd_excludeHostRegex" + exclude_priority_regex "my_defaultFluentd_excludePriorityRegex" + exclude_unit_regex "my_defaultFluentd_excludeUnitRegex" @type record_modifier