From 9a47d5c3ef94cb09338a1b64d4dc9365d526bb54 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Fri, 24 Sep 2021 15:05:48 +0200
Subject: refactor textfile collector script handling

---
 .../prometheus/exporter/node/tasks/main.yml        | 24 ++++------------------
 .../node/tasks/textfile_collector_script.yml       |  2 +-
 2 files changed, 5 insertions(+), 21 deletions(-)

(limited to 'roles/monitoring/prometheus/exporter/node/tasks')

diff --git a/roles/monitoring/prometheus/exporter/node/tasks/main.yml b/roles/monitoring/prometheus/exporter/node/tasks/main.yml
index 61e385f7..56903a33 100644
--- a/roles/monitoring/prometheus/exporter/node/tasks/main.yml
+++ b/roles/monitoring/prometheus/exporter/node/tasks/main.yml
@@ -2,7 +2,9 @@
   ## TODO: pin version
 - name: install apt packages
   apt:
-    name: prom-exporter-node
+    name:
+    - prom-exporter-node
+    - moreutils
     state: present
 
 - name: create directory for textfile collector
@@ -34,27 +36,9 @@
 
 - name: create directory for textfile collector scripts
   file:
-    path: /usr/local/lib/prometheus-node-exporter
+    path: /usr/local/share/prometheus-node-exporter
     state: directory
 
-- name: install textfile collector script wrapper
-  copy:
-    content: |
-      #!/bin/bash
-
-      if [ -z "$1" ]; then
-        echo "Please specify which collector script to call!"
-        exit 1
-      fi
-      collector="$1"
-
-      set -e
-      rm -f "/var/lib/prometheus-node-exporter/textfile-collector/$collector.prom".*
-      "/usr/local/lib/prometheus-node-exporter/$collector" > "/var/lib/prometheus-node-exporter/textfile-collector/$collector.prom.$$"
-      mv "/var/lib/prometheus-node-exporter/textfile-collector/$collector.prom.$$" "/var/lib/prometheus-node-exporter/textfile-collector/$collector.prom"
-    dest: /usr/local/lib/prometheus-node-exporter/run-collector
-    mode: 0755
-
 - name: install the apt textfile collector script
   when: ansible_pkg_mgr == "apt"
   vars:
diff --git a/roles/monitoring/prometheus/exporter/node/tasks/textfile_collector_script.yml b/roles/monitoring/prometheus/exporter/node/tasks/textfile_collector_script.yml
index 1a39bb4c..5c068fe7 100644
--- a/roles/monitoring/prometheus/exporter/node/tasks/textfile_collector_script.yml
+++ b/roles/monitoring/prometheus/exporter/node/tasks/textfile_collector_script.yml
@@ -2,7 +2,7 @@
 - name: install the collector script
   copy:
     src: "{{ textfile_collector_name }}"
-    dest: "/usr/local/lib/prometheus-node-exporter/{{ textfile_collector_name }}"
+    dest: "/usr/local/share/prometheus-node-exporter/{{ textfile_collector_name }}"
     mode: 0755
 
 - name: install systemd service units
-- 
cgit v1.2.3