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:
parent
fa4534f75b
commit
eaef96093a
|
@ -30,7 +30,17 @@ in
|
||||||
Whether to perform certificate verification for https.
|
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 = {
|
serviceOpts = {
|
||||||
serviceConfig = {
|
serviceConfig = {
|
||||||
|
@ -40,6 +50,7 @@ in
|
||||||
--nginx.ssl-verify ${toString cfg.sslVerify} \
|
--nginx.ssl-verify ${toString cfg.sslVerify} \
|
||||||
--web.listen-address ${cfg.listenAddress}:${toString cfg.port} \
|
--web.listen-address ${cfg.listenAddress}:${toString cfg.port} \
|
||||||
--web.telemetry-path ${cfg.telemetryPath} \
|
--web.telemetry-path ${cfg.telemetryPath} \
|
||||||
|
--prometheus.const-labels ${concatStringsSep "," cfg.constLabels} \
|
||||||
${concatStringsSep " \\\n " cfg.extraFlags}
|
${concatStringsSep " \\\n " cfg.extraFlags}
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
|
@ -287,7 +287,7 @@ let
|
||||||
services.nginx = {
|
services.nginx = {
|
||||||
enable = true;
|
enable = true;
|
||||||
statusPage = true;
|
statusPage = true;
|
||||||
virtualHosts."/".extraConfig = "return 204;";
|
virtualHosts."test".extraConfig = "return 204;";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
exporterTest = ''
|
exporterTest = ''
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
buildGoPackage rec {
|
buildGoPackage rec {
|
||||||
pname = "nginx_exporter";
|
pname = "nginx_exporter";
|
||||||
version = "0.5.0";
|
version = "0.6.0";
|
||||||
|
|
||||||
goPackagePath = "github.com/nginxinc/nginx-prometheus-exporter";
|
goPackagePath = "github.com/nginxinc/nginx-prometheus-exporter";
|
||||||
|
|
||||||
|
@ -14,7 +14,7 @@ buildGoPackage rec {
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
owner = "nginxinc";
|
owner = "nginxinc";
|
||||||
repo = "nginx-prometheus-exporter";
|
repo = "nginx-prometheus-exporter";
|
||||||
sha256 = "1fyn2bjq80dx4jv1rakrm0vg6i657a5rs7kkg0f9mbv1alir8kkx";
|
sha256 = "1rwafmm9x0sxj4z7x4axhrjgdy15z70a1y00hw6smq30fcpkazhq";
|
||||||
};
|
};
|
||||||
|
|
||||||
doCheck = true;
|
doCheck = true;
|
||||||
|
|
Loading…
Reference in New Issue