]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
mgr/cephadm: fixing Grafana domain handling 58402/head
authorRedouane Kachach <rkachach@ibm.com>
Wed, 31 Jul 2024 11:23:13 +0000 (13:23 +0200)
committerRedouane Kachach <rkachach@ibm.com>
Thu, 1 Aug 2024 11:34:29 +0000 (13:34 +0200)
commitd95e8511eb606262f8c7bd46ca53dccf52c640c9
tree5a632b2fcd6398466aa43f20fe24bdb24736eae5
parent9dc630b00db26abfb72f9c884950e739c121aa5e
mgr/cephadm: fixing Grafana domain handling

it seems that with Grafana 10.4.0 the domain parameter is taken into
account while building the final url (earlier versions didn't seem to
behave the same way). This change sets the domain to the hostname where
Grafana daemon is running instead of '*.lab'. serve_from_sub_path is
removed as it's no needed and when add it causes some undesirable
redirections that could break monitoring HA.

Signed-off-by: Redouane Kachach <rkachach@ibm.com>
src/pybind/mgr/cephadm/services/monitoring.py
src/pybind/mgr/cephadm/templates/services/grafana/grafana.ini.j2
src/pybind/mgr/cephadm/tests/test_services.py