diff --git a/flake.nix b/flake.nix index 009ebc8..eccb00a 100644 --- a/flake.nix +++ b/flake.nix @@ -21,6 +21,10 @@ deployment.targetUser = null; }; + monitoring = { config, pkgs, ... }: { + deployment.targetHost = "monitoring.bula22.de"; + }; + nixdeploy = {...}: { deployment.targetHost = "nixdeploy.bula22.de"; deployment.allowLocalDeployment = true; diff --git a/hosts/monitoring/configuration.nix b/hosts/monitoring/configuration.nix index 879cb3d..ef27ebd 100644 --- a/hosts/monitoring/configuration.nix +++ b/hosts/monitoring/configuration.nix @@ -6,13 +6,18 @@ with lib; [ ./hardware-configuration.nix ]; - boot.loader.grub.enable = true; - boot.loader.grub.version = 2; - boot.loader.grub.device = "/dev/sda"; + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; + networking.hostName = "monitoring"; networking.useDHCP = false; - networking.interfaces.ens18.ipv4.addresses = [ { address = ""; prefixLength = 24; } ]; - networking.interfaces.ens18.ipv6.addresses = [ { address = ""; prefixLength = 64; } ]; + networking.interfaces.ens18.ipv4.addresses = [ + {address = "10.42.10.7"; prefixLength = 24; } + ]; + networking.interfaces.ens18.ipv6.addresses = [ + {address = "2a01:4f8:1c0c:8221::7"; prefixLength = 64; } + {address = "2a01:4f8:1c0c:8221::1984"; prefixLength = 64; } + ]; networking.defaultGateway = { address = "10.42.10.1"; interface = "ens18"; }; networking.defaultGateway6 = { address = "2a01:4f8:1c0c:8221::1"; interface = "ens18"; }; networking.nameservers = [ "2a01:4f8:1c0c:8221::1" "10.42.10.1" ]; @@ -21,7 +26,17 @@ with lib; enable = true; listenAddress = "[::1]"; port = 9093; - configuration = {}; + configuration = { + route = { + receiver = "default"; + group_by = [ "instance" ]; + }; + receivers = [ + { + name = "default"; + } + ]; + }; }; services.prometheus = { enable = true; @@ -60,7 +75,7 @@ with lib; } ]; } ]; - rules = [ (readFile ./rules.yml) ]; + rules = [ (readFile ./alertmanager-rules.yml) ]; }; services.grafana = { enable = true; @@ -79,11 +94,7 @@ with lib; isDefault = true; } ]; - dashboards = [ - { - options.path = ./dashboards; - } - ]; + dashboards = []; }; }; services.nginx = { @@ -102,5 +113,6 @@ with lib; }; }; networking.firewall.allowedTCPPorts = [ 80 443 ]; - system.stateVersion = ""; + + system.stateVersion = "22.05"; }