CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2026-05-22 11:05:13 +02:00
Code Issues Packages Projects Releases Wiki Activity
9,245 Commits 29 Branches 126 Tags
03b9b74ace8b021d9a5d6e7a3318ae213cd5d086
Commit Graph

9245 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
m0duspwnens 0cf877f169 kill any possible queued salt jobs before stopping salt-master 2022-01-12 12:27:19 -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
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
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
m0duspwnens 715d3f0e7e dont try to register if state file exists 2022-01-07 16:05:55 -05:00
Jason Ertel db04646735 Merge pull request #6794 from Security-Onion-Solutions/kilo 
Update field mappings based on Wes' feedback
 2022-01-07 16:03:05 -05:00
Jason Ertel 66c9e20c6a Add wilcards for CCS compatibility 2022-01-07 15:57:08 -05:00
Josh Patterson ed97fe0b65 Merge pull request #6795 from Security-Onion-Solutions/fix/wazuh_register_agent 
Fix/wazuh register agent
 2022-01-07 15:52:17 -05:00
m0duspwnens 3a86af8de2 quote $API_RESULT 2022-01-07 15:49:53 -05:00
m0duspwnens 7ee913eb1f if /opt/so/conf/wazuh/initial_agent_registration.log doesnt exist, and agent is already registered, touch file and exit 0 to prevent salt error 2022-01-07 15:46:47 -05:00
Jason Ertel d3656a7777 Merge branch 'dev' into kilo 2022-01-07 13:41:35 -05:00
Josh Patterson 3c44f6fd41 Merge pull request #6793 from Security-Onion-Solutions/23100soup_jpp 
23100soup
 2022-01-07 13:32:33 -05:00
Jason Ertel 391db568b0 Update field mappings based on Wes' feedback 2022-01-07 13:28:36 -05:00
Jason Ertel a4f01d4412 Merge pull request #6792 from Security-Onion-Solutions/kilo 
Add case exclusion toggle to Hunt to avoid hunt results getting case …
 2022-01-07 13:02:27 -05:00
Jason Ertel 9ef83da23f Add case exclusion toggle to Hunt to avoid hunt results getting case data hits unintentionally 2022-01-07 12:58:35 -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
weslambert 218f7f3a13 Merge pull request #6790 from Security-Onion-Solutions/fix/dtc_severity_label 
Add event.severity_label
 2022-01-07 11:44:30 -05:00
weslambert 770e53d914 Add keyword subfield for event.severity_label 2022-01-07 11:21:57 -05:00