Merge pull request #26 from cinaq/mendix10

Mendix10 support stated to micrometer
cinaq · Apr 10, 2024 · 0f10e8a · 0f10e8a
2 parents 7044deb + 18c682b
commit 0f10e8a
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 2 deletions.
diff --git a/charts/app-mendix/Chart.yaml b/charts/app-mendix/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: app-mendix
-version: 2.2.5
+version: 2.3.0
 description: Mendix Application Chart.
 icon: https://cinaq.github.io/helm-charts/icons/mendix-logo.png
 maintainers:

diff --git a/charts/app-mendix/templates/deployment-leader.yaml b/charts/app-mendix/templates/deployment-leader.yaml
@@ -39,10 +39,16 @@ spec:
               name: metrics-mendix
             {{- end }}
           env:
+            - name: NON_MENDIX_PUBLIC_CLOUD
+              value: "true"
             - name: CF_INSTANCE_INDEX
               value: "0"
             - name: MXRUNTIME_Metrics_Registries
               value: '[{"type": "prometheus", "settings": {"step": "5m"}}]'
+            - name: RUNTIME_LOGIN_METRICS_ENABLED
+              value: {{ .Values.metrics.runtimeLoginMetricsEnabled | quote }}
+            - name: TRENDS_FORWARDER_URL
+              value: {{ .Values.metrics.trendsForwarderUrl | quote }}
           {{- if .Values.licenseId }}
             - name: LICENSE_ID
               value: {{ .Values.licenseId }}

diff --git a/charts/app-mendix/templates/deployment-slave.yaml b/charts/app-mendix/templates/deployment-slave.yaml
@@ -48,10 +48,16 @@ spec:
               name: metrics-mendix
             {{- end }}
           env:
+            - name: NON_MENDIX_PUBLIC_CLOUD
+              value: "true"
             - name: CF_INSTANCE_INDEX
               value: "1"
             - name: MXRUNTIME_Metrics_Registries
               value: '[{"type": "prometheus", "settings": {"step": "5m"}}]'
+            - name: RUNTIME_LOGIN_METRICS_ENABLED
+              value: {{ .Values.metrics.runtimeLoginMetricsEnabled | quote }}
+            - name: TRENDS_FORWARDER_URL
+              value: {{ .Values.metrics.trendsForwarderUrl | quote }}
           {{- if .Values.licenseId }}
             - name: LICENSE_ID
               value: {{ .Values.licenseId }}

diff --git a/charts/app-mendix/values.yaml b/charts/app-mendix/values.yaml
@@ -143,4 +143,7 @@ lifecycle:
     command: /opt/eap/bin/stop.sh
 
 metrics:
-  enabled: true
+  enabled: true
+  runtimeLoginMetricsEnabled: true
+  # example: http://loki-stack:3100/loki/api/v1/push
+  trendsForwarderUrl: ""