Missing support in Helm-Chart for APM-Server Elasticsearch authentication

Author: Chris Wiechmann

CHANGELOG.md

@@ -10,6 +10,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - Elastic-Helm charts dependencies for the Elasticstack updated from 7.17.1 to 7.17.3
 - Updated default Elastic-Stack version from 7.17.1 to 7.17.3
 
+### Fixed
+- Missing support in Helm-Chart for APM-Server Elasticsearch authentication
+
 ## [4.5.0] 2022-03-31
 ### Added
 - Now the parameter: `CACHE_API_PATHS` is also used to cache the API-Ignore lookup more efficient

helm/templates/elasticApimApmServer/_helpers.tpl

@@ -25,7 +25,7 @@ Selector labels
 app.kubernetes.io/component: apm-server
 app.kubernetes.io/name: {{ include "apim4elastic.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
-{{- range $key, $value := .Values.apmserver.labels }}
+{{- range $key, $value := index .Values "apm-server" "labels" }}
 {{ $key }}: {{ $value | quote }}
 {{- end }}
 {{- end }}

helm/templates/elasticApimApmServer/apm-server-config.yaml

@@ -4,10 +4,7 @@ kind: ConfigMap
 metadata:
   name: {{ template "apmserver.fullname" . }}-env-config
   labels:
-    app: "{{ template "apmserver.fullname" . }}"
-    chart: "{{ .Chart.Name }}"
-    heritage: {{ .Release.Service | quote }}
-    release: {{ .Release.Name | quote }}
+    {{- include "apmserver.labels" . | nindent 4 }}
 data: 
   ELASTICSEARCH_HOSTS: {{ required "The value global.elasticsearchHosts is missing." .Values.global.elasticsearchHosts | quote }}
   ELASTICSEARCH_CLUSTER_UUID: {{ index .Values "apm-server" "elasticsearchClusterUUID" | quote }}

helm/templates/elasticApimApmServer/apm-server-secret.yaml

@@ -0,0 +1,12 @@
+{{- if and ".Values.apm-server.enabled" ".Values.apm-server.apmserverSecrets.enabled" }} 
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ template "apmserver.fullname" . }}-secret
+  labels:
+    {{- include "apmserver.labels" . | nindent 4 }}
+type: Opaque
+data:
+  APM_USERNAME: {{ index .Values "apm-server" "apmserverSecrets" "username" | b64enc | quote }}
+  APM_PASSWORD: {{ index .Values "apm-server" "apmserverSecrets" "password" | b64enc | quote }}
+{{- end }}

helm/values.yaml

@@ -776,9 +776,20 @@ apm-server:
   # Required for the internal stack monitoring to work with the APM-Server
   elasticsearchClusterUUID: ""
 
+  # Username and Password for APM-Server to send monitoring events to Elasticsearch
+  # When enabled, the provided username and password are used to create the secret 
+  # <releaseName>-apim4elastic-apmserver-secret which is referenced below. 
+  # You may use your own secret and reference it here. 
+  apmserverSecrets: 
+    enabled: true
+    username: ""
+    password: ""
+
   envFrom:
     - configMapRef:
         name: axway-elk-apim4elastic-apmserver-env-config
+    - secretRef:
+        name: axway-elk-apim4elastic-apmserver-secret
 
   secretMounts:
     - name: certificates
@@ -798,6 +809,9 @@ apm-server:
   # Possible values: (full|strict|certificate|none) - Defaults to: full
   validateElasticsearchCertificate: full
 
+  # additional labels
+  labels: {}
+
   livenessProbe:
     httpGet:
       path: /