Merge pull request #1401 from sever-sever/T4411

monitoring: T4411: Migrate influxdb options to influxdb node

2 files changed, 82 insertions, 11 deletions

diff --git a/src/conf_mode/service_monitoring_telegraf.py b/src/conf_mode/service_monitoring_telegraf.py
index daf75d740..62f5e1ddf 100755
--- a/src/conf_mode/service_monitoring_telegraf.py
+++ b/src/conf_mode/service_monitoring_telegraf.py
@@ -99,10 +99,6 @@ def get_config(config=None):
     monitoring['interfaces_ethernet'] = get_interfaces('ethernet', vlan=False)
     monitoring['nft_chains'] = get_nft_filter_chains()
 
-    if 'authentication' in monitoring or \
-       'url' in monitoring:
-        monitoring['influxdb_configured'] = True
-
     # Redefine azure group-metrics 'single-table' and 'table-per-metric'
     if 'azure_data_explorer' in monitoring:
         if 'single-table' in monitoring['azure_data_explorer']['group_metrics']:
@@ -119,6 +115,9 @@ def get_config(config=None):
 
     # Ignore default XML values if config doesn't exists
     # Delete key from dict
+    if not conf.exists(base + ['influxdb']):
+        del monitoring['influxdb']
+
     if not conf.exists(base + ['prometheus-client']):
         del monitoring['prometheus_client']
 
@@ -132,14 +131,15 @@ def verify(monitoring):
     if not monitoring:
         return None
 
-    if 'influxdb_configured' in monitoring:
-        if 'authentication' not in monitoring or \
-           'organization' not in monitoring['authentication'] or \
-           'token' not in monitoring['authentication']:
-            raise ConfigError(f'Authentication "organization and token" are mandatory!')
+    # Verify influxdb
+    if 'influxdb' in monitoring:
+        if 'authentication' not in monitoring['influxdb'] or \
+           'organization' not in monitoring['influxdb']['authentication'] or \
+           'token' not in monitoring['influxdb']['authentication']:
+            raise ConfigError(f'influxdb authentication "organization and token" are mandatory!')
 
-        if 'url' not in monitoring:
-            raise ConfigError(f'Monitoring "url" is mandatory!')
+        if 'url' not in monitoring['influxdb']:
+            raise ConfigError(f'Monitoring influxdb "url" is mandatory!')
 
     # Verify azure-data-explorer
     if 'azure_data_explorer' in monitoring:
diff --git a/src/migration-scripts/monitoring/0-to-1 b/src/migration-scripts/monitoring/0-to-1
new file mode 100755
index 000000000..803cdb49c
--- /dev/null
+++ b/src/migration-scripts/monitoring/0-to-1
@@ -0,0 +1,71 @@
+#!/usr/bin/env python3
+#
+# Copyright (C) 2022 VyOS maintainers and contributors
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 or later as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# T3417: migrate IS-IS tagNode to node as we can only have one IS-IS process
+
+from sys import argv
+from sys import exit
+
+from vyos.configtree import ConfigTree
+
+if (len(argv) < 1):
+    print("Must specify file name!")
+    exit(1)
+
+file_name = argv[1]
+
+with open(file_name, 'r') as f:
+    config_file = f.read()
+
+base = ['service', 'monitoring', 'telegraf']
+config = ConfigTree(config_file)
+
+if not config.exists(base):
+    # Nothing to do
+    exit(0)
+
+if config.exists(base + ['authentication', 'organization']):
+    tmp = config.return_value(base + ['authentication', 'organization'])
+    config.delete(base + ['authentication', 'organization'])
+    config.set(base + ['influxdb', 'authentication', 'organization'], value=tmp)
+
+if config.exists(base + ['authentication', 'token']):
+    tmp = config.return_value(base + ['authentication', 'token'])
+    config.delete(base + ['authentication', 'token'])
+    config.set(base + ['influxdb', 'authentication', 'token'], value=tmp)
+
+if config.exists(base + ['bucket']):
+    tmp = config.return_value(base + ['bucket'])
+    config.delete(base + ['bucket'])
+    config.set(base + ['influxdb', 'bucket'], value=tmp)
+
+if config.exists(base + ['port']):
+    tmp = config.return_value(base + ['port'])
+    config.delete(base + ['port'])
+    config.set(base + ['influxdb', 'port'], value=tmp)
+
+if config.exists(base + ['url']):
+    tmp = config.return_value(base + ['url'])
+    config.delete(base + ['url'])
+    config.set(base + ['influxdb', 'url'], value=tmp)
+
+
+try:
+    with open(file_name, 'w') as f:
+        f.write(config.to_string())
+except OSError as e:
+    print(f'Failed to save the modified config: {e}')
+    exit(1)