nixos/prometheus: add ec2_sd_configs section to scrape_configs
#54691
+115
−3
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
basvandijk
suggested changes
Apr 9, 2019
There was a problem hiding this comment.
@thefloweringash note I just merged PR #58255 which adds the prometheus2 service.
I see that the ec2_sd_config options are different between 1.8 and 2.8. So I think it makes sense starting to split the options for these version. Like having both promTypes.ec2_sd_config_v1 and promTypes.ec2_sd_config_v2.
I also agree it would be nice to have a extraConfigs in scrapeConfigs like you suggest.
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
force-pushed
the
prometheus-ec2
branch
from
36a94c3
to
a913d08
Compare
basvandijk
approved these changes
Apr 16, 2019
|
@GrahamcOfBorg test prometheus prometheus2 |
10 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
Prometheus's configuration in Nix is exhaustively specified. To use any of the various service discovery mechanisms they must be defined in the module. This adds definitions for the EC2 service discovery according to the Prometheus Documentation for version 1.8, matching the default value of
config.services.prometheus.package.Applies cleanly to 18.09 where I tested it, and is purely additive. If merged, I'd like it to be backported as well.
In the interests of not having to closely track upstream changes, would it be preferable to have an
extraConfigsinsidescrapeConfigs, that is merged as pure data? For example, if a user wants to use prometheus 2.6, it has a new option in the EC2 service discovery section calledfilters. As is, this is impossible(?) without updating this module again, but with anextraConfigsthere's an escape.Things done
sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)nix path-info -Sbefore and after)