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: 6845ebbff1c4
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: b4d9f14d3cc4
Choose a head ref
  • 4 commits
  • 2 files changed
  • 1 contributor

Commits on Nov 23, 2018

  1. nixos/prometheus: add package option to alertmanager

    @andir
    andir committed Nov 23, 2018
    Copy the full SHA
    d1ef00e View commit details
    Browse the repository at this point in the history

  2. nixos/prometheus: check alertmanager configuration

    @andir
    andir committed Nov 23, 2018
    Copy the full SHA
    b1032db View commit details
    Browse the repository at this point in the history

  3. nixos/prometheus: require one alertmanager configuration parameter 

    This commit adds an assertion that checks that either `configFile` or
`configuration` is configured for alertmanager. The alertmanager config
can not be an empty attributeset. The check executed with `amtool` fails
before the service even has the chance to start. We should probably not
allow a broken alertmanager configuration anyway.

This also introduces a test for alertmanager configuration that piggy
backs on the existing prometheus tests.
    @andir
    andir committed Nov 23, 2018
    Copy the full SHA
    51c3082 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #49756 from andir/prometheus 

    nixos/prometheus: check alertmanager configuration
    @andir
    andir committed Nov 23, 2018
    Copy the full SHA
    b4d9f14 View commit details
    Browse the repository at this point in the history