From 96c0a651dd3dbc215b35096ede32f760bc12f6ff Mon Sep 17 00:00:00 2001 From: TheWanderingCrow Date: Sun, 1 Feb 2026 13:57:16 -0500 Subject: [PATCH] WIP: prometheus logging --- .../system-logging/prometheus-server.nix | 51 +++++++++++++------ modules/services/system-logging/proxy.nix | 13 ----- 2 files changed, 36 insertions(+), 28 deletions(-) delete mode 100644 modules/services/system-logging/proxy.nix diff --git a/modules/services/system-logging/prometheus-server.nix b/modules/services/system-logging/prometheus-server.nix index 9aea98c..337604f 100644 --- a/modules/services/system-logging/prometheus-server.nix +++ b/modules/services/system-logging/prometheus-server.nix @@ -1,18 +1,39 @@ +{ lib, ... }: +let + #grafanaPort = lib.custom.autoport "grafana"; + grafanaPort = 3000; +in { - services.prometheus = { - enable = true; - scrapeConfigs = [ - { - job_name = "prometheus"; - scrape_interval = "5s"; - static_configs = [ - { - targets = [ - "localhost:9090" - ]; - } - ]; - } - ]; + services = { + prometheus = { + enable = true; + globalConfig = { + scrape_interval = "15s"; + evaluation_interval = "15s"; + }; + scrapeConfigs = [ + { + job_name = "prometheus"; + static_configs = [ + { + targets = [ "localhost:9090" ]; + } + ]; + } + ]; + }; + + #grafana = { + # enable = true; + # settings = { + # server = { + # http_addr = "0.0.0.0"; + # http_port = grafanaPort; + # enable_gzip = true; + # domain = "localhost"; + # }; + # analytics.reporting_enabled = false; + # }; + #}; }; } diff --git a/modules/services/system-logging/proxy.nix b/modules/services/system-logging/proxy.nix deleted file mode 100644 index 31ead83..0000000 --- a/modules/services/system-logging/proxy.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ - config, - inputs, - ... -}: -{ - services.caddy = { - enable = true; - virtualHosts."logs.wanderingcrow.net".extraConfig = '' - reverse_proxy http://${builtins.toString config.services.grafana.settings.server.http_addr}:${builtins.toString config.services.grafana.settings.server.http_port} - ''; - }; -}