Merge pull request #988 from stackhpc/add-missing-plugins

technowhizz · web-flow · commit 99ccda6b4c3d · 2024-03-14T14:57:35.000Z
Add missing grafana plugins
diff --git a/etc/kayobe/kolla-image-tags.yml b/etc/kayobe/kolla-image-tags.yml
@@ -18,3 +18,6 @@ kolla_image_tags:
   neutron:
     rocky-9: 2023.1-rocky-9-20240202T145927
     ubuntu-jammy: 2023.1-ubuntu-jammy-20240221T103817
+  grafana:
+    rocky-9: 2023.1-rocky-9-20240313T165255
+    ubuntu-jammy: 2023.1-ubuntu-jammy-20240313T165255
diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml
@@ -320,7 +320,9 @@ kolla_build_blocks:
     ADD additions-archive /
   grafana_plugins_install: |
     RUN grafana-cli plugins install vonage-status-panel \
-        && grafana-cli plugins install grafana-piechart-panel
+        && grafana-cli plugins install grafana-piechart-panel \
+        && grafana-cli plugins install grafana-opensearch-datasource \
+        && grafana-cli plugins install gnocchixyz-gnocchi-datasource
   ironic_inspector_header: |
     ADD additions-archive /
   magnum_base_footer: |
diff --git a/etc/releasenotes/notes/add-grafana-plugins-f4856a30529ac686.yaml b/etc/releasenotes/notes/add-grafana-plugins-f4856a30529ac686.yaml
@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    The grafana image now includes the `gnocchixyz-gnocchi-datasource` and the
+    `grafana-opensearch-datasource` plugins, which are the default upstream
+    plugins.
