From 7a6b17fb367246c953edc36a8b8e33504363e4e3 Mon Sep 17 00:00:00 2001 From: SebastianStork Date: Sat, 28 Feb 2026 21:24:06 +0100 Subject: [PATCH] victorialogs: Remove module --- hosts/vps-monitor/default.nix | 5 -- modules/nixos/services/alloy.nix | 80 ++++----------------- modules/nixos/web-services/grafana.nix | 35 --------- modules/nixos/web-services/victorialogs.nix | 44 ------------ 4 files changed, 12 insertions(+), 152 deletions(-) delete mode 100644 modules/nixos/web-services/victorialogs.nix diff --git a/hosts/vps-monitor/default.nix b/hosts/vps-monitor/default.nix index a8f8d97..1cc36c3 100644 --- a/hosts/vps-monitor/default.nix +++ b/hosts/vps-monitor/default.nix @@ -55,11 +55,6 @@ enable = true; domain = "metrics.${privateDomain}"; }; - - victorialogs = { - enable = true; - domain = "logs.${privateDomain}"; - }; }; }; } diff --git a/modules/nixos/services/alloy.nix b/modules/nixos/services/alloy.nix index 6ad99c5..3bed041 100644 --- a/modules/nixos/services/alloy.nix +++ b/modules/nixos/services/alloy.nix @@ -17,48 +17,25 @@ in type = lib.types.nonEmptyStr; default = "https://metrics.${config.custom.networking.overlay.domain}/prometheus/api/v1/write"; }; - logsEndpoint = lib.mkOption { - type = lib.types.nonEmptyStr; - default = "https://logs.${config.custom.networking.overlay.domain}/insert/loki/api/v1/push"; - }; - collect = { - metrics = { - system = lib.mkEnableOption "" // { - default = true; - }; - victorialogs = lib.mkEnableOption "" // { - default = config.services.victorialogs.enable; - }; - caddy = lib.mkEnableOption "" // { - default = config.services.caddy.enable; - }; + collect.metrics = { + system = lib.mkEnableOption "" // { + default = true; }; - logs.openssh = lib.mkEnableOption "" // { - default = config.services.openssh.enable; + caddy = lib.mkEnableOption "" // { + default = config.services.caddy.enable; }; }; }; config = lib.mkIf cfg.enable { assertions = - let - metricsAssertions = - cfg.collect.metrics - |> lib.attrNames - |> lib.filter (name: name != "system") - |> lib.map (name: { - assertion = cfg.collect.metrics.${name} -> config.services.${name}.enable; - message = "Alloy cannot collect `${name}` metrics without the `${name}` service"; - }); - logsAssertions = - cfg.collect.logs - |> lib.attrNames - |> lib.map (name: { - assertion = cfg.collect.logs.${name} -> config.services.${name}.enable; - message = "Alloy cannot collect '${name}' logs without the '${name}' service"; - }); - in - metricsAssertions ++ logsAssertions; + cfg.collect.metrics + |> lib.attrNames + |> lib.filter (name: name != "system") + |> lib.map (name: { + assertion = cfg.collect.metrics.${name} -> config.services.${name}.enable; + message = "Alloy cannot collect `${name}` metrics without the `${name}` service"; + }); services.alloy = { enable = true; @@ -84,16 +61,6 @@ in } ''; }; - "alloy/logs-endpoint.alloy" = { - enable = cfg.collect.logs |> anyIsTrue; - text = '' - loki.write "default" { - endpoint { - url = "${cfg.logsEndpoint}" - } - } - ''; - }; "alloy/system-metrics.alloy" = { enable = cfg.collect.metrics.system; text = '' @@ -108,20 +75,6 @@ in } ''; }; - "alloy/victorialogs-metrics.alloy" = { - enable = cfg.collect.metrics.victorialogs; - text = '' - prometheus.scrape "victorialogs" { - targets = [{ - __address__ = "localhost:${toString config.custom.web-services.victorialogs.port}", - job = "victorialogs", - instance = constants.hostname, - }] - forward_to = [prometheus.remote_write.default.receiver] - scrape_interval = "15s" - } - ''; - }; "alloy/caddy-metrics.alloy" = { enable = cfg.collect.metrics.caddy; text = '' @@ -136,15 +89,6 @@ in } ''; }; - "alloy/sshd-logs.alloy" = { - enable = cfg.collect.logs.openssh; - text = '' - loki.source.journal "sshd" { - matches = "_SYSTEMD_UNIT=sshd.service" - forward_to = [loki.write.default.receiver] - } - ''; - }; }; custom.services.caddy.virtualHosts.${cfg.domain}.port = cfg.port; diff --git a/modules/nixos/web-services/grafana.nix b/modules/nixos/web-services/grafana.nix index 3bf9049..60f4134 100644 --- a/modules/nixos/web-services/grafana.nix +++ b/modules/nixos/web-services/grafana.nix @@ -37,15 +37,6 @@ in default = "https://${config.custom.web-services.victoriametrics.domain}"; }; }; - victorialogs = { - enable = lib.mkEnableOption "" // { - default = config.custom.web-services.victorialogs.enable; - }; - url = lib.mkOption { - type = lib.types.nonEmptyStr; - default = "https://${config.custom.web-services.victorialogs.domain}"; - }; - }; }; dashboards = { nodeExporter.enable = lib.mkEnableOption "" // { @@ -54,9 +45,6 @@ in victoriametrics.enable = lib.mkEnableOption "" // { default = config.custom.web-services.victoriametrics.enable; }; - victorialogs.enable = lib.mkEnableOption "" // { - default = config.custom.web-services.victorialogs.enable; - }; }; }; @@ -110,12 +98,6 @@ in inherit (cfg.datasources.victoriametrics) url; isDefault = false; }) - (lib.mkIf cfg.datasources.victorialogs.enable { - name = "VictoriaLogs"; - type = "victoriametrics-logs-datasource"; - inherit (cfg.datasources.victorialogs) url; - isDefault = false; - }) ]; }; }; @@ -126,7 +108,6 @@ in in [ (lib.optional cfg.datasources.victoriametrics.enable plugins.victoriametrics-metrics-datasource) - (lib.optional cfg.datasources.victorialogs.enable plugins.victoriametrics-logs-datasource) ] |> lib.concatLists; }; @@ -157,22 +138,6 @@ in '' ); }; - # https://grafana.com/grafana/dashboards/22084-victorialogs-single-node/ - "grafana-dashboards/victorialogs-single-node-patched.json" = { - enable = cfg.dashboards.victorialogs.enable; - source = - pkgs.fetchurl { - name = "victorialogs-single-node.json"; - url = "https://grafana.com/api/dashboards/22084/revisions/8/download"; - hash = "sha256-/a3Rbp/6oyiLBnQtGupyFZW+fIHQfkyKRRTyfofxVTM="; - } - |> ( - src: - pkgs.runCommand "victorialogs-single-node-patched.json" { buildInputs = [ pkgs.gnused ]; } '' - sed 's/victoria-logs-//g' ${src} > $out - '' - ); - }; }; custom.services.caddy.virtualHosts.${cfg.domain}.port = cfg.port; diff --git a/modules/nixos/web-services/victorialogs.nix b/modules/nixos/web-services/victorialogs.nix deleted file mode 100644 index 80c9dc9..0000000 --- a/modules/nixos/web-services/victorialogs.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ config, lib, ... }: -let - cfg = config.custom.web-services.victorialogs; -in -{ - options.custom.web-services.victorialogs = { - enable = lib.mkEnableOption ""; - domain = lib.mkOption { - type = lib.types.nonEmptyStr; - default = ""; - }; - port = lib.mkOption { - type = lib.types.port; - default = 9428; - }; - }; - - config = lib.mkIf cfg.enable { - users = { - users.victorialogs = { - isSystemUser = true; - group = config.users.groups.victoriametrics.name; - }; - groups.victorialogs = { }; - }; - - systemd.services.victorialogs.serviceConfig = { - DynamicUser = lib.mkForce false; - User = config.users.users.victorialogs.name; - Group = config.users.groups.victorialogs.name; - }; - - services.victorialogs = { - enable = true; - listenAddress = "localhost:${toString cfg.port}"; - }; - - custom = { - services.caddy.virtualHosts.${cfg.domain}.port = cfg.port; - - persistence.directories = [ "/var/lib/${config.services.victorialogs.stateDir}" ]; - }; - }; -}