3 files changed, 7 insertions, 7 deletions
diff --git a/data/templates/dhcp-server/dhcpd.conf.tmpl b/data/templates/dhcp-server/dhcpd.conf.tmpl
index dbd864b5e..0f0c622d4 100644
--- a/data/templates/dhcp-server/dhcpd.conf.tmpl
+++ b/data/templates/dhcp-server/dhcpd.conf.tmpl
@@ -62,7 +62,7 @@ subnet {{ address | network_from_ipv4 }} netmask {{ address | netmask_from_ipv4
 # Shared network configration(s)
 {% if shared_network_name is defined and shared_network_name is not none %}
 {%   for network, network_config in shared_network_name.items() if network_config.disable is not defined %}
-shared-network {{ network | replace('_','-') }} {
+shared-network {{ network }} {
 {%     if network_config.authoritative is defined %}
     authoritative;
 {%     endif %}
@@ -212,7 +212,7 @@ shared-network {{ network | replace('_','-') }} {
 {%       endfor %}
 {%     endif %}
     on commit {
-        set shared-networkname = "{{ network | replace('_','-') }}";
+        set shared-networkname = "{{ network }}";
 {%     if hostfile_update is defined %}
         set ClientIp = binary-to-ascii(10, 8, ".", leased-address);
         set ClientMac = binary-to-ascii(16, 8, ":", substring(hardware, 1, 6));
diff --git a/data/templates/dhcp-server/dhcpdv6.conf.tmpl b/data/templates/dhcp-server/dhcpdv6.conf.tmpl
index 45d629928..d5f277463 100644
--- a/data/templates/dhcp-server/dhcpdv6.conf.tmpl
+++ b/data/templates/dhcp-server/dhcpdv6.conf.tmpl
@@ -15,7 +15,7 @@ option dhcp6.name-servers {{ global_parameters.name_server | join(', ') }};
 # Shared network configration(s)
 {% if shared_network_name is defined and shared_network_name is not none %}
 {%   for network, network_config in shared_network_name.items() if network_config.disable is not defined %}
-shared-network {{ network | replace('_','-') }} {
+shared-network {{ network }} {
 {%     if network_config.common_options is defined and network_config.common_options is not none %}
 {%       if network_config.common_options.info_refresh_time is defined and network_config.common_options.info_refresh_time is not none %}
     option dhcp6.info-refresh-time {{ network_config.common_options.info_refresh_time }};
@@ -117,7 +117,7 @@ shared-network {{ network | replace('_','-') }} {
 {%       endfor %}
 {%     endif %}
     on commit {
-        set shared-networkname = "{{ network | replace('_','-') }}";
+        set shared-networkname = "{{ network }}";
     }
 }
 {%   endfor %}
diff --git a/data/templates/monitoring/telegraf.tmpl b/data/templates/monitoring/telegraf.tmpl
index d3145a500..cf33eec4e 100644
--- a/data/templates/monitoring/telegraf.tmpl
+++ b/data/templates/monitoring/telegraf.tmpl
@@ -1,12 +1,12 @@
 # Generated by /usr/libexec/vyos/conf_mode/service_monitoring_telegraf.py
 
 [agent]
-  interval = "10s"
+  interval = "15s"
   round_interval = true
   metric_batch_size = 1000
   metric_buffer_limit = 10000
-  collection_jitter = "0s"
-  flush_interval = "10s"
+  collection_jitter = "5s"
+  flush_interval = "15s"
   flush_jitter = "0s"
   precision = ""
   debug = false