diff options
author | John Estabrook <jestabro@vyos.io> | 2023-08-06 18:32:29 -0500 |
---|---|---|
committer | John Estabrook <jestabro@vyos.io> | 2023-08-07 14:46:42 -0500 |
commit | a170d52f5725608d4b0ac7960fcbad50826bdbdf (patch) | |
tree | c7dd2bbda32eb8a6535f43ab22778466d1724dfa | |
parent | 66092eb38fff2ca87cb591578948d4f130a6797f (diff) | |
download | vyos-1x-a170d52f5725608d4b0ac7960fcbad50826bdbdf.tar.gz vyos-1x-a170d52f5725608d4b0ac7960fcbad50826bdbdf.zip |
T5434: use merge_defaults in service_monitoring_telegraf.py
-rwxr-xr-x | src/conf_mode/service_monitoring_telegraf.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/conf_mode/service_monitoring_telegraf.py b/src/conf_mode/service_monitoring_telegraf.py index 0269bedd9..40eb13e23 100755 --- a/src/conf_mode/service_monitoring_telegraf.py +++ b/src/conf_mode/service_monitoring_telegraf.py @@ -22,7 +22,6 @@ from sys import exit from shutil import rmtree from vyos.config import Config -from vyos.configdict import dict_merge from vyos.configdict import is_node_changed from vyos.configverify import verify_vrf from vyos.ifconfig import Section @@ -30,7 +29,6 @@ from vyos.template import render from vyos.utils.process import call from vyos.utils.permission import chown from vyos.utils.process import cmd -from vyos.xml import defaults from vyos import ConfigError from vyos import airbag airbag.enable() @@ -83,8 +81,7 @@ def get_config(config=None): # We have gathered the dict representation of the CLI, but there are default # options which we need to update into the dictionary retrived. - default_values = defaults(base) - monitoring = dict_merge(default_values, monitoring) + monitoring = conf.merge_defaults(monitoring, recursive=True) monitoring['custom_scripts_dir'] = custom_scripts_dir monitoring['hostname'] = get_hostname() |