diff --git a/salt/common/tools/sbin/so-influxdb-clean b/salt/common/tools/sbin/so-influxdb-clean index 635ac6a02..7b586f03b 100755 --- a/salt/common/tools/sbin/so-influxdb-clean +++ b/salt/common/tools/sbin/so-influxdb-clean @@ -15,6 +15,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . +. /usr/sbin/so-common + wdurregex="^[0-9]+w$" ddurregex="^[0-9]+d$" diff --git a/salt/common/tools/sbin/so-influxdb-migrate b/salt/common/tools/sbin/so-influxdb-migrate index 4d65cba95..7ab5378f7 100755 --- a/salt/common/tools/sbin/so-influxdb-migrate +++ b/salt/common/tools/sbin/so-influxdb-migrate @@ -15,19 +15,21 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . +. /usr/sbin/so-common + echo -e "\nThis script is used to reduce the size of InfluxDB by downsampling old data into the so_long_term retention policy." -echo -e "\nInfluxDB will now be migrated. This could take a few hours depending on how large the database is and hardware resources available." +echo -e "\nInfluxDB will now be downsampled. This could take a few hours depending on how large the database is and hardware resources available." read -r -p "Are you sure you want to continue? [y/N] " yorn if [[ "$yorn" =~ ^([yY][eE][sS]|[yY])$ ]]; then - echo -e "\nMigrating InfluxDb started at `date`. This may take several hours depending on how much data needs to be moved." + echo -e "\nMigrating InfluxDb started at `date`. This may take several hours depending on how much data needs to be downsampled." day=0 startdate=`date` while docker exec -t so-influxdb /bin/bash -c "influx -ssl -unsafeSsl -database telegraf -execute \"SELECT mean(*) INTO \"so_long_term\".:MEASUREMENT FROM \"autogen\"./.*/ WHERE \"time\" >= '2020-07-21T00:00:00.0000000Z' + ${day}d AND \"time\" <= '2020-07-21T00:00:00.0000000Z' + $((day+1))d GROUP BY time(5m),*\""; do # why 2020-07-21? migrationdate=`date -d "2020-07-21 + ${day} days" +"%y-%m-%d"` - echo "Migration of $migrationdate started at $startdate and completed at `date`." + echo "Downsampling of $migrationdate started at $startdate and completed at `date`." newdaytomigrate=$(date -d "$migrationdate + 1 days" +"%s") today=$(date +"%s") @@ -36,11 +38,11 @@ if [[ "$yorn" =~ ^([yY][eE][sS]|[yY])$ ]]; then else ((day=day+1)) startdate=`date` - echo -e "\nMigrating the next day's worth of data." + echo -e "\nDownsampling the next day's worth of data." fi done - echo -e "\nInfluxDb data migration complete." + echo -e "\nInfluxDb data downsampling complete." else echo -e "\nExiting as requested."