]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #47903 from rkachach/fix_issue_57366
authorAdam King <47704447+adk3798@users.noreply.github.com>
Thu, 6 Oct 2022 11:18:35 +0000 (07:18 -0400)
committerGitHub <noreply@github.com>
Thu, 6 Oct 2022 11:18:35 +0000 (07:18 -0400)
mgr/cephadm: reconfig prometheus when service-discovery port changes

Reviewed-by: Adam King <adking@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
1  2 
src/pybind/mgr/cephadm/module.py
src/pybind/mgr/cephadm/serve.py
src/pybind/mgr/cephadm/services/cephadmservice.py
src/pybind/mgr/cephadm/services/monitoring.py
src/pybind/mgr/mgr_module.py
src/pybind/mgr/mgr_util.py

Simple merge
Simple merge
Simple merge
Simple merge