diff options
| author | Daniil Baturin <daniil@vyos.io> | 2025-05-20 16:13:29 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-05-20 16:13:29 +0100 |
| commit | 792094088f39c1e87c7755bf0a49721e451c58ac (patch) | |
| tree | 45d8bc5cd9ed8a73f7837cf5e9070e1f8f7d4f37 /src/conf_mode/service_monitoring_prometheus.py | |
| parent | 19b32d22b60df9d9389f126d1979391351e1b4d3 (diff) | |
| parent | 5dd5e74ef8206546ab69839277c3deb635197f7c (diff) | |
| download | vyos-1x-792094088f39c1e87c7755bf0a49721e451c58ac.tar.gz vyos-1x-792094088f39c1e87c7755bf0a49721e451c58ac.zip | |
Merge pull request #4498 from opswill/current
prometheus: T7435: Ensure only configured exporters are started
Diffstat (limited to 'src/conf_mode/service_monitoring_prometheus.py')
| -rwxr-xr-x | src/conf_mode/service_monitoring_prometheus.py | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/src/conf_mode/service_monitoring_prometheus.py b/src/conf_mode/service_monitoring_prometheus.py index 9a07d8593..f55b09f6c 100755 --- a/src/conf_mode/service_monitoring_prometheus.py +++ b/src/conf_mode/service_monitoring_prometheus.py @@ -48,9 +48,21 @@ def get_config(config=None): if not conf.exists(base): return None - monitoring = conf.get_config_dict( - base, key_mangling=('-', '_'), get_first_key=True, with_recursive_defaults=True - ) + monitoring = {} + exporters = { + 'node_exporter': base + ['node-exporter'], + 'frr_exporter': base + ['frr-exporter'], + 'blackbox_exporter': base + ['blackbox-exporter'], + } + + for exporter_name, exporter_base in exporters.items(): + if conf.exists(exporter_base): + monitoring[exporter_name] = conf.get_config_dict( + exporter_base, + key_mangling=('-', '_'), + get_first_key=True, + with_recursive_defaults=True, + ) tmp = is_node_changed(conf, base + ['node-exporter', 'vrf']) if tmp: |