930 Commits

Author	SHA1	Message	Date
Jason Ertel	0572ea4095	Fail curl command if a failing status code is returned by the remote server	2021-05-21 17:27:11 -04:00
William Wernert	946e369a44	Merge branch 'dev' into foxtrot	2021-05-21 15:26:24 -04:00
William Wernert	fe3aec173f	Merge branch 'master' into feature/merge-2.3.51 ... # Conflicts: # VERSION # salt/influxdb/init.sls	2021-05-21 12:31:54 -04:00
Jason Ertel	b440f73336	Truncate wait_for_web_response.log before each wait invocation	2021-05-19 18:37:08 -04:00
William Wernert	f445186f1e	Remove redundant error messages	2021-05-18 13:38:55 -04:00
William Wernert	bdd53ed5e3	Change retry delay + count	2021-05-18 12:23:40 -04:00
William Wernert	dbd5ef70c9	Change retry delay + count	2021-05-17 16:19:31 -04:00
William Wernert	ce9554281e	Fix backwards logic	2021-05-17 16:08:34 -04:00
William Wernert	4e1fba5b38	Only echo error code if not using retry	2021-05-17 16:04:13 -04:00
William Wernert	3f238f7a4a	Set flag so trap doesn't repeat info	2021-05-17 16:02:52 -04:00
William Wernert	b89091cc7d	Try retrying in curl instead of shell function	2021-05-17 15:58:25 -04:00
William Wernert	992b76a0f0	Remove debug lines	2021-05-17 15:38:10 -04:00
William Wernert	2bcd51b21c	Fix error message	2021-05-17 15:10:57 -04:00
William Wernert	3625453668	Don't unmount airgap directory if not airgap	2021-05-17 11:00:28 -04:00
Mike Reeves	71a74a6656	Added updated script and core modules	2021-05-13 13:07:16 -04:00
William Wernert	192b5db25a	Add true to end of functions ending with shorthand comparison ... Functions ending with test using [[ <false> ]] && <cmd> will trip set -e, so adding true to the last line of the function will prevent the function from returning a nonzero code	2021-05-12 15:26:39 -04:00
William Wernert	9ced391c11	Fix indent in main(), re-add trap, remove ERR_HANDLED variable	2021-05-12 13:20:59 -04:00
William Wernert	807b525c79	Temp remove exit on failure + bash trap	2021-05-12 11:19:33 -04:00
William Wernert	7bd04deae7	Unset exit on failure for pkill command	2021-05-12 10:45:03 -04:00
William Wernert	c379822bf0	Set variable to skip trap if error already handled	2021-05-11 12:59:49 -04:00
William Wernert	f793450d97	Return actual exit code from retry	2021-05-10 13:22:13 -04:00
William Wernert	fec868432f	Try to fix bash trap	2021-05-10 11:59:22 -04:00
William Wernert	d3b08beb53	Only cat file if it exists	2021-05-10 11:11:54 -04:00
William Wernert	a75d4841d0	Add debug lines	2021-05-10 11:05:24 -04:00
William Wernert	8b3730748b	Add debug line and remove exit command on retry failure	2021-05-10 10:58:29 -04:00
William Wernert	de5552c91a	Merge branch 'dev' into issue/3220	2021-05-10 10:33:52 -04:00
William Wernert	f8dd6890b2	Unset/set exit on command fail for retries	2021-05-07 16:50:59 -04:00
m0duspwnens	9eb63b17f9	exit if retry fails	2021-05-07 14:48:02 -04:00
m0duspwnens	009f7617c1	check salt-master is responding	2021-05-07 12:47:22 -04:00
William Wernert	7b29c6427b	Add preliminary error handling in soup	2021-05-07 10:55:17 -04:00
m0duspwnens	d0e084b8ea	change command to test if salt-master is accepting connections	2021-05-07 10:20:04 -04:00
m0duspwnens	46223e0b30	add quotes around minionid	2021-05-07 08:59:47 -04:00
m0duspwnens	5d3b147b42	change retry command	2021-05-06 20:32:26 -04:00
m0duspwnens	b8ad80ae35	update comment	2021-05-06 17:49:40 -04:00
m0duspwnens	78240b4b52	change retry command	2021-05-06 17:49:02 -04:00
m0duspwnens	e7c716ede4	merge with dev, use retry to check if manager up instead of sleep in soup	2021-05-06 16:44:34 -04:00
m0duspwnens	da528e802f	ensure migration script doesnt migrate the current days data and fix downsample cq to move from so_short_term rp	2021-05-06 12:52:47 -04:00
Josh Brower	23b4327c28	Merge pull request #4072 from petiepooo/fix-sleep ... fix 5-second sleep	2021-05-06 12:48:34 -04:00
William Wernert	9f6dfa4d2e	Merge pull request #4112 from Security-Onion-Solutions/master ... Bring hotfix changes into dev	2021-05-06 10:44:25 -04:00
Wes Lambert	1b749cf004	Additional config	2021-05-06 13:55:07 +00:00
m0duspwnens	9dbb9f519b	create so_short_term rp as default so that autogen can just be dropped once data is downsampled	2021-05-06 09:14:49 -04:00
m0duspwnens	20188549f7	add the logic for so-influxdb-migrate	2021-05-05 19:28:16 -04:00
m0duspwnens	925be17d51	clean some commas in so-influxdb-clean	2021-05-05 15:59:18 -04:00
m0duspwnens	0ea4c99102	remove support for months as it isnt supported in InfluxQL	2021-05-05 15:32:53 -04:00
m0duspwnens	db98b7ed27	verify with user before proceedig to clean	2021-05-05 15:08:11 -04:00
m0duspwnens	44de611097	rename to so-influxdb-clean	2021-05-05 14:57:39 -04:00
m0duspwnens	a5ee8fb59d	fix the issues with so-influxdb-clear	2021-05-05 14:56:53 -04:00
m0duspwnens	e532804474	move to proper dir	2021-05-05 13:42:21 -04:00
m0duspwnens	ce24781446	first take at so-infludb-clean	2021-05-05 13:29:24 -04:00
m0duspwnens	fcd1bea4a3	remove auto data migration, change duration from 0s to 0d	2021-05-04 12:06:03 -04:00