From 58c4a715ad9eba9674738bbc8d6c841ca94ec9fa Mon Sep 17 00:00:00 2001
From: Florian Sesser <florian@private.storage>
Date: Wed, 3 Nov 2021 21:03:58 +0000
Subject: [PATCH] Make megacli2prom search the PATH
Thanks to @tomprince for the suggestion.
---
nixos/modules/monitoring/exporters/megacli2prom.nix | 3 ++-
nixos/pkgs/megacli2prom/default.nix | 4 ----
nixos/pkgs/megacli2prom/repo.json | 4 ++--
3 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/nixos/modules/monitoring/exporters/megacli2prom.nix b/nixos/modules/monitoring/exporters/megacli2prom.nix
index adc69934..b364088a 100644
--- a/nixos/modules/monitoring/exporters/megacli2prom.nix
+++ b/nixos/modules/monitoring/exporters/megacli2prom.nix
@@ -9,7 +9,7 @@
#
# See https://nixos.org/manual/nixos/stable/#module-services-prometheus-exporters
-{ config, options, lib, ourpkgs, ... }:
+{ config, options, lib, ourpkgs, pkgs, ... }:
let
cfg = config.services.private-storage.monitoring.megacli2prom;
@@ -41,6 +41,7 @@ in {
description = "MegaCli2Prom metrics gathering service";
wantedBy = [ "multi-user.target" ];
startAt = cfg.interval;
+ path = [ pkgs.megacli ];
script = "${ourpkgs.megacli2prom}/bin/megacli2prom > ${cfg.outFile}";
};
};
diff --git a/nixos/pkgs/megacli2prom/default.nix b/nixos/pkgs/megacli2prom/default.nix
index 60c77e8b..f2a14aac 100644
--- a/nixos/pkgs/megacli2prom/default.nix
+++ b/nixos/pkgs/megacli2prom/default.nix
@@ -9,10 +9,6 @@ pkgs.stdenv.mkDerivation {
name = "megacli2prom";
buildInputs = [ pkgs.python3 pkgs.megacli ];
src = repo;
- prePatch = ''
- substituteInPlace ./megacli2prom.py \
- --replace '/opt/MegaRAID/MegaCli/MegaCli64' '${pkgs.megacli}/bin/MegaCli64'
- '';
installPhase = ''
mkdir -p $out/bin
cp ./megacli2prom.py $out/bin/megacli2prom
diff --git a/nixos/pkgs/megacli2prom/repo.json b/nixos/pkgs/megacli2prom/repo.json
index fcda3be1..3c8cd0af 100644
--- a/nixos/pkgs/megacli2prom/repo.json
+++ b/nixos/pkgs/megacli2prom/repo.json
@@ -2,7 +2,7 @@
"owner": "PrivateStorageio",
"repo": "megacli2prom",
"branch": "main",
- "rev": "b845de8110050c7eb8aa655108515edcdb8f36be",
+ "rev": "9536933d325c843b2662f80486660bf81d73941e",
"outputHashAlgo": "sha512",
- "outputHash": "2fqnb31i0278kb9mprl62jb4zbar38kjf28b2s8hwpmwp8zsp9c9p4cx7ydn36bjz6bxw7dyjiw6z82jpgcgv3752yab3b4lz01fnz7"
+ "outputHash": "1xrsv0bkmazbhqarx84lhvmrzzdv1bm04xvr0hw1yrw1f4xb450f4pwgapnkjczy0l4c6rp3pmh64cblgbs3ki30wacbv1bqzv5745g"
}
\ No newline at end of file
--
GitLab