From: Sebastian Wagner <sebastian.wagner@suse.com>
Date: Fri, 8 May 2020 10:59:37 +0000 (+0200)
Subject: mgr/cephadm: node-exporter is not a ceph service
X-Git-Tag: v15.2.4~73^2~44
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2d9021e2105fe3d590c309087c01c82007fab820;p=ceph.git

mgr/cephadm: node-exporter is not a ceph service

Fixes: https://tracker.ceph.com/issues/45427
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit f9321ebbb42319aa47a0bac2d29790fa262ca4e9)
---

diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py
index 168a564e9e61..6fd1b3b60851 100644
--- a/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@ -1581,6 +1581,9 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule):
         elif daemon_type == 'alertmanager':
             cephadm_config, deps = self.alertmanager_service.generate_config()
             extra_args.extend(['--config-json', '-'])
+        elif daemon_type == 'node-exporter':
+            cephadm_config, deps = self.node_exporter_service.generate_config()
+            extra_args.extend(['--config-json', '-'])
         else:
             # Ceph.daemons (mon, mgr, mds, osd, etc)
             cephadm_config = self._get_config_and_keyring(
diff --git a/src/pybind/mgr/cephadm/services/monitoring.py b/src/pybind/mgr/cephadm/services/monitoring.py
index 27a165ba4bb4..242afdc390fe 100644
--- a/src/pybind/mgr/cephadm/services/monitoring.py
+++ b/src/pybind/mgr/cephadm/services/monitoring.py
@@ -273,3 +273,6 @@ scrape_configs:
 class NodeExporterService(CephadmService):
     def create(self, daemon_id, host) -> str:
         return self.mgr._create_daemon('node-exporter', daemon_id, host)
+
+    def generate_config(self) -> Tuple[Dict[str, Any], List[str]]:
+        return {}, []