From dcc12cea9f72717a6f22e5d15c65f4042512b775 Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Sun, 11 Aug 2019 11:50:09 +0200
Subject: [PATCH 1/2] prometheus-blackbox-exporter: 0.12.0 -> 0.14.0, run tests
Also added myself as maintainer.
---
.../monitoring/prometheus/blackbox-exporter.nix | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix
index 1f342adebaa0..9803ba09e16a 100644
--- a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
name = "blackbox_exporter-${version}";
- version = "0.12.0";
+ version = "0.14.0";
rev = version;
goPackagePath = "github.com/prometheus/blackbox_exporter";
@@ -11,14 +11,16 @@ buildGoPackage rec {
rev = "v${version}";
owner = "prometheus";
repo = "blackbox_exporter";
- sha256 = "0gd3vymk3qdfjnf0rx9kwc6v0jv7f8l30igvj2v7bljar2d6hzxf";
+ sha256 = "1v5n59p9jl6y1ka9mqp0ibx1kpcb3gbpl0i6bhqpbr154frmqm4x";
};
+ doCheck = true;
+
meta = with stdenv.lib; {
description = "Blackbox probing of endpoints over HTTP, HTTPS, DNS, TCP and ICMP";
- homepage = https://github.com/prometheus/blackbox_exporter;
+ homepage = "https://github.com/prometheus/blackbox_exporter";
license = licenses.asl20;
- maintainers = with maintainers; [ globin fpletz ];
+ maintainers = with maintainers; [ globin fpletz willibutz ];
platforms = platforms.unix;
};
}
From c28ded36ef50cb80796c6bd946754abfb47ffa28 Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Sun, 11 Aug 2019 12:06:29 +0200
Subject: [PATCH 2/2] nixos/prometheus-blackbox-exporter: add config check
---
.../monitoring/prometheus/exporters/blackbox.nix | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/blackbox.nix b/nixos/modules/services/monitoring/prometheus/exporters/blackbox.nix
index f69b389760f7..ca4366121e12 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters/blackbox.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters/blackbox.nix
@@ -4,6 +4,13 @@ with lib;
let
cfg = config.services.prometheus.exporters.blackbox;
+
+ checkConfig = file: pkgs.runCommand "checked-blackbox-exporter.conf" {
+ preferLocalBuild = true;
+ buildInputs = [ pkgs.buildPackages.prometheus-blackbox-exporter ]; } ''
+ ln -s ${file} $out
+ blackbox_exporter --config.check --config.file $out
+ '';
in
{
port = 9115;
@@ -21,7 +28,7 @@ in
ExecStart = ''
${pkgs.prometheus-blackbox-exporter}/bin/blackbox_exporter \
--web.listen-address ${cfg.listenAddress}:${toString cfg.port} \
- --config.file ${cfg.configFile} \
+ --config.file ${checkConfig cfg.configFile} \
${concatStringsSep " \\\n " cfg.extraFlags}
'';
ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";