1248 Commits

Author	SHA1	Message	Date
Mike Reeves	34d4eedf67	Remove old modules	2021-05-26 10:11:47 -04:00
Mike Reeves	e5a41b60ef	Merge remote-tracking branch 'remotes/origin/dev' into pipeline	2021-05-24 09:14:03 -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
Mike Reeves	71a74a6656	Added updated script and core modules	2021-05-13 13:07:16 -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
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
m0duspwnens	3dcaa1f6fb	more logging for influxdb migration	2021-05-04 10:37:25 -04:00
m0duspwnens	2d91e509fa	update wording	2021-05-04 10:34:13 -04:00
m0duspwnens	a0f1839162	run in background	2021-05-04 09:59:16 -04:00
m0duspwnens	e2f52765e4	add newline	2021-05-04 09:34:42 -04:00
m0duspwnens	f186a3dde9	make sure user sees influxdb migration message by requiring enter to be pressed to continue	2021-05-04 09:30:38 -04:00
Mike Reeves	10c4a7fd98	Update soup	2021-05-04 09:18:59 -04:00
m0duspwnens	9b065155f4	log iunfluxdb migration to new log	2021-05-04 08:56:13 -04:00
m0duspwnens	12306368cf	add post upgrade function for 2.3.60 soup to migrate influxdb data	2021-05-04 08:37:52 -04:00
Mike Reeves	e113e75f4d	Update soup	2021-05-03 18:52:40 -04:00
Mike Reeves	9066959945	Update soup	2021-05-03 18:46:24 -04:00
Jason Ertel	6768e8ddf6	copy_new_files usage consistent across soup and hotfixapply scripts	2021-05-03 15:42:24 -04:00
Mike Reeves	a489b369d7	Jertel Compliance	2021-05-03 15:23:34 -04:00
Mike Reeves	074fe46e90	Adding airgap hotfix	2021-05-03 15:02:51 -04:00
Mike Reeves	f04ed94627	Adding airgap hotfix	2021-05-03 14:33:45 -04:00
Mike Reeves	296c1c5a3c	Adding airgap hotfix	2021-05-03 14:30:53 -04:00
Pete	b80dd1ef3e	fix 5-second sleep ... using wait here instead of sleep tries to wait until pid 5 exits and generates the error > /usr/sbin/so-playbook-reset: line 25: wait: pid 5 is not a child of this shell	2021-04-30 20:21:50 +00:00
m0duspwnens	f9573f7972	Merge remote-tracking branch 'remotes/origin/dev' into issue/3264	2021-04-30 13:33:47 -04:00
Mike Reeves	02b621bd2c	Add Kratos to Backups	2021-04-29 11:29:07 -04:00
m0duspwnens	2b9b22cd90	Merge remote-tracking branch 'remotes/origin/dev' into issue/3264	2021-04-28 18:02:01 -04:00
Jason Ertel	7a21c44727	Remove unused and incorrectly formatted osraid metric	2021-04-28 13:27:11 -04:00
m0duspwnens	d9cb018a7d	merge with dev, resolve conflicts	2021-04-28 10:19:01 -04:00
Mike Reeves	df22269fc9	Repo Fix	2021-04-26 14:49:44 -04:00
Mike Reeves	6135d89721	Prompt airgap to update	2021-04-25 12:19:34 -04:00