fix: PodMonitor doesn't honor sonarWebContext and fails to monitor So…

…narQube
SonarSource · Apr 12, 2024 · 8f7bc2f · 8f7bc2f
1 parent c4d4979
commit 8f7bc2f
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 2 deletions.
diff --git a/charts/sonarqube-dce/CHANGELOG.md b/charts/sonarqube-dce/CHANGELOG.md
@@ -17,6 +17,7 @@ All changes to this chart will be documented in this file.
 * Deprecate nginx.enabled in favor of ingress-nginx.enabled, to match with subchart config block
 * Deprecate `ApplicationNodes.prometheusMonitoring.podMonitor.namespace`
 * Instantiate `monitoring-web` and `monitoring-ce` endpoints when the `ApplicationNodes.prometheusExporter` is enabled
+* Take `sonarWebContext` into account for the `PodMonitor` path
 
 ## [10.4.0]
 * Upgrade SonarQube to 10.4.0

diff --git a/charts/sonarqube-dce/Chart.yaml b/charts/sonarqube-dce/Chart.yaml
@@ -57,6 +57,8 @@ annotations:
       description: "Deprecate ApplicationNodes.prometheusMonitoring.podMonitor.namespace"
     - kind: changed
       description: "Instantiate monitoring-web and monitoring-ce endpoints when the ApplicationNodes.prometheusExporter is enabled"
+    - kind: fixed
+      description: "Take `sonarWebContext` into account for the `PodMonitor` path"
   artifacthub.io/links: |
     - name: support
       url: https://community.sonarsource.com/

diff --git a/charts/sonarqube-dce/templates/prometheus-podmonitor.yaml b/charts/sonarqube-dce/templates/prometheus-podmonitor.yaml
@@ -22,7 +22,7 @@ spec:
       app: {{ template "sonarqube.name" . }}
   podMetricsEndpoints:
   - port: http
-    path: /api/monitoring/metrics
+    path: {{ include "sonarqube.webcontext" . }}api/monitoring/metrics
     scheme: http
     {{- if .Values.ApplicationNodes.prometheusMonitoring.podMonitor.interval }}
     interval: {{ .Values.ApplicationNodes.prometheusMonitoring.podMonitor.interval }}

diff --git a/charts/sonarqube/CHANGELOG.md b/charts/sonarqube/CHANGELOG.md
@@ -11,6 +11,7 @@ All changes to this chart will be documented in this file.
 * Deprecate nginx.enabled in favor of ingress-nginx.enabled, to match with subchart config block
 * Deprecate `prometheusMonitoring.podMonitor.namespace`
 * Instantiate `monitoring-web` and `monitoring-ce` endpoints when the `prometheusExporter` is enabled
+* Take `sonarWebContext` into account for the `PodMonitor` path
 
 ## [10.4.0]
 * Upgrade SonarQube to 10.4.0

diff --git a/charts/sonarqube/Chart.yaml b/charts/sonarqube/Chart.yaml
@@ -52,6 +52,8 @@ annotations:
       description: "Deprecate prometheusMonitoring.podMonitor.namespace"
     - kind: changed
       description: "Instantiate monitoring-web and monitoring-ce endpoints when the prometheusExporter is enabled"
+    - kind: fixed
+      description: "Take `sonarWebContext` into account for the `PodMonitor` path"
   artifacthub.io/containsSecurityUpdates: "false"
   artifacthub.io/images: |
     - name: sonarqube

diff --git a/charts/sonarqube/templates/prometheus-podmonitor.yaml b/charts/sonarqube/templates/prometheus-podmonitor.yaml
@@ -22,7 +22,7 @@ spec:
       app: {{ template "sonarqube.name" . }}
   podMetricsEndpoints:
   - port: http
-    path: /api/monitoring/metrics
+    path: {{ include "sonarqube.webcontext" . }}api/monitoring/metrics
     scheme: http
     {{- if .Values.prometheusMonitoring.podMonitor.interval }}
     interval: {{ .Values.prometheusMonitoring.podMonitor.interval }}