571 Commits

Author	SHA1	Message	Date
m0duspwnens	e33a9eb45c	bootstrap.sh, dont start salt services after salt upgrade, allow soup to do it	2022-01-11 13:11:25 -05:00
m0duspwnens	9d19cba600	log time when salt services stopped and started	2022-01-11 13:09:05 -05:00
m0duspwnens	baf297ab0a	merge with dev, resolve conflict	2022-01-11 11:24:10 -05:00
Doug Burks	29d8dbe371	Remove unnecessary word	2022-01-11 11:05:30 -05:00
m0duspwnens	91ef9b9366	update salt mine before salt-master and salt-minion get stopped	2022-01-11 10:57:48 -05:00
m0duspwnens	86c8fc6c1c	need to update mine after salt-master starts	2022-01-11 08:56:38 -05:00
Josh Patterson	3c44f6fd41	Merge pull request #6793 from Security-Onion-Solutions/23100soup_jpp ... 23100soup	2022-01-07 13:32:33 -05:00
m0duspwnens	871fd115ae	put so-firewalll in /usr/sbin since salt-master isnt running at this time	2022-01-07 12:04:19 -05:00
m0duspwnens	fd0e5d7d29	make sure so-firewall is up to date	2022-01-07 11:10:48 -05:00
m0duspwnens	5ecb63f5cf	prevent exit if minion doesnt respond	2022-01-06 16:17:51 -05:00
m0duspwnens	cd590b894a	check that ossec.conf exists	2022-01-06 12:39:48 -05:00
weslambert	db43e21378	Fix indentation	2022-01-05 10:46:41 -05:00
weslambert	4d8b417fc9	Denote which branch is being used in SOUP if BRANCH is specified	2022-01-05 10:41:27 -05:00
m0duspwnens	7bb9b6efa9	populate mine with network.ip_addrs pillar.host.mainint for each host prior to highstate	2022-01-04 10:27:45 -05:00
Mike Reeves	288389c93e	Soup changes for 2.3.100	2022-01-04 08:38:14 -05:00
Mike Reeves	f82d204c0e	Update soup	2021-12-03 15:20:33 -05:00
Mike Reeves	780daf8aa7	Apply hotfix to all 2.3.90 installs	2021-12-03 15:15:45 -05:00
m0duspwnens	c6773a0bbc	move "Preparing soup" to main so shows in soup.log	2021-12-03 10:26:22 -05:00
m0duspwnens	ff2d2c7c04	export LC_CTYPE="en_US.UTF-8" - https://github.com/Security-Onion-Solutions/securityonion/discussions/6431	2021-12-02 16:39:32 -05:00
m0duspwnens	8d667795a7	only add soc:es_index_patterns to pillar if not already present	2021-12-02 10:28:17 -05:00
m0duspwnens	7a664ab8f7	more error proof up_to_2.3.90 function	2021-12-02 10:02:26 -05:00
m0duspwnens	5e0ac89841	merge with master	2021-12-01 14:27:58 -05:00
m0duspwnens	c571b2c499	handle redirect if more than 1 match from compgen	2021-12-01 13:17:14 -05:00
Josh Patterson	63cb486698	remove redirect to /dev/null for compgen	2021-12-01 10:16:04 -05:00
Jason Ertel	4f283c2d86	Suppres grep output	2021-11-23 14:52:40 -05:00
Jason Ertel	801d42ed20	Correct if check to inline the command instead of checking for emptiness of a variable	2021-11-23 14:51:06 -05:00
Jason Ertel	59fc122eec	Force restart of wazuh since conf file is changing	2021-11-23 13:29:04 -05:00
Jason Ertel	bd59d65f02	Strip trailing newlines from version and hotfix files	2021-11-23 13:12:27 -05:00
Jason Ertel	01ceded223	Handle CRs in hotfix	2021-11-23 13:03:40 -05:00
Jason Ertel	3c37bd61ab	Add debug logging	2021-11-23 12:46:59 -05:00
Jason Ertel	7627d37386	Add 2.3.90 WAZUH hotfix corrective function	2021-11-23 12:21:28 -05:00
Josh Patterson	c67b2b6936	Update soup ... only check if salt was upgraded if upgrade_salt function was called	2021-11-23 11:14:10 -05:00
m0duspwnens	c0f183fb5e	add comment	2021-11-19 16:37:27 -05:00
m0duspwnens	d602339c45	render and md5sum soup and so-common	2021-11-19 16:32:59 -05:00
William Wernert	bebd62187d	Check soup in /usr/sbin rather than the saltstack default dir	2021-11-19 11:23:32 -05:00
William Wernert	23b91ee7e5	Fix indent on playbook_admin and playbook_automation secrets	2021-11-19 10:27:11 -05:00
Mike Reeves	12546a8efa	Merge pull request #6271 from Security-Onion-Solutions/fix/fleet-users ... Fix soup - fleetdm SA user	2021-11-17 19:48:15 -05:00
Josh Brower	3f5956b56d	Fix soup - fleetdm SA user	2021-11-17 19:47:16 -05:00
Josh Brower	66e2de0934	Merge pull request #6268 from Security-Onion-Solutions/fix/fleet-users ... Fix soup - fleetdm SA user	2021-11-17 18:26:11 -05:00
Josh Brower	c93794a402	Fix soup - fleetdm SA user	2021-11-17 18:22:34 -05:00
Josh Brower	2fe4fa06a6	Merge pull request #6265 from Security-Onion-Solutions/fix/fleet-users ... Fix FleetDM SA Creation for SOUP	2021-11-17 14:09:59 -05:00
Josh Brower	773c580e77	Fix FleetDM SA Creation for SOUP	2021-11-17 14:08:34 -05:00
Mike Reeves	aca684d55a	Merge pull request #6264 from Security-Onion-Solutions/fix/fleet-users ... Migrate FleetDM user mgt to fleetctl	2021-11-17 13:16:05 -05:00
Josh Brower	6f391dbe50	Migrate FleetDM user mgt to fleetctl	2021-11-17 13:13:25 -05:00
m0duspwnens	ac400f1c41	change how soc endgame added to manager pillar in soup	2021-11-17 11:07:12 -05:00
Josh Patterson	a16e6aca22	Merge pull request #6257 from Security-Onion-Solutions/es_soup_ingest ... escape raw and endraw	2021-11-17 07:56:01 -05:00
m0duspwnens	ce21ae11f5	escape raw and endraw	2021-11-17 07:53:15 -05:00
Mike Reeves	fdd9706669	Merge pull request #6255 from Security-Onion-Solutions/kilo	2021-11-16 18:09:40 -05:00
Jason Ertel	8fa9a180b2	Refactor upgrade and post-upgrade version to function mappings; fix missing version upgrades from older 2.3.61 releases and earlier; Drop support for upgrading ancient RC releases	2021-11-16 18:08:28 -05:00
Josh Patterson	6288365a50	Merge pull request #6254 from Security-Onion-Solutions/es_soup_ingest ... wrap common ingest in raw endraw since json and no jinja	2021-11-16 16:47:53 -05:00