Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: PodMonitor doesn't honor sonarWebContext and fails to monitor SonarQube #452

Merged
merged 1 commit into from Apr 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions charts/sonarqube-dce/CHANGELOG.md
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions charts/sonarqube-dce/Chart.yaml
Expand Up @@ -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/
Expand Down
2 changes: 1 addition & 1 deletion charts/sonarqube-dce/templates/prometheus-podmonitor.yaml
Expand Up @@ -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 }}
Expand Down
1 change: 1 addition & 0 deletions charts/sonarqube/CHANGELOG.md
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions charts/sonarqube/Chart.yaml
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion charts/sonarqube/templates/prometheus-podmonitor.yaml
Expand Up @@ -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 }}
Expand Down