git-server-git.apps.pok.os.sepia.ceph.com Git

]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit

author	Avan Thakkar <athakkar@redhat.com>
	Mon, 12 Dec 2022 11:45:47 +0000 (17:15 +0530)
committer	Adam King <adking@redhat.com>
	Wed, 15 Feb 2023 14:51:44 +0000 (09:51 -0500)
commit	5f04222cba320665e45726f14be321813d0a6ed2
tree	4a086161ba70c62e067d0b9263d21f69b38977b4	tree \| snapshot
parent	e1dad2e503de6120bfd204feb8a1d82686acdd89	commit \| diff

ceph-exporter: cephadm changes

Fixes: https://tracker.ceph.com/issues/55046
Signed-off-by: Avan Thakkar <athakkar@redhat.com>
Includes changes required for introducing ceph-exporter container in cephadm.

(cherry picked from commit 0253053dbfb1e98d38cf2f522751d2a4c780adc0)

Conflicts:
src/pybind/mgr/cephadm/module.py
src/pybind/mgr/cephadm/service_discovery.py
src/pybind/mgr/cephadm/services/cephadmservice.py
src/pybind/mgr/cephadm/services/monitoring.py
src/pybind/mgr/cephadm/tests/test_services.py
src/python-common/ceph/deployment/service_spec.py

12 files changed:

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom

src/cephadm/cephadm		diff \| blob \| history
src/pybind/mgr/cephadm/agent.py		diff \| blob \| history
src/pybind/mgr/cephadm/module.py		diff \| blob \| history
src/pybind/mgr/cephadm/services/cephadmservice.py		diff \| blob \| history
src/pybind/mgr/cephadm/services/monitoring.py		diff \| blob \| history
src/pybind/mgr/cephadm/templates/services/prometheus/prometheus.yml.j2		diff \| blob \| history
src/pybind/mgr/cephadm/tests/test_agent.py		diff \| blob \| history
src/pybind/mgr/cephadm/tests/test_services.py		diff \| blob \| history
src/pybind/mgr/cephadm/utils.py		diff \| blob \| history
src/pybind/mgr/orchestrator/_interface.py		diff \| blob \| history
src/pybind/mgr/orchestrator/module.py		diff \| blob \| history
src/python-common/ceph/deployment/service_spec.py		diff \| blob \| history