From fb4d21c23e668cac2c3739c0f673962489688e2b Mon Sep 17 00:00:00 2001
From: Adam Saleh <adam@asaleh.net>
Date: Mon, 27 Mar 2023 11:47:06 +0200
Subject: [PATCH] Fixing dashboard deployment

---
 .../templates/dashboard_configmap.yml         |  4 +--
 .../templates/dashboard_deploymentconfig.yml  |  9 ++++--
 .../templates/dashboard_provision_config.yml  | 30 +++++++++++++++++++
 3 files changed, 39 insertions(+), 4 deletions(-)
 create mode 100644 roles/openshift-apps/monitor-gating/templates/dashboard_provision_config.yml

diff --git a/roles/openshift-apps/monitor-gating/templates/dashboard_configmap.yml b/roles/openshift-apps/monitor-gating/templates/dashboard_configmap.yml
index 574ba09b95..98a1288caa 100644
--- a/roles/openshift-apps/monitor-gating/templates/dashboard_configmap.yml
+++ b/roles/openshift-apps/monitor-gating/templates/dashboard_configmap.yml
@@ -16,11 +16,11 @@ data:
         secureJsonData:
           password: {{ datanommer_ro_password }}
         jsonData:
-          database: datanommer2
+          database: datanommer
           default: true
           sslmode: "disable" # disable/require/verify-ca/verify-full
           maxOpenConns: 0         # Grafana v5.4+
           maxIdleConns: 2         # Grafana v5.4+
           connMaxLifetime: 14400  # Grafana v5.4+
           postgresVersion: 1200 # 903=9.3, 904=9.4, 905=9.5, 906=9.6, 1000=10
-          timescaledb: false
+          timescaledb: true
diff --git a/roles/openshift-apps/monitor-gating/templates/dashboard_deploymentconfig.yml b/roles/openshift-apps/monitor-gating/templates/dashboard_deploymentconfig.yml
index b62d303ccd..2ae398ca19 100644
--- a/roles/openshift-apps/monitor-gating/templates/dashboard_deploymentconfig.yml
+++ b/roles/openshift-apps/monitor-gating/templates/dashboard_deploymentconfig.yml
@@ -54,7 +54,7 @@ spec:
             - name: 'GF_USERS_AUTO_ASSIGN_ORG_ROLE'
               value: 'Admin'
             - name: 'V'
-              value: '16'
+              value: '17'
           image: registry.hub.docker.com/grafana/grafana:latest
           name: dashboard
           ports:
@@ -64,6 +64,8 @@ spec:
               name: grafana-datasources
             - mountPath: /var/lib/grafana/dashboards
               name: grafana-dashboards
+            - mountPath: /etc/grafana/provisioning/dashboards
+              name: grafana-dashboards-provision
       serviceAccountName: monitor-dashboard
       volumes:
         - name: grafana-tls
@@ -74,4 +76,7 @@ spec:
           name: grafana-datasources
         - configMap:
             name: grafana-dashboards
-          name: grafana-dashboards
\ No newline at end of file
+          name: grafana-dashboards
+        - configMap:
+            name: grafana-dashboards-provision
+          name: grafana-dashboards-provision
\ No newline at end of file
diff --git a/roles/openshift-apps/monitor-gating/templates/dashboard_provision_config.yml b/roles/openshift-apps/monitor-gating/templates/dashboard_provision_config.yml
new file mode 100644
index 0000000000..7eda14da6f
--- /dev/null
+++ b/roles/openshift-apps/monitor-gating/templates/dashboard_provision_config.yml
@@ -0,0 +1,30 @@
+apiVersion: v1
+data:
+  dashboards.yml: |
+    apiVersion: 1
+    
+    providers:
+      # <string> an unique provider name. Required
+      - name: 'Preset Dashboards'
+        # <int> Org id. Default to 1
+        orgId: 1
+        # <string> name of the dashboard folder.
+        folder: ''
+        # <string> folder UID. will be automatically generated if not specified
+        folderUid: ''
+        # <string> provider type. Default to 'file'
+        type: file
+        # <bool> disable dashboard deletion
+        disableDeletion: false
+        # <int> how often Grafana will scan for changed dashboards
+        updateIntervalSeconds: 10
+        # <bool> allow updating provisioned dashboards from the UI
+        allowUiUpdates: false
+        options:
+          # <string, required> path to dashboard files on disk. Required when using the 'file' type
+          path: /var/lib/grafana/dashboards
+          # <bool> use folder names from filesystem to create folders in Grafana
+          foldersFromFilesStructure: true
+kind: ConfigMap
+metadata:
+  name: grafana-dashboards-provision
\ No newline at end of file