Remove deprecated routeConfig

Flake lock file updates:

• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/0c5b4ecbed5b155b705336aa96d878e55acd8685?narHash=sha256-T38FQOg0BV5M8FN1712fovzNakSOENEYs%2BCSkg31C9Y%3D' (2024-11-27)
  → 'github:nixos/nixpkgs/c71ad5c34d51dcbda4c15f44ea4e4aa6bb6ac1e9?narHash=sha256-fYNXgpu1AEeLyd3fQt4Ym0tcVP7cdJ8wRoqJ%2BCtTRyY%3D' (2024-11-28)

.sops.yaml

@@ -9,6 +9,7 @@ keys:
   - &server_inc1 age1g5luz2rtel3surgzuh62rkvtey7lythrvfenyq954vmeyfpxjqkqdj3wt8
   - &server_http-proxy age1gq8434ku0xekqmvnseeunv83e779cg03c06gwrusnymdsr3rpufqx6vr3m
   - &server_ca age1288993th0ge00reg4zqueyvmkrsvk829cs068eekjqfdprsrkeqql7mljk
+  - &server_monitoring01 age1vpns76ykll8jgdlu3h05cur4ew2t3k7u03kxdg8y6ypfhsfhq9fqyurjey
 creation_rules:
   - path_regex: secrets/[^/]+\.(yaml|json|env|ini)
     key_groups:
@@ -23,6 +24,7 @@ creation_rules:
         - *server_inc1
         - *server_http-proxy
         - *server_ca
+        - *server_monitoring01
   - path_regex: secrets/ns3/[^/]+\.(yaml|json|env|ini)
     key_groups:
       - age:
@@ -33,6 +35,11 @@ creation_rules:
       - age:
         - *admin_torjus
         - *server_ca
+  - path_regex: secrets/monitoring01/[^/]+\.(yaml|json|env|ini)
+    key_groups:
+      - age:
+        - *admin_torjus
+        - *server_monitoring01
   - path_regex: secrets/ca/keys/.+
     key_groups:
       - age:

flake.lock

@@ -23,16 +23,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1732749044,
+        "lastModified": 1732824227,
-        "narHash": "sha256-T38FQOg0BV5M8FN1712fovzNakSOENEYs+CSkg31C9Y=",
+        "narHash": "sha256-fYNXgpu1AEeLyd3fQt4Ym0tcVP7cdJ8wRoqJ+CtTRyY=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "0c5b4ecbed5b155b705336aa96d878e55acd8685",
+        "rev": "c71ad5c34d51dcbda4c15f44ea4e4aa6bb6ac1e9",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-24.05",
+        "ref": "nixos-24.11",
         "repo": "nixpkgs",
         "type": "github"
       }

flake.nix

@@ -2,7 +2,7 @@
   description = "Homelab v5 Nixos Server Configurations";
 
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-24.05";
+    nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-24.11";
     nixpkgs-unstable.url = "github:nixos/nixpkgs?ref=nixos-unstable";
 
     sops-nix = {
@@ -215,6 +215,22 @@
             sops-nix.nixosModules.sops
           ];
         };
+        monitoring01 = nixpkgs.lib.nixosSystem {
+          inherit system;
+          specialArgs = {
+            inherit inputs self sops-nix;
+          };
+          modules = [
+            (
+              { config, pkgs, ... }:
+              {
+                nixpkgs.overlays = [ overlay-unstable ];
+              }
+            )
+            ./hosts/monitoring01
+            sops-nix.nixosModules.sops
+          ];
+        };
       };
     };
 }

hosts/ca/configuration.nix

@@ -35,7 +35,7 @@
       "10.69.13.12/24"
     ];
     routes = [
-      { routeConfig.Gateway = "10.69.13.1"; }
+      { Gateway = "10.69.13.1"; }
     ];
     linkConfig.RequiredForOnline = "routable";
   };

hosts/ha1/configuration.nix

@@ -33,7 +33,7 @@
       "10.69.13.9/24"
     ];
     routes = [
-      { routeConfig.Gateway = "10.69.13.1"; }
+      { Gateway = "10.69.13.1"; }
     ];
     linkConfig.RequiredForOnline = "routable";
   };

hosts/http-proxy/configuration.nix

@@ -35,7 +35,7 @@
       "10.69.13.11/24"
     ];
     routes = [
-      { routeConfig.Gateway = "10.69.13.1"; }
+      { Gateway = "10.69.13.1"; }
     ];
     linkConfig.RequiredForOnline = "routable";
   };

hosts/inc1/configuration.nix

@@ -45,7 +45,7 @@
       VLAN = [ "enp2s0.13" ];
     };
     routes = [
-      { routeConfig.Gateway = "10.69.12.1"; }
+      { Gateway = "10.69.12.1"; }
     ];
     linkConfig.RequiredForOnline = "routable";
   };

hosts/inc2/configuration.nix

@@ -45,7 +45,7 @@
       VLAN = [ "enp2s0.13" ];
     };
     routes = [
-      { routeConfig.Gateway = "10.69.12.1"; }
+      { Gateway = "10.69.12.1"; }
     ];
     linkConfig.RequiredForOnline = "routable";
   };

hosts/jump/configuration.nix

@@ -29,7 +29,7 @@
       "10.69.13.10/24"
     ];
     routes = [
-      { routeConfig.Gateway = "10.69.13.1"; }
+      { Gateway = "10.69.13.1"; }
     ];
     linkConfig.RequiredForOnline = "routable";
   };

hosts/monitoring01/configuration.nix

@@ -0,0 +1,62 @@
+{
+  pkgs,
+  ...
+}:
+
+{
+  imports = [
+    ../template/hardware-configuration.nix
+
+    ../../system
+  ];
+
+  nixpkgs.config.allowUnfree = true;
+  # Use the systemd-boot EFI boot loader.
+  boot.loader.grub = {
+    enable = true;
+    device = "/dev/sda";
+    configurationLimit = 3;
+  };
+
+  networking.hostName = "monitoring01";
+  networking.domain = "home.2rjus.net";
+  networking.useNetworkd = true;
+  networking.useDHCP = false;
+  services.resolved.enable = true;
+  networking.nameservers = [
+    "10.69.13.5"
+    "10.69.13.6"
+  ];
+
+  systemd.network.enable = true;
+  systemd.network.networks."ens18" = {
+    matchConfig.Name = "ens18";
+    address = [
+      "10.69.13.13/24"
+    ];
+    routes = [
+      { Gateway = "10.69.13.1"; }
+    ];
+    linkConfig.RequiredForOnline = "routable";
+  };
+  time.timeZone = "Europe/Oslo";
+
+  nix.settings.experimental-features = [
+    "nix-command"
+    "flakes"
+  ];
+  nix.settings.tarball-ttl = 0;
+  environment.systemPackages = with pkgs; [
+    vim
+    wget
+    git
+  ];
+
+  # Open ports in the firewall.
+  # networking.firewall.allowedTCPPorts = [ ... ];
+  # networking.firewall.allowedUDPPorts = [ ... ];
+  # Or disable the firewall altogether.
+  networking.firewall.enable = false;
+
+  system.stateVersion = "23.11"; # Did you read the comment?
+}

hosts/monitoring01/default.nix

@@ -0,0 +1,7 @@
+{ ... }:
+{
+  imports = [
+    ./configuration.nix
+    ../../services/monitoring
+  ];
+}

hosts/nixos-test1/configuration.nix

@@ -30,7 +30,7 @@
       "10.69.13.10/24"
     ];
     routes = [
-      { routeConfig.Gateway = "10.69.13.1"; }
+      { Gateway = "10.69.13.1"; }
     ];
     linkConfig.RequiredForOnline = "routable";
   };

hosts/ns1/configuration.nix

@@ -32,7 +32,7 @@
       "10.69.13.5/24"
     ];
     routes = [
-      { routeConfig.Gateway = "10.69.13.1"; }
+      { Gateway = "10.69.13.1"; }
     ];
     linkConfig.RequiredForOnline = "routable";
   };

hosts/ns2/configuration.nix

@@ -32,7 +32,7 @@
       "10.69.13.6/24"
     ];
     routes = [
-      { routeConfig.Gateway = "10.69.13.1"; }
+      { Gateway = "10.69.13.1"; }
     ];
     linkConfig.RequiredForOnline = "routable";
   };

hosts/ns3/configuration.nix

@@ -32,7 +32,7 @@
       "10.69.13.7/24"
     ];
     routes = [
-      { routeConfig.Gateway = "10.69.13.1"; }
+      { Gateway = "10.69.13.1"; }
     ];
     linkConfig.RequiredForOnline = "routable";
   };

hosts/ns4/configuration.nix

@@ -32,7 +32,7 @@
       "10.69.13.8/24"
     ];
     routes = [
-      { routeConfig.Gateway = "10.69.13.1"; }
+      { Gateway = "10.69.13.1"; }
     ];
     linkConfig.RequiredForOnline = "routable";
   };

hosts/template/configuration.nix

@@ -28,7 +28,7 @@
       "10.69.8.250/24"
     ];
     routes = [
-      { routeConfig.Gateway = "10.69.8.1"; }
+      { Gateway = "10.69.8.1"; }
     ];
     linkConfig.RequiredForOnline = "routable";
   };

services/monitoring/default.nix

@@ -0,0 +1,7 @@
+{ ... }:
+{
+  imports = [
+    ./loki.nix
+    ./grafana.nix
+  ];
+}

services/monitoring/grafana.nix

@@ -0,0 +1,11 @@
+{ pkgs, ... }:
+{
+  services.grafana = {
+    enable = true;
+    settings = {
+      server = {
+        http_addr = "";
+      };
+    };
+  };
+}

services/monitoring/loki.nix

@@ -0,0 +1,42 @@
+{ ... }:
+{
+  services.loki = {
+    enable = true;
+    configuration = {
+      auth_enabled = false;
+
+      server = {
+        http_listen_port = 3100;
+      };
+      common = {
+        ring = {
+          instance_addr = "127.0.0.1";
+          kvstore = {
+            store = "inmemory";
+          };
+        };
+        replication_factor = 1;
+        path_prefix = "/var/lib/loki";
+      };
+      schema_config = {
+        configs = [
+          {
+            from = "2024-01-01";
+            store = "tsdb";
+            object_store = "filesystem";
+            schema = "v13";
+            index = {
+              prefix = "loki_index_";
+              period = "24h";
+            };
+          }
+        ];
+      };
+      storage_config = {
+        filesystem = {
+          directory = "/var/lib/loki/chunks";
+        };
+      };
+    };
+  };
+}

services/monitoring/prometheus.nix

@@ -0,0 +1,6 @@
+{ ... }:
+{
+  services.prometheus = {
+    enable = true;
+  };
+}

services/ns/zones-home-2rjus-net.conf

@@ -1,7 +1,7 @@
 $ORIGIN home.2rjus.net.
 $TTL 1800
 @       IN      SOA     ns1.home.2rjus.net.      admin.test.2rjus.net. (
-                        2041                    ; serial number
+                        2042                    ; serial number
                         3600                    ; refresh
                         900                     ; retry
                         1209600                 ; expire
@@ -62,6 +62,7 @@ sonarr              IN      CNAME   http-proxy
 ha                  IN      CNAME   http-proxy
 z2m                 IN      CNAME   http-proxy
 ca                  IN      A       10.69.13.12
+monitoring01        IN      A       10.69.13.13
 
 ; 22_WLAN
 unifi-ctrl          IN      A       10.69.22.5