From 8d9723e183b38d1d4f6e80a631cdd0c6bb594fa9 Mon Sep 17 00:00:00 2001 From: Vijit Singhal Date: Fri, 3 Apr 2020 12:08:30 -0700 Subject: [PATCH 1/2] add plugin specific log level for metadata and output plugins --- deploy/helm/sumologic/conf/logs/logs.source.containers.conf | 3 +++ deploy/helm/sumologic/values.yaml | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/deploy/helm/sumologic/conf/logs/logs.source.containers.conf b/deploy/helm/sumologic/conf/logs/logs.source.containers.conf index 6f2c4c7501..38366879a5 100644 --- a/deploy/helm/sumologic/conf/logs/logs.source.containers.conf +++ b/deploy/helm/sumologic/conf/logs/logs.source.containers.conf @@ -30,11 +30,13 @@ # third-party kubernetes metadata filter plugin @type kubernetes_metadata + @log_level {{ .Values.fluentd.metadata.pluginLogLevel }} @include logs.kubernetes.metadata.filter.conf # sumologic kubernetes metadata enrichment filter plugin @type enhance_k8s_metadata + @log_level {{ .Values.fluentd.metadata.pluginLogLevel }} @include logs.enhance.k8s.metadata.filter.conf {{- .Values.fluentd.logs.containers.extraFilterPluginConf | nindent 4 }} @@ -46,6 +48,7 @@ @type sumologic @id sumologic.endpoint.logs + @log_level {{ .Values.fluentd.logs.output.pluginLogLevel }} {{- .Values.fluentd.logs.containers.outputConf | nindent 6 }} {{- if or .Values.fluentd.persistence.enabled (eq .Values.fluentd.buffer.type "file") }} diff --git a/deploy/helm/sumologic/values.yaml b/deploy/helm/sumologic/values.yaml index c0fcecaeae..3743d76fb5 100644 --- a/deploy/helm/sumologic/values.yaml +++ b/deploy/helm/sumologic/values.yaml @@ -189,6 +189,8 @@ fluentd: cacheTtl: "3600" ## Option to control the interval at which metadata cache is asynchronously refreshed (in seconds). cacheRefresh: "1800" + ## Option to give plugin specific log level + pluginLogLevel: "error" logs: ## Configuration for sumologic output plugin @@ -202,6 +204,8 @@ fluentd: addTimestamp: true ## Field name when add_timestamp is on. timestampKey: "timestamp" + ## Option to give plugin specific log level + pluginLogLevel: "error" ## Additional config parameters for sumologic output plugin extraConf: |- From 0b54f20cf9f4a1c9ba3e37e8067312d5e1d539a8 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Mon, 6 Apr 2020 06:38:23 +0000 Subject: [PATCH 2/2] Generate new 'fluentd-sumologic.yaml.tmpl' --- deploy/kubernetes/fluentd-sumologic.yaml.tmpl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/deploy/kubernetes/fluentd-sumologic.yaml.tmpl b/deploy/kubernetes/fluentd-sumologic.yaml.tmpl index c66be84685..145a68efbc 100644 --- a/deploy/kubernetes/fluentd-sumologic.yaml.tmpl +++ b/deploy/kubernetes/fluentd-sumologic.yaml.tmpl @@ -260,11 +260,13 @@ data: # third-party kubernetes metadata filter plugin @type kubernetes_metadata + @log_level error @include logs.kubernetes.metadata.filter.conf # sumologic kubernetes metadata enrichment filter plugin @type enhance_k8s_metadata + @log_level error @include logs.enhance.k8s.metadata.filter.conf @@ -276,6 +278,7 @@ data: @type sumologic @id sumologic.endpoint.logs + @log_level error @include logs.output.conf @type memory