Merge branch '2.4/dev' into kilo

setup/so-functions

@@ -1832,6 +1832,7 @@ reinstall_init() {
 		# Backup (and erase) directories in /nsm to prevent app errors
 		backup_dir /nsm/mysql "$date_string"
 		backup_dir /nsm/kratos "$date_string"
+		backup_dir /nsm/influxdb "$date_string"
 
 		# Remove the old launcher package in case the config changes
 		remove_package launcher-final

setup/so-setup

@@ -611,7 +611,8 @@ if ! [[ -f $install_opt_file ]]; then
 		title "Seeding the docker registry"
 		docker_seed_registry
 		title "Applying the manager state"
-		logCmd "salt-call state.apply -l info manager" 
+		logCmd "salt-call state.apply -l info manager"
+		logCmd "salt-call state.apply influxdb -l info"
 		logCmd "salt-call state.highstate -l info"
 		add_web_user
 		info "Restarting SOC to pick up initial user"

setup/so-verify

@@ -36,7 +36,7 @@ log_has_errors() {
         grep -vE "The Salt Master has cached the public key for this node" | \
         grep -vE "Minion failed to authenticate with the master" | \
         grep -vE "Failed to connect to ::1" | \
-	grep -vE "Failed to set locale" | \
+        grep -vE "Failed to set locale" | \
         grep -vE "perl-Error-" | \
         grep -vE "Failed:\s*?[0-9]+" | \
         grep -vE "Status .* was not found" | \