diff --git a/flake.lock b/flake.lock index 0d3b53b..748cedf 100644 --- a/flake.lock +++ b/flake.lock @@ -375,11 +375,11 @@ ] }, "locked": { - "lastModified": 1707467182, - "narHash": "sha256-/Bw/xgCXfj4nXDd8Xq+r1kaorfsYkkomMf5w5MpsDyA=", + "lastModified": 1707607386, + "narHash": "sha256-hj/RgQMTvCWQVInkZwiMMieumkfOjHXhtWhfuXHop/8=", "owner": "nix-community", "repo": "home-manager", - "rev": "5b9156fa9a8b8beba917b8f9adbfd27bf63e16af", + "rev": "bfd0ae29a86eff4603098683b516c67e22184511", "type": "github" }, "original": { @@ -517,11 +517,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1707576355, - "narHash": "sha256-BjW0NgDH+hAEuqdaw97ym3HNFiDaSpS57/UGCinNKIs=", + "lastModified": 1707627072, + "narHash": "sha256-yTLO5gT7KMkqtTzH8iWcyYsF0IAAX1afIt5W9gFngiA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "dfe0f725c1eb95a74ecb5940b7188307f483f63b", + "rev": "d7c8d1d8427590de4ea9769732d0f27a4c117416", "type": "github" }, "original": { @@ -565,11 +565,11 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1707347730, - "narHash": "sha256-0etC/exQIaqC9vliKhc3eZE2Mm2wgLa0tj93ZF/egvM=", + "lastModified": 1707514827, + "narHash": "sha256-Y+wqFkvikpE1epCx57PsGw+M1hX5aY5q/xgk+ebDwxI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6832d0d99649db3d65a0e15fa51471537b2c56a6", + "rev": "20f65b86b6485decb43c5498780c223571dd56ef", "type": "github" }, "original": { @@ -581,11 +581,11 @@ }, "nixpkgs-stable_4": { "locked": { - "lastModified": 1707391491, - "narHash": "sha256-TyDXcq8Z3slMNeyeF+ke0BzISWuM6NrBklr7XyiRbZA=", + "lastModified": 1707603439, + "narHash": "sha256-LodBVZ3+ehJP2azM5oj+JrhfNAAzmTJ/OwAIOn0RfZ0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bc6cb3d59b7aab88e967264254f8c1aa4c0284e9", + "rev": "d8cd80616c8800feec0cab64331d7c3d5a1a6d98", "type": "github" }, "original": { @@ -677,11 +677,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1707268954, - "narHash": "sha256-2en1kvde3cJVc3ZnTy8QeD2oKcseLFjYPLKhIGDanQ0=", + "lastModified": 1707451808, + "narHash": "sha256-UwDBUNHNRsYKFJzyTMVMTF5qS4xeJlWoeyJf+6vvamU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f8e2ebd66d097614d51a56a755450d4ae1632df1", + "rev": "442d407992384ed9c0e6d352de75b69079904e4e", "type": "github" }, "original": { @@ -702,11 +702,11 @@ "pre-commit-hooks": "pre-commit-hooks_2" }, "locked": { - "lastModified": 1707545157, - "narHash": "sha256-w4dubmw//nocfi2/KkvM1SLtDQUhIFfVsXDWf3zZTLk=", + "lastModified": 1707595282, + "narHash": "sha256-F96hGG5ZCJiwZFBvlUrW8uLyhhz1/QJiqk+vaCjtWjw=", "owner": "nix-community", "repo": "nixvim", - "rev": "66c069c48db4b67fd0d536128b000684a5f72f5b", + "rev": "e0926bc41bd06e0f4e86631872ec1a1aa41a4ba2", "type": "github" }, "original": { @@ -826,11 +826,11 @@ "nixpkgs-stable": "nixpkgs-stable_4" }, "locked": { - "lastModified": 1707397511, - "narHash": "sha256-pYqXcTjcPC/go3FzT1dYtYsbmzAjO1MHhT/xgiI6J7o=", + "lastModified": 1707620614, + "narHash": "sha256-gfAoB9dGzBu62NoAoM945aok7+6M+LFu+nvnGwAsTp4=", "owner": "Mic92", "repo": "sops-nix", - "rev": "2168851d58595431ee11ebfc3a49d60d318b7312", + "rev": "2eb7c4ba3aa75e2660fd217eb1ab64d5b793608e", "type": "github" }, "original": { diff --git a/nixos/hosts/ingress-proxy/default.nix b/nixos/hosts/ingress-proxy/default.nix index e7fafbc..be56235 100644 --- a/nixos/hosts/ingress-proxy/default.nix +++ b/nixos/hosts/ingress-proxy/default.nix @@ -6,6 +6,7 @@ in { ../../server.nix ../../features/dns-cache.nix ../../features/nginx.nix + ../../features/telemetry.nix ]; networking.hostName = "ingress-proxy"; diff --git a/nixos/hosts/monitoring/default.nix b/nixos/hosts/monitoring/default.nix index d5f212b..f7ea900 100644 --- a/nixos/hosts/monitoring/default.nix +++ b/nixos/hosts/monitoring/default.nix @@ -1,4 +1,4 @@ -{ pkgs, config, ... }: { +{ ... }: { imports = [ ../../templates/proxmox-lxc.nix ../../server.nix @@ -9,10 +9,6 @@ system.stateVersion = "24.05"; nixpkgs.hostPlatform = "x86_64-linux"; - #networking.firewall.allowedTCPPorts = [ - # config.services.grafana.settings.server.http_port - #]; - services.grafana = { enable = true; settings = { @@ -48,8 +44,22 @@ } ]; }; + port = 14200; in [ - (static "aerial" [ 14200 ]) + (static "aerial" [ port ]) + (static "pineapple" [ port (port + 1) ]) + (static "watermelon" [ port (port + 1) (port + 2) ]) + (static "mango" [ port ]) + (static "happystaticbuzz" [ port ]) + (static "keylime" [ port ]) + (static "keysmash" [ port ]) + (static "ingress-proxy" [ port ]) + { + job_name = "pve1"; + static_configs = [ + { targets = [ "192.168.1.128:${port}" ]; } + ]; + } ]; };