From 4977b301a358c6334e5afc57523b79a8009c7d23 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Tue, 7 May 2019 00:25:34 +0200
Subject: ...

---
 odin.nix | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/odin.nix b/odin.nix
index b1fa8193..f3516007 100644
--- a/odin.nix
+++ b/odin.nix
@@ -534,17 +534,18 @@
   users.groups.ssl = {};
   users.users.nginx.extraGroups = ["ssl"];
 
-  services.prometheus = {
+  services.prometheus.exporters = {
+    node = {
+      enable = true;
+      listenAddress = "localhost";
+      enabledCollectors = [ "logind" "systemd" "processes" ];
+    };
+  };
+
+  services.prometheus2 = {
     enable = true;
     webExternalUrl = "http://odin.asgard.yggdrasil/prometheus";
     listenAddress = "localhost:9090";
-    exporters = {
-      node = {
-        enable = true;
-        listenAddress = "localhost";
-        enabledCollectors = [ "logind" "systemd" "processes" ];
-      };
-    };
     globalConfig = {
       scrape_interval = "5s";
       scrape_timeout = "5s";
-- 
cgit v1.2.3