Merge branch 'dns'

machines/overwatch/configuration.nix

@@ -2,6 +2,9 @@
 
 with lib;
 
+let
+  hosts = import ../hosts.nix {};
+in
 {
   sops.defaultSopsFile = ./secrets.yaml;
   sops.secrets = {
@@ -29,7 +32,6 @@ with lib;
     enable = true;
     enablePromtail = true;
     logNginx = false;
-    lokiHost = "10.0.0.14";
   };
 
   services.grafana = {
@@ -121,31 +123,31 @@ with lib;
       {
         job_name = "durruti";
         static_configs = [{
-          targets = [ "10.0.0.5:9002" ];
+          targets = [ "${hosts.malobeo.hosts.durruti.network.address}:9002" ];
         }];
       }
       {
         job_name = "infradocs";
         static_configs = [{
-          targets = [ "10.0.0.11:9002" ];
+          targets = [ "${hosts.malobeo.hosts.infradocs.network.address}:9002" ];
         }];
       }
       {
         job_name = "nextcloud";
         static_configs = [{
-          targets = [ "10.0.0.13:9002" ];
+          targets = [ "${hosts.malobeo.hosts.nextcloud.network.address}:9002" ];
         }];
       }
       {
         job_name = "zineshop";
         static_configs = [{
-          targets = [ "10.0.0.15:9002" ];
+          targets = [ "${hosts.malobeo.hosts.zineshop.network.address}:9002" ];
         }];
       }
       {
         job_name = "fanny";
         static_configs = [{
-          targets = [ "10.0.0.1:9002" ];
+          targets = [ "${hosts.malobeo.hosts.fanny.network.address}:9002" ];
         }];
       }
       # add vpn - check how to reach it first. most probably 10.100.0.1

machines/overwatch/dashboards/node_full.json

@@ -23750,8 +23750,8 @@
       },
       {
         "current": {
-          "text": "10.0.0.13:9002",
-          "value": "10.0.0.13:9002"
+          "text": "192.168.1.13:9002",
+          "value": "192.168.1.13:9002"
         },
         "datasource": {
           "type": "prometheus",

machines/overwatch/promtail.yaml

@@ -6,7 +6,7 @@ positions:
   filename: /tmp/positions.yaml
 
 clients:
-  - url: http://10.0.0.13:3100/loki/api/v1/push
+  - url: http://192.168.1.13:3100/loki/api/v1/push
 
   
 scrape_configs: