From e7b173b0118c57f436621fee8f8d9b2076c04e3f Mon Sep 17 00:00:00 2001
From: Piotr Rygielski <114479+vikin91@users.noreply.github.com>
Date: Mon, 7 Apr 2025 15:19:37 +0200
Subject: [PATCH] Upgrade Grafana to 10.4.17

---
 .../charts/monitoring/dashboards/node-inventory.json  |  2 +-
 deploy/charts/monitoring/templates/deployment.yaml    | 11 +++++++++++
 deploy/charts/monitoring/templates/grafana.yaml       | 11 +++++++++++
 deploy/charts/monitoring/values.yaml                  |  2 +-
 4 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/deploy/charts/monitoring/dashboards/node-inventory.json b/deploy/charts/monitoring/dashboards/node-inventory.json
index a09bac3e21dca..c4e45b6b2717d 100644
--- a/deploy/charts/monitoring/dashboards/node-inventory.json
+++ b/deploy/charts/monitoring/dashboards/node-inventory.json
@@ -383,4 +383,4 @@
   "title": "Node Inventory Status",
   "uid": "wdPp0woVz",
   "version": 7
-}
\ No newline at end of file
+}
diff --git a/deploy/charts/monitoring/templates/deployment.yaml b/deploy/charts/monitoring/templates/deployment.yaml
index d1ca43b77721f..ce85234124aa2 100644
--- a/deploy/charts/monitoring/templates/deployment.yaml
+++ b/deploy/charts/monitoring/templates/deployment.yaml
@@ -81,6 +81,11 @@ spec:
           - name: grafana-dashboards-volume
             mountPath: /etc/grafana/provisioning/dashboards
             readOnly: true
+          - name: grafana-plugins-volume
+            mountPath: /etc/grafana/provisioning/plugins
+          - name: grafana-notifiers-volume
+            mountPath: /etc/grafana/provisioning/notifiers
+            readOnly: true
           - name: monitoring-ui-volume
             mountPath: /run/secrets/stackrox.io/monitoring/certs/
             readOnly: true
@@ -128,6 +133,12 @@ spec:
           name: grafana-dashboards
       - name: grafana-var-volume
         emptyDir: {}
+      - name: grafana-notifiers-volume
+        emptyDir: {}
+      - name: grafana-plugins-volume
+        configMap:
+          defaultMode: 420
+          name: grafana-plugins
       - name: prometheus-config-volume
         configMap:
           name: prometheus
diff --git a/deploy/charts/monitoring/templates/grafana.yaml b/deploy/charts/monitoring/templates/grafana.yaml
index 21ebc44ec0556..839547ee3af3d 100644
--- a/deploy/charts/monitoring/templates/grafana.yaml
+++ b/deploy/charts/monitoring/templates/grafana.yaml
@@ -50,6 +50,17 @@ data:
 ---
 apiVersion: v1
 kind: ConfigMap
+metadata:
+  name: grafana-plugins
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/name: stackrox
+data:
+  sample.yaml: |-
+    apiVersion: 1
+---
+apiVersion: v1
+kind: ConfigMap
 metadata:
   name: grafana-dashboards
   namespace: {{ .Release.Namespace }}
diff --git a/deploy/charts/monitoring/values.yaml b/deploy/charts/monitoring/values.yaml
index f98bcd5c4c7ce..696fbbafc295c 100644
--- a/deploy/charts/monitoring/values.yaml
+++ b/deploy/charts/monitoring/values.yaml
@@ -1,4 +1,4 @@
-grafanaImage: grafana/grafana:7.5.15
+grafanaImage: grafana/grafana:10.4.17
 prometheusImage: prom/prometheus:v2.34.0
 password: stackrox