9278 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
m0duspwnens	a2ed9a86ff	remove influixdb salt state files and update patch files for influxdb salt modules/state	2022-01-18 11:33:36 -05:00
m0duspwnens	87999453f2	Merge remote-tracking branch 'remotes/origin/dev' into issue/6810	2022-01-18 09:13:10 -05:00
m0duspwnens	3bd26f05d4	account for salt 3004 adding new chars to random.get_str	2022-01-14 18:02:18 -05:00
m0duspwnens	a46a740170	account for salt 3004 adding new chars to random.get_str	2022-01-14 17:23:29 -05:00
Mike Reeves	71da74fd00	Merge pull request #6878 from Security-Onion-Solutions/fix/scan_pe_sections_entropy ... Fix/scan pe sections entropy	2022-01-14 17:02:32 -05:00
weslambert	c512351dd6	Add mapping for scan.exiftool and scan.pe.sections.entropy	2022-01-14 17:01:13 -05:00
weslambert	a90bc9dba9	Add mapping for scan.pe.sections.entropy	2022-01-14 16:58:53 -05:00
m0duspwnens	02ce5c3236	update install salt to 3004	2022-01-14 13:47:16 -05:00
m0duspwnens	b6b2e06fbc	change module to cmd for onchanges_in	2022-01-14 12:44:58 -05:00
m0duspwnens	f5fe466410	repo update	2022-01-14 12:02:35 -05:00
Jason Ertel	a63787daba	Merge pull request #6864 from Security-Onion-Solutions/kilo ... Add default queries for cases to show user's assigned cases	2022-01-13 17:15:02 -05:00
Jason Ertel	6b0b7245f0	Add default queries for cases to show user's assigned cases	2022-01-13 17:10:08 -05:00
m0duspwnens	bda9221d6f	upgrade salt to 3004 and update bootstrap-salt.sh	2022-01-13 13:26:11 -05:00
Josh Patterson	b2434faf10	Merge pull request #6862 from Security-Onion-Solutions/issue/6811 ... restart wazuh with docker restart vs so-wazuh-restart	2022-01-13 13:06:43 -05:00
m0duspwnens	82db3fa3c0	restart wazuh with docker restart vs so-wazuh-restart	2022-01-13 13:02:01 -05:00
Josh Patterson	78bb6e4176	Merge pull request #6856 from Security-Onion-Solutions/issue/6811 ... Issue/6811	2022-01-13 11:03:51 -05:00
m0duspwnens	06c0cebb26	merge with dev	2022-01-13 09:44:26 -05:00
m0duspwnens	389ff1a46d	create enable_highstate state to reenable highstate following minion restart if it was previously disabled. same with cron	2022-01-13 09:39:46 -05:00
m0duspwnens	a28bb23d20	fix os_family for cron state map	2022-01-12 17:27:47 -05:00
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