Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Backport prometheus ec2_sd_config and tls_config options to release-19.03 #59769

Merged
merged 4 commits into from Apr 18, 2019
Merged

Backport prometheus ec2_sd_config and tls_config options to release-19.03 #59769

merged 4 commits into from Apr 18, 2019

Conversation

basvandijk
Copy link
Member

Motivation for this change

I would like to use the new ec2_sd_config and tls_config prometheus options on NixOS-19.03.

Things done

Cherry-picked #56017 and #54691.

  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

elohmeier and others added 4 commits April 17, 2019 13:27
@elohmeier @basvandijk
prometheus: add tls_config
4713945 
(cherry picked from commit da7aeb1)
@thefloweringash @basvandijk
nixos/prometheus: add ec2_sd_configs section to scrape_configs
67d1bcb 
(cherry picked from commit ad7e232)
@basvandijk
nixos/prometheus: add new ec2_sd_config options for prometheus2
84414b3 
(cherry picked from commit a23db5d)
@basvandijk
nixos/prometheus: filter out empty srcape_configs attributes
2a0742b 
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
Copy link
Member Author

@GrahamcOfBorg test prometheus prometheus2

@basvandijk basvandijk changed the title Prometheus ec2 release 19.03 Backport prometheus ec2_sd_config and tls_config options to release-19.03 Apr 17, 2019
@basvandijk basvandijk merged commit bcd5fe6 into NixOS:release-19.03 Apr 18, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@infinisil infinisil Awaiting requested review from infinisil infinisil is a code owner

Assignees
No one assigned
Labels
6.topic: nixos 8.has: module (update) 10.rebuild-darwin: 0 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@basvandijk @GrahamcOfBorg @elohmeier @thefloweringash