From 7b6f895146bf439f7b5445914e02c132163fc4fd Mon Sep 17 00:00:00 2001
From: Nicolas Vollmar <nvo@scaling.ch>
Date: Wed, 18 Dec 2024 15:09:57 +0100
Subject: T6953: merges node and frr exporter under prometheus section

---
 data/templates/frr_exporter/frr_exporter.service.j2  | 20 --------------------
 .../templates/node_exporter/node_exporter.service.j2 | 20 --------------------
 data/templates/prometheus/frr_exporter.service.j2    | 20 ++++++++++++++++++++
 data/templates/prometheus/node_exporter.service.j2   | 20 ++++++++++++++++++++
 4 files changed, 40 insertions(+), 40 deletions(-)
 delete mode 100644 data/templates/frr_exporter/frr_exporter.service.j2
 delete mode 100644 data/templates/node_exporter/node_exporter.service.j2
 create mode 100644 data/templates/prometheus/frr_exporter.service.j2
 create mode 100644 data/templates/prometheus/node_exporter.service.j2

(limited to 'data')

diff --git a/data/templates/frr_exporter/frr_exporter.service.j2 b/data/templates/frr_exporter/frr_exporter.service.j2
deleted file mode 100644
index c3892e42b..000000000
--- a/data/templates/frr_exporter/frr_exporter.service.j2
+++ /dev/null
@@ -1,20 +0,0 @@
-{% set vrf_command = 'ip vrf exec ' ~ vrf ~ ' runuser -u frr -- ' if vrf is vyos_defined else '' %}
-[Unit]
-Description=FRR Exporter
-Documentation=https://github.com/tynany/frr_exporter
-After=network.target
-
-[Service]
-{% if vrf is not vyos_defined %}
-User=frr
-{% endif %}
-ExecStart={{ vrf_command }}/usr/sbin/frr_exporter \
-{% if listen_address is vyos_defined %}
-{%     for address in listen_address %}
-        --web.listen-address={{ address }}:{{ port }}
-{%     endfor %}
-{% else %}
-        --web.listen-address=:{{ port }}
-{% endif %}
-[Install]
-WantedBy=multi-user.target
diff --git a/data/templates/node_exporter/node_exporter.service.j2 b/data/templates/node_exporter/node_exporter.service.j2
deleted file mode 100644
index 62e7e6774..000000000
--- a/data/templates/node_exporter/node_exporter.service.j2
+++ /dev/null
@@ -1,20 +0,0 @@
-{% set vrf_command = 'ip vrf exec ' ~ vrf ~ ' runuser -u node_exporter -- ' if vrf is vyos_defined else '' %}
-[Unit]
-Description=Node Exporter
-Documentation=https://github.com/prometheus/node_exporter
-After=network.target
-
-[Service]
-{% if vrf is not vyos_defined %}
-User=node_exporter
-{% endif %}
-ExecStart={{ vrf_command }}/usr/sbin/node_exporter \
-{% if listen_address is vyos_defined %}
-{%     for address in listen_address %}
-        --web.listen-address={{ address }}:{{ port }}
-{%     endfor %}
-{% else %}
-        --web.listen-address=:{{ port }}
-{% endif %}
-[Install]
-WantedBy=multi-user.target
diff --git a/data/templates/prometheus/frr_exporter.service.j2 b/data/templates/prometheus/frr_exporter.service.j2
new file mode 100644
index 000000000..c3892e42b
--- /dev/null
+++ b/data/templates/prometheus/frr_exporter.service.j2
@@ -0,0 +1,20 @@
+{% set vrf_command = 'ip vrf exec ' ~ vrf ~ ' runuser -u frr -- ' if vrf is vyos_defined else '' %}
+[Unit]
+Description=FRR Exporter
+Documentation=https://github.com/tynany/frr_exporter
+After=network.target
+
+[Service]
+{% if vrf is not vyos_defined %}
+User=frr
+{% endif %}
+ExecStart={{ vrf_command }}/usr/sbin/frr_exporter \
+{% if listen_address is vyos_defined %}
+{%     for address in listen_address %}
+        --web.listen-address={{ address }}:{{ port }}
+{%     endfor %}
+{% else %}
+        --web.listen-address=:{{ port }}
+{% endif %}
+[Install]
+WantedBy=multi-user.target
diff --git a/data/templates/prometheus/node_exporter.service.j2 b/data/templates/prometheus/node_exporter.service.j2
new file mode 100644
index 000000000..62e7e6774
--- /dev/null
+++ b/data/templates/prometheus/node_exporter.service.j2
@@ -0,0 +1,20 @@
+{% set vrf_command = 'ip vrf exec ' ~ vrf ~ ' runuser -u node_exporter -- ' if vrf is vyos_defined else '' %}
+[Unit]
+Description=Node Exporter
+Documentation=https://github.com/prometheus/node_exporter
+After=network.target
+
+[Service]
+{% if vrf is not vyos_defined %}
+User=node_exporter
+{% endif %}
+ExecStart={{ vrf_command }}/usr/sbin/node_exporter \
+{% if listen_address is vyos_defined %}
+{%     for address in listen_address %}
+        --web.listen-address={{ address }}:{{ port }}
+{%     endfor %}
+{% else %}
+        --web.listen-address=:{{ port }}
+{% endif %}
+[Install]
+WantedBy=multi-user.target
-- 
cgit v1.2.3