Update template files for prometheus metrics

wso2 · Feb 19, 2025 · 505bc13 · 505bc13
1 parent bc00e04
commit 505bc13
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 59 deletions.
diff --git a/...s/templates/data-plane/gateway-components/gateway-runtime/gateway-runtime-deployment.yaml b/...s/templates/data-plane/gateway-components/gateway-runtime/gateway-runtime-deployment.yaml
@@ -101,6 +101,10 @@ spec:
               value: "3"
             - name: enforcer_admin_pwd
               value: admin
+            {{- if and .Values.wso2.apk.metrics .Values.wso2.apk.metrics.enabled }}
+            - name: METRICS_ENABLED
+              value: "true"
+            {{- end }}
             - name: JAVA_OPTS
               value: {{ include "apk.javaOptions" . }}
             {{- if and .Values.wso2.apk.dp.gatewayRuntime.analytics .Values.wso2.apk.dp.gatewayRuntime.analytics.publishers }}
@@ -187,11 +191,6 @@ spec:
             {{- else }}
               subPath: tls.key
             {{- end }}
-            {{- if and .Values.wso2.apk.metrics .Values.wso2.apk.metrics.enabled }}
-            - name: prometheus-jmx-config-volume
-              mountPath: /tmp/metrics/prometheus-jmx-config-enforcer.yml
-              subPath: prometheus-jmx-config-enforcer.yml
-            {{- end }}
             - name: enforcer-keystore-secret-volume
               mountPath: /home/wso2/security/keystore/enforcer.crt
             {{- if and .Values.wso2.apk.dp.gatewayRuntime.deployment.enforcer.configs .Values.wso2.apk.dp.gatewayRuntime.deployment.enforcer.configs.tls }}
@@ -440,11 +439,6 @@ spec:
         #     secretName: {{ template "apk-helm.resource.prefix" . }}-common-controller-server-cert
         #   {{- end }}
         #     defaultMode: 420
-        {{- if and .Values.wso2.apk.metrics .Values.wso2.apk.metrics.enabled }}
-        - name: prometheus-jmx-config-volume
-          configMap: 
-            name: prometheus-jmx-config-enforcer
-        {{- end }}
         - name: enforcer-keystore-secret-volume
           secret: 
           {{- if and .Values.wso2.apk.dp.gatewayRuntime.deployment.enforcer.configs .Values.wso2.apk.dp.gatewayRuntime.deployment.enforcer.configs.tls }}

diff --git a/...rts/templates/data-plane/gateway-components/gateway-runtime/prometheus-jmx-configmap.yaml b/...rts/templates/data-plane/gateway-components/gateway-runtime/prometheus-jmx-configmap.yaml