diff --git a/salt/common/tools/sbin/soup b/salt/common/tools/sbin/soup index de968caea..4c82e48c7 100755 --- a/salt/common/tools/sbin/soup +++ b/salt/common/tools/sbin/soup @@ -313,7 +313,7 @@ post_2.3.5X_to_2.3.60() { echo "The status can be checked in $INFLUXDB_MIGRATION_LOG" read -p "Press enter to continue." echo "" - docker exec -t so-influxdb /bin/bash -c 'influx -ssl -unsafeSsl -database telegraf -execute "SELECT mean(*) INTO "so_long_term".:MEASUREMENT FROM /.*/ GROUP BY time(5m),*"' >> "$INFLUXDB_MIGRATION_LOG" 2>&1 & + 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),*"' >> "$INFLUXDB_MIGRATION_LOG" 2>&1 POSTVERSION=2.3.60 } diff --git a/salt/influxdb/defaults.yaml b/salt/influxdb/defaults.yaml index 03ac4c3c6..54e175024 100644 --- a/salt/influxdb/defaults.yaml +++ b/salt/influxdb/defaults.yaml @@ -2,12 +2,12 @@ influxdb: retention_policies: autogen: default: True - duration: 1d - shard_duration: 1h + duration: 30d + shard_duration: 1d so_long_term: default: False - duration: 7d - shard_duration: 1d + duration: 0s + shard_duration: 7d downsample: so_long_term: resolution: 5m \ No newline at end of file