From: Ian Kelling <iank@fsf.org>
Date: Sat, 8 Apr 2023 03:43:37 +0000 (-0400)
Subject: fixes
X-Git-Url: https://iankelling.org/git/?p=buildscripts;a=commitdiff_plain;h=b248f5ddb1971417a4a67c428efed3495b355187

fixes
---

diff --git a/prom-node-exporter b/prom-node-exporter
index d46a4bf..61fe700 100755
--- a/prom-node-exporter
+++ b/prom-node-exporter
@@ -127,7 +127,9 @@ i /etc/default/prometheus-node-exporter <<EOF
 # Due to shell scaping, to pass backslashes for regexes, you need to double
 # them (\\d for \d). If running under systemd, you need to double them again
 # (\\\\d to mean \d), and escape newlines too.
-ARGS="--web.listen-address=${listen_address}:9100 --collector.textfile.directory=/var/lib/prometheus/node-exporter"
+
+# sometime before 1.5 systemd was a default collector
+ARGS="--web.listen-address=${listen_address}:9100 --collector.textfile.directory=/var/lib/prometheus/node-exporter --collector.systemd"
 # to see all possible args, run with --help
 EOF
 
@@ -158,7 +160,7 @@ if [[ -d /etc/systemd/system ]]; then # we are using systemd
     fi
 
 
-    i /etc/systemd/system/prometheus.service.d/override.conf <<'EOF'
+    i /etc/systemd/system/prometheus-node-exporter.service.d/override.conf <<'EOF'
 [Unit]
 # needed to continually restart
 StartLimitIntervalSec=0
@@ -170,10 +172,10 @@ RestartSec=600
 
 # empty signifies to replace the existing value
 ExecStart=
-ExecStart=/usr/local/bin/prometheus $ARGS
+ExecStart=/usr/local/bin/prometheus-node-exporter $ARGS
 EOF
   else # we dont have the distro package installed
-    i /etc/systemd/system/prometheus.service <<'EOF'
+    i /etc/systemd/system/prometheus-node-exporter.service <<'EOF'
 [Unit]
 Description=Prometheus exporter for machine metrics
 Documentation=https://github.com/prometheus/node_exporter