From a0c15a159e54cb1b6abba7a0a6a0a793a53915d0 Mon Sep 17 00:00:00 2001 From: rebortg Date: Wed, 11 Sep 2024 14:15:07 +0200 Subject: T973: add basic node_exporter implementation --- .../cli/test_service_monitoring_node-exporter.py | 64 ++++++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100755 smoketest/scripts/cli/test_service_monitoring_node-exporter.py (limited to 'smoketest') diff --git a/smoketest/scripts/cli/test_service_monitoring_node-exporter.py b/smoketest/scripts/cli/test_service_monitoring_node-exporter.py new file mode 100755 index 000000000..6b96e3130 --- /dev/null +++ b/smoketest/scripts/cli/test_service_monitoring_node-exporter.py @@ -0,0 +1,64 @@ +#!/usr/bin/env python3 +# +# Copyright (C) 2020-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 +# published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +import unittest + +from base_vyostest_shim import VyOSUnitTestSHIM +from vyos.utils.process import process_named_running +from vyos.utils.file import read_file + +PROCESS_NAME = 'node_exporter' +base_path = ['service', 'monitoring', 'node-exporter'] +service_file = '/etc/systemd/system/node_exporter.service' +listen_if = 'dum3421' +listen_ip = '192.0.2.1' + + +class TestMonitoringNodeExporter(VyOSUnitTestSHIM.TestCase): + @classmethod + def setUpClass(cls): + # call base-classes classmethod + super(TestMonitoringNodeExporter, cls).setUpClass() + # create a test interfaces + cls.cli_set( + cls, ['interfaces', 'dummy', listen_if, 'address', listen_ip + '/32'] + ) + + @classmethod + def tearDownClass(cls): + cls.cli_delete(cls, ['interfaces', 'dummy', listen_if]) + super(TestMonitoringNodeExporter, cls).tearDownClass() + + def tearDown(self): + self.cli_delete(base_path) + self.cli_commit() + self.assertFalse(process_named_running(PROCESS_NAME)) + + def test_01_basic_config(self): + self.cli_set(base_path + ['listen-address', listen_ip]) + + # commit changes + self.cli_commit() + + file_content = read_file(service_file) + self.assertIn(f'{listen_ip}:9100', file_content) + + # Check for running process + self.assertTrue(process_named_running(PROCESS_NAME)) + + +if __name__ == '__main__': + unittest.main(verbosity=2) -- cgit v1.2.3 From 1749c3a99b88c8376b505d0d776cc9b4d5f167cd Mon Sep 17 00:00:00 2001 From: rebortg 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 'smoketest') 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 @@ #include - - 0.0.0.0 - #include 9100 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