From 9f59bce7985b2b1f7e91f11f92e3f4016c269532 Mon Sep 17 00:00:00 2001 From: Xiwen Cheng Date: Fri, 22 Dec 2023 16:12:50 +0100 Subject: [PATCH] Expose prometheus scraping of telegraf via metrics_mendix port (#21) * Expose prometheus scraping of telegraf via metrics_mendix port * Do not publish on pull request --- .github/workflows/release.yml | 1 - charts/app-mendix/Chart.yaml | 2 +- charts/app-mendix/templates/deployment-leader.yaml | 2 ++ charts/app-mendix/templates/deployment-slave.yaml | 3 +++ 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e482bc5..80f5e31 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -4,7 +4,6 @@ on: push: branches: - main - pull_request: jobs: release: diff --git a/charts/app-mendix/Chart.yaml b/charts/app-mendix/Chart.yaml index adbc06a..1dd3feb 100644 --- a/charts/app-mendix/Chart.yaml +++ b/charts/app-mendix/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: app-mendix -version: 2.0.0 +version: 2.1.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 1602019..9d1ff8b 100644 --- a/charts/app-mendix/templates/deployment-leader.yaml +++ b/charts/app-mendix/templates/deployment-leader.yaml @@ -34,6 +34,8 @@ spec: {{- if .Values.metrics.enabled }} - containerPort: {{ add .Values.service.internalPort 3}} name: metrics + - containerPort: 9273 + name: metrics_mendix {{- end }} env: - name: CF_INSTANCE_INDEX diff --git a/charts/app-mendix/templates/deployment-slave.yaml b/charts/app-mendix/templates/deployment-slave.yaml index ad56925..e70a7c5 100644 --- a/charts/app-mendix/templates/deployment-slave.yaml +++ b/charts/app-mendix/templates/deployment-slave.yaml @@ -40,6 +40,9 @@ spec: - containerPort: {{ .Values.service.internalPort }} {{- if .Values.metrics.enabled }} - containerPort: {{ add .Values.service.internalPort 3 }} + name: metrics + - containerPort: 9273 + name: metrics_mendix {{- end }} env: - name: CF_INSTANCE_INDEX