RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-22 10:37:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #47529 from hookak/container-args

Browse Source 
cephadm: Remove duplicated process args in promtail and loki

Reviewed-by: Adam King <adking@redhat.com>
This commit is contained in:
Adam King 2022-08-16 14:32:03 -04:00 committed by GitHub
commit efcab49ea2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/cephadm/cephadm
View File

@ -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',