From 2a86395f87868530ab3c803ab2c2e03c6f0751a4 Mon Sep 17 00:00:00 2001 From: technowhizz <7688823+technowhizz@users.noreply.github.com> Date: Thu, 14 Mar 2024 13:29:35 +0000 Subject: [PATCH 1/4] Change grafana plugin install logic Changing the way in which we specify grafana plugins to install. This is due to a change upstream which now allows plugins to be installed in an additive method instead of replacing the upstream default plugins [1]. [1] https://review.opendev.org/c/openstack/kolla/+/913184 Co-authored-by: Will Szumski --- etc/kayobe/kolla.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml index 0da3da8ba..b61fdea35 100644 --- a/etc/kayobe/kolla.yml +++ b/etc/kayobe/kolla.yml @@ -345,9 +345,6 @@ kolla_build_blocks: bifrost_base_header: | ADD additions-archive / ENV TOX_CONSTRAINTS_FILE=/requirements/upper-constraints.txt - grafana_plugins_install: | - RUN grafana-cli plugins install vonage-status-panel \ - && grafana-cli plugins install grafana-opensearch-datasource ironic_inspector_header: | ADD additions-archive / @@ -360,6 +357,9 @@ kolla_build_blocks: kolla_build_customizations_common: bifrost_base_pip_packages_append: - /additions/* + grafana_plugins_append: + - grafana-piechart-panel + - vonage-status-panel ironic_inspector_pip_packages_append: - /additions/* magnum_base_pip_packages_override: From b6fcc2b14664166cee642a735bc89f4c2091159e Mon Sep 17 00:00:00 2001 From: technowhizz <7688823+technowhizz@users.noreply.github.com> Date: Fri, 13 Dec 2024 16:40:55 +0000 Subject: [PATCH 2/4] Remove angular plugins from grafana --- etc/kayobe/kolla.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml index b61fdea35..48d6121b4 100644 --- a/etc/kayobe/kolla.yml +++ b/etc/kayobe/kolla.yml @@ -358,7 +358,6 @@ kolla_build_customizations_common: bifrost_base_pip_packages_append: - /additions/* grafana_plugins_append: - - grafana-piechart-panel - vonage-status-panel ironic_inspector_pip_packages_append: - /additions/* From a3a94dca4403d7a26ce3c1dc8af29a200abc7b7f Mon Sep 17 00:00:00 2001 From: technowhizz <7688823+technowhizz@users.noreply.github.com> Date: Tue, 21 Jan 2025 13:32:46 +0000 Subject: [PATCH 3/4] Add releasenote --- .../grafana-plugin-install-logic-d935846abf0d27d0.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 releasenotes/notes/grafana-plugin-install-logic-d935846abf0d27d0.yaml diff --git a/releasenotes/notes/grafana-plugin-install-logic-d935846abf0d27d0.yaml b/releasenotes/notes/grafana-plugin-install-logic-d935846abf0d27d0.yaml new file mode 100644 index 000000000..db2e8279a --- /dev/null +++ b/releasenotes/notes/grafana-plugin-install-logic-d935846abf0d27d0.yaml @@ -0,0 +1,8 @@ +--- +features: + - | + New logic for installing grafana plugins. When building you can pass a + variable ``grafana_plugins_append`` that contains a list of plugins you + want to install. This will be appended to the default list of plugins. The + existing method of overwriting the ``grafana_plugins_install`` block still + works. From 68815abd7e174fbc8319fd1c1f9de3ebf6d20f0a Mon Sep 17 00:00:00 2001 From: technowhizz <7688823+technowhizz@users.noreply.github.com> Date: Thu, 8 Jan 2026 21:10:15 +0000 Subject: [PATCH 4/4] bump grafana image --- etc/kayobe/kolla-image-tags.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/etc/kayobe/kolla-image-tags.yml b/etc/kayobe/kolla-image-tags.yml index ba9fca4e7..951e92547 100644 --- a/etc/kayobe/kolla-image-tags.yml +++ b/etc/kayobe/kolla-image-tags.yml @@ -6,6 +6,9 @@ kolla_image_tags: openstack: rocky-9: 2025.1-rocky-9-20250730T105631 ubuntu-noble: 2025.1-ubuntu-noble-20250730T105631 + grafana: + rocky-9: 2025.1-rocky-9-20260108T141619 + ubuntu-noble: 2025.1-ubuntu-noble-20260108T141619 iscsid: rocky-9: 2025.1-rocky-9-20251013T135156 ubuntu-noble: 2025.1-ubuntu-noble-20251013T135156