cephadm: Support custom alertmanager container#36477
Merged
sebastian-philipp merged 2 commits intoceph:masterfrom Aug 20, 2020
Merged
cephadm: Support custom alertmanager container#36477sebastian-philipp merged 2 commits intoceph:masterfrom
sebastian-philipp merged 2 commits intoceph:masterfrom
Conversation
When alertmanager image has been customized and does not have a /etc/alertmanager directory, the uid/gid extraction fails. This change assumes that instead the /etc/prometheus directory exists and can be used to extract the uid and gid. Signed-off-by: Patrick Seidensal <pseidensal@suse.com>
Contributor
Fixes other alertmanager containers which do not default to look for a configuration file in `/etc/alertmanager/alertmanager.yml`. Signed-off-by: Patrick Seidensal <pseidensal@suse.com>
7b5e0db to
cdd0ba1
Compare
Contributor
|
jenkins test make check |
sebastian-philipp
approved these changes
Aug 20, 2020
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Alertmanager container images derived from a different distribution than the upstream container image can contain an alertmanager binary which,
Furthermore the uid/gid of the container can be different.
These adaptations make cephadm compatible with container images that either use
/etc/prometheusor/etc/alertmanageras their default configuration directory, by extracting the uid/gid of those directories. The cephadm configuration file will always be placed in the same directory (/etc/alertmanager/alertmanager.yml) and the container is instructed with arguments to load it, so that different container images won't have any issues.Checklist
Show available Jenkins commands
jenkins retest this pleasejenkins test classic perfjenkins test crimson perfjenkins test signedjenkins test make checkjenkins test make check arm64jenkins test submodulesjenkins test dashboardjenkins test apijenkins test docsjenkins render docsjenkins test ceph-volume alljenkins test ceph-volume tox