diff options
author | WilliButz <WilliButz@users.noreply.github.com> | 2023-12-20 20:27:28 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-12-20 20:27:28 +0100 |
commit | ac58b65cf53f8bebbb5ec35ae870a88466301a66 (patch) | |
tree | 4034318cd93aff8aeb67234ac7f6e6bff9b619e9 | |
parent | f27bb1216c942b4a7b3ec57fcbd24acb9b34c71c (diff) | |
parent | faff9de75451ca926a0e8c682b2ea217cb7b1fa8 (diff) | |
download | nixlib-ac58b65cf53f8bebbb5ec35ae870a88466301a66.tar nixlib-ac58b65cf53f8bebbb5ec35ae870a88466301a66.tar.gz nixlib-ac58b65cf53f8bebbb5ec35ae870a88466301a66.tar.bz2 nixlib-ac58b65cf53f8bebbb5ec35ae870a88466301a66.tar.lz nixlib-ac58b65cf53f8bebbb5ec35ae870a88466301a66.tar.xz nixlib-ac58b65cf53f8bebbb5ec35ae870a88466301a66.tar.zst nixlib-ac58b65cf53f8bebbb5ec35ae870a88466301a66.zip |
Merge pull request #275112 from r-ryantm/auto-update/prometheus-nginx-exporter
prometheus-nginx-exporter: 0.11.0 -> 1.0.0
-rw-r--r-- | nixos/modules/services/monitoring/prometheus/exporters/nginx.nix | 4 | ||||
-rw-r--r-- | nixos/tests/prometheus-exporters.nix | 3 | ||||
-rw-r--r-- | pkgs/servers/monitoring/prometheus/nginx-exporter.nix | 6 |
3 files changed, 7 insertions, 6 deletions
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/nginx.nix b/nixos/modules/services/monitoring/prometheus/exporters/nginx.nix index 3158e71f0468..88dc79fc2503 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/nginx.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/nginx.nix @@ -43,14 +43,14 @@ in }; }; serviceOpts = mkMerge ([{ + environment.CONST_LABELS = concatStringsSep "," cfg.constLabels; serviceConfig = { ExecStart = '' ${pkgs.prometheus-nginx-exporter}/bin/nginx-prometheus-exporter \ --nginx.scrape-uri='${cfg.scrapeUri}' \ - --nginx.ssl-verify=${boolToString cfg.sslVerify} \ + --${lib.optionalString (!cfg.sslVerify) "no-"}nginx.ssl-verify \ --web.listen-address=${cfg.listenAddress}:${toString cfg.port} \ --web.telemetry-path=${cfg.telemetryPath} \ - --prometheus.const-labels=${concatStringsSep "," cfg.constLabels} \ ${concatStringsSep " \\\n " cfg.extraFlags} ''; }; diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix index 7840130d4a36..14c0cc0e1d85 100644 --- a/nixos/tests/prometheus-exporters.nix +++ b/nixos/tests/prometheus-exporters.nix @@ -806,6 +806,7 @@ let nginx = { exporterConfig = { enable = true; + constLabels = [ "foo=bar" ]; }; metricProvider = { services.nginx = { @@ -818,7 +819,7 @@ let wait_for_unit("nginx.service") wait_for_unit("prometheus-nginx-exporter.service") wait_for_open_port(9113) - succeed("curl -sSf http://localhost:9113/metrics | grep 'nginx_up 1'") + succeed("curl -sSf http://localhost:9113/metrics | grep 'nginx_up{foo=\"bar\"} 1'") ''; }; diff --git a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix index 010481134941..b846cc336bfc 100644 --- a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "nginx_exporter"; - version = "0.11.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "nginxinc"; repo = "nginx-prometheus-exporter"; rev = "v${version}"; - sha256 = "sha256-glKjScJoJnFEm7Z9LAVF51haeyHB3wQ946U8RzJXs3k="; + sha256 = "sha256-fnYZmJxXY1RaPJX8KiKxFmMauP5Jh5H72FWjIwgoIio="; }; - vendorHash = "sha256-YyMySHnrjBHm3hRNJDwWBs86Ih4S5DONYuwlQ3FBjkA="; + vendorHash = "sha256-VkatDZerLKnfbNFtnjklkE3TLY57uO1WUGa/p5tAXSQ="; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; |