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: fe9c676e99eb
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: f3160a2db6dc
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Aug 12, 2019

  1. nixos/prometheus: replace 'alertmanagerURL' options for prometheus2 

    Prometheus2 does no longer support the command-line flag to specify
an alertmanager. Instead it now supports both service discovery and
configuration of alertmanagers in the alerting config section.

Simply mapping the previous option to an entry in the new alertmanagers
section is not enough to allow for complete configurations of an
alertmanager.

Therefore the option alertmanagerURL is no longer used and instead
a full alertmanager configuration is expected.
    @WilliButz
    WilliButz committed Aug 12, 2019
    Copy the full SHA
    543f219 View commit details
    Browse the repository at this point in the history

  2. nixos/rename: add prometheus2 change

    @WilliButz
    WilliButz committed Aug 12, 2019
    Copy the full SHA
    a8847c8 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #66476 from WilliButz/fix-prometheus-alertmanager-… 

    …option

nixos/prometheus2: replace alertmanagerURL with new alertmanagers option
    @fpletz
    fpletz committed Aug 12, 2019
    Copy the full SHA
    f3160a2 View commit details
    Browse the repository at this point in the history