From 7f540d57db4cef8276cd69cc6e3f65e8d5a9665a Mon Sep 17 00:00:00 2001
From: Stefan Reimer <stefan@zero-downtime.net>
Date: Wed, 26 Aug 2020 23:02:47 +0100
Subject: [PATCH] Revert ES fixes as servicemonitor is retarted

---
 charts/kubezero-logging/templates/eck/secrets.yaml        | 1 +
 charts/kubezero-logging/templates/eck/servicemonitor.yaml | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/charts/kubezero-logging/templates/eck/secrets.yaml b/charts/kubezero-logging/templates/eck/secrets.yaml
index 3bac143..897b968 100644
--- a/charts/kubezero-logging/templates/eck/secrets.yaml
+++ b/charts/kubezero-logging/templates/eck/secrets.yaml
@@ -12,4 +12,5 @@ metadata:
 {{ include "kubezero-lib.labels" . | indent 4 }}
 data:
   elastic: {{ .Values.elastic_password | b64enc | quote }}
+  username: {{ "elastic" | b64enc | quote }}
 {{- end }}
diff --git a/charts/kubezero-logging/templates/eck/servicemonitor.yaml b/charts/kubezero-logging/templates/eck/servicemonitor.yaml
index 78ccb1b..8c809f5 100644
--- a/charts/kubezero-logging/templates/eck/servicemonitor.yaml
+++ b/charts/kubezero-logging/templates/eck/servicemonitor.yaml
@@ -10,7 +10,9 @@ metadata:
 spec:
   endpoints:
   - basicAuth:
-      username: elastic
+      username:
+        name: {{ template "kubezero-lib.fullname" $ }}-es-elastic-user
+        key: username
       password:
         name: {{ template "kubezero-lib.fullname" $ }}-es-elastic-user
         key: elastic