From 976e1df8ecf3445c6bc76ec3bb4f083086a2f55e Mon Sep 17 00:00:00 2001
From: Viacheslav Hletenko <v.gletenko@vyos.io>
Date: Thu, 7 Jul 2022 17:40:07 +0000
Subject: monitoring: T4411: Migrate influxdb options to influxdb node

As we have specific configuration for each plugin:
set service monitoring telegraf xxx
 - azure-data-explorer
 - prometheus-client
 - splunk

We should to move configuration that related to influxdb under
influxdb node

Replace:
set service monitoring telegraf
 - authentication xxx
 - bucket xxx
 - port xxx
 - url

To:
set service monitoring telegraf influxdb xxx
---
 .../include/version/monitoring-version.xml.i       |  3 +
 .../service-monitoring-telegraf.xml.in             | 67 ++++++++++++----------
 2 files changed, 40 insertions(+), 30 deletions(-)
 create mode 100644 interface-definitions/include/version/monitoring-version.xml.i

(limited to 'interface-definitions')

diff --git a/interface-definitions/include/version/monitoring-version.xml.i b/interface-definitions/include/version/monitoring-version.xml.i
new file mode 100644
index 000000000..6a275a5d8
--- /dev/null
+++ b/interface-definitions/include/version/monitoring-version.xml.i
@@ -0,0 +1,3 @@
+<!-- include start from include/version/monitoring-version.xml.i -->
+<syntaxVersion component='monitoring' version='1'></syntaxVersion>
+<!-- include end -->
diff --git a/interface-definitions/service-monitoring-telegraf.xml.in b/interface-definitions/service-monitoring-telegraf.xml.in
index d0d9202c1..36f40a539 100644
--- a/interface-definitions/service-monitoring-telegraf.xml.in
+++ b/interface-definitions/service-monitoring-telegraf.xml.in
@@ -13,32 +13,50 @@
               <help>Telegraf monitoring</help>
             </properties>
             <children>
-              <node name="authentication">
+              <node name="influxdb">
                 <properties>
-                  <help>Authentication parameters</help>
+                  <help>Output plugin InfluxDB</help>
                 </properties>
                 <children>
-                  <leafNode name="organization">
+                  <node name="authentication">
                     <properties>
-                      <help>Authentication organization for InfluxDB v2</help>
-                      <constraint>
-                        <regex>[a-zA-Z][1-9a-zA-Z@_\-.]{2,50}</regex>
-                      </constraint>
-                      <constraintErrorMessage>Organization name must be alphanumeric and can contain hyphens, underscores and at symbol.</constraintErrorMessage>
+                      <help>Authentication parameters</help>
                     </properties>
-                  </leafNode>
-                  <leafNode name="token">
+                    <children>
+                      <leafNode name="organization">
+                        <properties>
+                          <help>Authentication organization for InfluxDB v2</help>
+                          <constraint>
+                            <regex>[a-zA-Z][1-9a-zA-Z@_\-.]{2,50}</regex>
+                          </constraint>
+                          <constraintErrorMessage>Organization name must be alphanumeric and can contain hyphens, underscores and at symbol.</constraintErrorMessage>
+                        </properties>
+                      </leafNode>
+                      <leafNode name="token">
+                        <properties>
+                          <help>Authentication token for InfluxDB v2</help>
+                          <valueHelp>
+                            <format>txt</format>
+                            <description>Authentication token</description>
+                          </valueHelp>
+                          <constraint>
+                            <regex>[a-zA-Z0-9-_]{86}==</regex>
+                          </constraint>
+                          <constraintErrorMessage>Token must be 88 characters long and must contain only [a-zA-Z0-9-_] and '==' characters.</constraintErrorMessage>
+                        </properties>
+                      </leafNode>
+                    </children>
+                  </node>
+                  <leafNode name="bucket">
                     <properties>
-                      <help>Authentication token for InfluxDB v2</help>
-                      <valueHelp>
-                        <format>txt</format>
-                        <description>Authentication token</description>
-                      </valueHelp>
-                      <constraint>
-                        <regex>[a-zA-Z0-9-_]{86}==</regex>
-                      </constraint>
-                      <constraintErrorMessage>Token must be 88 characters long and must contain only [a-zA-Z0-9-_] and '==' characters.</constraintErrorMessage>
+                      <help>Remote bucket</help>
                     </properties>
+                    <defaultValue>main</defaultValue>
+                  </leafNode>
+                  #include <include/monitoring/url.xml.i>
+                  #include <include/port-number.xml.i>
+                  <leafNode name="port">
+                    <defaultValue>8086</defaultValue>
                   </leafNode>
                 </children>
               </node>
@@ -130,12 +148,6 @@
                   #include <include/monitoring/url.xml.i>
                 </children>
               </node>
-              <leafNode name="bucket">
-                <properties>
-                  <help>Remote bucket</help>
-                </properties>
-                <defaultValue>main</defaultValue>
-              </leafNode>
               <leafNode name="source">
                 <properties>
                   <help>Source parameters for monitoring</help>
@@ -294,11 +306,6 @@
                   </leafNode>
                 </children>
               </node>
-              #include <include/monitoring/url.xml.i>
-              #include <include/port-number.xml.i>
-              <leafNode name="port">
-                <defaultValue>8086</defaultValue>
-              </leafNode>
             </children>
           </node>
         </children>
-- 
cgit v1.2.3