Add default Loki output when enabled

chart/templates/logging/fluentbit/values.yaml

@@ -5,7 +5,8 @@
 {{- define "bigbang.defaults.fluentbit" -}}
 {{- $disableDefault := dig "additionalOutputs" "disableDefault" false .Values.fluentbit.values }}
 
-{{- if and (not $disableDefault) .Values.logging.enabled }}
+{{- if (not $disableDefault) }}
+{{- if .Values.logging.enabled }}
 env:
   - name: FLUENT_ELASTICSEARCH_PASSWORD
     valueFrom:
@@ -27,36 +28,60 @@ extraVolumeMounts:
     name: flb-storage
   - mountPath: /etc/elasticsearch/certs/
     name: elasticsearch-certs
-
+{{- end }}
+{{- if or .Values.logging.enabled .Values.loki.enabled }}
 config:
   outputs: |
+    {{- if .Values.logging.enabled }}
     [OUTPUT]
-        Name es
-        Match kube.*
-        Host {{ dig "elasticsearch" "name" "logging-ek" .Values.fluentbit.values }}-es-http
-        HTTP_User elastic
-        HTTP_Passwd ${FLUENT_ELASTICSEARCH_PASSWORD}
-        Logstash_Format On
-        Retry_Limit False
-        Replace_Dots On
-        tls On
-        tls.verify On
-        tls.ca_file /etc/elasticsearch/certs/ca.crt
+        Name                     es
+        Match                    kube.*
+        Host                     {{ dig "elasticsearch" "name" "logging-ek" .Values.fluentbit.values }}-es-http
+        HTTP_User                elastic
+        HTTP_Passwd              ${FLUENT_ELASTICSEARCH_PASSWORD}
+        Logstash_Format          On
+        Retry_Limit              False
+        Replace_Dots             On
+        tls                      On
+        tls.verify               On
+        tls.ca_file              /etc/elasticsearch/certs/ca.crt
         storage.total_limit_size {{ dig "storage" "total_limit_size" "10G" .Values.fluentbit.values }}
-
     [OUTPUT]
-        Name es
-        Match host.*
-        Host {{ dig "elasticsearch" "name" "logging-ek" .Values.fluentbit.values }}-es-http
-        HTTP_User elastic
-        HTTP_Passwd ${FLUENT_ELASTICSEARCH_PASSWORD}
-        Logstash_Format On
-        Logstash_Prefix node
-        Retry_Limit False
-        tls On
-        tls.verify On
-        tls.ca_file /etc/elasticsearch/certs/ca.crt
+        Name                     es
+        Match                    host.*
+        Host                     {{ dig "elasticsearch" "name" "logging-ek" .Values.fluentbit.values }}-es-http
+        HTTP_User                elastic
+        HTTP_Passwd              ${FLUENT_ELASTICSEARCH_PASSWORD}
+        Logstash_Format          On
+        Logstash_Prefix          node
+        Retry_Limit              False
+        tls                      On
+        tls.verify               On
+        tls.ca_file              /etc/elasticsearch/certs/ca.crt
         storage.total_limit_size {{ dig "storage" "total_limit_size" "10G" .Values.fluentbit.values }}
+    {{- end }}
+
+    {{- if .Values.loki.enabled }}
+    [OUTPUT]
+        name                   loki
+        match                  kube.*
+        labels                 job=fluentbit, container=$kubernetes['container_name'], pod=$kubernetes['pod_name'], namespace=$kubernetes['namespace_name'], node_name=$kubernetes['host']
+        host                   logging-loki
+        port                   3100
+        auto_kubernetes_labels on
+        Retry_Limit            False
+        tls                    Off
+    [OUTPUT]
+        name                   loki
+        match                  host.*
+        labels                 job=fluentbit, container=$kubernetes['container_name'], pod=$kubernetes['pod_name'], namespace=$kubernetes['namespace_name'], node_name=$kubernetes['host']
+        host                   logging-loki
+        port                   3100
+        auto_kubernetes_labels on
+        Retry_Limit            False
+        tls                    Off
+    {{- end }}
+{{- end }}
 {{- end }}
 
 imagePullSecrets: