From 5331574c85febd243afa415c2a1fad9ad3c63e59 Mon Sep 17 00:00:00 2001
From: Ian Kelling <iank@fsf.org>
Date: Fri, 31 Mar 2023 17:24:09 -0400
Subject: [PATCH] mergcam merging was buggy, fix by using new exporter

---
 sysd-prom-fail         | 25 +++++--------------------
 sysd-prom-fail-install |  6 ++++--
 2 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/sysd-prom-fail b/sysd-prom-fail
index ea84f74..0781ff4 100755
--- a/sysd-prom-fail
+++ b/sysd-prom-fail
@@ -13,6 +13,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+
+# requires 1.4.0 to run with multiple units due to bug before that:
+# https://github.com/prometheus/node_exporter/pull/2475
+
 set -eE -o pipefail
 trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
 
@@ -33,13 +37,7 @@ if [[ ! -e $dir  ]]; then
   exit 0
 fi
 
-# we have to merge files due to this:
-# https://github.com/prometheus/node_exporter/issues/1885
-# or else we could put the label in the metric name, but that
-# is a bad practice.
-# Note, i found this https://github.com/hansmi/prometheus-textformat-merge
-# but it seems overkill.
-f=$dir/${ser_name}-result-fail.premerge
+f=$dir/${ser_name}-result.prom
 ftmp=$f.$$
 
 
@@ -66,17 +64,4 @@ fi
 if $write_count; then
   printf 'node_systemd_unit_result_fail_count{name="%s"} %s\n' "$ser_name" "$count" >$ftmp
   mv $ftmp $f
-  finaltmp=$dir/sysd-result-fail.prom.$$
-  # i had a minor problem that multiple of these scripts executed at the same time, and ended up with
-  # multiple instances of the same file
-  # ls -lai
-  # ...
-  # 3896242 -rw-r--r-- 1 root       root         439 Apr  4 00:02 sysd-result-fail.prom
-  # 3896242 -rw-r--r-- 1 root       root         439 Apr  4 00:02 sysd-result-fail.prom
-  # 3896242 -rw-r--r-- 1 root       root         439 Apr  4 00:02 sysd-result-fail.prom
-  # this seems harmless, https://www.spinics.net/lists/linux-btrfs/msg111245.html
-  # however, lets do a bit to avoid it: sleep a random amount of time from 0-.5 seconds.
-  sleep 0.$(( RANDOM % 500 ))
-  cat $dir/*-result-fail.premerge >$finaltmp
-  mv $finaltmp $dir/sysd-result-fail.prom
 fi
diff --git a/sysd-prom-fail-install b/sysd-prom-fail-install
index ad98456..40eb336 100755
--- a/sysd-prom-fail-install
+++ b/sysd-prom-fail-install
@@ -23,10 +23,10 @@ ser_name=$1
 
 mkdir -p /var/lib/prometheus/node-exporter
 
-f=/var/local/sysd-prom-fail/${ser_name}-result-fail.prom
+f=/var/local/sysd-prom-fail/${ser_name}-result.prom
 
 
-if [[ ! -s /var/lib/prometheus/node-exporter/${ser_name}-result-fail.premerge ]]; then
+if [[ ! -s $f ]]; then
   SERVICE_RESULT=success /usr/local/bin/sysd-prom-fail $ser_name
 fi
 
@@ -48,3 +48,5 @@ if [[ $out ]]; then
     systemctl restart $ser_name ||:
   fi
 fi
+
+# todo: make uninstall script
-- 
2.30.2