Merge pull request ceph#62302 from thegreenbear/cephadm-sd-custom-containers

adk3798 · web-flow · commit c94a2f55cf0c · 2025-04-24T14:34:21.000-04:00
mgr/cephadm: enhanced service to allow discovery of custom containers

Reviewed-by: Adam King &lt;adking@redhat.com&gt;
Reviewed-by: Redouane Kachach &lt;rkachach@redhat.com&gt;
diff --git a/src/pybind/mgr/cephadm/service_discovery.py b/src/pybind/mgr/cephadm/service_discovery.py
@@ -138,7 +138,7 @@ def __init__(self, mgr: "CephadmOrchestrator", port: int = 0, host: str = ''):
 
     @cherrypy.expose
     def index(self) -> str:
-        return '''<!DOCTYPE html>
+        return self.mgr.get_store('service_discovery/index') or '''<!DOCTYPE html>
 <html>
 <head><title>Cephadm HTTP Endpoint</title></head>
 <body>
@@ -175,6 +175,8 @@ def get_sd_config(self, service: str) -> List[Dict[str, Collection[str]]]:
             return self.nfs_sd_config()
         elif service == 'smb':
             return self.smb_sd_config()
+        elif service.startswith("container"):
+            return self.container_sd_config(service)
         else:
             return []
 
@@ -282,6 +284,21 @@ def smb_sd_config(self) -> List[Dict[str, Collection[str]]]:
             })
         return srv_entries
 
+    def container_sd_config(self, service: str) -> List[Dict[str, Collection[str]]]:
+        """Return <http_sd_config> compatible prometheus config for a container service."""
+        srv_entries = []
+        for dd in self.mgr.cache.get_daemons_by_service(service):
+            assert dd.hostname is not None
+            addr = dd.ip if dd.ip else self.mgr.inventory.get_addr(dd.hostname)
+            if not dd.ports:
+                continue
+            port = dd.ports[0]
+            srv_entries.append({
+                'targets': [build_url(host=addr, port=port).lstrip('/')],
+                'labels': {'instance': dd.hostname}
+            })
+        return srv_entries
+
     @cherrypy.expose(alias='prometheus/rules')
     def get_prometheus_rules(self) -> str:
         """Return currently configured prometheus rules as Yaml."""
diff --git a/src/pybind/mgr/cephadm/tests/test_service_discovery.py b/src/pybind/mgr/cephadm/tests/test_service_discovery.py
@@ -31,6 +31,10 @@ def get_daemons_by_service(self, service_type):
             return [FakeDaemonDescription('1.2.3.4', [9922], 'node0'),
                     FakeDaemonDescription('1.2.3.5', [9922], 'node1')]
 
+        if service_type == 'container.custom-container':
+            return [FakeDaemonDescription('1.2.3.4', [9123], 'node0'),
+                    FakeDaemonDescription('1.2.3.5', [9123], 'node1')]
+
         return [FakeDaemonDescription('1.2.3.4', [9100], 'node0'),
                 FakeDaemonDescription('1.2.3.5', [9200], 'node1')]
 
@@ -224,6 +228,20 @@ def test_get_sd_config_smb(self):
         # check content
         assert cfg[0]['targets'] == ['1.2.3.4:9922']
 
+    def test_get_sd_config_custom_container(self):
+        mgr = FakeMgr()
+        root = Root(mgr, 5000, '0.0.0.0')
+        cfg = root.get_sd_config('container.custom-container')
+
+        # check response structure
+        assert cfg
+        for entry in cfg:
+            assert 'labels' in entry
+            assert 'targets' in entry
+
+        # check content
+        assert cfg[0]['targets'] == ['1.2.3.4:9123']
+
     def test_get_sd_config_invalid_service(self):
         mgr = FakeMgr()
         root = Root(mgr, 5000, '0.0.0.0')
