]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
cephadm: Remove duplicated process args in promtail and loki(config.file) 47529/head
authorjinhong.kim <jinhong.kim0@navercorp.com>
Wed, 10 Aug 2022 08:24:22 +0000 (17:24 +0900)
committerjinhong.kim <jinhong.kim0@navercorp.com>
Tue, 16 Aug 2022 00:48:23 +0000 (09:48 +0900)
Signed-off-by: jinhong.kim <jinhong.kim0@navercorp.com>
src/cephadm/cephadm

index ba342991e1b0c0d657a4ad6e29f4606dd1d30b1b..36a28358378812ce513ff4971d816bc048ad1cee 100755 (executable)
@@ -2647,10 +2647,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',