From 6e3da59fa2b115d2e725a7cade636209099daef7 Mon Sep 17 00:00:00 2001 From: Viktor Date: Wed, 10 Apr 2024 15:47:57 +0200 Subject: [PATCH 1/2] mendix 10 support statsd to micrometer --- charts/app-mendix/Chart.yaml | 2 +- charts/app-mendix/templates/deployment-leader.yaml | 6 ++++++ charts/app-mendix/templates/deployment-slave.yaml | 6 ++++++ charts/app-mendix/values.yaml | 5 ++++- 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/charts/app-mendix/Chart.yaml b/charts/app-mendix/Chart.yaml index 6b70aed..63104e8 100644 --- 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 index 853f3c0..9b68e40 100644 --- 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 }} {{- 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 index c222b35..e62747b 100644 --- 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 }} {{- if .Values.licenseId }} - name: LICENSE_ID value: {{ .Values.licenseId }} diff --git a/charts/app-mendix/values.yaml b/charts/app-mendix/values.yaml index 058c19d..fa8ab35 100644 --- 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 \ No newline at end of file + enabled: true + runtimeLoginMetricsEnabled: true + # example: http://loki-stack:3100/loki/api/v1/push + trendsForwarderUrl: "" \ No newline at end of file From 18c682ba62ebc91b32f78a27212455dd8d28270a Mon Sep 17 00:00:00 2001 From: Viktor Date: Wed, 10 Apr 2024 15:52:00 +0200 Subject: [PATCH 2/2] quote env values --- charts/app-mendix/templates/deployment-leader.yaml | 2 +- charts/app-mendix/templates/deployment-slave.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/app-mendix/templates/deployment-leader.yaml b/charts/app-mendix/templates/deployment-leader.yaml index 9b68e40..50f676c 100644 --- a/charts/app-mendix/templates/deployment-leader.yaml +++ b/charts/app-mendix/templates/deployment-leader.yaml @@ -48,7 +48,7 @@ spec: - name: RUNTIME_LOGIN_METRICS_ENABLED value: {{ .Values.metrics.runtimeLoginMetricsEnabled | quote }} - name: TRENDS_FORWARDER_URL - value: {{ .Values.metrics.trendsForwarderUrl }} + 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 index e62747b..7162949 100644 --- a/charts/app-mendix/templates/deployment-slave.yaml +++ b/charts/app-mendix/templates/deployment-slave.yaml @@ -57,7 +57,7 @@ spec: - name: RUNTIME_LOGIN_METRICS_ENABLED value: {{ .Values.metrics.runtimeLoginMetricsEnabled | quote }} - name: TRENDS_FORWARDER_URL - value: {{ .Values.metrics.trendsForwarderUrl }} + value: {{ .Values.metrics.trendsForwarderUrl | quote }} {{- if .Values.licenseId }} - name: LICENSE_ID value: {{ .Values.licenseId }}