Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

prometheus-nginx-exporter: switch to official version & general prometheus-exporters cleanup #65088

Merged
merged 7 commits into from Jul 22, 2019
Merged

prometheus-nginx-exporter: switch to official version & general prometheus-exporters cleanup #65088

merged 7 commits into from Jul 22, 2019

Conversation

WilliButz
Copy link
Member

Motivation for this change

NGINX Inc. provide their own prometheus exporter.

Things done
  • fixed two failing prometheus-exporter tests (bind and varnish)
  • refactored the prometheus-exporter "meta module" a bit
  • added functionality to define option renamings and removals in exporter submodules
  • added a small documentation section on adding option overrides for exporter submodules
  • switched to the official version of the nginx-exporter and updated the module
  • replaced 'with lib;' in the exporter "meta module" and the exporter test, to avoid having implicit imports in these more complex files.
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS (x86_64-linux & aarch64-linux)
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

/cc @fpletz @benley as additional maintainers of the package prometheus-nginx-exporter

@WilliButz
Copy link
Member Author

@GrahamcOfBorg test prometheus-exporters.bind prometheus-exporters.blackbox prometheus-exporters.collectd prometheus-exporters.dnsmasq prometheus-exporters.dovecot prometheus-exporters.fritzbox prometheus-exporters.json prometheus-exporters.nginx prometheus-exporters.node
prometheus-exporters.postfix prometheus-exporters.snmp prometheus-exporters.surfboard prometheus-exporters.tor prometheus-exporters.varnish prometheus-exporters.wireguard

@risicle
Copy link
Contributor

risicle commented Jul 19, 2019

nox-review is happy enough on macos 10.13 and the nginx-prometheus-exporter binary runs.

@WilliButz
nixos/test: fix prometheus-{bind,varnish}-exporter tests
01ee2ee
@WilliButz
nixos/prometheus-exporters: refactor imports, replace 'with lib;'
7742211 
Pass through 'options' to exporter definitions and replace 'with lib;'
by explicit function imports.
@WilliButz
nixos/tests/prometheus-exporters: replace 'with lib;'
77ccb1f 
Replace 'with lib;' by explicit function imports.
@WilliButz
nixos/prometheus-exporters: add option renaming for submodules
fb6f0a4 
Adds the functionality to create option renamings and removals
for exporter submodules as in nixos/modules/rename.nix.
@WilliButz
prometheus-nginx-exporter: 0.1.0 -> 0.4.1, use official version
86c884f 
Use official exporter from nginxinc.
@WilliButz
nixos/prometheus-nginx-exporter: update module
c64f621 
Update exporter submodule to match the new exporter version.
@WilliButz
nixos/release-notes: add note about nginx-exporter
294bed6
@WilliButz WilliButz force-pushed the prometheus-exporters-cleanup branch from 5e5a11c to 294bed6 Compare July 22, 2019 14:41
@WilliButz
Copy link
Member Author

I included the proposed changes and rebased onto master.
@globin reminded me to also add a small section in the 19.09 release notes about the incompatible metrics.

@fpletz fpletz merged commit d893a9a into NixOS:master Jul 22, 2019
@WilliButz WilliButz deleted the prometheus-exporters-cleanup branch July 22, 2019 15:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@benley benley benley left review comments

@fpletz fpletz fpletz approved these changes

Assignees
No one assigned
Labels
6.topic: nixos 8.has: changelog 8.has: documentation 8.has: module (update) 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@WilliButz @risicle @fpletz @benley