From baf6494a9c9e00f4054dd1fb9e63115cac48b43a Mon Sep 17 00:00:00 2001 From: James Eversole Date: Sun, 2 Jun 2024 20:37:17 -0500 Subject: [PATCH] Upgrade to 24.05; drop Loki/Promtail --- flake.lock | 22 +++++------ flake.nix | 4 +- nix/monitoring/grafana.nix | 6 --- nix/monitoring/loki.nix | 76 ------------------------------------- nix/monitoring/nginx.nix | 26 ------------- nix/monitoring/promtail.nix | 31 --------------- 6 files changed, 12 insertions(+), 153 deletions(-) delete mode 100644 nix/monitoring/loki.nix delete mode 100644 nix/monitoring/promtail.nix diff --git a/flake.lock b/flake.lock index 45bba8e..a69e57d 100644 --- a/flake.lock +++ b/flake.lock @@ -63,29 +63,29 @@ }, "nixpkgs": { "locked": { - "lastModified": 1716991068, - "narHash": "sha256-Av0UWCCiIGJxsZ6TFc+OiKCJNqwoxMNVYDBChmhjNpo=", + "lastModified": 1717144377, + "narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "25cf937a30bf0801447f6bf544fc7486c6309234", + "rev": "805a384895c696f802a9bf5bf4720f37385df547", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-23.11", + "ref": "nixos-24.05", "type": "indirect" } }, "nixpkgs-lib": { "locked": { - "lastModified": 1714640452, - "narHash": "sha256-QBx10+k6JWz6u7VsohfSw8g8hjdBZEf8CFzXH1/1Z94=", + "lastModified": 1717284937, + "narHash": "sha256-lIbdfCsf8LMFloheeE6N31+BMIeixqyQWbSr2vk79EQ=", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/50eb7ecf4cd0a5756d7275c8ba36790e5bd53e33.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz" }, "original": { "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/50eb7ecf4cd0a5756d7275c8ba36790e5bd53e33.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz" } }, "parts": { @@ -93,11 +93,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1715865404, - "narHash": "sha256-/GJvTdTpuDjNn84j82cU6bXztE0MSkdnTWClUCRub78=", + "lastModified": 1717285511, + "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "8dc45382d5206bd292f9c2768b8058a8fd8311d9", + "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index e673ecf..377bf74 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "eve-psr-nix0 - Home Server"; inputs = { - nixpkgs.url = "nixpkgs/nixos-23.11"; + nixpkgs.url = "nixpkgs/nixos-24.05"; agenix = { url = "github:ryantm/agenix"; inputs.nixpkgs.follows = "nixpkgs"; @@ -56,8 +56,6 @@ ./nix/monitoring/nginx.nix ./nix/monitoring/grafana.nix ./nix/monitoring/prometheus.nix - ./nix/monitoring/loki.nix - ./nix/monitoring/promtail.nix ./nix/system/age.nix ./nix/system/dns.nix diff --git a/nix/monitoring/grafana.nix b/nix/monitoring/grafana.nix index a97d30c..6d25604 100644 --- a/nix/monitoring/grafana.nix +++ b/nix/monitoring/grafana.nix @@ -10,12 +10,6 @@ access = "proxy"; url = "http://127.0.0.1:${toString config.services.prometheus.port}"; } - { - name = "Loki"; - type = "loki"; - access = "proxy"; - url = "http://127.0.0.1:${toString config.services.loki.configuration.server.http_listen_port}"; - } ]; }; settings = { diff --git a/nix/monitoring/loki.nix b/nix/monitoring/loki.nix deleted file mode 100644 index 4dc27cd..0000000 --- a/nix/monitoring/loki.nix +++ /dev/null @@ -1,76 +0,0 @@ -{ config, pkgs, ... }: { - services.loki = { - enable = true; - configuration = { - server.http_listen_port = 6999; - auth_enabled = false; - - ingester = { - lifecycler = { - address = "127.0.0.1"; - ring = { - kvstore = { - store = "inmemory"; - }; - replication_factor = 1; - }; - }; - chunk_idle_period = "1h"; - max_chunk_age = "1h"; - chunk_target_size = 999999; - chunk_retain_period = "30s"; - max_transfer_retries = 0; - }; - - schema_config = { - configs = [{ - from = "2022-06-06"; - store = "boltdb-shipper"; - object_store = "filesystem"; - schema = "v11"; - index = { - prefix = "index_"; - period = "24h"; - }; - }]; - }; - - storage_config = { - boltdb_shipper = { - active_index_directory = "/var/lib/loki/boltdb-shipper-active"; - cache_location = "/var/lib/loki/boltdb-shipper-cache"; - cache_ttl = "24h"; - shared_store = "filesystem"; - }; - - filesystem = { - directory = "/var/lib/loki/chunks"; - }; - }; - limits_config = { - reject_old_samples = true; - reject_old_samples_max_age = "168h"; - }; - - chunk_store_config = { - max_look_back_period = "0s"; - }; - - table_manager = { - retention_deletes_enabled = false; - retention_period = "0s"; - }; - - compactor = { - working_directory = "/var/lib/loki"; - shared_store = "filesystem"; - compactor_ring = { - kvstore = { - store = "inmemory"; - }; - }; - }; - }; - }; - -} diff --git a/nix/monitoring/nginx.nix b/nix/monitoring/nginx.nix index 3f3ed10..acb1b2b 100644 --- a/nix/monitoring/nginx.nix +++ b/nix/monitoring/nginx.nix @@ -16,16 +16,6 @@ in "127.0.0.1:${toString config.services.prometheus.port}" = { }; }; }; - "loki" = { - servers = { - "127.0.0.1:${toString config.services.loki.configuration.server.http_listen_port}" = { }; - }; - }; - "promtail" = { - servers = { - "127.0.0.1:${toString config.services.promtail.configuration.server.http_listen_port}" = { }; - }; - }; }; virtualHosts."graf.matri.cx" = { @@ -56,21 +46,5 @@ in port = 8020; }]; }; - - virtualHosts.loki = { - locations."/".proxyPass = "http://loki"; - listen = [{ - addr = hostIP; - port = 8030; - }]; - }; - - virtualHosts.promtail = { - locations."/".proxyPass = "http://promtail"; - listen = [{ - addr = hostIP; - port = 8031; - }]; - }; }; } diff --git a/nix/monitoring/promtail.nix b/nix/monitoring/promtail.nix deleted file mode 100644 index 096630f..0000000 --- a/nix/monitoring/promtail.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ config, pkgs, ... }: { - services.promtail = { - enable = true; - configuration = { - server = { - http_listen_port = 6998; - grpc_listen_port = 0; - }; - positions = { - filename = "/tmp/positions.yaml"; - }; - clients = [{ - url = "http://127.0.0.1:${toString config.services.loki.configuration.server.http_listen_port}/loki/api/v1/push"; - }]; - scrape_configs = [{ - job_name = "journal"; - journal = { - max_age = "12h"; - labels = { - job = "systemd-journal"; - host = "pihole"; - }; - }; - relabel_configs = [{ - source_labels = [ "__journal__systemd_unit" ]; - target_label = "unit"; - }]; - }]; - }; - }; -}