RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-29 15:03:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

mgr/cephadm: Build service discovery end-point by using mgr-ip only

Browse Source 
Fixes: https://tracker.ceph.com/issues/58526

Signed-off-by: Redouane Kachach <rkachach@redhat.com>
This commit is contained in:
Redouane Kachach 2023-01-20 19:16:25 +01:00
parent bf3bbd062e
commit d9079e3b71
No known key found for this signature in database
GPG Key ID: 843EE0E7D13F5049
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/pybind/mgr/cephadm/services/monitoring.py
View File

@ -13,6 +13,7 @@ from ceph.deployment.service_spec import AlertManagerSpec, GrafanaSpec, ServiceS
SNMPGatewaySpec, PrometheusSpec
from cephadm.services.cephadmservice import CephadmService, CephadmDaemonDeploySpec
from mgr_util import verify_tls, ServerConfigException, create_self_signed_cert, build_url, get_cert_issuer_info
from ceph.deployment.utils import wrap_ipv6
logger = logging.getLogger(__name__)
@ -339,18 +340,10 @@ class PrometheusService(CephadmService):
# default to disabled
retention_size = '0'
t = self.mgr.get('mgr_map').get('services', {}).get('prometheus', None)
sd_port = self.mgr.service_discovery_port
srv_end_point = ''
if t:
p_result = urlparse(t)
# urlparse .hostname removes '[]' from the hostname in case
# of ipv6 addresses so if this is the case then we just
# append the brackets when building the final scrape endpoint
if '[' in p_result.netloc and ']' in p_result.netloc:
srv_end_point = f'https://[{p_result.hostname}]:{sd_port}/sd/prometheus/sd-config?'
else:
srv_end_point = f'https://{p_result.hostname}:{sd_port}/sd/prometheus/sd-config?'
# build service discovery end-point
port = self.mgr.service_discovery_port
mgr_addr = wrap_ipv6(self.mgr.get_mgr_ip())
srv_end_point = f'https://{mgr_addr}:{port}/sd/prometheus/sd-config?'
node_exporter_cnt = len(self.mgr.cache.get_daemons_by_service('node-exporter'))
alertmgr_cnt = len(self.mgr.cache.get_daemons_by_service('alertmanager'))

1
src/pybind/mgr/cephadm/tests/test_services.py
View File

@ -393,6 +393,7 @@ class TestMonitoring:
)
@patch("cephadm.serve.CephadmServe._run_cephadm")
@patch("cephadm.module.CephadmOrchestrator.get_mgr_ip", lambda _: '::1')
def test_prometheus_config(self, _run_cephadm, cephadm_module: CephadmOrchestrator):
_run_cephadm.side_effect = async_side_effect(('{}', '', 0))