From f9321ebbb42319aa47a0bac2d29790fa262ca4e9 Mon Sep 17 00:00:00 2001 From: Sebastian Wagner Date: Fri, 8 May 2020 12:59:37 +0200 Subject: [PATCH] mgr/cephadm: node-exporter is not a ceph service Fixes: https://tracker.ceph.com/issues/45427 Signed-off-by: Sebastian Wagner --- src/pybind/mgr/cephadm/module.py | 3 +++ src/pybind/mgr/cephadm/services/monitoring.py | 3 +++ 2 files changed, 6 insertions(+) diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py index 70922599cb2..a28c2baee6c 100644 --- a/src/pybind/mgr/cephadm/module.py +++ b/src/pybind/mgr/cephadm/module.py @@ -1846,6 +1846,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 27a165ba4bb..242afdc390f 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 {}, [] -- 2.39.5