summaryrefslogtreecommitdiff
path: root/src/conf_mode
diff options
context:
space:
mode:
authorNicolas Vollmar <nvo@scaling.ch>2024-12-20 05:57:31 +0100
committerNicolas Vollmar <nvo@scaling.ch>2024-12-20 05:58:46 +0100
commit5a44b71015e0e30e056815293b2eb6359d31d83a (patch)
treec63ff6e894cd657eb362397f9731a6a81eaa0e8d /src/conf_mode
parent8092236acc138f21aaea32df706a713f07ed88b7 (diff)
downloadvyos-1x-5a44b71015e0e30e056815293b2eb6359d31d83a.tar.gz
vyos-1x-5a44b71015e0e30e056815293b2eb6359d31d83a.zip
T6953: simplify config handling
Diffstat (limited to 'src/conf_mode')
-rwxr-xr-xsrc/conf_mode/service_monitoring_prometheus.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/conf_mode/service_monitoring_prometheus.py b/src/conf_mode/service_monitoring_prometheus.py
index 18b148ef0..e0a9fc4ef 100755
--- a/src/conf_mode/service_monitoring_prometheus.py
+++ b/src/conf_mode/service_monitoring_prometheus.py
@@ -45,8 +45,9 @@ def get_config(config=None):
if not conf.exists(base):
return None
- monitoring = conf.get_config_dict(base, key_mangling=('-', '_'), get_first_key=True)
- monitoring = conf.merge_defaults(monitoring, recursive=True)
+ monitoring = conf.get_config_dict(
+ base, key_mangling=('-', '_'), get_first_key=True, with_recursive_defaults=True
+ )
tmp = is_node_changed(conf, base + ['node-exporter', 'vrf'])
if tmp: