From 5d052bd6beae3f1cef6008dbf62021e91cf6bfa0 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 <will@stackhpc.com>
---
 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 6892d9e999..742a6d79d2 100644
--- a/etc/kayobe/kolla.yml
+++ b/etc/kayobe/kolla.yml
@@ -349,9 +349,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 /
 
@@ -364,6 +361,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 9e73667a4787ba8c6e64136562083010e1051711 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 742a6d79d2..40e7343595 100644
--- a/etc/kayobe/kolla.yml
+++ b/etc/kayobe/kolla.yml
@@ -362,7 +362,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 bb27d2bc8011a363c9ce35e65d9f5eea62ed1e3a Mon Sep 17 00:00:00 2001
From: technowhizz <7688823+technowhizz@users.noreply.github.com>
Date: Tue, 21 Jan 2025 13:29:25 +0000
Subject: [PATCH 3/4] Bump grafana image to remove angular plugins

---
 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 2a87d2d5cc..ecd4f9a48d 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-20250916T101619
+    ubuntu-noble: 2025.1-ubuntu-noble-20250916T101619
   keystone:
     rocky-9: 2025.1-rocky-9-20250805T134044
     ubuntu-noble: 2025.1-ubuntu-noble-20250805T134044

From 7ca3e8e07484e61f27dc8c62ed13192720116f46 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 4/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 0000000000..db2e8279a6
--- /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.