diff --git a/hosts/h001/flake.lock b/hosts/h001/flake.lock index e7e5257..987af3b 100644 --- a/hosts/h001/flake.lock +++ b/hosts/h001/flake.lock @@ -33,11 +33,11 @@ "ragenix": "ragenix" }, "locked": { - "lastModified": 1750459395, - "narHash": "sha256-i6Khg4dcHXl6keWUW8vv7+aUAFdM+1rahFg59qx2xQ8=", + "lastModified": 1750780721, + "narHash": "sha256-EgWdBolm8wPXY9iuTHPXykJiQRzSnfXzkCXpNooxEB8=", "ref": "refs/heads/master", - "rev": "1b02f9ea95ec7e81a45ec40159991065856482b7", - "revCount": 489, + "rev": "2004734c7b7d77638874b63e147970199830c3fd", + "revCount": 500, "type": "git", "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" }, diff --git a/hosts/h001/flake.nix b/hosts/h001/flake.nix index 109440d..3f5c1ff 100644 --- a/hosts/h001/flake.nix +++ b/hosts/h001/flake.nix @@ -49,6 +49,9 @@ systemName = configuration_name; boot.systemd.enable = true; secrets.enable = true; + general = { + reporting.enable = true; + }; programs = { tailnet.enable = true; ssh.enable = true; diff --git a/hosts/h001/mods/default.nix b/hosts/h001/mods/default.nix index 5d1fb62..dbd2ac6 100644 --- a/hosts/h001/mods/default.nix +++ b/hosts/h001/mods/default.nix @@ -6,6 +6,5 @@ ./adguardhome.nix ./nixarr.nix ./monitoring.nix - ./reporting.nix ]; } diff --git a/hosts/h001/mods/reporting.nix b/hosts/h001/mods/reporting.nix deleted file mode 100644 index 7a9eadb..0000000 --- a/hosts/h001/mods/reporting.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ - config, - ... -}: -{ - config = { - services.prometheus.exporters.node = { - enable = true; - port = 9100; - }; - # Create necessary directories with appropriate permissions - systemd.tmpfiles.rules = [ - "d /tmp/positions 1777 - - -" # World-writable directory for positions file - "f /tmp/positions.yaml 0666 - - -" # World-writable positions file - ]; - users.groups.systemd-journal.members = [ "promtail" ]; - services.promtail = { - enable = true; - extraFlags = [ - "-config.expand-env=true" - ]; - configuration = { - server = { - http_listen_port = 9080; - grpc_listen_port = 0; - }; - positions = { - filename = "/tmp/positions.yaml"; # Changed from /var/lib/promtail/positions.yaml - }; - clients = [ - { - url = "http://100.64.0.13:3100/loki/api/v1/push"; # Points to your Loki instance - } - ]; - scrape_configs = [ - { - job_name = "journal"; - journal = { - json = false; - max_age = "12h"; - path = "/var/log/journal"; - labels = { - job = "systemd-journal"; - host = config.networking.hostName; - }; - }; - relabel_configs = [ - { - source_labels = [ "__journal__systemd_unit" ]; - target_label = "unit"; - } - ]; - } - ]; - }; - }; - }; -}