Navigation Menu

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: 80c0524d67ad
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 4e867661d50d
Choose a head ref
  • 4 commits
  • 1 file changed
  • 2 contributors

Commits on Apr 16, 2019

  1. nixos/prometheus: add ec2_sd_configs section to scrape_configs

    @thefloweringash @basvandijk
    thefloweringash authored and basvandijk committed Apr 16, 2019
    Copy the full SHA
    ad7e232 View commit details
    Browse the repository at this point in the history

  2. nixos/prometheus: add new ec2_sd_config options for prometheus2

    @basvandijk
    basvandijk committed Apr 16, 2019
    Copy the full SHA
    a23db5d View commit details
    Browse the repository at this point in the history

  3. nixos/prometheus: filter out empty srcape_configs attributes 

    This results in a smaller prometheus.yml config file.

It also allows us to use the same options for both prometheus-1 and
prometheus-2 since the new options for prometheus-2 default to null
and will be filtered out if they are not set.
    @basvandijk
    basvandijk committed Apr 16, 2019
    Copy the full SHA
    a913d08 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #54691 from thefloweringash/prometheus-ec2 

    nixos/prometheus: add `ec2_sd_configs` section to `scrape_configs`
    @basvandijk
    basvandijk committed Apr 16, 2019
    Copy the full SHA
    4e86766 View commit details
    Browse the repository at this point in the history