9309 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
m0duspwnens	443dc6ebaa	move branch echo to main so it is in the log	2022-01-12 16:14:49 -05:00
m0duspwnens	03b9b74ace	stop cron before soup upgrades the manager, start cron at the end. add cron state that is in included in common	2022-01-12 16:04:10 -05:00
Mike Reeves	e123dd4bb2	Merge pull request #6844 from Security-Onion-Solutions/highlanderml ... Add additional highlander settings	2022-01-12 13:34:22 -05:00
Josh Patterson	5889ce02cd	Merge pull request #6845 from Security-Onion-Solutions/23100soup_jpp ... remove mine push from 2.3.100 function	2022-01-12 13:34:06 -05:00
Josh Patterson	776e4c6e12	Update soup	2022-01-12 13:32:46 -05:00
Josh Patterson	035984569b	Merge branch 'dev' into 23100soup_jpp	2022-01-12 13:31:46 -05:00
Josh Patterson	da30f66096	remove mine push from 2.3.100 function	2022-01-12 13:29:34 -05:00
Mike Reeves	c525bf310d	Add additional highlander settings	2022-01-12 13:19:40 -05:00
Mike Reeves	ee44edfe75	Add additional highlander settings	2022-01-12 13:18:44 -05:00
m0duspwnens	0cf877f169	kill any possible queued salt jobs before stopping salt-master	2022-01-12 12:27:19 -05:00
Mike Reeves	f836d3ad16	Merge pull request #6843 from Security-Onion-Solutions/23100soup_jpp ... push ips of mainint to salt mine	2022-01-12 12:25:51 -05:00
Josh Patterson	5b347600e9	push ips of mainint to salt mine	2022-01-12 12:24:52 -05:00
m0duspwnens	0388912ba7	kill all salt jobs across grid before stopping salt-master. kill all salt jobs on manager before stopping salt-minion.	2022-01-12 11:05:47 -05:00
m0duspwnens	494737549d	move some es script to src elasticsearch/tools/sbin and dst /usr/sbin. set requires	2022-01-12 10:20:05 -05:00
Mike Reeves	22096174bb	Merge pull request #6841 from Security-Onion-Solutions/TOoSmOotH-patch-4 ... Fix some formatting	2022-01-12 09:39:15 -05:00
Mike Reeves	1d94e3ac69	Fix some formatting	2022-01-12 09:38:22 -05:00
m0duspwnens	abf3a9401b	listen instead to not start service if not running then restart if changes to files	2022-01-11 18:31:35 -05:00
m0duspwnens	ae0f392035	wait for salt-master and salt-minin to exit. disable highstate before stopping salt-minion. apply salt-minion state before first highstate to update configs	2022-01-11 16:57:29 -05:00
Mike Reeves	53d2e20e48	Merge pull request #6834 from Security-Onion-Solutions/nohive ... Remove hive install option	2022-01-11 16:50:18 -05:00
Mike Reeves	4ff5fc3b38	Remove hive install option	2022-01-11 14:38:38 -05:00
m0duspwnens	5ade8193f0	move highstate messages for more accurate final highstate message	2022-01-11 13:41:51 -05:00
m0duspwnens	0ef130bd38	bootstrap.sh, dont start salt services after salt upgrade, allow soup to do it	2022-01-11 13:12:07 -05:00
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
m0duspwnens	14eed8e5b9	redirect to setup_log	2022-01-11 11:20:30 -05:00
Josh Brower	5083be4ce7	Merge pull request #6816 from Security-Onion-Solutions/fix/wazuh-parsing-v2 ... Fix Wazuh WEL Parsing	2022-01-11 11:17:24 -05:00
Doug Burks	a3c8335130	Merge pull request #6827 from Security-Onion-Solutions/dougburks-patch-1 ... Remove unnecessary word	2022-01-11 11:06:40 -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	328d6cdeb4	Merge remote-tracking branch 'remotes/origin/dev' into issue/6811	2022-01-11 10:02:18 -05:00
Mike Reeves	a9e58e2aba	Merge pull request #6826 from Security-Onion-Solutions/TOoSmOotH-patch-3 ... Update init.sls	2022-01-11 10:01:49 -05:00
Mike Reeves	8ad36fc7b9	Update init.sls	2022-01-11 10:01:14 -05:00
m0duspwnens	87756cdbc9	Merge remote-tracking branch 'remotes/origin/dev' into issue/6811	2022-01-11 09:57:31 -05:00
Mike Reeves	7937487ee9	Merge pull request #6825 from Security-Onion-Solutions/TOoSmOotH-patch-1 ... Update init.sls	2022-01-11 09:57:10 -05:00
Mike Reeves	770a389410	Update init.sls	2022-01-11 09:56:22 -05:00
m0duspwnens	b5c274de10	Merge remote-tracking branch 'remotes/origin/dev' into issue/6811	2022-01-11 09:48:31 -05:00
m0duspwnens	a8d1b9eb90	restart salt-minion at end of run if mine_functions changes	2022-01-11 09:29:12 -05:00
m0duspwnens	86c8fc6c1c	need to update mine after salt-master starts	2022-01-11 08:56:38 -05:00
weslambert	17509a9231	Merge pull request #6822 from Security-Onion-Solutions/fix/event_fields ... Add event.acknowledged and event.escalated mappings	2022-01-10 16:14:45 -05:00
weslambert	84f7c6b13b	Add event.acknowledged and event.escalated mappings	2022-01-10 16:08:35 -05:00
m0duspwnens	716c98ec61	requires and ordering for socusersroles state	2022-01-10 14:39:00 -05:00
Josh Brower	56aa24d874	Fix Wazuh WEL Parsing	2022-01-10 13:55:38 -05:00
Mike Reeves	b7a90a88f9	Merge pull request #6815 from Security-Onion-Solutions/esbackup ... Add ability to specify local backup dir	2022-01-10 13:31:24 -05:00
weslambert	1dc363138a	Merge pull request #6814 from Security-Onion-Solutions/fix/template_typo ... Fix typo -- replace period with comma	2022-01-10 13:30:13 -05:00
weslambert	1c3eeb5a34	Fix typo -- replace period with comma	2022-01-10 13:29:06 -05:00
m0duspwnens	beb9a33628	only include curl.config if elasticsearch:auth is enabled	2022-01-10 11:48:16 -05:00
Mike Reeves	dbba7d7226	Add ability to specify local backup dir	2022-01-10 11:31:41 -05:00
m0duspwnens	291ac7d361	https://github.com/Security-Onion-Solutions/securityonion/issues/6811	2022-01-10 10:36:42 -05:00
Josh Patterson	43eda0c5a3	Merge pull request #6796 from Security-Onion-Solutions/fix/wazuh_register_agent ... dont try to register if state file exists	2022-01-07 16:07:56 -05:00