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 --- src/conf_mode/service_monitoring_node-exporter.py | 104 ++++++++++++++++++++++ 1 file changed, 104 insertions(+) create mode 100755 src/conf_mode/service_monitoring_node-exporter.py (limited to 'src') diff --git a/src/conf_mode/service_monitoring_node-exporter.py b/src/conf_mode/service_monitoring_node-exporter.py new file mode 100755 index 000000000..e8d7c15b4 --- /dev/null +++ b/src/conf_mode/service_monitoring_node-exporter.py @@ -0,0 +1,104 @@ +#!/usr/bin/env python3 +# +# Copyright (C) 2021-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 os + +from sys import exit + +from vyos.config import Config +from vyos.configdict import is_node_changed +from vyos.configverify import verify_vrf +from vyos.template import render +from vyos.utils.process import call +from vyos import ConfigError +from vyos import airbag + + +airbag.enable() + +service_file = '/etc/systemd/system/node_exporter.service' +systemd_service = 'node_exporter.service' + + +def get_config(config=None): + if config: + conf = config + else: + conf = Config() + base = ['service', 'monitoring', 'node-exporter'] + if not conf.exists(base): + return None + + config_data = conf.get_config_dict( + base, key_mangling=('-', '_'), get_first_key=True + ) + config_data = conf.merge_defaults(config_data, recursive=True) + + tmp = is_node_changed(conf, base + ['vrf']) + if tmp: + config_data.update({'restart_required': {}}) + + return config_data + + +def verify(config_data): + # bail out early - looks like removal from running config + if not config_data: + return None + + verify_vrf(config_data) + return None + + +def generate(config_data): + if not config_data: + # Delete systemd files + if os.path.isfile(service_file): + os.unlink(service_file) + return None + + # Render node_exporter service_file + render(service_file, 'node_exporter/node_exporter.service.j2', config_data) + return None + + +def apply(config_data): + # Reload systemd manager configuration + call('systemctl daemon-reload') + if not config_data: + call(f'systemctl stop {systemd_service}') + return + + # we need to restart the service if e.g. the VRF name changed + systemd_action = 'reload-or-restart' + if 'restart_required' in config_data: + systemd_action = 'restart' + + call(f'systemctl {systemd_action} {systemd_service}') + + # Telegraf include custom rsyslog config changes + call('systemctl reload-or-restart rsyslog') + + +if __name__ == '__main__': + try: + c = get_config() + verify(c) + generate(c) + apply(c) + except ConfigError as e: + print(e) + exit(1) -- 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 'src') 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