Merge pull request #304 from ministryofjustice/nd-481

Nd 481 upgrade grafana to version 11
ministryofjustice · Dec 20, 2024 · 873c59f · 873c59f
2 parents c20c482 + 0b8f8cc
commit 873c59f
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 55 deletions.
diff --git a/k8s-helm-charts/cns-team-monitoring/templates/bind-dns-metrics-grafana-dashboard.yaml b/k8s-helm-charts/cns-team-monitoring/templates/bind-dns-metrics-grafana-dashboard.yaml
@@ -1303,24 +1303,7 @@ data:
             "label": "Environment",
             "multi": false,
             "name": "account_id",
-            "options": [
-              {
-                "selected": true,
-                "text": "Production",
-                "value": "{{ .Values.production_account_id }}"
-              },
-              {
-                "selected": false,
-                "text": "Pre-Production",
-                "value": "{{ .Values.pre_production_account_id }}"
-              },
-              {
-                "selected": false,
-                "text": "Development",
-                "value": "{{ .Values.development_account_id }}"
-              }
-            ],
-            "query": "Production,Pre-Production,Development",
+            "query": "Production : {{ .Values.production_account_id }},Pre-Production : {{ .Values.pre_production_account_id }},Development : {{ .Values.development_account_id }}",
             "queryValue": "",
             "skipUrlSync": false,
             "type": "custom"

diff --git a/k8s-helm-charts/cns-team-monitoring/templates/kea-dhcp-metrics-grafana-dashboard.yaml b/k8s-helm-charts/cns-team-monitoring/templates/kea-dhcp-metrics-grafana-dashboard.yaml
@@ -2036,24 +2036,7 @@ data:
             "label": "Environment",
             "multi": false,
             "name": "account_id",
-            "options": [
-              {
-                "selected": true,
-                "text": "Production",
-                "value": "{{ .Values.production_account_id }}"
-              },
-              {
-                "selected": false,
-                "text": "Pre-Production",
-                "value": "{{ .Values.pre_production_account_id }}"
-              },
-              {
-                "selected": false,
-                "text": "Development",
-                "value": "{{ .Values.development_account_id }}"
-              }
-            ],
-            "query": "Production,Pre-Production,Development",
+            "query": "Production : {{ .Values.production_account_id }},Pre-Production : {{ .Values.pre_production_account_id }},Development : {{ .Values.development_account_id }}",
             "queryValue": "",
             "skipUrlSync": false,
             "type": "custom"

diff --git a/k8s-helm-charts/cns-team-monitoring/templates/network-access-control-grafana-dashboard.yaml b/k8s-helm-charts/cns-team-monitoring/templates/network-access-control-grafana-dashboard.yaml
@@ -1771,24 +1771,7 @@ data:
             "label": "Environment",
             "multi": false,
             "name": "account_id",
-            "options": [
-              {
-                "selected": true,
-                "text": "Production",
-                "value": "{{ .Values.production_account_id }}"
-              },
-              {
-                "selected": false,
-                "text": "Pre-Production",
-                "value": "{{ .Values.pre_production_account_id }}"
-              },
-              {
-                "selected": false,
-                "text": "Development",
-                "value": "{{ .Values.development_account_id }}"
-              }
-            ],
-            "query": "Production,Pre-Production,Development",
+            "query": "Production : {{ .Values.production_account_id }},Pre-Production : {{ .Values.pre_production_account_id }},Development : {{ .Values.development_account_id }}",
             "queryValue": "",
             "skipUrlSync": false,
             "type": "custom"

diff --git a/scripts/deploy.sh b/scripts/deploy.sh
@@ -239,7 +239,7 @@ deploy_grafana() {
   helm repo add grafana https://grafana.github.io/helm-charts
   helm repo update
   helm upgrade --install grafana grafana/grafana \
-    --version 7.3.11 \
+    --version 8.8.2 \
     -f ./k8s-values/values.grafana.yaml \
     -n grafana \
     --create-namespace \