Merge "Elasticsearch remote logging user"

elasticsearch/templates/bin/_apache.sh.tpl

@@ -33,6 +33,10 @@ function start () {
     htpasswd -cb /usr/local/apache2/conf/.htpasswd "$ELASTICSEARCH_USERNAME" "$ELASTICSEARCH_PASSWORD"
   fi
 
+  if [ ! -z $ELASTICSEARCH_LOGGING_USERNAME ]; then
+    htpasswd -b /usr/local/apache2/conf/.htpasswd "$ELASTICSEARCH_LOGGING_USERNAME" "$ELASTICSEARCH_LOGGING_PASSWORD"
+  fi
+
   #Launch Apache on Foreground
   exec httpd -DFOREGROUND
 }

elasticsearch/templates/deployment-client.yaml

@@ -91,6 +91,16 @@ spec:
                 secretKeyRef:
                   name: {{ $esUserSecret }}
                   key: ELASTICSEARCH_PASSWORD
+            - name: ELASTICSEARCH_LOGGING_USERNAME
+              valueFrom:
+                secretKeyRef:
+                  name: {{ $esUserSecret }}
+                  key: ELASTICSEARCH_LOGGING_USERNAME
+            - name: ELASTICSEARCH_LOGGING_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: {{ $esUserSecret }}
+                  key: ELASTICSEARCH_LOGGING_PASSWORD
           volumeMounts:
             - name: pod-tmp
               mountPath: /tmp

elasticsearch/templates/secret-elasticsearch.yaml

@@ -29,6 +29,8 @@ type: Opaque
 data:
   ELASTICSEARCH_USERNAME: {{ .Values.endpoints.elasticsearch.auth.admin.username | b64enc }}
   ELASTICSEARCH_PASSWORD: {{ .Values.endpoints.elasticsearch.auth.admin.password | b64enc }}
+  ELASTICSEARCH_LOGGING_USERNAME: {{ .Values.endpoints.elasticsearch.auth.logging.username | b64enc }}
+  ELASTICSEARCH_LOGGING_PASSWORD: {{ .Values.endpoints.elasticsearch.auth.logging.password | b64enc }}
   ELASTICSEARCH_URI: {{ $elasticsearch_uri | b64enc }}
   BIND_DN: {{ .Values.endpoints.ldap.auth.admin.bind | b64enc }}
   BIND_PASSWORD: {{ .Values.endpoints.ldap.auth.admin.password | b64enc }}

elasticsearch/values.yaml

@@ -788,6 +788,9 @@ endpoints:
       admin:
         username: admin
         password: changeme
+      logging:
+        username: remote
+        password: changeme
     hosts:
       data: elasticsearch-data
       default: elasticsearch-logging