summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorPol Dellaiera <pol.dellaiera@protonmail.com>2023-07-04 11:24:24 +0200
committerGitHub <noreply@github.com>2023-07-04 11:24:24 +0200
commit3ede00e4fa3337d590cd3fee6c313f2304f88e05 (patch)
tree7dbbc240a158d36d7e3b924a194b1544e2b21945 /nixos
parentd9c0d0ddfb3dac5bd5e1e564f48c87c86d1def97 (diff)
parentf856229c9af1b59f4573c629578ba52694d02858 (diff)
downloadnixpkgs-3ede00e4fa3337d590cd3fee6c313f2304f88e05.tar
nixpkgs-3ede00e4fa3337d590cd3fee6c313f2304f88e05.tar.gz
nixpkgs-3ede00e4fa3337d590cd3fee6c313f2304f88e05.tar.bz2
nixpkgs-3ede00e4fa3337d590cd3fee6c313f2304f88e05.tar.lz
nixpkgs-3ede00e4fa3337d590cd3fee6c313f2304f88e05.tar.xz
nixpkgs-3ede00e4fa3337d590cd3fee6c313f2304f88e05.tar.zst
nixpkgs-3ede00e4fa3337d590cd3fee6c313f2304f88e05.zip
Merge pull request #240571 from gaelreyrol/scaphandre-module-assertions
nixos/prometheus/exporters: adjust scaphandre assertions
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/services/monitoring/prometheus/exporters.nix8
1 files changed, 4 insertions, 4 deletions
diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix
index 9e3109dc0cb..397125b5123 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters.nix
@@ -304,19 +304,19 @@ in
           'services.prometheus.exporters.sql.configFile'
       '';
     } {
-      assertion = cfg.scaphandre.enable -> (pkgs.stdenv.hostPlatform.isx86_64 == true);
+      assertion = cfg.scaphandre.enable -> (pkgs.stdenv.targetPlatform.isx86_64 == true);
       message = ''
-        Only x86_64 host platform architecture is not supported.
+        Scaphandre only support x86_64 architectures.
       '';
     } {
       assertion = cfg.scaphandre.enable -> ((lib.kernel.whenHelpers pkgs.linux.version).whenOlder "5.11" true).condition == false;
       message = ''
-        A kernel version newer than '5.11' is required. ${pkgs.linux.version}
+        Scaphandre requires a kernel version newer than '5.11', '${pkgs.linux.version}' given.
       '';
     } {
       assertion = cfg.scaphandre.enable -> (builtins.elem "intel_rapl_common" config.boot.kernelModules);
       message = ''
-        Please enable 'intel_rapl_common' in 'boot.kernelModules'.
+        Scaphandre needs 'intel_rapl_common' kernel module to be enabled. Please add it in 'boot.kernelModules'.
       '';
     } ] ++ (flip map (attrNames exporterOpts) (exporter: {
       assertion = cfg.${exporter}.firewallFilter != null -> cfg.${exporter}.openFirewall;