prometheus-nginx-exporter: 0.5.0 -> 0.6.0 (#81285)

* prometheus-nginx-exporter: 0.5.0 -> 0.6.0

* nixos/prometheus-nginx-exporter: update for 0.6.0

Added new option constLabels and updated virtualHost name in the
exporter's test.
This commit is contained in:
WilliButz 2020-03-02 20:48:40 +01:00 committed by GitHub
parent fa4534f75b
commit eaef96093a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 4 deletions

View file

@ -30,7 +30,17 @@ in
Whether to perform certificate verification for https.
'';
};
constLabels = mkOption {
type = types.listOf types.str;
default = [];
example = [
"label1=value1"
"label2=value2"
];
description = ''
A list of constant labels that will be used in every metric.
'';
};
};
serviceOpts = {
serviceConfig = {
@ -40,6 +50,7 @@ in
--nginx.ssl-verify ${toString cfg.sslVerify} \
--web.listen-address ${cfg.listenAddress}:${toString cfg.port} \
--web.telemetry-path ${cfg.telemetryPath} \
--prometheus.const-labels ${concatStringsSep "," cfg.constLabels} \
${concatStringsSep " \\\n " cfg.extraFlags}
'';
};

View file

@ -287,7 +287,7 @@ let
services.nginx = {
enable = true;
statusPage = true;
virtualHosts."/".extraConfig = "return 204;";
virtualHosts."test".extraConfig = "return 204;";
};
};
exporterTest = ''

View file

@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "nginx_exporter";
version = "0.5.0";
version = "0.6.0";
goPackagePath = "github.com/nginxinc/nginx-prometheus-exporter";
@ -14,7 +14,7 @@ buildGoPackage rec {
rev = "v${version}";
owner = "nginxinc";
repo = "nginx-prometheus-exporter";
sha256 = "1fyn2bjq80dx4jv1rakrm0vg6i657a5rs7kkg0f9mbv1alir8kkx";
sha256 = "1rwafmm9x0sxj4z7x4axhrjgdy15z70a1y00hw6smq30fcpkazhq";
};
doCheck = true;