diff --git a/modules/nixos/services/alloy.nix b/modules/nixos/services/alloy.nix index ab391b6..5abfd2c 100644 --- a/modules/nixos/services/alloy.nix +++ b/modules/nixos/services/alloy.nix @@ -25,9 +25,6 @@ in caddy = lib.mkEnableOption "" // { default = config.services.caddy.enable; }; - comin = lib.mkEnableOption "" // { - default = config.services.comin.enable; - }; }; }; @@ -112,20 +109,6 @@ in } ''; }; - "alloy/comin-metrics.alloy" = { - enable = cfg.collect.metrics.comin; - text = '' - prometheus.scrape "comin" { - targets = [{ - __address__ = "localhost:${toString config.custom.services.comin.metricsPort}", - job = "comin", - instance = constants.hostname, - }] - forward_to = [prometheus.remote_write.default.receiver] - scrape_interval = "30s" - } - ''; - }; }; custom.services.caddy.virtualHosts.${cfg.domain}.port = cfg.port; diff --git a/modules/nixos/services/comin.nix b/modules/nixos/services/comin.nix index 97190cd..d7f495f 100644 --- a/modules/nixos/services/comin.nix +++ b/modules/nixos/services/comin.nix @@ -4,21 +4,12 @@ lib, ... }: -let - cfg = config.custom.services.comin; -in { imports = [ inputs.comin.nixosModules.comin ]; - options.custom.services.comin = { - enable = lib.mkEnableOption ""; - metricsPort = lib.mkOption { - type = lib.types.port; - default = 4243; - }; - }; + options.custom.services.comin.enable = lib.mkEnableOption ""; - config = lib.mkIf cfg.enable { + config = lib.mkIf config.custom.services.comin.enable { services.comin = { enable = true; remotes = lib.singleton { @@ -26,10 +17,6 @@ in url = "https://github.com/SebastianStork/nixos-config.git"; branches.main.name = "deploy"; }; - exporter = { - listen_address = "127.0.0.1"; - port = cfg.metricsPort; - }; }; }; }