prometheus: Fix Grafana blackbox endpoint checks#886
Merged
Conversation
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 <dawud@stackhpc.com>
There was a problem hiding this comment.
Pull request overview
This PR fixes Prometheus blackbox monitoring for Grafana by separating checks for Grafana’s public vs. internal endpoints and aligning the enablement logic with enable_grafana_external and VIP topology, preventing false failures when external Grafana access is disabled.
Changes:
- Split Grafana blackbox targets into distinct public and internal endpoint checks.
- Gate the public Grafana check behind
enable_grafana_external, while ensuring the internal check remains enabled when external access is disabled or when internal/external VIPs differ. - Add a release note documenting the monitoring behavior change.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| releasenotes/notes/fix-grafana-external-blackbox-check-c1b97a2406ad3b15.yaml | Documents the corrected Grafana blackbox monitoring behavior. |
| ansible/roles/prometheus/defaults/main.yml | Updates default blackbox endpoints to split and correctly gate Grafana public vs internal checks. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
dougszumski
approved these changes
Jun 17, 2026
dougszumski
left a comment
dougszumski
left a comment
Member
There was a problem hiding this comment.
Based on https://review.opendev.org/c/openstack/kolla-ansible/+/988713
Ideally we would wait but we need it asap
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Split the Grafana blackbox endpoint into separate public and internal checks. The public endpoint is now only monitored when both Grafana and
enable_grafana_externalare 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_externalis disabled.Closes-Bug: #2157003
Change-Id: Iea3b21dcfa4284f2a74c1bee95577ce8a219cf5f