From a0c15a159e54cb1b6abba7a0a6a0a793a53915d0 Mon Sep 17 00:00:00 2001
From: rebortg <github@ghlr.de>
Date: Wed, 11 Sep 2024 14:15:07 +0200
Subject: T973: add basic node_exporter implementation

---
 .../service_monitoring_node_exporter.xml.in        | 28 ++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 interface-definitions/service_monitoring_node_exporter.xml.in

(limited to 'interface-definitions')

diff --git a/interface-definitions/service_monitoring_node_exporter.xml.in b/interface-definitions/service_monitoring_node_exporter.xml.in
new file mode 100644
index 000000000..ee6d06d6d
--- /dev/null
+++ b/interface-definitions/service_monitoring_node_exporter.xml.in
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<interfaceDefinition>
+  <node name="service">
+    <children>
+      <node name="monitoring">
+        <children>
+          <node name="node-exporter" owner="${vyos_conf_scripts_dir}/service_monitoring_node-exporter.py">
+            <properties>
+              <help>Prometheus exporter for hardware and operating system metrics</help>
+              <priority>1280</priority>
+            </properties>
+            <children>
+              #include <include/listen-address.xml.i>
+              <leafNode name="listen-address">
+                <defaultValue>0.0.0.0</defaultValue>
+              </leafNode>
+              #include <include/port-number.xml.i>
+              <leafNode name="port">
+                <defaultValue>9100</defaultValue>
+              </leafNode>
+              #include <include/interface/vrf.xml.i>
+            </children>
+          </node>
+        </children>
+      </node>
+    </children>
+  </node>
+</interfaceDefinition>
-- 
cgit v1.2.3


From 1749c3a99b88c8376b505d0d776cc9b4d5f167cd Mon Sep 17 00:00:00 2001
From: rebortg <github@ghlr.de>
Date: Mon, 30 Sep 2024 22:31:16 +0200
Subject: T973: remove irrelevant standard values

---
 data/templates/node_exporter/node_exporter.service.j2          | 9 ++++++---
 interface-definitions/service_monitoring_node_exporter.xml.in  | 3 ---
 smoketest/scripts/cli/test_service_monitoring_node-exporter.py | 2 +-
 src/conf_mode/service_monitoring_node-exporter.py              | 5 +----
 4 files changed, 8 insertions(+), 11 deletions(-)

(limited to 'interface-definitions')

diff --git a/data/templates/node_exporter/node_exporter.service.j2 b/data/templates/node_exporter/node_exporter.service.j2
index 01dad5aa2..62e7e6774 100644
--- a/data/templates/node_exporter/node_exporter.service.j2
+++ b/data/templates/node_exporter/node_exporter.service.j2
@@ -9,9 +9,12 @@ After=network.target
 User=node_exporter
 {% endif %}
 ExecStart={{ vrf_command }}/usr/sbin/node_exporter \
-{% for address in listen_address %}
+{% if listen_address is vyos_defined %}
+{%     for address in listen_address %}
         --web.listen-address={{ address }}:{{ port }}
-{% endfor %}
-
+{%     endfor %}
+{% else %}
+        --web.listen-address=:{{ port }}
+{% endif %}
 [Install]
 WantedBy=multi-user.target
diff --git a/interface-definitions/service_monitoring_node_exporter.xml.in b/interface-definitions/service_monitoring_node_exporter.xml.in
index ee6d06d6d..a11d2304f 100644
--- a/interface-definitions/service_monitoring_node_exporter.xml.in
+++ b/interface-definitions/service_monitoring_node_exporter.xml.in
@@ -11,9 +11,6 @@
             </properties>
             <children>
               #include <include/listen-address.xml.i>
-              <leafNode name="listen-address">
-                <defaultValue>0.0.0.0</defaultValue>
-              </leafNode>
               #include <include/port-number.xml.i>
               <leafNode name="port">
                 <defaultValue>9100</defaultValue>
diff --git a/smoketest/scripts/cli/test_service_monitoring_node-exporter.py b/smoketest/scripts/cli/test_service_monitoring_node-exporter.py
index 6b96e3130..e18a3f7a2 100755
--- a/smoketest/scripts/cli/test_service_monitoring_node-exporter.py
+++ b/smoketest/scripts/cli/test_service_monitoring_node-exporter.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (C) 2020-2024 VyOS maintainers and contributors
+# Copyright (C) 2024 VyOS maintainers and contributors
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 2 or later as
diff --git a/src/conf_mode/service_monitoring_node-exporter.py b/src/conf_mode/service_monitoring_node-exporter.py
index e8d7c15b4..db34bb5d0 100755
--- a/src/conf_mode/service_monitoring_node-exporter.py
+++ b/src/conf_mode/service_monitoring_node-exporter.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (C) 2021-2024 VyOS maintainers and contributors
+# Copyright (C) 2024 VyOS maintainers and contributors
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 2 or later as
@@ -89,9 +89,6 @@ def apply(config_data):
 
     call(f'systemctl {systemd_action} {systemd_service}')
 
-    # Telegraf include custom rsyslog config changes
-    call('systemctl reload-or-restart rsyslog')
-
 
 if __name__ == '__main__':
     try:
-- 
cgit v1.2.3