From 72c7547efce6051edc9a6c14083cf56a5368836a Mon Sep 17 00:00:00 2001
From: Viacheslav Hletenko <v.gletenko@vyos.io>
Date: Thu, 13 Oct 2022 11:17:22 +0000
Subject: monitoring: T4312: Ability to set IP address in the URL

Use common "url.xml" which allow URL as domain name or IP entrie
---
 interface-definitions/include/url.xml.i                  | 15 +++++++++++++++
 interface-definitions/service_monitoring_telegraf.xml.in | 14 +-------------
 2 files changed, 16 insertions(+), 13 deletions(-)
 create mode 100644 interface-definitions/include/url.xml.i

diff --git a/interface-definitions/include/url.xml.i b/interface-definitions/include/url.xml.i
new file mode 100644
index 000000000..caa6f67bd
--- /dev/null
+++ b/interface-definitions/include/url.xml.i
@@ -0,0 +1,15 @@
+<!-- include start from url.xml.i -->
+<leafNode name="url">
+  <properties>
+    <help>Remote URL</help>
+    <valueHelp>
+      <format>url</format>
+      <description>Remote URL</description>
+    </valueHelp>
+    <constraint>
+      <regex>^https?:\/\/?[a-z0-9]+([\-\.]{1}[a-z0-9]+)*(\:[0-9]+)*(\/.*)?</regex>
+    </constraint>
+    <constraintErrorMessage>Incorrect URL format</constraintErrorMessage>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/service_monitoring_telegraf.xml.in b/interface-definitions/service_monitoring_telegraf.xml.in
index b38e0dd51..8a6b31d8c 100644
--- a/interface-definitions/service_monitoring_telegraf.xml.in
+++ b/interface-definitions/service_monitoring_telegraf.xml.in
@@ -164,19 +164,7 @@
                    </leafNode>
                  </children>
                </node>
-              <leafNode name="url">
-                <properties>
-                  <help>Remote URL [REQUIRED]</help>
-                  <valueHelp>
-                    <format>url</format>
-                    <description>Remote URL to InfluxDB v2</description>
-                  </valueHelp>
-                  <constraint>
-                    <regex>^(http:\/\/www\.|https:\/\/www\.|http:\/\/|https:\/\/)?[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}?(\/.*)?$</regex>
-                  </constraint>
-                  <constraintErrorMessage>Incorrect URL format.</constraintErrorMessage>
-                </properties>
-              </leafNode>
+              #include <include/url.xml.i>
               #include <include/port-number.xml.i>
               <leafNode name="port">
                 <defaultValue>8086</defaultValue>
-- 
cgit v1.2.3