From 2d34422e2da7568a4c55f890c2e3e4a3aa2cc113 Mon Sep 17 00:00:00 2001
From: MillerUk <ben@haresign.net>
Date: Sun, 30 Apr 2023 20:32:40 +0000
Subject: [PATCH 1/2] add grafana datasoure and dashboard provisioning

---
 docker/docker-compose.yml     |  7 +++++++
 docker/grafana-dashboards.yml | 25 +++++++++++++++++++++++++
 docker/grafana-datasource.yml | 12 ++++++++++++
 3 files changed, 44 insertions(+)
 create mode 100644 docker/grafana-dashboards.yml
 create mode 100644 docker/grafana-datasource.yml

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index e296a8f4..f797e073 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -57,7 +57,14 @@ services:
     depends_on:
       - auth_mysql
     volumes:
+      - ./grafana-datasource.yml:/etc/grafana/provisioning/datasources/datasource.yaml
+      - ./grafana-dashboards.yml:/etc/grafana/provisioning/dashboards/datasource.yaml
+      - ./grafana/dashboards:/var/lib/grafana/dashboards:ro
       - grafana-data:/var/lib/grafana
+    environment:
+      GF_INSTALL_PLUGINS: grafana-piechart-panel,grafana-clock-panel,grafana-simple-json-datasource
+      GF_AUTH_DATABASE_PASSWORD: ${GRAFANA_DB_PASSWORD}
+
   proxy:
     image: 'jc21/nginx-proxy-manager:latest'
     restart: always
diff --git a/docker/grafana-dashboards.yml b/docker/grafana-dashboards.yml
new file mode 100644
index 00000000..11651744
--- /dev/null
+++ b/docker/grafana-dashboards.yml
@@ -0,0 +1,25 @@
+apiVersion: 1
+
+providers:
+  # <string> an unique provider name
+- name: 'auth dashboards'
+  # <int> org id. will default to orgId 1 if not specified
+  orgId: 1
+  # <string, required> name of the dashboard folder. Required
+  folder: ''
+  # <string> folder UID. will be automatically generated if not specified
+  folderUid: ''
+  # <string, required> provider type. Required
+  type: file
+  # <bool> disable dashboard deletion
+  disableDeletion: false
+  # <bool> enable dashboard editing
+  editable: true
+  # <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
+    path: /var/lib/grafana/dashboards
+    foldersFromFilesStructure: true
\ No newline at end of file
diff --git a/docker/grafana-datasource.yml b/docker/grafana-datasource.yml
new file mode 100644
index 00000000..d72162f1
--- /dev/null
+++ b/docker/grafana-datasource.yml
@@ -0,0 +1,12 @@
+apiVersion: 1
+
+datasources:
+
+- name: MySQL
+  type: mysql
+  url: auth_mysql
+  database: alliance_auth
+  user: grafana
+  editable: true
+  secureJsonData:
+    password: ${GF_AUTH_DATABASE_PASSWORD}
\ No newline at end of file

From 79637020f3a284c982e1634c79336255bc4456c5 Mon Sep 17 00:00:00 2001
From: MillerUk <ben@haresign.net>
Date: Tue, 16 May 2023 22:14:11 +0000
Subject: [PATCH 2/2] add grafana datasoure and dashboard provisioning

---
 docker/grafana-dashboards.yml | 2 +-
 docker/grafana-datasource.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker/grafana-dashboards.yml b/docker/grafana-dashboards.yml
index 11651744..3e0aa5c7 100644
--- a/docker/grafana-dashboards.yml
+++ b/docker/grafana-dashboards.yml
@@ -22,4 +22,4 @@ providers:
   options:
     # <string, required> path to dashboard files on disk. Required
     path: /var/lib/grafana/dashboards
-    foldersFromFilesStructure: true
\ No newline at end of file
+    foldersFromFilesStructure: true
diff --git a/docker/grafana-datasource.yml b/docker/grafana-datasource.yml
index d72162f1..bc5b2115 100644
--- a/docker/grafana-datasource.yml
+++ b/docker/grafana-datasource.yml
@@ -9,4 +9,4 @@ datasources:
   user: grafana
   editable: true
   secureJsonData:
-    password: ${GF_AUTH_DATABASE_PASSWORD}
\ No newline at end of file
+    password: ${GF_AUTH_DATABASE_PASSWORD}