Add if conditions to fluentd configuration templates

SumoLogic · Jan 11, 2021 · 55c6fd7 · 55c6fd7
1 parent 97716a9
commit 55c6fd7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/deploy/helm/sumologic/conf/buffer.output.conf b/deploy/helm/sumologic/conf/buffer.output.conf
@@ -7,4 +7,6 @@ queued_chunks_limit_size {{ .Values.fluentd.buffer.queueChunkLimitSize | quote }
 overflow_action drop_oldest_chunk
 retry_max_interval {{ .Values.fluentd.buffer.retryMaxInterval | quote }}
 retry_forever {{ .Values.fluentd.buffer.retryForever | quote }}
-{{- .Values.fluentd.buffer.extraConf | nindent 2 }}
+{{- if .Values.fluentd.buffer.extraConf }}
+{{- .Values.fluentd.buffer.extraConf | nindent 2 }}
+{{- end }}
diff --git a/deploy/helm/sumologic/conf/logs/logs.conf b/deploy/helm/sumologic/conf/logs/logs.conf
@@ -6,5 +6,7 @@
 </source>
 @include logs.source.containers.conf
 @include logs.source.systemd.conf
+{{- if .Values.fluentd.logs.extraLogs }}
 {{- .Values.fluentd.logs.extraLogs | nindent 2 }}
-@include logs.source.default.conf
+{{- end }}
+@include logs.source.default.conf
diff --git a/deploy/helm/sumologic/conf/logs/logs.output.conf b/deploy/helm/sumologic/conf/logs/logs.output.conf
@@ -8,4 +8,6 @@ timestamp_key {{ .Values.fluentd.logs.output.timestampKey | quote }}
 proxy_uri {{ .Values.fluentd.proxyUri | quote }}
 compress {{ .Values.fluentd.compression.enabled | quote }}
 compress_encoding {{ .Values.fluentd.compression.encoding | quote }}
+{{- if .Values.fluentd.logs.output.extraConf }}
 {{- .Values.fluentd.logs.output.extraConf | nindent 2 }}
+{{- end }}