From 49e1b408be668ade5c4f49cf1bdeba4e5c8ef580 Mon Sep 17 00:00:00 2001
From: Max <max@privatevoid.net>
Date: Sat, 17 Dec 2022 20:03:51 +0100
Subject: [PATCH] VEGAS/monitoring: new datasource provisioning format

---
 hosts/VEGAS/services/monitoring/default.nix | 7 +++----
 hosts/VEGAS/services/monitoring/tracing.nix | 5 ++---
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/hosts/VEGAS/services/monitoring/default.nix b/hosts/VEGAS/services/monitoring/default.nix
index 0a231db..4f7f5c1 100644
--- a/hosts/VEGAS/services/monitoring/default.nix
+++ b/hosts/VEGAS/services/monitoring/default.nix
@@ -73,18 +73,17 @@ in
     };
     provision = {
       enable = true;
-      datasources = [
+      datasources.settings.datasources = [
         {
           name = "Prometheus";
-          # wait for https://github.com/NixOS/nixpkgs/pull/175330
-          # uid = "PBFA97CFB590B2093";
+          uid = "PBFA97CFB590B2093";
           inherit (links.prometheus) url;
           type = "prometheus";
           isDefault = true;
         }
         {
           name = "Loki";
-          # uid = "P8E80F9AEF21F6940";
+          uid = "P8E80F9AEF21F6940";
           inherit (loki-ingest) url;
           type = "loki";
         }
diff --git a/hosts/VEGAS/services/monitoring/tracing.nix b/hosts/VEGAS/services/monitoring/tracing.nix
index ee1adfe..e86e913 100644
--- a/hosts/VEGAS/services/monitoring/tracing.nix
+++ b/hosts/VEGAS/services/monitoring/tracing.nix
@@ -91,11 +91,10 @@ in {
       PrivateTmp = true;
     };
   };
-  services.grafana.provision.datasources = [
+  services.grafana.provision.datasources.settings.datasources = [
     {
       name = "Tempo";
-      # wait for https://github.com/NixOS/nixpkgs/pull/175330
-      # uid = "P214B5B846CF3925F";
+      uid = "P214B5B846CF3925F";
       inherit (links.tempo) url;
       type = "tempo";
       jsonData = {