From 0939405c7a4f030e397a5c0605ef2bf72bcb2e7c Mon Sep 17 00:00:00 2001
From: Stefan Reimer <stefan@zero-downtime.net>
Date: Fri, 18 Sep 2020 16:12:52 +0100
Subject: [PATCH] Logging fixes for NOT using nameoverride

---
 charts/kubezero-logging/values.yaml | 2 ++
 deploy/templates/values.yaml        | 8 ++++++++
 2 files changed, 10 insertions(+)

diff --git a/charts/kubezero-logging/values.yaml b/charts/kubezero-logging/values.yaml
index 00f6e77a..3f0f51dc 100644
--- a/charts/kubezero-logging/values.yaml
+++ b/charts/kubezero-logging/values.yaml
@@ -70,6 +70,7 @@ fluentd:
       namespace: monitoring
 
   output:
+    # Default should be "logging-kubezero-logging-es-http" if fullnameOverride is NOT used
     host: logging-es-http
 
   shared_key: "cloudbender"
@@ -78,6 +79,7 @@ fluentd:
     OUTPUT_USER: elastic
     OUTPUT_SSL_VERIFY: "false"
 
+  # Same here the secret names change if fullnameOverride is not used !!
   extraEnvVars:
   - name: OUTPUT_PASSWORD
     valueFrom:
diff --git a/deploy/templates/values.yaml b/deploy/templates/values.yaml
index b971aad5..eed44916 100644
--- a/deploy/templates/values.yaml
+++ b/deploy/templates/values.yaml
@@ -168,6 +168,14 @@ kubezero:
         metrics:
           enabled: {{ and .Values.metrics.enabled .Values.metrics.ready }}
         url: {{ .Values.logging.fluentd.url }}
+        {{- if .Values.logging.fluentd.output }}
+        output:
+          host: {{ .Values.logging.fluentd.output.host }}
+        {{- end }}
+        {{- if .Values.logging.fluentd.extraEnvVars }}
+        extraEnvVars:
+          {{- toYaml .Values.logging.fluentd.extraEnvVars | nindent 10 }}
+        {{- end }}
         {{- if and .Values.logging.fluentd.istio .Values.istio.enabled .Values.istio.ready }}
         istio:
           {{- with .Values.logging.fluentd.istio }}