T973: remove irrelevant standard values

vyos · Oct 3, 2024 · 4903b66 · 4903b66
1 parent a0c15a1
commit 4903b66
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 10 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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,8 +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__':