From 46085e5d9c4700d418d592412e900c6b573dc815 Mon Sep 17 00:00:00 2001 From: Lu Wang Date: Wed, 1 Jan 2025 10:24:32 +0800 Subject: [PATCH] treewide: dedup monitoring profile imports --- flake/nixos.nix | 7 ++++++- nixos/hosts/kanako-hkg0/default.nix | 2 -- nixos/hosts/reisen-nrt0/default.nix | 2 -- nixos/hosts/reisen-sea0/default.nix | 2 -- nixos/hosts/reisen-sin0/default.nix | 2 -- nixos/hosts/suwako-vie0/default.nix | 2 -- nixos/hosts/suwako-vie1/default.nix | 2 -- 7 files changed, 6 insertions(+), 13 deletions(-) diff --git a/flake/nixos.nix b/flake/nixos.nix index aea0393..8524e9e 100644 --- a/flake/nixos.nix +++ b/flake/nixos.nix @@ -64,9 +64,14 @@ let services.restic ]; + monitoring = with profiles; [ + services.prometheus.node-exporter + services.prometheus.ping-exporter + ]; + workstation = suites.baseline ++ suites.network ++ suites.desktop ++ suites.backup; - server = suites.baseline ++ suites.network ++ suites.backup; + server = suites.baseline ++ suites.network ++ suites.backup ++ suites.monitoring; } ); in diff --git a/nixos/hosts/kanako-hkg0/default.nix b/nixos/hosts/kanako-hkg0/default.nix index 38ef1eb..64dab94 100644 --- a/nixos/hosts/kanako-hkg0/default.nix +++ b/nixos/hosts/kanako-hkg0/default.nix @@ -9,8 +9,6 @@ suites.server ++ (with profiles; [ services.caddy - services.prometheus.node-exporter - services.prometheus.ping-exporter ]) ++ (mylib.path.scanPaths ./. "default.nix"); diff --git a/nixos/hosts/reisen-nrt0/default.nix b/nixos/hosts/reisen-nrt0/default.nix index 4713ece..69db800 100644 --- a/nixos/hosts/reisen-nrt0/default.nix +++ b/nixos/hosts/reisen-nrt0/default.nix @@ -11,8 +11,6 @@ services.caddy services.knot.secondary services.ntfy - services.prometheus.node-exporter - services.prometheus.ping-exporter services.prometheus.server ]) ++ (mylib.path.scanPaths ./. "default.nix"); diff --git a/nixos/hosts/reisen-sea0/default.nix b/nixos/hosts/reisen-sea0/default.nix index 1346a53..fd3a4e1 100644 --- a/nixos/hosts/reisen-sea0/default.nix +++ b/nixos/hosts/reisen-sea0/default.nix @@ -10,8 +10,6 @@ ++ (with profiles; [ services.caddy services.knot.primary - services.prometheus.node-exporter - services.prometheus.ping-exporter ]) ++ (mylib.path.scanPaths ./. "default.nix"); diff --git a/nixos/hosts/reisen-sin0/default.nix b/nixos/hosts/reisen-sin0/default.nix index 2be304e..c82726d 100644 --- a/nixos/hosts/reisen-sin0/default.nix +++ b/nixos/hosts/reisen-sin0/default.nix @@ -10,8 +10,6 @@ ++ (with profiles; [ services.caddy services.knot.secondary - services.prometheus.node-exporter - services.prometheus.ping-exporter ]) ++ (mylib.path.scanPaths ./. "default.nix"); diff --git a/nixos/hosts/suwako-vie0/default.nix b/nixos/hosts/suwako-vie0/default.nix index 9af3f1d..ef055e7 100644 --- a/nixos/hosts/suwako-vie0/default.nix +++ b/nixos/hosts/suwako-vie0/default.nix @@ -15,8 +15,6 @@ services.matrix.synapse services.miniflux services.postgresql - services.prometheus.node-exporter - services.prometheus.ping-exporter ]) ++ (mylib.path.scanPaths ./. "default.nix"); diff --git a/nixos/hosts/suwako-vie1/default.nix b/nixos/hosts/suwako-vie1/default.nix index 4955b48..0aee006 100644 --- a/nixos/hosts/suwako-vie1/default.nix +++ b/nixos/hosts/suwako-vie1/default.nix @@ -13,8 +13,6 @@ services.mail.dovecot services.mail.postfix services.mail.rspamd - services.prometheus.node-exporter - services.prometheus.ping-exporter services.well-known ]) ++ (mylib.path.scanPaths ./. "default.nix");