From 30385068eed7a4f93179e8d2748dd6e01bba6ffd Mon Sep 17 00:00:00 2001 From: Tatjana Dehler Date: Wed, 9 Mar 2022 16:10:49 +0100 Subject: [PATCH] mgr/cephadm: unify way to get the host address There are two different ways to get the host address. From the inventory of the mgr object directly or via the `_inventory_get_addr` method of `CephadmService`. Update the code in order to use the `_inventory_get_addr` method only. Signed-off-by: Tatjana Dehler --- src/pybind/mgr/cephadm/services/monitoring.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/pybind/mgr/cephadm/services/monitoring.py b/src/pybind/mgr/cephadm/services/monitoring.py index 61bd1662feb..22436906cbf 100644 --- a/src/pybind/mgr/cephadm/services/monitoring.py +++ b/src/pybind/mgr/cephadm/services/monitoring.py @@ -159,7 +159,7 @@ class AlertmanagerService(CephadmService): if dd.daemon_id == self.mgr.get_mgr_id(): continue assert dd.hostname is not None - addr = self.mgr.inventory.get_addr(dd.hostname) + addr = self._inventory_get_addr(dd.hostname) dashboard_urls.append(build_url(scheme=proto, host=addr, port=port)) for dd in self.mgr.cache.get_daemons_by_service('snmp-gateway'): @@ -183,7 +183,7 @@ class AlertmanagerService(CephadmService): for dd in self.mgr.cache.get_daemons_by_service('alertmanager'): assert dd.hostname is not None deps.append(dd.name()) - addr = self.mgr.inventory.get_addr(dd.hostname) + addr = self._inventory_get_addr(dd.hostname) peers.append(build_url(host=addr, port=port).lstrip('/')) return { @@ -274,7 +274,7 @@ class PrometheusService(CephadmService): if dd.daemon_id == self.mgr.get_mgr_id(): continue assert dd.hostname is not None - addr = self.mgr.inventory.get_addr(dd.hostname) + addr = self._inventory_get_addr(dd.hostname) mgr_scrape_list.append(build_url(host=addr, port=port).lstrip('/')) # scrape node exporters @@ -282,7 +282,7 @@ class PrometheusService(CephadmService): for dd in self.mgr.cache.get_daemons_by_service('node-exporter'): assert dd.hostname is not None deps.append(dd.name()) - addr = dd.ip if dd.ip else self.mgr.inventory.get_addr(dd.hostname) + addr = dd.ip if dd.ip else self._inventory_get_addr(dd.hostname) port = dd.ports[0] if dd.ports else 9100 nodes.append({ 'hostname': dd.hostname, @@ -294,7 +294,7 @@ class PrometheusService(CephadmService): for dd in self.mgr.cache.get_daemons_by_service('alertmanager'): assert dd.hostname is not None deps.append(dd.name()) - addr = dd.ip if dd.ip else self.mgr.inventory.get_addr(dd.hostname) + addr = dd.ip if dd.ip else self._inventory_get_addr(dd.hostname) port = dd.ports[0] if dd.ports else 9093 alertmgr_targets.append("'{}'".format(build_url(host=addr, port=port).lstrip('/'))) @@ -306,7 +306,7 @@ class PrometheusService(CephadmService): assert dd.hostname is not None deps.append(dd.name()) if dd.daemon_type == 'haproxy': - addr = self.mgr.inventory.get_addr(dd.hostname) + addr = self._inventory_get_addr(dd.hostname) haproxy_targets.append({ "url": f"'{build_url(host=addr, port=spec.monitor_port).lstrip('/')}'", "service": dd.service_name(), -- 2.39.5