hosts/monitoring-3/grafana.nix

@@ -2,17 +2,11 @@
 {
   services.grafana = {
     enable  = true;
-    settings = {
-      server = {
-        domain = "grafana.monitoring.clerie.de";
-        root_url = "https://grafana.monitoring.clerie.de";
-        http_port = 3001;
-        http_addr = "::1";
-      };
-      "auth.anonymous" = {
-        enabled = true;
-      };
-    };
+    domain  = "grafana.monitoring.clerie.de";
+    rootUrl = "https://grafana.monitoring.clerie.de";
+    port    = 3001;
+    addr = "::1";
+    auth.anonymous.enable = true;
 
     provision = {
       enable = true;

hosts/monitoring-3/prometheus.nix

@@ -294,66 +294,6 @@ in {
           relabelAddressToInstance
         ];
       }
-      {
-        job_name = "blackbox_local_icmp6_1s";
-        scrape_interval = "1s";
-        metrics_path = "/probe";
-        params = {
-          module = [ "icmp6" ];
-        };
-        static_configs = [
-          {
-            targets = [
-              "carbon.net.clerie.de"
-            ];
-          }
-        ];
-        relabel_configs = [
-          {
-            source_labels = [ "__address__" ];
-            target_label = "__param_target";
-          }
-          {
-            source_labels = [ "__address__" ];
-            target_label = "target";
-          }
-          {
-            target_label = "__address__";
-            replacement = "monitoring-3.mon.clerie.de:9115";
-          }
-          relabelAddressToInstance
-        ];
-      }
-      {
-        job_name = "blackbox_local_icmp4_1s";
-        scrape_interval = "1s";
-        metrics_path = "/probe";
-        params = {
-          module = [ "icmp4" ];
-        };
-        static_configs = [
-          {
-            targets = [
-              "carbon.net.clerie.de"
-            ];
-          }
-        ];
-        relabel_configs = [
-          {
-            source_labels = [ "__address__" ];
-            target_label = "__param_target";
-          }
-          {
-            source_labels = [ "__address__" ];
-            target_label = "target";
-          }
-          {
-            target_label = "__address__";
-            replacement = "monitoring-3.mon.clerie.de:9115";
-          }
-          relabelAddressToInstance
-        ];
-      }
       {
         job_name = "zimmer-temp";
         scrape_interval = "20s";