Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: 95be462d0704
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: d893a9acf8d8
Choose a head ref
  • 8 commits
  • 23 files changed
  • 2 contributors

Commits on Jul 22, 2019

  1. nixos/test: fix prometheus-{bind,varnish}-exporter tests

    @WilliButz
    WilliButz committed Jul 22, 2019
    Copy the full SHA
    01ee2ee View commit details
    Browse the repository at this point in the history

  2. nixos/prometheus-exporters: refactor imports, replace 'with lib;' 

    Pass through 'options' to exporter definitions and replace 'with lib;'
by explicit function imports.
    @WilliButz
    WilliButz committed Jul 22, 2019
    Copy the full SHA
    7742211 View commit details
    Browse the repository at this point in the history

  3. nixos/tests/prometheus-exporters: replace 'with lib;' 

    Replace 'with lib;' by explicit function imports.
    @WilliButz
    WilliButz committed Jul 22, 2019
    Copy the full SHA
    77ccb1f View commit details
    Browse the repository at this point in the history

  4. nixos/prometheus-exporters: add option renaming for submodules 

    Adds the functionality to create option renamings and removals
for exporter submodules as in nixos/modules/rename.nix.
    @WilliButz
    WilliButz committed Jul 22, 2019
    Copy the full SHA
    fb6f0a4 View commit details
    Browse the repository at this point in the history

  5. prometheus-nginx-exporter: 0.1.0 -> 0.4.1, use official version 

    Use official exporter from nginxinc.
    @WilliButz
    WilliButz committed Jul 22, 2019
    Copy the full SHA
    86c884f View commit details
    Browse the repository at this point in the history

  6. nixos/prometheus-nginx-exporter: update module 

    Update exporter submodule to match the new exporter version.
    @WilliButz
    WilliButz committed Jul 22, 2019
    Copy the full SHA
    c64f621 View commit details
    Browse the repository at this point in the history

  7. nixos/release-notes: add note about nginx-exporter

    @WilliButz
    WilliButz committed Jul 22, 2019
    Copy the full SHA
    294bed6 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #65088 from WilliButz/prometheus-exporters-cleanup 

    prometheus-nginx-exporter: switch to official version & general prometheus-exporters cleanup
    @fpletz
    fpletz committed Jul 22, 2019
    Copy the full SHA
    d893a9a View commit details
    Browse the repository at this point in the history