From 5211e5dd452e3de222ad681d2d66211e9dc18018 Mon Sep 17 00:00:00 2001
From: James Green <james.green6@justice.gov.uk>
Date: Thu, 19 Dec 2024 16:20:55 +0000
Subject: [PATCH 1/2] updated grafana helm version

---
 scripts/deploy.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/deploy.sh b/scripts/deploy.sh
index 61b4dd2..7dc802e 100755
--- 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 \

From 0b8f8ccd4db05f5f65c20744b111b903d8720e46 Mon Sep 17 00:00:00 2001
From: James Green <james.green6@justice.gov.uk>
Date: Thu, 19 Dec 2024 16:21:38 +0000
Subject: [PATCH 2/2] fix grafana labeling bug issue

---
 .../bind-dns-metrics-grafana-dashboard.yaml   | 19 +------------------
 .../kea-dhcp-metrics-grafana-dashboard.yaml   | 19 +------------------
 ...work-access-control-grafana-dashboard.yaml | 19 +------------------
 3 files changed, 3 insertions(+), 54 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
index 52992ff..516f180 100644
--- 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
index b493478..b5f7c60 100644
--- 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
index ac1e810..da5b40a 100644
--- 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"