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: 6866a74a851a
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: bcd5fe647124
Choose a head ref
  • 5 commits
  • 1 file changed
  • 3 contributors

Commits on Apr 17, 2019

  1. prometheus: add tls_config 

    (cherry picked from commit da7aeb1)
    @elohmeier @basvandijk
    elohmeier authored and basvandijk committed Apr 17, 2019
    Copy the full SHA
    4713945 View commit details
    Browse the repository at this point in the history

  2. nixos/prometheus: add ec2_sd_configs section to scrape_configs 

    (cherry picked from commit ad7e232)
    @thefloweringash @basvandijk
    thefloweringash authored and basvandijk committed Apr 17, 2019
    Copy the full SHA
    67d1bcb View commit details
    Browse the repository at this point in the history

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

    (cherry picked from commit a23db5d)
    @basvandijk
    basvandijk committed Apr 17, 2019
    Copy the full SHA
    84414b3 View commit details
    Browse the repository at this point in the history

  4. 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.

(cherry picked from commit a913d08)
    @basvandijk
    basvandijk committed Apr 17, 2019
    Copy the full SHA
    2a0742b View commit details
    Browse the repository at this point in the history

Commits on Apr 18, 2019

  1. Merge pull request #59769 from basvandijk/prometheus-ec2-release-19.03 

    Backport prometheus ec2_sd_config and tls_config options to release-19.03
    @basvandijk
    basvandijk committed Apr 18, 2019
    Copy the full SHA
    bcd5fe6 View commit details
    Browse the repository at this point in the history