From e0975b8d27605bc327188a0d33676156aea237be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Sun, 6 Jun 2021 08:44:43 +0200 Subject: [PATCH] rename entrouvert-exporter as system-exporter (but keep writing to entrouvert.prom for compatibility) --- debian/prometheus-entrouvert-exporter.install | 2 +- ...s-entrouvert-exporter.prometheus-system-exporter.service | 6 ++++++ ...us-entrouvert-exporter.prometheus-system-exporter.timer} | 2 +- debian/prometheus-entrouvert-exporter.service | 6 ------ debian/rules | 3 +++ ...entrouvert-exporter.py => prometheus-system-exporter.py} | 0 6 files changed, 11 insertions(+), 8 deletions(-) create mode 100644 debian/prometheus-entrouvert-exporter.prometheus-system-exporter.service rename debian/{prometheus-entrouvert-exporter.timer => prometheus-entrouvert-exporter.prometheus-system-exporter.timer} (57%) delete mode 100644 debian/prometheus-entrouvert-exporter.service rename prometheus-entrouvert-exporter/{prometheus-entrouvert-exporter.py => prometheus-system-exporter.py} (100%) diff --git a/debian/prometheus-entrouvert-exporter.install b/debian/prometheus-entrouvert-exporter.install index 919ed87..5722229 100644 --- a/debian/prometheus-entrouvert-exporter.install +++ b/debian/prometheus-entrouvert-exporter.install @@ -1 +1 @@ -prometheus-entrouvert-exporter/prometheus-entrouvert-exporter.py usr/bin +prometheus-entrouvert-exporter/prometheus-system-exporter.py usr/bin diff --git a/debian/prometheus-entrouvert-exporter.prometheus-system-exporter.service b/debian/prometheus-entrouvert-exporter.prometheus-system-exporter.service new file mode 100644 index 0000000..79ce05f --- /dev/null +++ b/debian/prometheus-entrouvert-exporter.prometheus-system-exporter.service @@ -0,0 +1,6 @@ +[Unit] +Description=Collect system metrics + +[Service] +Type=oneshot +ExecStart=/bin/bash -c "/usr/bin/prometheus-system-exporter.py | sponge /var/lib/prometheus/node-exporter/entrouvert.prom" diff --git a/debian/prometheus-entrouvert-exporter.timer b/debian/prometheus-entrouvert-exporter.prometheus-system-exporter.timer similarity index 57% rename from debian/prometheus-entrouvert-exporter.timer rename to debian/prometheus-entrouvert-exporter.prometheus-system-exporter.timer index f8ccdd1..8b81db0 100644 --- a/debian/prometheus-entrouvert-exporter.timer +++ b/debian/prometheus-entrouvert-exporter.prometheus-system-exporter.timer @@ -1,5 +1,5 @@ [Unit] -Description=Run entrouvert metrics collection every 15 minutes +Description=Run system metrics collection every 15 minutes [Timer] OnBootSec=0 diff --git a/debian/prometheus-entrouvert-exporter.service b/debian/prometheus-entrouvert-exporter.service deleted file mode 100644 index 0d053b3..0000000 --- a/debian/prometheus-entrouvert-exporter.service +++ /dev/null @@ -1,6 +0,0 @@ -[Unit] -Description=Collect Entrouvert metrics - -[Service] -Type=oneshot -ExecStart=/bin/bash -c "/usr/bin/prometheus-entrouvert-exporter.py | sponge /var/lib/prometheus/node-exporter/entrouvert.prom" diff --git a/debian/rules b/debian/rules index f9948df..8b0f425 100755 --- a/debian/rules +++ b/debian/rules @@ -6,3 +6,6 @@ override_dh_auto_build: dh_auto_build cd sysadmin-doc; make html + +override_dh_installsystemd: + dh_installsystemd --name=prometheus-system-exporter diff --git a/prometheus-entrouvert-exporter/prometheus-entrouvert-exporter.py b/prometheus-entrouvert-exporter/prometheus-system-exporter.py similarity index 100% rename from prometheus-entrouvert-exporter/prometheus-entrouvert-exporter.py rename to prometheus-entrouvert-exporter/prometheus-system-exporter.py