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.

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

alertmanager: 0.15.3 -> 0.16.2 #59264

Merged
merged 2 commits into from Apr 10, 2019
Merged

alertmanager: 0.15.3 -> 0.16.2 #59264

merged 2 commits into from Apr 10, 2019

Conversation

basvandijk
Copy link
Member

@basvandijk basvandijk commented Apr 10, 2019 •
edited

Motivation for this change

https://github.com/prometheus/alertmanager/releases/tag/v0.16.2

Things done
  • 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.

@basvandijk
prometheus-alertmanager: 0.15.3 -> 0.16.2
18925d0
@basvandijk
nixos/prometheus/alertmanager: use ExecStart instead of script
739bdff 
This results in a simpler service unit which doesn't first have to
start a shell:

  > cat /nix/store/s95nsr8zbkblklanqpkiap49mkwbaq45-unit-alertmanager.service/alertmanager.service
  ...
  ExecStart=/nix/store/4g784lwcy7kp69hg0z2hfwkhjp2914lr-alertmanager-0.16.2-bin/bin/alertmanager \
    --config.file /nix/store/p2c7fyi2jkkwq04z2flk84q4wyj2ggry-checked-config \
    --web.listen-address [::1]:9093 \
    --log.level warn
  ...
@basvandijk
Copy link
Member Author

The prometheus test contains a test for alertmanager so:

@GrahamcOfBorg test prometheus

@arianvp
Copy link
Member

arianvp commented Apr 10, 2019 •
edited

While we're at it, we should remove the use of the nobody user and use DynamicUser instead. Also see
#55370

Given that alertmanager doesn't store any state on disk, I think this is a safe change.

could simply be:

ExecStart=...
User=alertmanager
Group=alertmanager
DynamicUser=true

@basvandijk
Copy link
Member Author

@arianvp good point. I'll do that in another PR because I would like to backport this to 19.03 and removing options is probably not accepted this late in the release process.

matthiasbeyer
matthiasbeyer approved these changes Apr 10, 2019
View reviewed changes
Copy link
Contributor

@matthiasbeyer matthiasbeyer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

None-trivial update, but from what I see this looks good.

@basvandijk basvandijk merged commit 08d9cf7 into NixOS:master Apr 10, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@matthiasbeyer matthiasbeyer matthiasbeyer approved these changes

@infinisil infinisil Awaiting requested review from infinisil

Assignees
No one assigned
Labels
6.topic: nixos 8.has: module (update) 10.rebuild-darwin: 1-10 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 @arianvp @matthiasbeyer @GrahamcOfBorg