diff --git a/hosts/srv-monitor/default.nix b/hosts/srv-monitor/default.nix index 3ef3e6e..35a4f33 100644 --- a/hosts/srv-monitor/default.nix +++ b/hosts/srv-monitor/default.nix @@ -79,11 +79,6 @@ alloy = { enable = true; domain = "alloy-${config.networking.hostName}.${tailscaleDomain}"; - collect.metrics = { - system = true; - victorialogs = true; - caddy = true; - }; }; caddy.virtualHosts = diff --git a/hosts/srv-private/default.nix b/hosts/srv-private/default.nix index 951fac3..9c1ac99 100644 --- a/hosts/srv-private/default.nix +++ b/hosts/srv-private/default.nix @@ -56,10 +56,6 @@ alloy = { enable = true; domain = "alloy-${config.networking.hostName}.${tailscaleDomain}"; - collect.metrics = { - system = true; - caddy = true; - }; }; caddy.virtualHosts = diff --git a/hosts/srv-public/default.nix b/hosts/srv-public/default.nix index b54effa..2d61d8e 100644 --- a/hosts/srv-public/default.nix +++ b/hosts/srv-public/default.nix @@ -77,13 +77,6 @@ alloy = { enable = true; domain = "alloy-${config.networking.hostName}.${config.custom.services.tailscale.domain}"; - collect = { - metrics = { - system = true; - caddy = true; - }; - logs.sshd = true; - }; }; caddy.virtualHosts = diff --git a/modules/system/services/alloy.nix b/modules/system/services/alloy.nix index b7c73fa..4946cee 100644 --- a/modules/system/services/alloy.nix +++ b/modules/system/services/alloy.nix @@ -23,11 +23,19 @@ in }; collect = { metrics = { - system = lib.mkEnableOption ""; - victorialogs = lib.mkEnableOption ""; - caddy = lib.mkEnableOption ""; + system = lib.mkEnableOption "" // { + default = true; + }; + victorialogs = lib.mkEnableOption "" // { + default = config.services.victorialogs.enable; + }; + caddy = lib.mkEnableOption "" // { + default = config.services.caddy.enable; + }; + }; + logs.sshd = lib.mkEnableOption "" // { + default = config.services.openssh.enable; }; - logs.sshd = lib.mkEnableOption ""; }; };