diff --git a/bin/lib/remote.utils.nu b/bin/lib/remote.utils.nu index f8f556e..45bc1d3 100644 --- a/bin/lib/remote.utils.nu +++ b/bin/lib/remote.utils.nu @@ -37,7 +37,7 @@ export def get-remote-boot-info [ host: string@remote_targets ] { # Poll SSH until the host reaches the desired reachability, or the timeout elapses. -def wait-for-host [target: string, want_online: bool, timeout: int] { +export def wait-for-host [target: string, want_online: bool, timeout: int] { let deadline = (date now) + ($timeout * 1sec) while (date now) < $deadline { let online = (try { @@ -53,7 +53,7 @@ def wait-for-host [target: string, want_online: bool, timeout: int] { } # Send a desktop notification if notify-send is available; never fail the caller. -def notify [title: string, body: string] { +export def notify [title: string, body: string] { try { ^notify-send $title $body } catch { } diff --git a/flake.lock b/flake.lock index a5781f6..2fd1d61 100644 --- a/flake.lock +++ b/flake.lock @@ -3116,6 +3116,7 @@ "nixpkgs": "nixpkgs_14", "nixpkgs-unstable": "nixpkgs-unstable", "noctalia": "noctalia", + "skyg-linux-tracker": "skyg-linux-tracker", "skygqts": "skygqts", "stylix": "stylix", "systems": "systems_6", @@ -3182,6 +3183,26 @@ "type": "github" } }, + "skyg-linux-tracker": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1792243194, + "narHash": "sha256-GYgEoGZOoqJjebzMZ+SFr/i47QmQdp5/uUbDPjzzakU=", + "ref": "refs/heads/main", + "rev": "81e99f86673a478be4b57c47f75db77a743ee7a1", + "revCount": 66, + "type": "git", + "url": "https://gitea.skyg.ca/ari/skyg-linux-tracker.git" + }, + "original": { + "type": "git", + "url": "https://gitea.skyg.ca/ari/skyg-linux-tracker.git" + } + }, "skygqts": { "inputs": { "nixpkgs": [ diff --git a/flake.nix b/flake.nix index 1b882e8..563e99f 100644 --- a/flake.nix +++ b/flake.nix @@ -4,6 +4,11 @@ skygqts.url = "git+ssh://gitea@gitea.app.internal:22/ari/skygqts.git"; skygqts.inputs.nixpkgs.follows = "nixpkgs"; hermenix.url = "git+ssh://gitea@gitea.app.internal:22/ari/hermenix.git"; + # Read-only host monitor (systemd, journal, Docker) over REST + MCP. + skyg-linux-tracker = { + url = "git+https://gitea.skyg.ca/ari/skyg-linux-tracker.git"; + inputs.nixpkgs.follows = "nixpkgs"; + }; # Headless Hyprland session streamed over a Unix socket. hhstream = { url = "git+ssh://gitea@gitea.app.internal:22/Hermenix/hyprland-headless-stream-plugin.git"; @@ -104,6 +109,7 @@ { self , skygqts , hermenix + , skyg-linux-tracker , hhstream , nixpkgs-unstable , flox @@ -174,6 +180,7 @@ buildbot-gitea-webhook-secret = ./secrets/buildbot-gitea-webhook-secret.age; buildbot-gitea-oauth-secret = ./secrets/buildbot-gitea-oauth-secret.age; immich-shared = ./secrets/immich-shared.age; + grafana-secret-key = ./secrets/grafana-secret-key.age; }; inherit hyprlauncher @@ -188,6 +195,7 @@ hermes-agent skygqts hermenix + skyg-linux-tracker hhstream flox determinate diff --git a/hosts/ABOUTME.md b/hosts/ABOUTME.md index ee0aad0..91c058e 100644 --- a/hosts/ABOUTME.md +++ b/hosts/ABOUTME.md @@ -35,7 +35,7 @@ hosts/ | `hl-fws1/` | hl-fws1 | Framework 11th Intel — K3s server node | | `hl-bigbox1/` | hl-bigbox1 | AI/compute server (NVIDIA + AMD); Immich machine-learning (CUDA) | | `hl-bigbox2/` | hl-bigbox2 | NFS storage server; Immich server/db (docker, `immich.home.sosnovsky.ca`) | -| `hl-minipc1/` | hl-minipc1 | Core infra: Gitea (native or containerized), nix-serve, registry, Buzz (docker, `buzz-manage` CLI) | +| `hl-minipc1/` | hl-minipc1 | Core infra: Gitea (native or containerized), nix-serve, registry, Buzz (docker, `buzz-manage` CLI), monitoring (Grafana, Prometheus, Loki, OTel collector) | | `hl-minipc2/` | hl-minipc2 | Container/media server | | `hl-minipc3/` | hl-minipc3 | K3s worker node; central Caddy reverse-proxy (`*.home.sosnovsky.ca`, plus `gitea.skyg.ca` HTTP/SSH); buildbot-nix CI master + worker (2 cores) | | `hl-pi1/` | hl-pi1 | Raspberry Pi CM4 (aarch64) — headless server, SSH only | diff --git a/hosts/hl-bigbox1/services/default.nix b/hosts/hl-bigbox1/services/default.nix index 90c1475..290a05d 100644 --- a/hosts/hl-bigbox1/services/default.nix +++ b/hosts/hl-bigbox1/services/default.nix @@ -4,5 +4,6 @@ ./immich-ml.nix ./portainer.nix ./timers.nix + ./linux-tracker.nix ]; } diff --git a/hosts/hl-bigbox1/services/linux-tracker.nix b/hosts/hl-bigbox1/services/linux-tracker.nix new file mode 100644 index 0000000..1f5d735 --- /dev/null +++ b/hosts/hl-bigbox1/services/linux-tracker.nix @@ -0,0 +1,18 @@ +{ config, ... }: +{ + services.skyg-linux-tracker = { + enable = true; + bind = "0.0.0.0"; + openFirewall = true; + docker.enable = config.virtualisation.docker.enable; + # Reachable only by its lab FQDN; the short name does not resolve. + allowedHosts = [ "bigbox1.lab.internal" ]; + # OTLP out to the collector on minipc1. + settings.otel = { + enabled = true; + endpoint = "http://minipc1.lab.internal:4317"; + protocol = "grpc"; + export_logs = true; + }; + }; +} diff --git a/hosts/hl-bigbox2/hardware.nix b/hosts/hl-bigbox2/hardware.nix index 209318a..e01b241 100644 --- a/hosts/hl-bigbox2/hardware.nix +++ b/hosts/hl-bigbox2/hardware.nix @@ -1,4 +1,40 @@ -{ ... }: +{ config, pkgs, ... }: { services.fwupd.enable = true; + + # Interim: the box loses power under load. Use less power and heat, log more. + # Remove this block once the new board is in and stable. + + systemd.tmpfiles.rules = [ + # No turbo. Lost on reboot unless set here. + "w /sys/devices/system/cpu/cpufreq/boost - - - - 0" + # Max clock 2.5 GHz. Steps on this CPU: 3.5, 3.0, 2.5, 2.0, 1.4. + "w /sys/devices/system/cpu/cpu*/cpufreq/scaling_max_freq - - - - 2500000" + ]; + + # Keep logs on disk and flush often, so the last seconds before a crash survive. + services.journald.extraConfig = '' + Storage=persistent + SystemMaxUse=2G + SyncIntervalSec=5s + ''; + + # Reboot 10 s after a kernel panic instead of hanging. + boot.kernel.sysctl."kernel.panic" = 10; + + # Watch disk health and log warnings. No mail set up. + services.smartd = { + enable = true; + autodetect = true; + }; + + environment.systemPackages = [ + pkgs.smartmontools + pkgs.lm_sensors + pkgs.dmidecode + pkgs.stress-ng + pkgs.memtester + pkgs.ethtool + config.boot.kernelPackages.cpupower + ]; } diff --git a/hosts/hl-bigbox2/services/default.nix b/hosts/hl-bigbox2/services/default.nix index c614365..599456e 100644 --- a/hosts/hl-bigbox2/services/default.nix +++ b/hosts/hl-bigbox2/services/default.nix @@ -4,5 +4,6 @@ ./nix-serve.nix ./nfs-server.nix ./immich.nix + ./linux-tracker.nix ]; } diff --git a/hosts/hl-bigbox2/services/immich.nix b/hosts/hl-bigbox2/services/immich.nix index 5331aed..a011754 100644 --- a/hosts/hl-bigbox2/services/immich.nix +++ b/hosts/hl-bigbox2/services/immich.nix @@ -34,7 +34,7 @@ in environmentFiles = [ config.age.secrets.immich-shared.path ]; environment = envVars; deploy.resources.limits = { - cpus = "4"; + cpus = "1"; memory = "8G"; }; networks = { diff --git a/hosts/hl-bigbox2/services/linux-tracker.nix b/hosts/hl-bigbox2/services/linux-tracker.nix new file mode 100644 index 0000000..a0cf4fd --- /dev/null +++ b/hosts/hl-bigbox2/services/linux-tracker.nix @@ -0,0 +1,18 @@ +{ config, ... }: +{ + services.skyg-linux-tracker = { + enable = true; + bind = "0.0.0.0"; + openFirewall = true; + docker.enable = config.virtualisation.docker.enable; + # Reachable only by its lab FQDN; the short name does not resolve. + allowedHosts = [ "bigbox2.lab.internal" ]; + # OTLP out to the collector on minipc1. + settings.otel = { + enabled = true; + endpoint = "http://minipc1.lab.internal:4317"; + protocol = "grpc"; + export_logs = true; + }; + }; +} diff --git a/hosts/hl-fwdesk/services/default.nix b/hosts/hl-fwdesk/services/default.nix index 23c8463..600baf9 100644 --- a/hosts/hl-fwdesk/services/default.nix +++ b/hosts/hl-fwdesk/services/default.nix @@ -7,5 +7,6 @@ ./wyoming.nix ./steam.nix ./buildbot.nix + ./linux-tracker.nix ]; } diff --git a/hosts/hl-fwdesk/services/hermenix.nix b/hosts/hl-fwdesk/services/hermenix.nix index 5394eeb..b010a8c 100644 --- a/hosts/hl-fwdesk/services/hermenix.nix +++ b/hosts/hl-fwdesk/services/hermenix.nix @@ -39,6 +39,8 @@ in { address = "10.0.101.3"; port = 8080; } { address = "10.0.101.3"; port = 9102; } { address = "10.0.101.8"; port = 3000; } + # skyg-linux-tracker (REST + MCP) on every lab host. + { address = "10.0.0.0/16"; port = 1984; } ]; publish = [ { hostPort = ports.hermes; guestPort = 8642; } diff --git a/hosts/hl-fwdesk/services/linux-tracker.nix b/hosts/hl-fwdesk/services/linux-tracker.nix new file mode 100644 index 0000000..da2b6c8 --- /dev/null +++ b/hosts/hl-fwdesk/services/linux-tracker.nix @@ -0,0 +1,18 @@ +{ config, ... }: +{ + services.skyg-linux-tracker = { + enable = true; + bind = "0.0.0.0"; + openFirewall = true; + docker.enable = config.virtualisation.docker.enable; + # Reachable only by its lab FQDN; the short name does not resolve. + allowedHosts = [ "fwdesk.lab.internal" ]; + # OTLP out to the collector on minipc1. + settings.otel = { + enabled = true; + endpoint = "http://minipc1.lab.internal:4317"; + protocol = "grpc"; + export_logs = true; + }; + }; +} diff --git a/hosts/hl-fws1/services.nix b/hosts/hl-fws1/services.nix index f37b701..82b9d83 100644 --- a/hosts/hl-fws1/services.nix +++ b/hosts/hl-fws1/services.nix @@ -31,4 +31,18 @@ enable = true; arguments = "-o pipewire"; }; + + services.skyg-linux-tracker = { + enable = true; + bind = "0.0.0.0"; + openFirewall = true; + allowedHosts = [ "fws1.lab.internal" ]; + # OTLP out to the collector on minipc1. + settings.otel = { + enabled = true; + endpoint = "http://minipc1.lab.internal:4317"; + protocol = "grpc"; + export_logs = true; + }; + }; } diff --git a/hosts/hl-minipc1/services/default.nix b/hosts/hl-minipc1/services/default.nix index f9db6fc..43ff84e 100644 --- a/hosts/hl-minipc1/services/default.nix +++ b/hosts/hl-minipc1/services/default.nix @@ -12,5 +12,10 @@ ./iu.nix ./audiobookshelf.nix ./buzz.nix + ./linux-tracker.nix + ./otel-collector.nix + ./prometheus.nix + ./loki.nix + ./grafana.nix ]; } diff --git a/hosts/hl-minipc1/services/grafana.nix b/hosts/hl-minipc1/services/grafana.nix new file mode 100644 index 0000000..6216ef8 --- /dev/null +++ b/hosts/hl-minipc1/services/grafana.nix @@ -0,0 +1,47 @@ +{ config, skyg-secrets, ... }: +let + ports = { + grafana = 3001; + prometheus = 9090; + loki = 3100; + }; +in +{ + age.secrets.grafana-secret-key = { + file = skyg-secrets.grafana-secret-key; + owner = "grafana"; + group = "grafana"; + }; + + services.grafana = { + enable = true; + openFirewall = true; + + settings = { + server = { + http_addr = "0.0.0.0"; + http_port = ports.grafana; + }; + security.secret_key = "$__(file){${config.age.secrets.grafana-secret-key.path}}"; + }; + + provision = { + enable = true; + datasources.settings.datasources = [ + { + name = "Prometheus"; + type = "prometheus"; + access = "proxy"; + url = "http://127.0.0.1:${toString ports.prometheus}"; + isDefault = true; + } + { + name = "Loki"; + type = "loki"; + access = "proxy"; + url = "http://127.0.0.1:${toString ports.loki}"; + } + ]; + }; + }; +} diff --git a/hosts/hl-minipc1/services/linux-tracker.nix b/hosts/hl-minipc1/services/linux-tracker.nix new file mode 100644 index 0000000..3a7376d --- /dev/null +++ b/hosts/hl-minipc1/services/linux-tracker.nix @@ -0,0 +1,18 @@ +{ config, ... }: +{ + services.skyg-linux-tracker = { + enable = true; + bind = "0.0.0.0"; + openFirewall = true; + docker.enable = config.virtualisation.docker.enable; + # Reachable only by its lab FQDN; the short name does not resolve. + allowedHosts = [ "minipc1.lab.internal" ]; + # OTLP out to the collector on this box (see ./otel-collector.nix). + settings.otel = { + enabled = true; + endpoint = "http://127.0.0.1:4317"; + protocol = "grpc"; + export_logs = true; + }; + }; +} diff --git a/hosts/hl-minipc1/services/loki.nix b/hosts/hl-minipc1/services/loki.nix new file mode 100644 index 0000000..bab7244 --- /dev/null +++ b/hosts/hl-minipc1/services/loki.nix @@ -0,0 +1,94 @@ +{ ... }: +let + ports = { + loki = 3100; + grpc = 9096; + }; + dataDir = "/var/lib/loki"; +in +{ + services.loki = { + enable = true; + + # Single-binary Loki on the filesystem: no object store, no ring. + configuration = { + auth_enabled = false; + + server = { + http_listen_port = ports.loki; + grpc_listen_port = ports.grpc; + }; + + common = { + instance_addr = "127.0.0.1"; + path_prefix = dataDir; + replication_factor = 1; + ring.kvstore.store = "inmemory"; + storage.filesystem = { + chunks_directory = "${dataDir}/chunks"; + rules_directory = "${dataDir}/rules"; + }; + }; + + schema_config.configs = [ + { + from = "2026-10-01"; + store = "tsdb"; + object_store = "filesystem"; + schema = "v13"; + index = { + prefix = "index_"; + period = "24h"; + }; + } + ]; + + # The compactor is what enforces the 24h window below. + compactor = { + working_directory = "${dataDir}/compactor"; + retention_enabled = true; + delete_request_store = "filesystem"; + }; + + limits_config = { + retention_period = "24h"; + reject_old_samples = true; + reject_old_samples_max_age = "168h"; + # Required for OTLP ingestion; on by default since 3.0. + allow_structured_metadata = true; + }; + + ruler = { + storage.type = "local"; + storage.local.directory = "${dataDir}/rules"; + }; + }; + }; + + # Loki data lives on tnas1. Prometheus and Grafana stay on local disk, since + # their databases do not work well on NFS. + # The export must exist on the NAS and be writable by uid 985 / gid 981. + # The mount is ordered after network-online so tnas1's name resolves at boot. + fileSystems.${dataDir} = { + device = "tnas1.lab.internal:/mnt/SmallG/monitoring/loki"; + fsType = "nfs"; + options = [ + "nfsvers=4.0" + "hard" + "noatime" + "nofail" + "_netdev" + "x-systemd.automount" + "x-systemd.requires=network-online.target" + "x-systemd.after=network-online.target" + ]; + }; + systemd.services.loki.unitConfig.RequiresMountsFor = [ dataDir ]; + + # NFS ownership is numeric, so pin the ids instead of letting NixOS assign + # them by name order (a new user sorting before "loki" would shift them). + users.users.loki.uid = 985; + users.groups.loki.gid = 981; + + networking.firewall.allowedTCPPorts = [ ports.loki ]; +} diff --git a/hosts/hl-minipc1/services/otel-collector.nix b/hosts/hl-minipc1/services/otel-collector.nix new file mode 100644 index 0000000..0789615 --- /dev/null +++ b/hosts/hl-minipc1/services/otel-collector.nix @@ -0,0 +1,61 @@ +{ pkgs, ... }: +let + ports = { + otlpGrpc = 4317; + otlpHttp = 4318; + # Loopback scrape target for the Prometheus below. + metrics = 9464; + }; +in +{ + services.opentelemetry-collector = { + enable = true; + # The prometheus exporter is a contrib component, not core. + package = pkgs.opentelemetry-collector-contrib; + + settings = { + receivers.otlp.protocols = { + grpc.endpoint = "0.0.0.0:${toString ports.otlpGrpc}"; + http.endpoint = "0.0.0.0:${toString ports.otlpHttp}"; + }; + + processors.batch.timeout = "5s"; + + exporters = { + # Pull endpoint. Resource attributes (host.name, service.name) only + # become labels when conversion is enabled — off by default, which + # would leave every host's series with an identical label set. + prometheus = { + endpoint = "127.0.0.1:${toString ports.metrics}"; + resource_to_telemetry_conversion.enabled = true; + }; + # The contrib `loki` exporter was removed upstream; Loki ingests + # OTLP/HTTP natively at /otlp instead. + "otlphttp/loki".endpoint = "http://127.0.0.1:3100/otlp"; + nop = { }; + }; + + service.pipelines = { + metrics = { + receivers = [ "otlp" ]; + processors = [ "batch" ]; + exporters = [ "prometheus" ]; + }; + logs = { + receivers = [ "otlp" ]; + processors = [ "batch" ]; + exporters = [ "otlphttp/loki" ]; + }; + # The tracker ships its own spans; nothing here stores them. + traces = { + receivers = [ "otlp" ]; + processors = [ "batch" ]; + exporters = [ "nop" ]; + }; + }; + }; + }; + + # Only the OTLP listeners face the lab; 9464 stays on loopback. + networking.firewall.allowedTCPPorts = [ ports.otlpGrpc ports.otlpHttp ]; +} diff --git a/hosts/hl-minipc1/services/prometheus.nix b/hosts/hl-minipc1/services/prometheus.nix new file mode 100644 index 0000000..1f72fa6 --- /dev/null +++ b/hosts/hl-minipc1/services/prometheus.nix @@ -0,0 +1,21 @@ +{ ... }: +let + ports = { prometheus = 9090; }; +in +{ + services.prometheus = { + enable = true; + port = ports.prometheus; + listenAddress = "0.0.0.0"; + retentionTime = "48h"; + + scrapeConfigs = [ + { + job_name = "lab-trackers"; + static_configs = [{ targets = [ "127.0.0.1:9464" ]; }]; + } + ]; + }; + + networking.firewall.allowedTCPPorts = [ ports.prometheus ]; +} diff --git a/hosts/hl-minipc2/services/default.nix b/hosts/hl-minipc2/services/default.nix index 3ca446b..c91db3e 100644 --- a/hosts/hl-minipc2/services/default.nix +++ b/hosts/hl-minipc2/services/default.nix @@ -6,5 +6,6 @@ ./stack1.nix ./stack2.nix ./timers.nix + ./linux-tracker.nix ]; } diff --git a/hosts/hl-minipc2/services/linux-tracker.nix b/hosts/hl-minipc2/services/linux-tracker.nix new file mode 100644 index 0000000..ebb5869 --- /dev/null +++ b/hosts/hl-minipc2/services/linux-tracker.nix @@ -0,0 +1,18 @@ +{ config, ... }: +{ + services.skyg-linux-tracker = { + enable = true; + bind = "0.0.0.0"; + openFirewall = true; + docker.enable = config.virtualisation.docker.enable; + # Reachable only by its lab FQDN; the short name does not resolve. + allowedHosts = [ "minipc2.lab.internal" ]; + # OTLP out to the collector on minipc1. + settings.otel = { + enabled = true; + endpoint = "http://minipc1.lab.internal:4317"; + protocol = "grpc"; + export_logs = true; + }; + }; +} diff --git a/hosts/hl-minipc3/services/default.nix b/hosts/hl-minipc3/services/default.nix index 4b8fcc3..1891ff2 100644 --- a/hosts/hl-minipc3/services/default.nix +++ b/hosts/hl-minipc3/services/default.nix @@ -2,6 +2,7 @@ imports = [ ./caddy.nix ./acme.nix + ./linux-tracker.nix # ./buildbot.nix ]; } diff --git a/hosts/hl-minipc3/services/linux-tracker.nix b/hosts/hl-minipc3/services/linux-tracker.nix new file mode 100644 index 0000000..9d7e39b --- /dev/null +++ b/hosts/hl-minipc3/services/linux-tracker.nix @@ -0,0 +1,18 @@ +{ config, ... }: +{ + services.skyg-linux-tracker = { + enable = true; + bind = "0.0.0.0"; + openFirewall = true; + docker.enable = config.virtualisation.docker.enable; + # Reachable only by its lab FQDN; the short name does not resolve. + allowedHosts = [ "minipc3.lab.internal" ]; + # OTLP out to the collector on minipc1. + settings.otel = { + enabled = true; + endpoint = "http://minipc1.lab.internal:4317"; + protocol = "grpc"; + export_logs = true; + }; + }; +} diff --git a/hosts/hl-terra1/services.nix b/hosts/hl-terra1/services.nix index 1354378..b6eefd1 100644 --- a/hosts/hl-terra1/services.nix +++ b/hosts/hl-terra1/services.nix @@ -1,6 +1,20 @@ { ... }: { skyg.nixos.common.networking.nfsServer.enable = true; + services.skyg-linux-tracker = { + enable = true; + bind = "0.0.0.0"; + openFirewall = true; + # Reachable only by its lab FQDN; the short name does not resolve. + allowedHosts = [ "terra1.lab.internal" ]; + # OTLP out to the collector on minipc1. + settings.otel = { + enabled = true; + endpoint = "http://minipc1.lab.internal:4317"; + protocol = "grpc"; + export_logs = true; + }; + }; services.nfs.server = { lockdPort = 4001; mountdPort = 4002; diff --git a/modules/lib.nix b/modules/lib.nix index ff558bc..6fca8c5 100644 --- a/modules/lib.nix +++ b/modules/lib.nix @@ -51,6 +51,7 @@ let specialArgs.hermes-agent.nixosModules.default specialArgs.tether.nixosModules.default specialArgs.hhstream.nixosModules.default + specialArgs.skyg-linux-tracker.nixosModules.default { programs.nix-index-database.comma.enable = true; } ]; makeHomeConfig = {}: import ./home { }; diff --git a/modules/nixos/server/ABOUTME.md b/modules/nixos/server/ABOUTME.md index 1e1866c..cdd9f1b 100644 --- a/modules/nixos/server/ABOUTME.md +++ b/modules/nixos/server/ABOUTME.md @@ -26,7 +26,9 @@ server/ - **`timers.nix`** is a reusable helper: anything added to `skyg.server.timers.` (with `script`, `OnCalendar`, `wantedBy`) becomes a systemd timer + oneshot service. Host files (e.g. `hosts/hl-minipc2.nix`'s scrypted-backups) use it for backups/auto-updates. -- No Prometheus exporters: the node exporter module was removed (unauthenticated, no scraper). +- No per-host Prometheus exporters: metrics are **pushed**. Every lab host runs + `skyg-linux-tracker` and ships OTLP to the collector on bigbox2 + (`hosts/hl-bigbox2/services/otel-collector.nix`), which feeds Prometheus and Loki. - Naming: this tree mostly uses the legacy `skyg.server.*` prefix for cross-cutting modules (admin/timers/arrs/dns) and `skyg.nixos.server.*` for the K3s/K8s roles and the service modules under `services/`. diff --git a/secrets.nix b/secrets.nix index c68a02e..8073d45 100644 --- a/secrets.nix +++ b/secrets.nix @@ -56,4 +56,7 @@ in # immich "secrets/immich-shared.age".publicKeys = [ ari bigbox2 ]; + + # Grafana signing key (settings.security.secret_key) on hl-minipc1 + "secrets/grafana-secret-key.age".publicKeys = [ ari minipc1 ]; } diff --git a/secrets/buildbot-gitea-oauth-secret.age b/secrets/buildbot-gitea-oauth-secret.age index 68409a7..5785943 100644 --- a/secrets/buildbot-gitea-oauth-secret.age +++ b/secrets/buildbot-gitea-oauth-secret.age @@ -1,7 +1,7 @@ age-encryption.org/v1 --> ssh-ed25519 CIR0mA MZHddRKKINlOjaZq4KeZv0ZbUlqHF72rSWaM8Gp9YEQ -dYvdCXVxJl/jqfzVCvWFOzpnZVLr4zDbeyo384EHUqA --> ssh-ed25519 So2Y2A lGsCiYTRNOTqY+XPtA/4b3L6aoS277CPBpJAYNBR+Bs -Q6rwNPEPENCz1f7RL1ugsz4UG3zh3bwIIIIFQzNrhDI ---- PECFTeXNGLXQn7oRM3/RQD4RoPYl+Udyt30iWLWvQ/s -Uèzy¡íÈC�œ7ŒŸJJè÷;ÓiÍdî÷‘ê†dGN((d‹‘YñX9£.‚#*š¦Ll·–N¼óêå/t:ÓrÅ·Æw9€®‘�hZ”eÎ0‹‘o ²¢ \ No newline at end of file +-> ssh-ed25519 CIR0mA xqQTxyhPrikYagGRGiZgquAAdZRRuJ6vY6QkhRrMsk4 +/hyH926q9x8OyK+sNFTmmDZA5X3cQJFA3+xiAP+7s7M +-> ssh-ed25519 So2Y2A NFDlVnErG2qjx0cP5Ud4nmdxZMm0KSJLFFXtjUBCwhM +SXbvegO8aC5My91ciXhu4Gq09FiRDmRIha/l0niyuL0 +--- thUe2VQJDpYQhtROqB1IbILqJ3C+XUoOq+ikZlv5FBQ +ˆú ¼åøó ˆ;ÃPטr솀·8UYÁh‡‚ºi³¦MÿFÑ®b7E±ÖÃébs<é’Ô)e`�dш€lۡߎ®fñõ˜‚EpHjô}c!¨°ÿ�Ŭö \ No newline at end of file diff --git a/secrets/buildbot-gitea-token.age b/secrets/buildbot-gitea-token.age index e51050b..5a11167 100644 --- a/secrets/buildbot-gitea-token.age +++ b/secrets/buildbot-gitea-token.age @@ -1,7 +1,7 @@ age-encryption.org/v1 --> ssh-ed25519 CIR0mA R/k75aPb/6UY7hC2sNLDnJBN0SzS1gLxCKV5/6k14lo -Ia2f/UVHOOyAOKIWQDQBGUA4tBQCC9I+jI8HKngdDgc --> ssh-ed25519 So2Y2A kMKHgmMXFv/FFpxG4afwDFu3EYY6dRHEDIMB+413VyQ -ohCZhQSOc8nB6F+VOMqLJsmzkydg/+wDJTeGbPyiWz4 ---- YJueYHrRUK8D0Jz+V9vXPPNOIpT0GGcIyKJ4u72qluY -Pp6~_Ñ} Ð‰êÝc,a}Õár£8í¥Y=dA¨ €ßŠñ|90%ay·�FÊ(HTª»±” ñ°gó§?m^a˜*Ÿ2� \ No newline at end of file +-> ssh-ed25519 CIR0mA qOPQimH/RGijxXLsUFYnoRBYaRlgkTkdakveVD/rxHY +I54XAAaZGHuREobPbErwvpjBDCutqv5qE/ZFivvonLc +-> ssh-ed25519 So2Y2A yEvFPWoKOHDebfR4fTVNooHahbqoNdkNEA6hR6bATGA +HHwKok4lDVU65Ty5f7ZIpeUZvTlBXdqvOlg83PQz7EU +--- abAtzYT8rbVVTB93m0IYUymq/RxV6X2sk6ZTxi4FIsw +§‘ø¦Zã,&¼F‘+׎ÉfÁ¨u£v¤eÙ#šŽ`óˆ]3 }Dq™98€Û�™5Çd]–õµì;°MC,ïbZø€„ip_Q \ No newline at end of file diff --git a/secrets/buildbot-gitea-webhook-secret.age b/secrets/buildbot-gitea-webhook-secret.age index 55bcf9a..287ea32 100644 --- a/secrets/buildbot-gitea-webhook-secret.age +++ b/secrets/buildbot-gitea-webhook-secret.age @@ -1,7 +1,7 @@ age-encryption.org/v1 --> ssh-ed25519 CIR0mA q9gHASCHMVma89r38UB+SQhOfvJh+fTn6cDde+VokyI -NwJV0BDtHtR76S1gnobJ/sCf72X7Jgh/aX9zdppJQrg --> ssh-ed25519 So2Y2A bA0FjhApSVVz5KihvhT/dYrSH5amAUX2j7b9IaZ1YSQ -1m1Tq0ib8kQbRXTCx+kiBEN/LG8mmfrlnVqCFZAYQtM ---- ClysLz304nxJUBJH8gx5VPE3FKJTtgntVj2b4czSJC8 -³=@b)[|[HÜúcmd1‰ÏÝ2L˜8Ú_`ùèo³§0Ñ^"¡Ö<¬ÁІúO>af¥æiü ~$¥ÿŸ…\q:±Pfåÿ¨3€#„c1‘ö—xByóxÈñÀò»EÏÇ \ No newline at end of file +-> ssh-ed25519 CIR0mA NcvzVtUfM/i7MmeLG7CV2Ngt8QplSC0nQ2m3Qo8/dWI +B1kUDAkLfcq6BRrfd1EYAohLnuF0rpC+QM4Un/9nVjQ +-> ssh-ed25519 So2Y2A 6pu6KIHQy0VqYAuxbWTTy4s1Mr1pNlugyNDsw3EXASU +ebUCvyFTKsxKKuTWPGVnb8FVpmtGsyRcXONN/L2SGKI +--- V80No7zOTrxlfBfSEorOEeLBe/2ve+lX3K/3ixY5QFg +µåHÖ¾1S¼uf´,¶7ò>.%Jµ�ëïç�hó_D8³†Ô8%æÖ¥cø‚ùÓZ‚é³|ß�¨íY¸CK1}¢ëQ•Z �šçÑ5 Bå‘jç…çôµß¬àX \ No newline at end of file diff --git a/secrets/buildbot-worker-password-fwdesk.age b/secrets/buildbot-worker-password-fwdesk.age index 1cd58ec..e0e9873 100644 Binary files a/secrets/buildbot-worker-password-fwdesk.age and b/secrets/buildbot-worker-password-fwdesk.age differ diff --git a/secrets/buildbot-worker-password-minipc3.age b/secrets/buildbot-worker-password-minipc3.age index 29b3b1a..4081b66 100644 Binary files a/secrets/buildbot-worker-password-minipc3.age and b/secrets/buildbot-worker-password-minipc3.age differ diff --git a/secrets/buzz-env.age b/secrets/buzz-env.age index d94b854..1be701d 100644 Binary files a/secrets/buzz-env.age and b/secrets/buzz-env.age differ diff --git a/secrets/buzz-tls-key.age b/secrets/buzz-tls-key.age index 08b564f..6d171ba 100644 Binary files a/secrets/buzz-tls-key.age and b/secrets/buzz-tls-key.age differ diff --git a/secrets/cloudflare-ddclient.age b/secrets/cloudflare-ddclient.age index 08d650f..c9aa0e2 100644 --- a/secrets/cloudflare-ddclient.age +++ b/secrets/cloudflare-ddclient.age @@ -1,8 +1,7 @@ age-encryption.org/v1 --> ssh-ed25519 CIR0mA CxgrXCVHrJnqoGzZEz0oKGie2XEHLu809dcFhmIUGA4 -X25TGuWbIwRMkAE9EEedn9hb6bWCuMVmJi+61d5KIys --> ssh-ed25519 LuJNQA kpVx1opi4cjdpzic4Xg8phRyR/AHZnVpsfqj62FBvFc -1siGAQsjaKNzx2XRrszSpjz75mzsOm23ya+QXSZFXtg ---- SZyPEECt2N8gsCZqrBJY6he5OohAZBJxh/uQs8BKWBE -çÒX®ÂåÀX„=ê �ÍØágÌÇ!©Y{ �‡Þ “ºÒ�fÓÚÍàÀð§wìŒ -Â?~gæK�O´dXÍiü©„.×™šEÄíá \ No newline at end of file +-> ssh-ed25519 CIR0mA u5gJNbu+l/8Fkd5yxYvtqKJ/ZDSxQqjcpP4g9yqzllg +I6C5pleesVsD66KfLsXfXyi5FWsPpTQH/01T9l3eCUM +-> ssh-ed25519 LuJNQA On/rlQtXl9Rr3OhJZ9zapT2GLcX3caGmeRUokUCwbD4 +v1zV8ri6IcLzTWGMne6DpjCJBVr/Lja4Ah1M5Bj0IDs +--- GSIODQOv5D+vQgI95cQxOwiVYZYhOqaYzNTPHCHoSlA +h ZÚ«þ›‰í¶qšŸYoáÿ±NÿµJ'€ßÚ€¡bV�ö$Û�ü±,|¼b•8ö8^FKûK­˜/ˆƒ±^€ø¡,_˵s \ No newline at end of file diff --git a/secrets/cloudflare-dns.age b/secrets/cloudflare-dns.age index 952988a..268a677 100644 Binary files a/secrets/cloudflare-dns.age and b/secrets/cloudflare-dns.age differ diff --git a/secrets/dns-addresses.conf.age b/secrets/dns-addresses.conf.age index 259069a..0580ada 100644 Binary files a/secrets/dns-addresses.conf.age and b/secrets/dns-addresses.conf.age differ diff --git a/secrets/glmain.json.age b/secrets/glmain.json.age index 7727c0b..12a9820 100644 Binary files a/secrets/glmain.json.age and b/secrets/glmain.json.age differ diff --git a/secrets/grafana-secret-key.age b/secrets/grafana-secret-key.age new file mode 100644 index 0000000..1968c5d --- /dev/null +++ b/secrets/grafana-secret-key.age @@ -0,0 +1,8 @@ +age-encryption.org/v1 +-> ssh-ed25519 CIR0mA Ef4yK/jaOy9aJoGACo8Hfl4/O3R+dOuBNNKmjf9mNnE +DGL2wY1SjH8j1n8cjl7FrYI4bki5fpPdcToGBh1gess +-> ssh-ed25519 LuJNQA 02n9TO/NsaebvWz1bvU/PMj151pZYVyGeDzZalJexwo +DLpad+VkRn9TnMrfE6yGoP2TrfZrjyqrgsXGqOPvUmI +--- l3k5gUk4hXjTmEVtvQhSz6vsreh3knXGcIgHAIiwJ7Y +¶#±3ॎ� Ö»á¼%N gØ t¬ór? Ç«<íÝ6  @˜“¾VšèwG4¯ qæP§ +?¶üBæò2'lÕbå©:U#5ë4çÒ¸¤~myyôÎb¯¿àýJÀ \ No newline at end of file diff --git a/secrets/hermes-env.age b/secrets/hermes-env.age index 293872f..f859e55 100644 Binary files a/secrets/hermes-env.age and b/secrets/hermes-env.age differ diff --git a/secrets/immich-shared.age b/secrets/immich-shared.age index 84d12aa..8c2f563 100644 Binary files a/secrets/immich-shared.age and b/secrets/immich-shared.age differ diff --git a/secrets/iu-project.age b/secrets/iu-project.age index a76da1c..ec61cb9 100644 --- a/secrets/iu-project.age +++ b/secrets/iu-project.age @@ -1,7 +1,7 @@ age-encryption.org/v1 --> ssh-ed25519 CIR0mA wbZRuR6TE7oD+sTfCZU561XShPsv0CMxMEpLebi+1hw -b1McWvJNoxYG6K5hjiuc0WLPViyCtgdyvmjwhxPfpZ0 --> ssh-ed25519 LuJNQA aTL4kxlpMBqABK/CJ5KjAiBDpL3m5ETnlK8hDF61cgw -gFIydWCNJH/iur3L7pj0R9cl+/i63jcHhVh0AlJwQvA ---- q2VnKs8u6d4NbPJoTDd0dJLuYVW8Ne3NaanbGlCakbQ -Q§ËÃï`·Ÿ�þgæëø¶ôPIqA•Ôjâø6bù*`÷"Ly¿Nt£Ôýð›ºgS÷ƒbz({Š�a®£¹(ƒ R×Ò¤mT,ÀÔÓù~Œ×¦ÃŒÄÇ5ä‹£¸ï_t8ö!·èF¤*vï £÷&i<œ \ No newline at end of file +-> ssh-ed25519 CIR0mA tptdMYirvCYTTTQKPR8ZrMKud6BsQkabKFqQppTJ8DM +ZPWGoj47fBimtTEkldCAY/UcYMM+uYp68MhSiW/K0u4 +-> ssh-ed25519 LuJNQA oXZz25+1kHT92d8ksBkIgZYmw+TsSlFU7GmQugsIWD8 +J2GqEFhaSs/JVWxH2q1vP39Hlxq5mGMlWPDMZAiRWus +--- pdLoyc19kNV5o4tLoYjw4334Xi6Pr4Adno0TUkxiJoM +ª%ñМ²‰ (;“šªËÈ8â0QƒÈK¤±–¦*ˆß¥ôþ¯•½ �'Gª*²z[P×Ô¹€’¾:Âþá�k™Ê³…^ÁáÚk:àôÈÖÏ�\ ôãÕ ÛME+ØUóvtÍ5A½ñ#`k¶Ç:ÿs¯(E�ì Šx>Õ \ No newline at end of file diff --git a/secrets/lab-ca-key.age b/secrets/lab-ca-key.age index 92194ac..a76a0df 100644 Binary files a/secrets/lab-ca-key.age and b/secrets/lab-ca-key.age differ diff --git a/secrets/portainer-agent-bigbox1.age b/secrets/portainer-agent-bigbox1.age index 817f614..1a94301 100644 Binary files a/secrets/portainer-agent-bigbox1.age and b/secrets/portainer-agent-bigbox1.age differ diff --git a/secrets/portainer-agent-minipc1.age b/secrets/portainer-agent-minipc1.age index 31755fb..ed9c8c6 100644 Binary files a/secrets/portainer-agent-minipc1.age and b/secrets/portainer-agent-minipc1.age differ diff --git a/secrets/portainer-agent-minipc3.age b/secrets/portainer-agent-minipc3.age index ffad362..5ea84fb 100644 Binary files a/secrets/portainer-agent-minipc3.age and b/secrets/portainer-agent-minipc3.age differ diff --git a/secrets/portainer-tls-key.age b/secrets/portainer-tls-key.age index 40ae62d..a633461 100644 Binary files a/secrets/portainer-tls-key.age and b/secrets/portainer-tls-key.age differ diff --git a/secrets/stack1.age b/secrets/stack1.age index b63c6ba..df40c31 100644 Binary files a/secrets/stack1.age and b/secrets/stack1.age differ diff --git a/secrets/stack2.age b/secrets/stack2.age index ef914b8..45a1bbf 100644 Binary files a/secrets/stack2.age and b/secrets/stack2.age differ