From 3c42d25ecdcb4d8717f771009b01db07ab64e8b8 Mon Sep 17 00:00:00 2001 From: clerie Date: Sun, 24 Mar 2024 13:01:32 +0100 Subject: [PATCH 1/9] hosts/monitoring-3: migrate renamed options --- hosts/monitoring-3/grafana.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/hosts/monitoring-3/grafana.nix b/hosts/monitoring-3/grafana.nix index e57eb63..8637c80 100644 --- a/hosts/monitoring-3/grafana.nix +++ b/hosts/monitoring-3/grafana.nix @@ -2,11 +2,17 @@ { services.grafana = { enable = true; - domain = "grafana.monitoring.clerie.de"; - rootUrl = "https://grafana.monitoring.clerie.de"; - port = 3001; - addr = "::1"; - auth.anonymous.enable = true; + settings = { + server = { + domain = "grafana.monitoring.clerie.de"; + root_url = "https://grafana.monitoring.clerie.de"; + http_port = 3001; + http_addr = "::1"; + }; + "auth.anonymous" = { + enabled = true; + }; + }; provision = { enable = true; From 4f96034838b9c4b3b0498f64b546de6275f50a7f Mon Sep 17 00:00:00 2001 From: clerie Date: Sun, 24 Mar 2024 13:03:23 +0100 Subject: [PATCH 2/9] hosts/monitoring-3: add prometheus job for high frequency pings --- hosts/monitoring-3/prometheus.nix | 60 +++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/hosts/monitoring-3/prometheus.nix b/hosts/monitoring-3/prometheus.nix index d8ca1d9..36ae5f9 100644 --- a/hosts/monitoring-3/prometheus.nix +++ b/hosts/monitoring-3/prometheus.nix @@ -294,6 +294,66 @@ in { relabelAddressToInstance ]; } + { + job_name = "blackbox_local_icmp6_1s"; + scrape_interval = "1s"; + metrics_path = "/probe"; + params = { + module = [ "icmp6" ]; + }; + static_configs = [ + { + targets = [ + "carbon.net.clerie.de" + ]; + } + ]; + relabel_configs = [ + { + source_labels = [ "__address__" ]; + target_label = "__param_target"; + } + { + source_labels = [ "__address__" ]; + target_label = "target"; + } + { + target_label = "__address__"; + replacement = "monitoring-3.mon.clerie.de:9115"; + } + relabelAddressToInstance + ]; + } + { + job_name = "blackbox_local_icmp4_1s"; + scrape_interval = "1s"; + metrics_path = "/probe"; + params = { + module = [ "icmp4" ]; + }; + static_configs = [ + { + targets = [ + "carbon.net.clerie.de" + ]; + } + ]; + relabel_configs = [ + { + source_labels = [ "__address__" ]; + target_label = "__param_target"; + } + { + source_labels = [ "__address__" ]; + target_label = "target"; + } + { + target_label = "__address__"; + replacement = "monitoring-3.mon.clerie.de:9115"; + } + relabelAddressToInstance + ]; + } { job_name = "zimmer-temp"; scrape_interval = "20s"; From 2927edcb95fe0c42af8f465ee0b2ed4e356d5c53 Mon Sep 17 00:00:00 2001 From: clerie Date: Sun, 24 Mar 2024 13:18:27 +0100 Subject: [PATCH 3/9] modules/clerie-system-upgrade: migrate option type from types.string to types.str --- modules/clerie-system-upgrade/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/clerie-system-upgrade/default.nix b/modules/clerie-system-upgrade/default.nix index b6c92ba..38eb1c1 100644 --- a/modules/clerie-system-upgrade/default.nix +++ b/modules/clerie-system-upgrade/default.nix @@ -21,7 +21,7 @@ in description = "Automatically check and install upgrades"; }; startAt = mkOption { - type = with types; nullOr string; + type = with types; nullOr str; default = null; description = "Systemd time string for starting the unit"; }; From fe85ab718abb8d9f9fcc119b54f9c4057aa6c856 Mon Sep 17 00:00:00 2001 From: clerie Date: Sun, 24 Mar 2024 13:26:26 +0100 Subject: [PATCH 4/9] hosts/storage-2: migrate renamed options --- hosts/storage-2/syncthing.nix | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/hosts/storage-2/syncthing.nix b/hosts/storage-2/syncthing.nix index c9feee5..ca23e08 100644 --- a/hosts/storage-2/syncthing.nix +++ b/hosts/storage-2/syncthing.nix @@ -3,18 +3,20 @@ { services.syncthing = { enable = true; - devices = { - ceasium = { id = "3JVJ2KS-C44JKLL-LFIMCVJ-VUQK2VB-WKJNOGB-4AIJYJM-MINXEKG-T5FHQQE"; }; - ev0 = { id = "XLZNAIG-Q5BJYXZ-IJWS3RD-EOETGFI-265U5MH-U4VBEXX-KC6MWPH-B22ROQT"; }; - }; - folders = { - mixcloud = { - path = "/data/mixcloud"; - type = "sendonly"; - devices = [ - "ceasium" - "ev0" - ]; + settings = { + devices = { + ceasium = { id = "3JVJ2KS-C44JKLL-LFIMCVJ-VUQK2VB-WKJNOGB-4AIJYJM-MINXEKG-T5FHQQE"; }; + ev0 = { id = "XLZNAIG-Q5BJYXZ-IJWS3RD-EOETGFI-265U5MH-U4VBEXX-KC6MWPH-B22ROQT"; }; + }; + folders = { + mixcloud = { + path = "/data/mixcloud"; + type = "sendonly"; + devices = [ + "ceasium" + "ev0" + ]; + }; }; }; }; From 0cd3c05a257557a283aa0c68c77dbfad2f71a0e7 Mon Sep 17 00:00:00 2001 From: clerie Date: Sun, 24 Mar 2024 14:08:34 +0100 Subject: [PATCH 5/9] hosts/web-2: migrate renamed options for gitea --- hosts/web-2/gitea.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hosts/web-2/gitea.nix b/hosts/web-2/gitea.nix index b536bbd..ba2fd42 100644 --- a/hosts/web-2/gitea.nix +++ b/hosts/web-2/gitea.nix @@ -12,10 +12,6 @@ user = "gitea"; socket = "/run/postgresql"; }; - rootUrl = "https://git.clerie.de/"; - domain = "git.clerie.de"; - httpAddress = "127.0.0.1"; - httpPort = 3000; lfs.enable = true; settings = { log = { @@ -30,6 +26,10 @@ DEFAULT_PRIVATE = true; }; server = { + ROOT_URL = "https://git.clerie.de/"; + DOMAIN = "git.clerie.de"; + HTTP_ADDRESS = "127.0.0.1"; + HTTP_PORT = 3000; OFFLINE_MODE = true; LANDING_PAGE = "explore"; }; From db58f552b26543f36d0b83c27f56656f88e241ea Mon Sep 17 00:00:00 2001 From: clerie Date: Sun, 24 Mar 2024 14:20:34 +0100 Subject: [PATCH 6/9] hosts/web-2: fix systemd service dependencies for chaosevents --- hosts/web-2/chaosevents.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hosts/web-2/chaosevents.nix b/hosts/web-2/chaosevents.nix index e504f42..6a85794 100644 --- a/hosts/web-2/chaosevents.nix +++ b/hosts/web-2/chaosevents.nix @@ -22,6 +22,7 @@ systemd.services."chaosevents" = { wantedBy = [ "multi-user.target" ]; + requires = [ "network.target" ]; after = [ "network.target" ]; serviceConfig = { Type = "oneshot"; @@ -41,6 +42,7 @@ OnCalendar = "hourly"; RandomizedDelaySec = "1h"; }; + requires = [ "network-online.target" ]; after = [ "network-online.target" ]; }; } From 50066d11220d8d87357939dc2987bb1acf5ec774 Mon Sep 17 00:00:00 2001 From: clerie Date: Sun, 24 Mar 2024 14:35:31 +0100 Subject: [PATCH 7/9] hosts/web-2: postgresql migrate to ensureDBOwnership --- hosts/web-2/gitea.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/web-2/gitea.nix b/hosts/web-2/gitea.nix index ba2fd42..482c64b 100644 --- a/hosts/web-2/gitea.nix +++ b/hosts/web-2/gitea.nix @@ -66,7 +66,7 @@ ensureUsers = [ { name = "gitea"; - ensurePermissions."DATABASE gitea" = "ALL PRIVILEGES"; + ensureDBOwnership = true; } ]; }; From b348d610136acdc4cc59a160dfa4e8cf951ad38b Mon Sep 17 00:00:00 2001 From: clerie Date: Sun, 24 Mar 2024 14:46:52 +0100 Subject: [PATCH 8/9] flake.lock: Update fieldpoc --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index ccc4e02..65e82b1 100644 --- a/flake.lock +++ b/flake.lock @@ -90,11 +90,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1687119570, - "narHash": "sha256-tZ6hctUdlZzsdg4WA4Fv7C5bNGnotYp0QT+s3rvlIKw=", + "lastModified": 1711287766, + "narHash": "sha256-2roymGPfsQZC1Lg/i3iffBQ8c86DLEXmuoKQIlbOg5o=", "ref": "refs/heads/main", - "rev": "cc43776e6dd7eb94962e9f23b8e8282d34597a75", - "revCount": 39, + "rev": "f707f212378f9d8de103ac96abcd9d377a2605a8", + "revCount": 56, "type": "git", "url": "https://git.clerie.de/clerie/fieldpoc.git" }, From 4506600be0c3fa32f0883f53eb9eec8225a36306 Mon Sep 17 00:00:00 2001 From: Flake Update Bot Date: Mon, 25 Mar 2024 03:03:58 +0100 Subject: [PATCH 9/9] Update nixpkgs 2024-03-25-02-03 --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 65e82b1..0b08da6 100644 --- a/flake.lock +++ b/flake.lock @@ -212,11 +212,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1708118438, - "narHash": "sha256-kk9/0nuVgA220FcqH/D2xaN6uGyHp/zoxPNUmPCMmEE=", + "lastModified": 1711163522, + "narHash": "sha256-YN/Ciidm+A0fmJPWlHBGvVkcarYWSC+s3NTPk/P+q3c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5863c27340ba4de8f83e7e3c023b9599c3cb3c80", + "rev": "44d0940ea560dee511026a53f0e2e2cde489b4d4", "type": "github" }, "original": {