Comparing changes
Open a pull request
base repository: NixOS/nixpkgs-channels
base: 7990c3ea401f
head repository: NixOS/nixpkgs-channels
compare: 31b53e0f4b59
- 17 commits
- 8 files changed
- 6 contributors
Commits on Apr 17, 2019
-
(cherry picked from commit da7aeb1)
-
nixos/prometheus: add
ec2_sd_configs
section toscrape_configs
(cherry picked from commit ad7e232)
-
nixos/prometheus: add new ec2_sd_config options for prometheus2
(cherry picked from commit a23db5d)
-
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)
-
gnome3.tracker: 2.1.6 -> 2.1.8
Fixes NixOS/nixpkgs#59772 Also fix path to gdbus in the autostart. https://gitlab.gnome.org/GNOME/tracker/blob/2.1.8/NEWS
Commits on Apr 18, 2019
-
Merge pull request #59788 from worldofpeace/stable-tracker-update
[19.03] gnome3.tracker: 2.1.6 -> 2.1.8
-
(cherry picked from commit f27690a) Signed-off-by: Domen Kožar <domen@dev.si>
-
Merge pull request #59769 from basvandijk/prometheus-ec2-release-19.03
Backport prometheus ec2_sd_config and tls_config options to release-19.03
-
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)
-
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)
-
nixos/prometheus: abstract over optional option creation
(cherry picked from commit 285fd3c)
-
nixos/prometheus: add more missing options
(cherry picked from commit cdd8268)
-
Merge pull request #59831 from basvandijk/prometheus-refactoring-rele…
…ase-19.03 Backport "nixos/prometheus: refactored & added more missing options" to release 19.03
-
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)
-
prometheus-pushgateway: 0.7.0 -> 0.8.0
(cherry picked from commit b0fbe1d)
-
nixos/prometheus/pushgateway: add module and test
(cherry picked from commit d1940be)
-
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
This comparison is taking too long to generate.
Unfortunately it looks like we can’t render this comparison for you right now. It might be too big, or there might be something weird with your repository.
You can try running this command locally to see the comparison on your machine:
git diff 7990c3ea401f...31b53e0f4b59