From: jinhong.kim <jinhong.kim0@navercorp.com>
Date: Wed, 10 Aug 2022 08:24:22 +0000 (+0900)
Subject: cephadm: Remove duplicated process args in promtail and loki(config.file)
X-Git-Tag: v17.2.4~18^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=469906f496066ebdcce138eb7e8f32c927f25802;p=ceph.git

cephadm: Remove duplicated process args in promtail and loki(config.file)

Signed-off-by: jinhong.kim <jinhong.kim0@navercorp.com>
(cherry picked from commit 6141d207cb0ab8a3928363d8c8e27fae8149082a)
---

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 3d540f4edd35..e620ae7bff03 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -2604,10 +2604,8 @@ def get_daemon_args(ctx, fsid, daemon_type, daemon_id):
                 r += ['--cluster.peer={}'.format(peer)]
             # some alertmanager, by default, look elsewhere for a config
             r += ['--config.file=/etc/alertmanager/alertmanager.yml']
-        if daemon_type == 'loki':
-            r += ['--config.file=/etc/loki/loki.yml']
         if daemon_type == 'promtail':
-            r += ['--config.file=/etc/promtail/promtail.yml']
+            r += ['--config.expand-env']
         if daemon_type == 'node-exporter':
             r += ['--path.procfs=/host/proc',
                   '--path.sysfs=/host/sys',