From 7f596068eb9b3791a94ef33f87a042c0034660ad Mon Sep 17 00:00:00 2001 From: Aashish Sharma Date: Wed, 2 Mar 2022 16:53:02 +0530 Subject: [PATCH] mgr/cephadm: fix cephadm errors Signed-off-by: Aashish Sharma (cherry picked from commit 46902381306fd31a054f58c49af7f817833f8cc4) --- src/cephadm/cephadm | 8 -------- src/pybind/mgr/cephadm/module.py | 2 +- src/pybind/mgr/cephadm/utils.py | 2 +- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm index fd84ec4b9936a..a16cc4332071b 100755 --- a/src/cephadm/cephadm +++ b/src/cephadm/cephadm @@ -620,14 +620,6 @@ class Monitoring(object): if code == 0: break cmd = 'alertmanager' # reset cmd for version extraction - elif daemon_type == 'loki': - _, err, code = call(ctx, [ - ctx.container_engine.path, 'exec', container_id, cmd, '--version' - ], verbosity=CallVerbosity.DEBUG) - if code == 0: - ver = err.index('version') - brnch = err.index('branch') - version = (err[ver + 7:brnch - 2]) else: _, err, code = call(ctx, [ ctx.container_engine.path, 'exec', container_id, cmd, '--version' diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py index 3b58d9251010c..461dc415eff8d 100644 --- a/src/pybind/mgr/cephadm/module.py +++ b/src/pybind/mgr/cephadm/module.py @@ -2487,7 +2487,7 @@ Then run the following: 'prometheus': PlacementSpec(count=1), 'node-exporter': PlacementSpec(host_pattern='*'), 'loki': PlacementSpec(count=1), - 'promtail': PlacementSpec(count=1), + 'promtail': PlacementSpec(host_pattern='*'), 'crash': PlacementSpec(host_pattern='*'), 'container': PlacementSpec(count=1), 'snmp-gateway': PlacementSpec(count=1), diff --git a/src/pybind/mgr/cephadm/utils.py b/src/pybind/mgr/cephadm/utils.py index 99e1683ed0376..94b9162affa7c 100644 --- a/src/pybind/mgr/cephadm/utils.py +++ b/src/pybind/mgr/cephadm/utils.py @@ -23,7 +23,7 @@ class CephadmNoImage(Enum): # NOTE: order important here as these are used for upgrade order CEPH_TYPES = ['mgr', 'mon', 'crash', 'osd', 'mds', 'rgw', 'rbd-mirror', 'cephfs-mirror'] GATEWAY_TYPES = ['iscsi', 'nfs'] -MONITORING_STACK_TYPES = ['node-exporter', 'prometheus', 'alertmanager', 'grafana'] +MONITORING_STACK_TYPES = ['node-exporter', 'prometheus', 'alertmanager', 'grafana', 'loki', 'promtail'] CEPH_UPGRADE_ORDER = CEPH_TYPES + GATEWAY_TYPES + MONITORING_STACK_TYPES -- 2.39.5