cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #285807 from MinerSebas/prometheus-restic-exporter

Browse source 
prometheus-restic-exporter: 1.4.0 -> 1.5.0
This commit is contained in:
Franz Pletz 2024-03-06 14:35:24 +01:00 committed by GitHub
commit f05e5f3a51
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
nixos/modules/services/monitoring/prometheus/exporters/restic.nix
View file

@ -93,12 +93,14 @@ in
}; };
serviceOpts = { serviceOpts = {
script = ''
export RESTIC_PASSWORD_FILE=$CREDENTIALS_DIRECTORY/RESTIC_PASSWORD_FILE
${pkgs.prometheus-restic-exporter}/bin/restic-exporter.py \
${concatStringsSep " \\\n " cfg.extraFlags}
'';
serviceConfig = { serviceConfig = {
ExecStart = ''
${pkgs.prometheus-restic-exporter}/bin/restic-exporter.py \
${concatStringsSep " \\\n " cfg.extraFlags}
'';
EnvironmentFile = mkIf (cfg.environmentFile != null) cfg.environmentFile; EnvironmentFile = mkIf (cfg.environmentFile != null) cfg.environmentFile;
LoadCredential = [ "RESTIC_PASSWORD_FILE:${cfg.passwordFile}" ];
}; };
environment = environment =
let let
@ -108,8 +110,7 @@ in
toRcloneVal = v: if lib.isBool v then lib.boolToString v else v; toRcloneVal = v: if lib.isBool v then lib.boolToString v else v;
in in
{ {
RESTIC_REPO_URL = cfg.repository; RESTIC_REPOSITORY = cfg.repository;
RESTIC_REPO_PASSWORD_FILE = cfg.passwordFile;
LISTEN_ADDRESS = cfg.listenAddress; LISTEN_ADDRESS = cfg.listenAddress;
LISTEN_PORT = toString cfg.port; LISTEN_PORT = toString cfg.port;
REFRESH_INTERVAL = toString cfg.refreshInterval; REFRESH_INTERVAL = toString cfg.refreshInterval;

6
pkgs/by-name/pr/prometheus-restic-exporter/package.nix
View file

@ -8,13 +8,13 @@
stdenvNoCC.mkDerivation rec { stdenvNoCC.mkDerivation rec {
pname = "prometheus-restic-exporter"; pname = "prometheus-restic-exporter";
version = "1.4.0"; version = "1.5.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ngosang"; owner = "ngosang";
repo = "restic-exporter"; repo = "restic-exporter";
rev = version; rev = version;
hash = "sha256-Qwhlecginl5+V+iddN/vIHfJA1kQOZtscECsoD4LJPE="; hash = "sha256-SC2ZCIQ33RaFI9+l/WI6edNzGEtsxJ2bBdeGNMHuyqY=";
}; };
buildInputs = [ buildInputs = [
@ -26,7 +26,7 @@ stdenvNoCC.mkDerivation rec {
install -D -m0755 restic-exporter.py $out/bin/restic-exporter.py install -D -m0755 restic-exporter.py $out/bin/restic-exporter.py
substituteInPlace $out/bin/restic-exporter.py --replace \"restic\" \"${lib.makeBinPath [ restic ]}/restic\" substituteInPlace $out/bin/restic-exporter.py --replace-fail \"restic\" \"${lib.makeBinPath [ restic ]}/restic\"
patchShebangs $out/bin/restic-exporter.py patchShebangs $out/bin/restic-exporter.py