From: Adam King <47704447+adk3798@users.noreply.github.com> Date: Tue, 25 Mar 2025 17:27:20 +0000 (-0400) Subject: Merge pull request #61824 from ShwetaBhosale1/fix_issue_69942_prometheus_not_adding_h... X-Git-Tag: v20.3.0~269 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=29656dcf91ff4188d24693ca58a91cad75df84aa;p=ceph.git Merge pull request #61824 from ShwetaBhosale1/fix_issue_69942_prometheus_not_adding_host_url_in_mgr_when_first_enabled mgr/cephadm: Deploying prometheus service for the first time, does not update PROMETHEUS_API_HOST url under mgr module Reviewed-by: Adam King --- 29656dcf91ff4188d24693ca58a91cad75df84aa diff --cc src/pybind/mgr/cephadm/module.py index f69bf6d9c1b,b559fae82fa..ef9a43571b8 --- a/src/pybind/mgr/cephadm/module.py +++ b/src/pybind/mgr/cephadm/module.py @@@ -43,9 -42,8 +43,9 @@@ from ceph.deployment.service_spec impor MgmtGatewaySpec, NvmeofServiceSpec, ) +from ceph.deployment.drive_group import DeviceSelection from ceph.utils import str_to_datetime, datetime_to_str, datetime_now - from cephadm.serve import CephadmServe + from cephadm.serve import CephadmServe, REQUIRES_POST_ACTIONS from cephadm.services.cephadmservice import CephadmDaemonDeploySpec from cephadm.http_server import CephadmHttpServer from cephadm.agent import CephadmAgentHelpers