]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
mgr/cephadm: allow setting insecure_skip_verify for alertmanager
authorAdam King <adking@redhat.com>
Wed, 6 Apr 2022 14:32:22 +0000 (10:32 -0400)
committerAdam King <adking@redhat.com>
Sun, 17 Apr 2022 01:57:11 +0000 (21:57 -0400)
commitfbeda4c29b768e390991256a2d48b123e35d331e
treed2d6ae75a4252c4d46307a201f3775784fa54196
parent3ff11327e39dade5d8044ded953dad03c0db3c0f
mgr/cephadm: allow setting insecure_skip_verify for alertmanager

Add a "secure" parameter to alertmanager spec that will cause it
to deploy alertmanagers with insecure_skip_verify as true or false
depending on the value given for "secure".

NOTE: alertmanager must still be reconfigured after applying a yaml
with this option changed.

Fixes: https://tracker.ceph.com/issues/55272
Fixes: https://tracker.ceph.com/issues/55333
Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit e583d4ef1ac23a7473d50d253e0edf70580542ae)
doc/cephadm/services/monitoring.rst
src/pybind/mgr/cephadm/services/monitoring.py
src/pybind/mgr/cephadm/templates/services/alertmanager/alertmanager.yml.j2
src/pybind/mgr/cephadm/tests/test_services.py
src/python-common/ceph/deployment/service_spec.py