From c11b8e157b64461c94ba850a4cc86d8e7d8afc17 Mon Sep 17 00:00:00 2001
From: Ian Fijolek <ian@iamthefij.com>
Date: Thu, 16 Nov 2023 12:21:40 -0800
Subject: [PATCH] Fix grafana dashboard provisioning

A path mismatch existed after migrating to alloc storage
---
 core/grafana.nomad                            | 6 +++---
 core/grafana/grafana.ini                      | 4 ++--
 core/grafana/provisioning/dashboards/main.yml | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/core/grafana.nomad b/core/grafana.nomad
index 5651cf9..f190110 100644
--- a/core/grafana.nomad
+++ b/core/grafana.nomad
@@ -28,7 +28,6 @@ job "grafana" {
       tags = [
         "traefik.enable=true",
         "traefik.http.routers.grafana.entryPoints=websecure",
-        # "traefik.http.routers.grafana.middlewares=authelia@nomad",
       ]
     }
 
@@ -150,7 +149,8 @@ SELECT 'NOOP';
 
       env = {
         "GF_INSTALL_PLUGINS" = "grafana-clock-panel,grafana-piechart-panel,grafana-polystat-panel,natel-discrete-panel",
-        "GF_PATHS_PROVISIONING" = "$${NOMAD_ALLOC_DIR}/config/provisioning"
+        "GF_PATHS_CONFIG" = "$${NOMAD_ALLOC_DIR}/config/grafana.ini",
+        "GF_PATHS_PROVISIONING" = "$${NOMAD_ALLOC_DIR}/config/provisioning",
       }
 
       template {
@@ -265,7 +265,7 @@ ${file(join("/", [module_path, "grafana", config_file]))}
         # Set owner to grafana uid
         # uid = 472
         # Change template delimeter for dashboard files that use json and have double curly braces and square braces
-        %{ if length(regexall("dashboard", config_file)) > 0 ~}
+        %{ if endswith(config_file, ".json") ~}
         left_delimiter = "<<<<"
         right_delimiter = ">>>>"
         %{ endif }
diff --git a/core/grafana/grafana.ini b/core/grafana/grafana.ini
index 842cd76..4bd3121 100644
--- a/core/grafana/grafana.ini
+++ b/core/grafana/grafana.ini
@@ -20,8 +20,8 @@ data = /var/lib/grafana
 # Directory where grafana will automatically scan and look for plugins
 ;plugins = /var/lib/grafana/plugins
 
-# folder that contains provisioning config files that grafana will apply on startup and while running.
-; provisioning = /etc/grafana/provisioning
+# folder that contains PROVISIONING config files that grafana will apply on startup and while running.
+provisioning = from_env
 
 #################################### Server ####################################
 [server]
diff --git a/core/grafana/provisioning/dashboards/main.yml b/core/grafana/provisioning/dashboards/main.yml
index 0027a2b..4eb2546 100644
--- a/core/grafana/provisioning/dashboards/main.yml
+++ b/core/grafana/provisioning/dashboards/main.yml
@@ -5,4 +5,4 @@ providers:
     type: file
     disableDeletion: false
     options:
-      path: /etc/grafana/provisioning/dashboards/default
+      path: {{ env "NOMAD_ALLOC_DIR }}/config/provisioning/dashboards/default