From 85e0d4ecbf694973dc20e48b1284529b8be01c19 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Thu, 25 Aug 2022 18:52:14 +0200
Subject: telegraf: T3872: re-use existing XML building blocks

---
 .../service-monitoring-telegraf.xml.in             | 38 ++--------------------
 1 file changed, 3 insertions(+), 35 deletions(-)

diff --git a/interface-definitions/service-monitoring-telegraf.xml.in b/interface-definitions/service-monitoring-telegraf.xml.in
index dc014ee16..68215dba4 100644
--- a/interface-definitions/service-monitoring-telegraf.xml.in
+++ b/interface-definitions/service-monitoring-telegraf.xml.in
@@ -10,7 +10,7 @@
         <children>
           <node name="telegraf" owner="${vyos_conf_scripts_dir}/service_monitoring_telegraf.py">
             <properties>
-              <help>Telegraf monitoring</help>
+              <help>Telegraf metric collector</help>
             </properties>
             <children>
               <node name="influxdb">
@@ -228,27 +228,7 @@
                       </constraint>
                     </properties>
                   </leafNode>
-                  <leafNode name="listen-address">
-                    <properties>
-                      <help>Local IP addresses to listen on</help>
-                      <completionHelp>
-                        <script>${vyos_completion_dir}/list_local_ips.sh --both</script>
-                      </completionHelp>
-                      <valueHelp>
-                        <format>ipv4</format>
-                        <description>IPv4 address to listen for incoming connections</description>
-                      </valueHelp>
-                      <valueHelp>
-                        <format>ipv6</format>
-                        <description>IPv6 address to listen for incoming connections</description>
-                      </valueHelp>
-                      <constraint>
-                        <validator name="ipv4-address"/>
-                        <validator name="ipv6-address"/>
-                        <validator name="ipv6-link-local"/>
-                      </constraint>
-                    </properties>
-                  </leafNode>
+                  #include <include/listen-address.xml.i>
                   <leafNode name="metric-version">
                     <properties>
                       <help>Metric version control mapping from Telegraf to Prometheus format</help>
@@ -291,19 +271,7 @@
                       </leafNode>
                     </children>
                   </node>
-                  <leafNode name="url">
-                    <properties>
-                      <help>Remote URL</help>
-                      <valueHelp>
-                        <format>url</format>
-                        <description>Remote URL to Splunk collector</description>
-                      </valueHelp>
-                      <constraint>
-                        <regex>^(http(s?):\/\/.*):(\d*)\/?(.*)</regex>
-                      </constraint>
-                      <constraintErrorMessage>Incorrect URL format</constraintErrorMessage>
-                    </properties>
-                  </leafNode>
+                  #include <include/monitoring/url.xml.i>
                 </children>
               </node>
               #include <include/interface/vrf.xml.i>
-- 
cgit v1.2.3