aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2026-09-29 11:20:16 +0000
committerGerrit Code Review <review@openstack.org>2026-09-29 11:20:16 +0000
commit92a16abdbbf006137d5394124b7da5232fbc9633 (patch)
treecaddf194ae310dcac39e9d92693c028d7107441d
parent2186de36cd74cc8093f4da081a46014f1c934622 (diff)
parent415b5b4633939df0be4b1259bcddf31d65b186b9 (diff)
downloadkolla-92a16abdbbf006137d5394124b7da5232fbc9633.tar.gz
kolla-92a16abdbbf006137d5394124b7da5232fbc9633.zip
Merge "grafana: install Prometheus datasource plugin" into stable/2026.1
-rw-r--r--docker/grafana/Dockerfile.j25
-rw-r--r--releasenotes/notes/bug-2165921-a70d2839ab32f423.yaml7
2 files changed, 11 insertions, 1 deletions
diff --git a/docker/grafana/Dockerfile.j2 b/docker/grafana/Dockerfile.j2
index 8574aadc8..728b55856 100644
--- a/docker/grafana/Dockerfile.j2
+++ b/docker/grafana/Dockerfile.j2
@@ -22,7 +22,10 @@ COPY extend_start.sh /usr/local/bin/kolla_extend_start
{% block grafana_plugins_install %}
-{% set grafana_default_plugins = ['grafana-opensearch-datasource'] %}
+{% set grafana_default_plugins = [
+ 'grafana-opensearch-datasource',
+ 'prometheus'
+] %}
{% set grafana_plugins = grafana_default_plugins | customizable("plugins") %}
{% if grafana_plugins | length > 0 %}
diff --git a/releasenotes/notes/bug-2165921-a70d2839ab32f423.yaml b/releasenotes/notes/bug-2165921-a70d2839ab32f423.yaml
new file mode 100644
index 000000000..91f900ec4
--- /dev/null
+++ b/releasenotes/notes/bug-2165921-a70d2839ab32f423.yaml
@@ -0,0 +1,7 @@
+---
+fixes:
+ - |
+ Install the Prometheus datasource plugin for Grafana 13.2+.
+ Grafana 13.2 moved Prometheus to a standalone plugin, which
+ is not automatically installed in offline environments.
+ `LP#2165921 <https://launchpad.net/bugs/2165921>`__