From 98fcc908347a22bde19d29eef4af9c72fc1dabe9 Mon Sep 17 00:00:00 2001 From: Tim Serong Date: Mon, 26 Jul 2021 21:05:50 +1000 Subject: [PATCH] monitoring: put node_exporter ARGS all on one line (bsc#1188486) There's a problem in /bin/fillup, where it sometimes doesn't parse multiline strings properly in sysconfig files. This results in corruption of /etc/sysconfig/prometheus-node_exporter when the golang-github-prometheus-node_exporter package is updated. We can work around this by putting all the arguments on one line. See https://bugzilla.opensuse.org/show_bug.cgi?id=1153280 and https://github.com/openSUSE/fillup/issues/1 for the underyling issue. Fixes: https://bugzilla.suse.com/show_bug.cgi?id=1188486 Signed-off-by: Tim Serong --- .../ceph/monitoring/prometheus/exporters/node_exporter.sls | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/srv/salt/ceph/monitoring/prometheus/exporters/node_exporter.sls b/srv/salt/ceph/monitoring/prometheus/exporters/node_exporter.sls index e7210fd17..dbd4ca258 100644 --- a/srv/salt/ceph/monitoring/prometheus/exporters/node_exporter.sls +++ b/srv/salt/ceph/monitoring/prometheus/exporters/node_exporter.sls @@ -29,10 +29,7 @@ set node exporter service args: - name: /etc/sysconfig/prometheus-node_exporter - mode: 644 - contents: | - ARGS="--collector.diskstats.ignored-devices=^(ram|loop|fd)\d+$ \ - --collector.filesystem.ignored-mount-points=^/(sys|proc|dev|run)($|/) \ - --collector.textfile.directory=/var/lib/prometheus/node-exporter \ - --collector.bonding --collector.ntp" + ARGS="--collector.diskstats.ignored-devices=^(ram|loop|fd)\d+$ --collector.filesystem.ignored-mount-points=^/(sys|proc|dev|run)($|/) --collector.textfile.directory=/var/lib/prometheus/node-exporter --collector.bonding --collector.ntp" {% if grains.get('os', '') == 'CentOS' %}