3085 Commits

Author	SHA1	Message	Date
weslambert	ea1f53b40c	Add check for field	2020-11-11 10:29:58 -05:00
m0duspwnens	da9a915421	add top change for fleet getting mysql state back was reverted in https://github.com/Security-Onion-Solutions/securityonion/pull/1880/files	2020-11-11 09:15:50 -05:00
weslambert	625307ac5f	Fix duplicate vars	2020-11-11 08:52:39 -05:00
Wes Lambert	1c326f561b	Allow for disabling Elastic stack via pillar	2020-11-11 13:26:59 +00:00
m0duspwnens	15f243f0ce	change names of acng and docker registry containers https://github.com/Security-Onion-Solutions/securityonion/issues/1681	2020-11-10 17:51:00 -05:00
m0duspwnens	edb00c2058	remove redundant common from top, create so-status conf files on manager before registry state https://github.com/Security-Onion-Solutions/securityonion/issues/1681	2020-11-10 17:09:38 -05:00
m0duspwnens	9e612e98ed	merge with dev	2020-11-10 15:43:40 -05:00
m0duspwnens	1fc94a8f59	change to so-acng for so-status https://github.com/Security-Onion-Solutions/securityonion/issues/1681	2020-11-10 15:37:03 -05:00
m0duspwnens	c58039ab47	rename state https://github.com/Security-Onion-Solutions/securityonion/issues/1681	2020-11-10 15:34:10 -05:00
m0duspwnens	1fca5e65df	redo how containers get added to so-status https://github.com/Security-Onion-Solutions/securityonion/issues/1681	2020-11-10 15:31:47 -05:00
William Wernert	676b4f0777	[fix] Close connection in mysql_conn module	2020-11-10 11:42:40 -05:00
William Wernert	6557155a8a	Merge pull request #1868 from Security-Onion-Solutions/feature/improve-mysql-dep ... Feature/improve mysql dep	2020-11-10 11:04:23 -05:00
William Wernert	d3227bbcb1	[refactor] Code cleanup pt. 3	2020-11-10 11:03:43 -05:00
William Wernert	7f218e5297	[feat] Also run query against mysql to ensure queries can complete	2020-11-10 11:02:34 -05:00
William Wernert	b3c527e7a9	[refactor] Code cleanup pt. 2	2020-11-10 10:05:06 -05:00
William Wernert	54d732a060	[refactor] Code cleanup	2020-11-10 10:01:10 -05:00
William Wernert	22b7de819c	[fix] Put mysql import in try,catch in case it hasn't been installed	2020-11-10 10:00:21 -05:00
William Wernert	dba30fb0ed	[refactor] Split 15 min mysql startup between two wait states	2020-11-10 09:48:20 -05:00
m0duspwnens	66cd91c0a7	make so-status line color same as service state https://github.com/Security-Onion-Solutions/securityonion/issues/1864	2020-11-09 18:16:02 -05:00
m0duspwnens	ae5bc297dd	remove extra squigly https://github.com/Security-Onion-Solutions/securityonion/issues/1857	2020-11-09 17:06:32 -05:00
m0duspwnens	f5a1bd4074	only try to get enrollsecret if fleet is already enabled https://github.com/Security-Onion-Solutions/securityonion/issues/1857	2020-11-09 16:25:28 -05:00
m0duspwnens	407a655717	merge with dev	2020-11-09 15:29:19 -05:00
m0duspwnens	0e19594c97	enable fleet in global pillars before running fleet state during setup https://github.com/Security-Onion-Solutions/securityonion/issues/1857	2020-11-09 15:25:11 -05:00
Josh Patterson	d122ca1ba3	Merge pull request #1861 from Security-Onion-Solutions/issue/1857 ... fix top logic for mysql for fleet/playbook	2020-11-09 13:16:28 -05:00
m0duspwnens	5616aa6beb	fix top logic for mysql - https://github.com/Security-Onion-Solutions/securityonion/issues/1857	2020-11-09 13:12:45 -05:00
William Wernert	394fa727cb	[fix] Don't overwrite mysql module	2020-11-09 13:05:29 -05:00
William Wernert	9960cf0592	[feat] Add salt module to check if mysql is accepting db connections	2020-11-09 12:05:37 -05:00
Wes Lambert	7e578d2ce0	Pull out additional fields from Exif info	2020-11-09 16:53:53 +00:00
William Wernert	0718dbbd4d	Merge branch 'dev' of github.com:Security-Onion-Solutions/securityonion into dev	2020-11-06 08:52:42 -05:00
William Wernert	6b2ab67c58	[fix] Bump version of navigator json to 3.0 + fix booleans	2020-11-06 08:52:36 -05:00
m0duspwnens	7eb0dab6c7	increase padding by 1 - https://github.com/Security-Onion-Solutions/securityonion/issues/1536	2020-11-05 19:08:19 -05:00
Josh Patterson	0caf054da0	Merge pull request #1842 from Security-Onion-Solutions/issue/1764 ... show if disabled regardless of highstate status	2020-11-05 18:50:09 -05:00
m0duspwnens	21b284fb10	show if disabled regardless of highstate status - https://github.com/Security-Onion-Solutions/securityonion/issues/1764	2020-11-05 18:46:11 -05:00
Josh Patterson	3d1412a138	Merge pull request #1841 from Security-Onion-Solutions/issue/1764 ... Issue/1764	2020-11-05 18:24:51 -05:00
m0duspwnens	c7b4a5351c	fix logic - https://github.com/Security-Onion-Solutions/securityonion/issues/1764	2020-11-05 18:17:11 -05:00
m0duspwnens	a95129b8c2	add color - https://github.com/Security-Onion-Solutions/securityonion/issues/1764	2020-11-05 18:03:42 -05:00
m0duspwnens	695bace3e8	https://github.com/Security-Onion-Solutions/securityonion/issues/1764	2020-11-05 17:54:10 -05:00
m0duspwnens	47cac59adb	https://github.com/Security-Onion-Solutions/securityonion/issues/1764	2020-11-05 17:52:28 -05:00
m0duspwnens	1a75ebdca3	https://github.com/Security-Onion-Solutions/securityonion/issues/1764	2020-11-05 17:51:51 -05:00
m0duspwnens	8da070d511	https://github.com/Security-Onion-Solutions/securityonion/issues/1764	2020-11-05 17:46:23 -05:00
weslambert	2911e37b70	Don't sleep if not registering agent	2020-11-05 14:03:08 -05:00
William Wernert	a5833f1f77	Merge branch 'dev' into feature/setup-idempotency ... # Conflicts: # setup/so-functions	2020-11-05 13:48:05 -05:00
Josh Patterson	fea6e6f4f9	Merge branch 'dev' into patch_2.3.3	2020-11-05 09:58:43 -05:00
Mike Reeves	3825becd1b	Update changes.json	2020-11-04 13:44:52 -05:00
Mike Reeves	2aa21512e5	Update soup	2020-11-04 13:40:45 -05:00
William Wernert	3ac9c43b7b	Merge branch 'dev' into feature/setup-idempotency	2020-11-04 12:44:14 -05:00
Mike Reeves	e989fc7041	Update map.jinja	2020-11-04 10:58:52 -05:00
Mike Reeves	4592e2d4d7	add airgap option to upgradecommand	2020-11-04 10:08:01 -05:00
Mike Reeves	ec64314b70	Fix soup to clear yum cache for airgap	2020-11-04 10:00:44 -05:00
Mike Reeves	cf001875c2	Update soup	2020-11-03 20:14:15 -05:00