From fcd1bea4a3b25b1b74c28363769d8256bca3a892 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Tue, 4 May 2021 12:06:03 -0400 Subject: [PATCH] remove auto data migration, change duration from 0s to 0d --- salt/common/tools/sbin/soup | 8 -------- salt/influxdb/defaults.yaml | 2 +- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/salt/common/tools/sbin/soup b/salt/common/tools/sbin/soup index 07a9804b2..1f6a6e5d7 100755 --- a/salt/common/tools/sbin/soup +++ b/salt/common/tools/sbin/soup @@ -307,14 +307,6 @@ post_2.3.30_to_2.3.40() { } post_2.3.5X_to_2.3.60() { - # These are post upgrade changes that need to take place after all the new states have been applied. - echo "" - echo "Migration of InfluxDB data will begin in the background. Depending on how much data is present, the process may take an hour or two to complete after soup finishes. Do not restart the so-influxdb container or server until this completes." - echo "The status can be checked in $INFLUXDB_MIGRATION_LOG" - read -p "Press enter to continue." - echo "" - docker exec -dt so-influxdb /bin/bash -c 'influx -ssl -unsafeSsl -database telegraf -execute "SELECT mean(*) INTO "so_long_term".:MEASUREMENT FROM /.*/ GROUP BY time(5m),*" && echo "InfluxDB migration complete." || echo "InfluxDB migration failed."' >> "$INFLUXDB_MIGRATION_LOG" 2>&1 - POSTVERSION=2.3.60 } diff --git a/salt/influxdb/defaults.yaml b/salt/influxdb/defaults.yaml index 54e175024..0c9a09080 100644 --- a/salt/influxdb/defaults.yaml +++ b/salt/influxdb/defaults.yaml @@ -6,7 +6,7 @@ influxdb: shard_duration: 1d so_long_term: default: False - duration: 0s + duration: 0d shard_duration: 7d downsample: so_long_term: