Skip to content
This repository has been archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
base: 7990c3ea401f
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
compare: 31b53e0f4b59
Choose a head ref
  • 17 commits
  • 8 files changed
  • 6 contributors

Commits on Apr 17, 2019

  1. prometheus: add tls_config

    (cherry picked from commit da7aeb1)
    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 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 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 committed Apr 17, 2019
    Copy the full SHA
    2a0742b View commit details
    Browse the repository at this point in the history
  5. gnome3.tracker: 2.1.6 -> 2.1.8

    worldofpeace committed Apr 17, 2019
    Copy the full SHA
    a0e8dfd View commit details
    Browse the repository at this point in the history

Commits on Apr 18, 2019

  1. Merge pull request #59788 from worldofpeace/stable-tracker-update

    [19.03] gnome3.tracker: 2.1.6 -> 2.1.8
    worldofpeace committed Apr 18, 2019
    Copy the full SHA
    80e68d5 View commit details
    Browse the repository at this point in the history
  2. atom: bump

    (cherry picked from commit f27690a)
    Signed-off-by: Domen Kožar <domen@dev.si>
    domenkozar committed Apr 18, 2019
    Copy the full SHA
    6866a74 View commit details
    Browse the repository at this point in the history
  3. 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 committed Apr 18, 2019
    Copy the full SHA
    bcd5fe6 View commit details
    Browse the repository at this point in the history
  4. nixos/prometheus: filter out the _module attr in a central place

    We previously filtered out the `_module` attribute in a NixOS
    configuration by filtering it using the option's `apply` function.
    
    This meant that every option that had a submodule type needed to have
    this apply function. Adding this function is easy to forget thus this
    mechanism is error prone.
    
    We now recursively filter out the `_module` attributes at the place we
    construct the Prometheus configuration file. Since we now do the filtering
    centrally we don't have to do it per option making it less prone to errors.
    
    (cherry picked from commit 57e5b75)
    basvandijk committed Apr 18, 2019
    Copy the full SHA
    c8e2dc0 View commit details
    Browse the repository at this point in the history
  5. nixos/prometheus: set optional attributes to type types.nullOr

    This makes sure that when a user hasn't set a Prometheus option it
    won't show up in the prometheus.yml configuration file. This results
    in smaller and easier to understand configuration files.
    
    (cherry picked from commit 55ef5d4)
    basvandijk committed Apr 18, 2019
    Copy the full SHA
    3a253af View commit details
    Browse the repository at this point in the history
  6. nixos/prometheus: abstract over optional option creation

    (cherry picked from commit 285fd3c)
    basvandijk committed Apr 18, 2019
    Copy the full SHA
    cf44453 View commit details
    Browse the repository at this point in the history
  7. nixos/prometheus: add more missing options

    (cherry picked from commit cdd8268)
    basvandijk committed Apr 18, 2019
    Copy the full SHA
    c99b5b4 View commit details
    Browse the repository at this point in the history
  8. Merge pull request #59831 from basvandijk/prometheus-refactoring-rele…

    …ase-19.03
    
    Backport "nixos/prometheus: refactored & added more missing options" to release 19.03
    basvandijk committed Apr 18, 2019
    Copy the full SHA
    1cbe0fe View commit details
    Browse the repository at this point in the history
  9. prometheus-pushgateway: 0.4.0 -> 0.7.0

    Add some tests to make sure the --version output includes the values
    passed in with -X.
    
    Add myself as a maintainer.
    
    (cherry picked from commit 8b4b12e)
    ivan authored and basvandijk committed Apr 18, 2019
    Copy the full SHA
    ae14052 View commit details
    Browse the repository at this point in the history
  10. prometheus-pushgateway: 0.7.0 -> 0.8.0

    (cherry picked from commit b0fbe1d)
    basvandijk committed Apr 18, 2019
    Copy the full SHA
    a3178b0 View commit details
    Browse the repository at this point in the history
  11. nixos/prometheus/pushgateway: add module and test

    (cherry picked from commit d1940be)
    basvandijk committed Apr 18, 2019
    Copy the full SHA
    5776161 View commit details
    Browse the repository at this point in the history
  12. Merge pull request #59832 from basvandijk/prometheus-pushgateway-modu…

    …le-release-19.03
    
    Backport "Prometheus pushgateway 0.4.0 -> 0.8.0 & module" to release 19.03
    basvandijk committed Apr 18, 2019
    Copy the full SHA
    31b53e0 View commit details
    Browse the repository at this point in the history