From ab3db510ab0ba85f38b945e15f77ba0a4e449bce Mon Sep 17 00:00:00 2001
From: Salt <rehashedsalt@cock.li>
Date: Tue, 22 Sep 2020 16:37:58 -0500
Subject: [PATCH] Migrate Grafana to postgres

---
 inventory/group_vars/9iron.club.yml | 16 +++++++++-------
 roles/grafana/meta/main.yml         |  1 -
 roles/grafana/tasks/main.yml        | 28 +++++++++++++++-------------
 roles/grafana/templates/grafana.ini |  6 +++---
 4 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/inventory/group_vars/9iron.club.yml b/inventory/group_vars/9iron.club.yml
index 5cfb3bc..3bdb9cf 100644
--- a/inventory/group_vars/9iron.club.yml
+++ b/inventory/group_vars/9iron.club.yml
@@ -84,13 +84,15 @@ gitea:
               62303264653836656162366362316461656363353539343632616462626231643632
 # Grafana
 grafana:
-  mysql_password: !vault |
-            $ANSIBLE_VAULT;1.1;AES256
-            65376335363732633132326630323161393861323833323631613630343262383137656138356262
-            3730386139393739373738626535376636666135646463350a623331333032346434343465666234
-            38393539623437376133363063633238383031326431653737346564323837343265653431633962
-            6665346237666165330a643635653863356633623535383063366632336437313730626233346664
-            33303465616532313339393634386166363162393661393037323835323035386663
+  db:
+    hostname: 172.31.47.215
+    pass: !vault |
+              $ANSIBLE_VAULT;1.1;AES256
+              65376335363732633132326630323161393861323833323631613630343262383137656138356262
+              3730386139393739373738626535376636666135646463350a623331333032346434343465666234
+              38393539623437376133363063633238383031326431653737346564323837343265653431633962
+              6665346237666165330a643635653863356633623535383063366632336437313730626233346664
+              33303465616532313339393634386166363162393661393037323835323035386663
   url: "monitor.9iron.club"
   webroot: "/var/www/grafana"
   config_repo: "https://git.9iron.club/salt/grafana"
diff --git a/roles/grafana/meta/main.yml b/roles/grafana/meta/main.yml
index d5f3152..7e415bc 100644
--- a/roles/grafana/meta/main.yml
+++ b/roles/grafana/meta/main.yml
@@ -2,4 +2,3 @@
 allow_duplicates: no
 dependencies:
   - role: apache-php
-  - role: mysql
diff --git a/roles/grafana/tasks/main.yml b/roles/grafana/tasks/main.yml
index e5d2f20..25f346c 100644
--- a/roles/grafana/tasks/main.yml
+++ b/roles/grafana/tasks/main.yml
@@ -3,22 +3,24 @@
 ---
 - name: Install, configure, and start Grafana
   block:
-    - name: Create and configure DB
+    - name: Set up PostgreSQL
       block:
+        - name: Create DB user
+          postgresql_user:
+            name: grafana
+            password: "{{ grafana.db.pass }}"
+            login_host: "{{ grafana.db.hostname }}"
+            login_user: "{{ psql.ansible.user }}"
+            login_password: "{{ psql.ansible.pass }}"
         - name: Create DB
-          mysql_db:
+          postgresql_db:
             name: grafana
-            login_user: root
-            login_password: "{{ mysql.root_password }}"
-            state: present
-        - name: Create user
-          mysql_user:
-            name: grafana
-            host: localhost
-            password: "{{ grafana.mysql_password }}"
-            priv: "grafana.*:ALL,GRANT"
-            login_user: root
-            login_password: "{{ mysql.root_password }}"
+            owner: grafana
+            encoding: UNICODE
+            login_host: "{{ grafana.db.hostname }}"
+            login_user: "{{ psql.ansible.user }}"
+            login_password: "{{ psql.ansible.pass }}"
+      tags: [ postgresql ]
     - name: Configure Grafana
       block:
         - name: Create configuration directories
diff --git a/roles/grafana/templates/grafana.ini b/roles/grafana/templates/grafana.ini
index 9701fd6..87e5a92 100644
--- a/roles/grafana/templates/grafana.ini
+++ b/roles/grafana/templates/grafana.ini
@@ -73,12 +73,12 @@ http_port = 3001
 # as separate properties or as on string using the url properties.
 
 # Either "mysql", "postgres" or "sqlite3", it's your choice
-type = mysql
-host = 127.0.0.1:3306
+type = postgres
+host = {{ grafana.db.hostname }}:5432
 name = grafana
 user = grafana
 # If the password contains # or ; you have to wrap it with triple quotes. Ex """#password;"""
-password = {{ grafana.mysql_password }}
+password = {{ grafana.db.pass }}
 
 # Use either URL or the previous fields to configure the database
 # Example: mysql://user:secret@host:port/database