From 1ae1aac29422dd56f9ad05ebe31a20749df910ec Mon Sep 17 00:00:00 2001
From: Stefan Reimer <stefan@zero-downtime.net>
Date: Sat, 15 Aug 2020 14:25:07 +0100
Subject: [PATCH] More logging fixes

---
 .../kubezero-logging/templates/secrets.yaml   |  2 +-
 charts/kubezero-logging/values-test.yaml      |  3 ++-
 charts/kubezero-logging/values.yaml           |  3 ++-
 deploy/templates/values.yaml                  | 24 +++++++++++++++++--
 4 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/charts/kubezero-logging/templates/secrets.yaml b/charts/kubezero-logging/templates/secrets.yaml
index 7dd7920..7ba0fbb 100644
--- a/charts/kubezero-logging/templates/secrets.yaml
+++ b/charts/kubezero-logging/templates/secrets.yaml
@@ -11,4 +11,4 @@ metadata:
 {{ include "kubezero-lib.labels" . | indent 4 }}
 data:
   username: {{ "elastic" | b64enc | quote }}
-  elastic: {{ .Values.es.elastic_password | b64enc | quote }}
+  elastic: {{ .Values.elastic_password | b64enc | quote }}
diff --git a/charts/kubezero-logging/values-test.yaml b/charts/kubezero-logging/values-test.yaml
index 077be87..f4327e0 100644
--- a/charts/kubezero-logging/values-test.yaml
+++ b/charts/kubezero-logging/values-test.yaml
@@ -8,6 +8,8 @@ fullnameOverride: logging
 # Version for ElasticSearch and Kibana have to match so we define it at top-level
 version: 7.6.0
 
+elastic_password: "dsfsfs" # super_secret_elastic_password
+
 es:
   nodeSets:
   - name: default-zone-0
@@ -19,7 +21,6 @@ es:
   s3Snapshot:
     enabled: true
     iamrole: "dfsf" # INSERT_CLOUDFORMATION_OUTPUT_ElasticSearchSnapshots
-  elastic_password: "dsfsfs" # super_secret_elastic_password
 
   prometheus: true
 
diff --git a/charts/kubezero-logging/values.yaml b/charts/kubezero-logging/values.yaml
index 6d6ae9a..b0f1645 100644
--- a/charts/kubezero-logging/values.yaml
+++ b/charts/kubezero-logging/values.yaml
@@ -4,6 +4,8 @@
 # Version for ElasticSearch and Kibana have to match so we define it at top-level
 version: 7.8.1
 
+elastic_password: "" # super_secret_elastic_password
+
 es:
   nodeSets: []
   #- count: 2
@@ -14,7 +16,6 @@ es:
   s3Snapshot:
     enabled: false
     iamrole: "" # INSERT_CLOUDFORMATION_OUTPUT_ElasticSearchSnapshots
-  elastic_password: "" # super_secret_elastic_password
 
   prometheus: false
 
diff --git a/deploy/templates/values.yaml b/deploy/templates/values.yaml
index 600df34..fdc4d0b 100644
--- a/deploy/templates/values.yaml
+++ b/deploy/templates/values.yaml
@@ -129,8 +129,28 @@ kubezero:
   logging:
     enabled: {{ .Values.logging.enabled }}
     values:
-      {{- with .Values.logging }}
-      {{- toYaml . | nindent 6 }}
+      elastic_password: {{ .Values.logging.elastic_password }}
+
+      {{- if .Values.logging.version }}
+      version: {{ .Values.logging.version }}
+
+      {{- if .Values.logging.fullnameOverride }}
+      {{- end }}
+      fullnameOverride: {{ .Values.logging.fullnameOverride }}
+      {{- end }}
+      es:
+        {{- if .Values.logging.es.nodeSets }}
+        nodeSets:
+        {{- with .Values.logging.es.nodeSets }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
+        {{- end }}
+        prometheus: {{ .Values.metrics.enabled }}
+      {{- if .Values.logging.kibana }}
+      kibana:
+        {{- with .Values.logging.kibana }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
       {{- end }}
 
 argo-cd: