summaryrefslogtreecommitdiff
path: root/interface-definitions
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2022-07-08 07:26:25 +0200
committerGitHub <noreply@github.com>2022-07-08 07:26:25 +0200
commit44b1bdd3273dce4e74a5474c401ac7107950635b (patch)
tree801c37767245d09633e413124040d837904f3baf /interface-definitions
parentff2665175fe58bff6f76f5ee57ebee6de838dbc5 (diff)
parent40adf40a7d07b70f5a9c5f17540ee0c42ce9323f (diff)
downloadvyos-1x-44b1bdd3273dce4e74a5474c401ac7107950635b.tar.gz
vyos-1x-44b1bdd3273dce4e74a5474c401ac7107950635b.zip
Merge pull request #1401 from sever-sever/T4411
monitoring: T4411: Migrate influxdb options to influxdb node
Diffstat (limited to 'interface-definitions')
-rw-r--r--interface-definitions/include/version/monitoring-version.xml.i3
-rw-r--r--interface-definitions/service-monitoring-telegraf.xml.in67
2 files changed, 40 insertions, 30 deletions
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>