Add option to add an external elasticsearch url and configure authentication via helm

Author: J12934

persistence/persistence-elastic/templates/import-dashboard.yaml

@@ -13,5 +13,10 @@ spec:
           image: scbexperimental/persistence-elastic-dashboard-importer
           imagePullPolicy: Always
           env:
+{{- if .Values.externalElasticStack.enabled }}      
             - name: KIBANA_URL
-              value: "http://persistence-elastic-kibana.{{ .Release.Namespace }}.svc.cluster.local:5601"
+              value: {{ .Values.externalElasticStack.kibanaAddress | quote }}
+{{- else }}
+            - name: KIBANA_URL
+              value: "http://persistence-elastic-kibana.{{ .Release.Namespace }}.svc.cluster.local:5601"
+{{- end }}

persistence/persistence-elastic/templates/persistence-provider.yaml

@@ -7,5 +7,21 @@ metadata:
 spec:
   image: "scbexperimental/persistence-elastic:latest"
   env:
+{{- if .Values.externalElasticStack.enabled }}
+    - name: ELASTICSEARCH_ADDRESS
+      value: {{ .Values.externalElasticStack.elasticsearchAddress | quote }}
+{{- else }}
     - name: ELASTICSEARCH_ADDRESS
       value: "http://elasticsearch-master.{{ .Release.Namespace }}.svc.cluster.local:9200"
+{{- end }}
+{{- if and .Values.authentication.user.username .Values.authentication.user.password }}
+    - name: ELASTICSEARCH_USERNAME
+      value: {{ .Values.authentication.user.username | quote }}
+    - name: ELASTICSEARCH_PASSWORD
+      value: {{ .Values.authentication.user.password | quote }}
+{{- else if .Values.authentication.apikey.key }}
+    - name: ELASTICSEARCH_APIKEY_ID
+      value: {{ .Values.authentication.apikey.id | quote }}
+    - name: ELASTICSEARCH_APIKEY
+      value: {{ .Values.authentication.apikey.key | quote }}
+{{- end }}

persistence/persistence-elastic/values.yaml

@@ -6,6 +6,22 @@ image:
   repository: scbexperimental/persistence-elastic
   pullPolicy: Always
 
+# Enable this when you already have an Elastic Stack running to which you want to send your results
+externalElasticStack:
+  enabled: false
+  elasticsearchAddress: "https://elasticsearch.example.com"
+  kibanaAddress: "https://kibana.example.com"
+
+# Configure authentication schema and credentials the persistence provider should use to connect to elasticsearch
+# user and apikey are mutually exclusive, only set one!
+authentication:
+  user:
+    username: null
+    password: null
+  apikey:
+    # Todo(@J12934) figure out when the "id" field is required for api keys.
+    key: null
+
 elasticsearch:
   enabled: true
   replicas: 1
@@ -17,8 +33,8 @@ kibana:
   # image: docker.elastic.co/kibana/kibana-oss
 
 imagePullSecrets: []
-nameOverride: ''
-fullnameOverride: ''
+nameOverride: ""
+fullnameOverride: ""
 
 podSecurityContext:
   {}