From 3676a278e9aad23491184921aa14773b8c312415 Mon Sep 17 00:00:00 2001 From: Dawud Date: Fri, 15 May 2026 00:28:44 +0100 Subject: prometheus: Fix Grafana blackbox endpoint checks Split the Grafana blackbox endpoint into separate public and internal checks. The public endpoint is now only monitored when both Grafana and ``enable_grafana_external`` are enabled (which is the default when enabling Grafana), matching the HAProxy external listener check. The internal endpoint remains monitored when Grafana is enabled and either external Grafana is disabled or the internal and external VIPs are separate. This avoids losing Grafana monitoring when ``enable_grafana_external`` is disabled. Closes-Bug: #2157003 Change-Id: Iea3b21dcfa4284f2a74c1bee95577ce8a219cf5f Signed-off-by: Dawud (cherry picked from commit 6e9bea3291a55829b32d58613b0414af547ec4a1) --- ansible/roles/prometheus/defaults/main.yml | 6 ++++-- .../fix-grafana-external-blackbox-check-c1b97a2406ad3b15.yaml | 7 +++++++ 2 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 releasenotes/notes/fix-grafana-external-blackbox-check-c1b97a2406ad3b15.yaml diff --git a/ansible/roles/prometheus/defaults/main.yml b/ansible/roles/prometheus/defaults/main.yml index 3416f72d9..c1c7c2f79 100644 --- a/ansible/roles/prometheus/defaults/main.yml +++ b/ansible/roles/prometheus/defaults/main.yml @@ -327,8 +327,10 @@ prometheus_blackbox_exporter_endpoints_default: enabled: "{{ enable_etcd | bool }}" - endpoints: - "grafana:http_2xx:{{ grafana_public_endpoint }}" - - "{{ ('grafana_internal:http_2xx:' + grafana_internal_endpoint) if not kolla_same_external_internal_vip | bool }}" - enabled: "{{ enable_grafana | bool }}" + enabled: "{{ enable_grafana | bool and enable_grafana_external | bool }}" + - endpoints: + - "grafana_internal:http_2xx:{{ grafana_internal_endpoint }}" + enabled: "{{ enable_grafana | bool and ((not enable_grafana_external | bool) or (not kolla_same_external_internal_vip | bool)) }}" - endpoints: - "opensearch:http_2xx:{{ opensearch_internal_endpoint }}" enabled: "{{ enable_opensearch | bool }}" diff --git a/releasenotes/notes/fix-grafana-external-blackbox-check-c1b97a2406ad3b15.yaml b/releasenotes/notes/fix-grafana-external-blackbox-check-c1b97a2406ad3b15.yaml new file mode 100644 index 000000000..9152ecf69 --- /dev/null +++ b/releasenotes/notes/fix-grafana-external-blackbox-check-c1b97a2406ad3b15.yaml @@ -0,0 +1,7 @@ +--- +fixes: + - | + Fixes Prometheus blackbox exporter checks for Grafana when external + Grafana access is disabled. The public Grafana endpoint is now only + monitored when ``enable_grafana_external`` is enabled, while the internal + endpoint continues to be monitored when appropriate. -- cgit v1.2.3