From 1d6acf6376f44250d33ba327f2130fdc5e959a5c Mon Sep 17 00:00:00 2001
From: Florian Sesser <florian@private.storage>
Date: Fri, 25 Feb 2022 17:07:39 +0000
Subject: [PATCH] Fixes
---
morph/lib/monitored-node.nix | 2 +-
morph/lib/monitoring.nix | 2 +-
nixos/modules/monitoring/exporters/tahoe.nix | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/morph/lib/monitored-node.nix b/morph/lib/monitored-node.nix
index b4e1f47e..709fbce5 100644
--- a/morph/lib/monitored-node.nix
+++ b/morph/lib/monitored-node.nix
@@ -24,7 +24,7 @@ in {
};
};
- services.private-storage.monitoring.node.enable = true;
+ services.private-storage.monitoring.exporters.node.enable = true;
services.private-storage.monitoring.vpn.client = {
enable = true;
ip = monitoringvpnIPv4;
diff --git a/morph/lib/monitoring.nix b/morph/lib/monitoring.nix
index cc7db265..d2552ebe 100644
--- a/morph/lib/monitoring.nix
+++ b/morph/lib/monitoring.nix
@@ -161,6 +161,6 @@ in {
domains = cfg.monitoringDomains;
};
- services.private-storage.monitoring.node.enable = true;
+ services.private-storage.monitoring.exporters.node.enable = true;
};
}
diff --git a/nixos/modules/monitoring/exporters/tahoe.nix b/nixos/modules/monitoring/exporters/tahoe.nix
index a31505c2..0f24bb6c 100644
--- a/nixos/modules/monitoring/exporters/tahoe.nix
+++ b/nixos/modules/monitoring/exporters/tahoe.nix
@@ -41,9 +41,9 @@ in {
lib.mkIf cfg.enable {
assertions = [
{
- assertion = config.services.private-storage.monitoring.node.enable;
+ assertion = config.services.private-storage.monitoring.exporters.node.enable;
message = ''
- services.private-storage.monitoring.tahoe requires services.private-storage.monitoring.node to provide the textfile prometheus collector.
+ services.private-storage.monitoring.tahoe requires services.private-storage.monitoring.exporters.node to provide the textfile prometheus collector.
'';
}
];
--
GitLab