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>
	Thu, 22 Feb 2024 11:00:06 +0000 (16:30 +0530)
committer	Adam King <adking@redhat.com>
	Sun, 10 Mar 2024 21:24:56 +0000 (17:24 -0400)
commit	f3fe3cb9da985f11e4efdc53efeb3e08b02707c0
tree	52893205dd0c2bec838bbecc2766d7561884e08f	tree \| snapshot
parent	c2ea977b6956d1f694ccf66acc692fdd979e3baa	commit \| diff

cephadm/nvmeof: scrape nvmeof prometheus endpoint

Fixes: https://tracker.ceph.com/issues/64536
Signed-off-by: Avan Thakkar <athakkar@redhat.com>
(cherry picked from commit 93ec6284fb3002b4778c4e54972ff1d864060922)

Conflicts:
src/cephadm/cephadmlib/constants.py
src/pybind/mgr/cephadm/module.py
src/pybind/mgr/cephadm/templates/services/nvmeof/ceph-nvmeof.conf.j2
src/pybind/mgr/cephadm/tests/test_services.py

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

RSS Atom

src/cephadm/cephadm.py		diff \| blob \| history
src/pybind/mgr/cephadm/module.py		diff \| blob \| history
src/pybind/mgr/cephadm/service_discovery.py		diff \| blob \| history
src/pybind/mgr/cephadm/services/monitoring.py		diff \| blob \| history
src/pybind/mgr/cephadm/services/nvmeof.py		diff \| blob \| history
src/pybind/mgr/cephadm/templates/services/nvmeof/ceph-nvmeof.conf.j2		diff \| blob \| history
src/pybind/mgr/cephadm/templates/services/prometheus/prometheus.yml.j2		diff \| blob \| history
src/pybind/mgr/cephadm/tests/test_service_discovery.py		diff \| blob \| history
src/pybind/mgr/cephadm/tests/test_services.py		diff \| blob \| history