Contezza · CapgeminiSBotha · Apr 6, 2023
diff --git a/helm/alfresco-content-services/charts/activemq/templates/deployment-activemq.yaml b/helm/alfresco-content-services/charts/activemq/templates/deployment-activemq.yaml
@@ -50,6 +50,25 @@ spec:
             secretKeyRef:
               name: {{ default (printf "%s-brokersecret" (include "content-services.shortname" $)) $.Values.adminUser.existingSecretName }}
               key: BROKER_PASSWORD
+        {{- if and (.Values.global.elasticAPM) (.Values.global.elasticAPM.enabled) }}
+        - name: ELASTIC_APM_SERVER_URLS
+          value: {{ .Values.global.elasticAPM.containers.env.serverUrls }}
+        - name: ELASTIC_APM_SERVICE_NAME
+          value: "activemq"
+        - name: ELASTIC_APM_APPLICATION_PACKAGES
+          value: com.alfresco,org.alfresco,nl.amsterdam,org.apache,org.fusesource,org.jasypt,org.slf4j,org.springframework,com.sun
+        - name: ELASTIC_APM_ENVIRONMENT
+          value: {{ .Values.global.elasticAPM.containers.env.environment }}
+        - name: ELASTIC_APM_LOG_LEVEL
+          value: {{ .Values.global.elasticAPM.containers.env.logLevel }}
+        - name: ELASTIC_APM_SECRET_TOKEN
+          valueFrom:
+            secretKeyRef:
+              name: {{ .Values.global.elasticAPM.containers.env.secretToken.name }}
+              key: {{ .Values.global.elasticAPM.containers.env.secretToken.key }}
+        - name: JAVA_TOOL_OPTIONS
+          value: {{ .Values.global.elasticAPM.containers.env.javaToolOptions }}
+        {{- end }}
         ports:
         - name: stomp
           containerPort: {{ .Values.services.broker.ports.internal.stomp | default 61613 }}
@@ -78,6 +97,23 @@ spec:
           - name: data
             mountPath: {{ .Values.persistence.data.mountPath }}
             subPath: {{ .Values.persistence.data.subPath }}
+          {{- if and (.Values.global.elasticAPM) (.Values.global.elasticAPM.enabled) }}
+          - name: {{ .Values.global.elasticAPM.containers.volumeMounts.name }}
+            mountPath: {{ .Values.global.elasticAPM.containers.volumeMounts.mountPath }}
+          {{- end }}
+      {{- if and (.Values.global.elasticAPM) (.Values.global.elasticAPM.enabled) }}
+      initContainers:
+        - name: elastic-java-agent
+          image: {{ .Values.global.elasticAPM.initContainers.image }}
+          volumeMounts:
+          - mountPath: {{ .Values.global.elasticAPM.initContainers.volumeMounts.mountPath }}
+            name: {{ .Values.global.elasticAPM.initContainers.volumeMounts.name }}
+          command: ['cp', '-v', '/usr/agent/elastic-apm-agent.jar', '/elastic/apm/agent']
+      {{- end }}
       volumes:
         {{- include "data_volume" .Values | nindent 8 }}
+        {{- if and (.Values.global.elasticAPM) (.Values.global.elasticAPM.enabled) }}
+        - name: elastic-apm-agent
+          emptyDir: {}
+        {{- end }}
 {{- end }}
diff --git a/helm/alfresco-content-services/charts/alfresco-search/templates/deployment.yaml b/helm/alfresco-content-services/charts/alfresco-search/templates/deployment.yaml
@@ -46,6 +46,28 @@ spec:
           image: {{ template "alfresco-search.dockerImage" . }}
           imagePullPolicy: {{ template "alfresco-search.pullPolicy" . }}
           {{- include "component-security-context" .Values | indent 8 }}
+          env:
+          {{- if and (.Values.global.elasticAPM) (.Values.global.elasticAPM.enabled) }}
+          - name: ELASTIC_APM_SERVER_URLS
+            value: {{ .Values.global.elasticAPM.containers.env.serverUrls }}
+          - name: ELASTIC_APM_SERVICE_NAME
+            value: "solr"
+          - name: ELASTIC_APM_APPLICATION_PACKAGES
+            value: com.alfresco,org.alfresco,nl.amsterdam,org.apache
+          - name: ELASTIC_APM_ENVIRONMENT
+            value: {{ .Values.global.elasticAPM.containers.env.environment }}
+          - name: ELASTIC_APM_LOG_LEVEL
+            value: {{ .Values.global.elasticAPM.containers.env.logLevel }}
+          - name: ELASTIC_APM_INSTRUMENT_ANCIENT_BYTECODE
+            value: "true"
+          - name: ELASTIC_APM_SECRET_TOKEN
+            valueFrom:
+              secretKeyRef:
+                name: {{ .Values.global.elasticAPM.containers.env.secretToken.name }}
+                key: {{ .Values.global.elasticAPM.containers.env.secretToken.key }}
+          - name: JAVA_TOOL_OPTIONS
+            value: {{ .Values.global.elasticAPM.containers.env.javaToolOptions }}
+          {{- end }}
           envFrom:
           - configMapRef:
               name: {{ template "alfresco-search.fullName" . }}-solr-configmap
@@ -60,6 +82,10 @@ spec:
           - name: data
             mountPath: {{ .Values.persistence.search.data.mountPath }}
             subPath: {{ .Values.persistence.search.data.subPath }}
+          {{- if and (.Values.global.elasticAPM) (.Values.global.elasticAPM.enabled) }}
+          - mountPath: {{ .Values.global.elasticAPM.containers.volumeMounts.mountPath }}
+            name: {{ .Values.global.elasticAPM.containers.volumeMounts.name }}
+          {{- end }}
           readinessProbe:
             httpGet:
               path: /solr/alfresco/admin/ping
@@ -90,8 +116,21 @@ spec:
             preStop:
               exec:
                 command: ["/bin/bash", "-c", "sleep 10"]
+      initContainers:
+        {{- if and (.Values.global.elasticAPM) (.Values.global.elasticAPM.enabled) }}
+        - name: elastic-java-agent
+          image: {{ .Values.global.elasticAPM.initContainers.image }}
+          volumeMounts:
+          - mountPath: {{ .Values.global.elasticAPM.initContainers.volumeMounts.mountPath }}
+            name: {{ .Values.global.elasticAPM.initContainers.volumeMounts.name }}
+          command: ['cp', '-v', '/usr/agent/elastic-apm-agent.jar', '/elastic/apm/agent']
+        {{- end }}
       volumes:
       - name: data
         persistentVolumeClaim:
           claimName: |-
             {{ .Values.persistence.existingClaim | default (printf "%s-solr-claim" (include "alfresco-search.fullName" .)) }}
+      {{- if and (.Values.global.elasticAPM) (.Values.global.elasticAPM.enabled) }}
+      - name: elastic-apm-agent
+        emptyDir: {}
+      {{- end }}
diff --git a/helm/alfresco-content-services/templates/deployment-filestore.yaml b/helm/alfresco-content-services/templates/deployment-filestore.yaml
@@ -59,6 +59,26 @@ spec:
         - name: {{ .Chart.Name }}
           image: "{{ .Values.filestore.image.repository }}:{{ .Values.filestore.image.tag }}"
           imagePullPolicy: {{ .Values.filestore.image.pullPolicy }}
+          {{- if and (.Values.global.elasticAPM) (.Values.global.elasticAPM.enabled) }}
+          env:
+          - name: ELASTIC_APM_SERVER_URLS
+            value: {{ .Values.global.elasticAPM.containers.env.serverUrls }}
+          - name: ELASTIC_APM_SERVICE_NAME
+            value: "filestore"
+          - name: ELASTIC_APM_APPLICATION_PACKAGES
+            value: com.alfresco,org.alfresco,nl.amsterdam,org.springframework
+          - name: ELASTIC_APM_ENVIRONMENT
+            value: {{ .Values.global.elasticAPM.containers.env.environment }}
+          - name: ELASTIC_APM_LOG_LEVEL
+            value: {{ .Values.global.elasticAPM.containers.env.logLevel }}
+          - name: ELASTIC_APM_SECRET_TOKEN
+            valueFrom:
+              secretKeyRef:
+                name: {{ .Values.global.elasticAPM.containers.env.secretToken.name }}
+                key: {{ .Values.global.elasticAPM.containers.env.secretToken.key }}
+          - name: JAVA_TOOL_OPTIONS
+            value: {{ .Values.global.elasticAPM.containers.env.javaToolOptions }}
+          {{- end }}
           {{- include "component-security-context" .Values.filestore | indent 8 }}
           envFrom:
           - configMapRef:
@@ -86,6 +106,23 @@ spec:
             - name: data
               mountPath: {{ .Values.filestore.persistence.data.mountPath }}
               subPath: {{ .Values.filestore.persistence.data.subPath }}
+            {{- if and (.Values.global.elasticAPM) (.Values.global.elasticAPM.enabled) }}
+            - name: {{ .Values.global.elasticAPM.containers.volumeMounts.name }}
+              mountPath: {{ .Values.global.elasticAPM.containers.volumeMounts.mountPath }}
+            {{- end }}
+      {{- if and (.Values.global.elasticAPM) (.Values.global.elasticAPM.enabled) }}
+      initContainers:
+        - name: elastic-java-agent
+          image: {{ .Values.global.elasticAPM.initContainers.image }}
+          volumeMounts:
+          - mountPath: {{ .Values.global.elasticAPM.initContainers.volumeMounts.mountPath }}
+            name: {{ .Values.global.elasticAPM.initContainers.volumeMounts.name }}
+          command: ['cp', '-v', '/usr/agent/elastic-apm-agent.jar', '/elastic/apm/agent']
+      {{- end }}
       volumes:
       {{- include "data_volume" .Values.filestore | nindent 8 }}
+      {{- if and (.Values.global.elasticAPM) (.Values.global.elasticAPM.enabled) }}
+      - name: elastic-apm-agent
+        emptyDir: {}
+      {{- end }}
 {{- end }}
diff --git a/helm/alfresco-content-services/templates/deployment-imagemagick.yaml b/helm/alfresco-content-services/templates/deployment-imagemagick.yaml
@@ -64,6 +64,25 @@ spec:
               name: {{ default (printf "%s-brokersecret" (include "content-services.shortname" .)) .Values.messageBroker.existingSecretName }}
           env:
             {{- include "activemq.env" . | nindent 12 }}
+          {{- if and (.Values.global.elasticAPM) (.Values.global.elasticAPM.enabled) }}
+          - name: ELASTIC_APM_SERVER_URLS
+            value: {{ .Values.global.elasticAPM.containers.env.serverUrls }}
+          - name: ELASTIC_APM_SERVICE_NAME
+            value: "imagemagick"
+          - name: ELASTIC_APM_APPLICATION_PACKAGES
+            value: com.alfresco,org.alfresco,nl.amsterdam
+          - name: ELASTIC_APM_ENVIRONMENT
+            value: {{ .Values.global.elasticAPM.containers.env.environment }}
+          - name: ELASTIC_APM_LOG_LEVEL
+            value: {{ .Values.global.elasticAPM.containers.env.logLevel }}
+          - name: ELASTIC_APM_SECRET_TOKEN
+            valueFrom:
+              secretKeyRef:
+                name: {{ .Values.global.elasticAPM.containers.env.secretToken.name }}
+                key: {{ .Values.global.elasticAPM.containers.env.secretToken.key }}
+          - name: JAVA_TOOL_OPTIONS
+            value: {{ .Values.global.elasticAPM.containers.env.javaToolOptions }}
+          {{- end }}
           ports:
             - containerPort: {{ .Values.imagemagick.image.internalPort }}
           resources: {{- toYaml .Values.imagemagick.resources | nindent 12 }}
@@ -82,3 +101,22 @@ spec:
             periodSeconds: {{ .Values.imagemagick.livenessProbe.periodSeconds }}
             failureThreshold: 1
             timeoutSeconds: {{ .Values.imagemagick.livenessProbe.timeoutSeconds }}
+          {{- if and (.Values.global.elasticAPM) (.Values.global.elasticAPM.enabled) }}
+          volumeMounts:
+            - name: {{ .Values.global.elasticAPM.containers.volumeMounts.name }}
+              mountPath: {{ .Values.global.elasticAPM.containers.volumeMounts.mountPath }}
+          {{- end }}
+      {{- if and (.Values.global.elasticAPM) (.Values.global.elasticAPM.enabled) }}
+      initContainers:
+        - name: elastic-java-agent
+          image: {{ .Values.global.elasticAPM.initContainers.image }}
+          volumeMounts:
+          - mountPath: {{ .Values.global.elasticAPM.initContainers.volumeMounts.mountPath }}
+            name: {{ .Values.global.elasticAPM.initContainers.volumeMounts.name }}
+          command: ['cp', '-v', '/usr/agent/elastic-apm-agent.jar', '/elastic/apm/agent']
+      {{- end }}
+      volumes:
+      {{- if and (.Values.global.elasticAPM) (.Values.global.elasticAPM.enabled) }}
+      - name: elastic-apm-agent
+        emptyDir: {}
+      {{- end }}
diff --git a/helm/alfresco-content-services/templates/deployment-libreoffice.yaml b/helm/alfresco-content-services/templates/deployment-libreoffice.yaml
@@ -65,6 +65,25 @@ spec:
               name: {{ default (printf "%s-brokersecret" (include "content-services.shortname" .)) .Values.messageBroker.existingSecretName }}
           env:
             {{- include "activemq.env" . | nindent 12 }}
+          {{- if and (.Values.global.elasticAPM) (.Values.global.elasticAPM.enabled) }}
+          - name: ELASTIC_APM_SERVER_URLS
+            value: {{ .Values.global.elasticAPM.containers.env.serverUrls }}
+          - name: ELASTIC_APM_SERVICE_NAME
+            value: "libreoffice"
+          - name: ELASTIC_APM_APPLICATION_PACKAGES
+            value: com.alfresco,org.alfresco,nl.amsterdam
+          - name: ELASTIC_APM_ENVIRONMENT
+            value: {{ .Values.global.elasticAPM.containers.env.environment }}
+          - name: ELASTIC_APM_LOG_LEVEL
+            value: {{ .Values.global.elasticAPM.containers.env.logLevel }}
+          - name: ELASTIC_APM_SECRET_TOKEN
+            valueFrom:
+              secretKeyRef:
+                name: {{ .Values.global.elasticAPM.containers.env.secretToken.name }}
+                key: {{ .Values.global.elasticAPM.containers.env.secretToken.key }}
+          - name: JAVA_TOOL_OPTIONS
+            value: {{ .Values.global.elasticAPM.containers.env.javaToolOptions }}
+          {{- end }}  
           ports:
             - containerPort: {{ .Values.libreoffice.image.internalPort }}
           resources: {{- toYaml .Values.libreoffice.resources | nindent 12 }}
@@ -83,3 +102,22 @@ spec:
             periodSeconds: {{ .Values.libreoffice.livenessProbe.periodSeconds }}
             failureThreshold: 1
             timeoutSeconds: {{ .Values.libreoffice.livenessProbe.timeoutSeconds }}
+          {{- if and (.Values.global.elasticAPM) (.Values.global.elasticAPM.enabled) }}
+          volumeMounts:
+            - name: {{ .Values.global.elasticAPM.containers.volumeMounts.name }}
+              mountPath: {{ .Values.global.elasticAPM.containers.volumeMounts.mountPath }}
+          {{- end }}
+      {{- if and (.Values.global.elasticAPM) (.Values.global.elasticAPM.enabled) }}
+      initContainers:
+        - name: elastic-java-agent
+          image: {{ .Values.global.elasticAPM.initContainers.image }}
+          volumeMounts:
+          - mountPath: {{ .Values.global.elasticAPM.initContainers.volumeMounts.mountPath }}
+            name: {{ .Values.global.elasticAPM.initContainers.volumeMounts.name }}
+          command: ['cp', '-v', '/usr/agent/elastic-apm-agent.jar', '/elastic/apm/agent']
+      {{- end }}
+      volumes:
+      {{- if and (.Values.global.elasticAPM) (.Values.global.elasticAPM.enabled) }}
+      - name: elastic-apm-agent
+        emptyDir: {}
+      {{- end }}
diff --git a/helm/alfresco-content-services/templates/deployment-pdfrenderer.yaml b/helm/alfresco-content-services/templates/deployment-pdfrenderer.yaml
@@ -64,6 +64,25 @@ spec:
               name: {{ default (printf "%s-brokersecret" (include "content-services.shortname" .)) .Values.messageBroker.existingSecretName }}
           env:
             {{- include "activemq.env" . | nindent 12 }}
+          {{- if and (.Values.global.elasticAPM) (.Values.global.elasticAPM.enabled) }}
+          - name: ELASTIC_APM_SERVER_URLS
+            value: {{ .Values.global.elasticAPM.containers.env.serverUrls }}
+          - name: ELASTIC_APM_SERVICE_NAME
+            value: "pdf-renderer"
+          - name: ELASTIC_APM_APPLICATION_PACKAGES
+            value: com.alfresco,org.alfresco,nl.amsterdam
+          - name: ELASTIC_APM_ENVIRONMENT
+            value: {{ .Values.global.elasticAPM.containers.env.environment }}
+          - name: ELASTIC_APM_LOG_LEVEL
+            value: {{ .Values.global.elasticAPM.containers.env.logLevel }}
+          - name: ELASTIC_APM_SECRET_TOKEN
+            valueFrom:
+              secretKeyRef:
+                name: {{ .Values.global.elasticAPM.containers.env.secretToken.name }}
+                key: {{ .Values.global.elasticAPM.containers.env.secretToken.key }}
+          - name: JAVA_TOOL_OPTIONS
+            value: {{ .Values.global.elasticAPM.containers.env.javaToolOptions }}
+          {{- end }}
           ports:
             - containerPort: {{ .Values.pdfrenderer.image.internalPort }}
           resources: {{- toYaml .Values.pdfrenderer.resources | nindent 12 }}
@@ -82,3 +101,22 @@ spec:
             periodSeconds: {{ .Values.pdfrenderer.livenessProbe.periodSeconds }}
             failureThreshold: 1
             timeoutSeconds: {{ .Values.pdfrenderer.livenessProbe.timeoutSeconds }}
+          {{- if and (.Values.global.elasticAPM) (.Values.global.elasticAPM.enabled) }}
+          volumeMounts:
+            - name: {{ .Values.global.elasticAPM.containers.volumeMounts.name }}
+              mountPath: {{ .Values.global.elasticAPM.containers.volumeMounts.mountPath }}
+          {{- end }}
+      {{- if and (.Values.global.elasticAPM) (.Values.global.elasticAPM.enabled) }}
+      initContainers:
+        - name: elastic-java-agent
+          image: {{ .Values.global.elasticAPM.initContainers.image }}
+          volumeMounts:
+          - mountPath: {{ .Values.global.elasticAPM.initContainers.volumeMounts.mountPath }}
+            name: {{ .Values.global.elasticAPM.initContainers.volumeMounts.name }}
+          command: ['cp', '-v', '/usr/agent/elastic-apm-agent.jar', '/elastic/apm/agent']
+      {{- end }}
+      volumes:
+      {{- if and (.Values.global.elasticAPM) (.Values.global.elasticAPM.enabled) }}
+      - name: elastic-apm-agent
+        emptyDir: {}
+      {{- end }}
diff --git a/helm/alfresco-content-services/templates/deployment-repository.yaml b/helm/alfresco-content-services/templates/deployment-repository.yaml
@@ -51,6 +51,26 @@ spec:
 {{ tpl .Values.repository.command . | indent 12 }}
           {{- end }}
           {{- include "component-security-context" .Values.repository | indent 8 }}
+          env:
+          {{- if and (.Values.global.elasticAPM) (.Values.global.elasticAPM.enabled) }}
+          - name: ELASTIC_APM_SERVER_URLS
+            value: {{ .Values.global.elasticAPM.containers.env.serverUrls}}
+          - name: ELASTIC_APM_SERVICE_NAME
+            value: "repository"
+          - name: ELASTIC_APM_APPLICATION_PACKAGES
+            value: com.alfresco,org.alfresco,nl.amsterdam
+          - name: ELASTIC_APM_ENVIRONMENT
+            value: {{ .Values.global.elasticAPM.containers.env.environment }}
+          - name: ELASTIC_APM_LOG_LEVEL
+            value: {{ .Values.global.elasticAPM.containers.env.logLevel }}
+          - name: ELASTIC_APM_SECRET_TOKEN
+            valueFrom:
+              secretKeyRef:
+                name: {{ .Values.global.elasticAPM.containers.env.secretToken.name}}
+                key: {{ .Values.global.elasticAPM.containers.env.secretToken.key }}
+          - name: JAVA_TOOL_OPTIONS
+            value: {{ .Values.global.elasticAPM.containers.env.javaToolOptions }}
+          {{- end }}
           envFrom:
           - secretRef:
               name: {{ default (printf "%s-dbsecret" (include "content-services.shortname" $)) $.Values.postgresql.existingSecretName }}
@@ -103,6 +123,11 @@ spec:
             mountPath: /usr/local/tomcat/shared/classes/alfresco/extension/dev-log4j.properties
             subPath: dev-log4j.properties
           {{- end }}
+          {{- if and (.Values.global.elasticAPM) (.Values.global.elasticAPM.enabled) }}
+          volumeMounts:
+            - name: {{ .Values.global.elasticAPM.containers.volumeMounts.name }}
+              mountPath: {{ .Values.global.elasticAPM.containers.volumeMounts.mountPath }}
+          {{- end }}
           startupProbe:
             httpGet:
               path: /alfresco/api/-default-/public/alfresco/versions/1/probes/-ready-
@@ -196,6 +221,14 @@ spec:
             - name: email-keystore-volume
               mountPath: /var/run/secrets/java.io/keystores
       {{- end }}
+      {{- if and (.Values.global.elasticAPM) (.Values.global.elasticAPM.enabled) }}
+        - name: elastic-java-agent
+          image: {{ .Values.global.elasticAPM.initContainers.image }}
+          volumeMounts:
+          - mountPath: {{ .Values.global.elasticAPM.initContainers.volumeMounts.mountPath }}
+            name: {{ .Values.global.elasticAPM.initContainers.volumeMounts.name }}
+          command: ['cp', '-v', '/usr/agent/elastic-apm-agent.jar', '/elastic/apm/agent']
+      {{- end }}
       volumes:
       {{- include "data_volume" .Values.repository | nindent 8 }}
       {{- if eq .Values.global.tracking.auth "secret" }}
@@ -250,6 +283,10 @@ spec:
             - key: ca.crt
               path: ca.crt
       {{- end }}
+      {{- if and (.Values.global.elasticAPM) (.Values.global.elasticAPM.enabled) }}
+      - name: elastic-apm-agent
+        emptyDir: {}
+      {{- end }}
       {{- if .Values.repository.extraVolumes }}
 {{ toYaml .Values.repository.extraVolumes | indent 6 }}
       {{- end }}