CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2025-12-07 17:52:46 +01:00
Code Issues Packages Projects Releases Wiki Activity
9,169 Commits 24 Branches 119 Tags
8950f94fb04a2bcaf33a8740b69f985a7d7974b6
Commit Graph

9169 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
m0duspwnens
5b70d5510f Merge remote-tracking branch 'remotes/origin/sans' into issue/6469 2021-12-09 13:12:00 -05:00
Jason Ertel
2761662eb9 Add status presets 2021-12-09 13:09:56 -05:00
Mike Reeves
a7f0d81555 SSL modifications 2021-12-09 13:07:00 -05:00
Josh Brower
d3bbae23ca Merge pull request #6499 from Security-Onion-Solutions/fix/beats-logstash 
Use id for doc id if it exists
 2021-12-09 09:47:14 -05:00
Josh Brower
656ea974dc Use id for doc id if it exists 2021-12-09 09:16:58 -05:00
Jason Ertel
a9b7b9ee92 Jinjafy case params 2021-12-08 17:41:48 -05:00
m0duspwnens
7390b03dc1 dont show es options in final whiptail setup confirmation 2021-12-08 14:58:34 -05:00
m0duspwnens
b4bc32d3ca set logstash pillar and enable avanced ls menu for so-receiver 2021-12-08 14:33:15 -05:00
m0duspwnens
ecc8594d44 prevent so-receiver from getting extra keys/certs 2021-12-08 13:32:56 -05:00
m0duspwnens
59464af10c filebeat certs for logstash on so-receiver 2021-12-08 09:41:17 -05:00
m0duspwnens
1ef63f3a23 ssl things for so-receiver 2021-12-08 09:08:46 -05:00
m0duspwnens
c80059efb0 change from || to && 2021-12-07 17:11:15 -05:00
m0duspwnens
8c95d0f36b set ip for wazuh-register-agent and dont apply nginx in setup for receiver 2021-12-07 16:50:41 -05:00
m0duspwnens
429b9cab2f set ip for ossec.conf 2021-12-07 16:22:07 -05:00
m0duspwnens
f8da5c7fe9 start of fw rules for receiver 2021-12-07 15:59:11 -05:00
m0duspwnens
06010bd157 add so-receiver to allowed_states 2021-12-07 13:34:06 -05:00
Jason Ertel
b73eb76c94 Make case module dynamic 2021-12-07 11:51:02 -05:00
m0duspwnens
f3ec5df447 add receiver node 2021-12-07 11:13:51 -05:00
m0duspwnens
7549e34881 Merge remote-tracking branch 'remotes/origin/dev' into issue/6469 2021-12-07 10:57:12 -05:00
m0duspwnens
ba30c59ec7 add receiver node 2021-12-07 10:56:35 -05:00
Mike Reeves
892899b7f9 Merge pull request #6477 from Security-Onion-Solutions/merge-202112071526 
Merge hotfix
 2021-12-07 10:30:13 -05:00
Jason Ertel
702d95c63a Merge branch 'master' into merge-202112071527 2021-12-07 10:28:00 -05:00
m0duspwnens
96666ab307 add receiver node 2021-12-07 10:19:32 -05:00
Mike Reeves
9f41df641e Merge pull request #6470 from Security-Onion-Solutions/hotfix/2.3.90 
HOTFIX: 2.3.90-20211206
2.3.90-20211206 		2021-12-07 09:51:01 -05:00
Mike Reeves
9f94ecfab7 Merge pull request #6466 from Security-Onion-Solutions/2390updates3 
2.3.90 hotfix 20211206
 2021-12-06 11:07:14 -05:00
Mike Reeves
4188282724 2.3.90 hotfix 20211206 2021-12-06 11:03:49 -05:00
Mike Reeves
3945933dec Merge pull request #6446 from Security-Onion-Solutions/TOoSmOotH-patch-4 
Update HOTFIX
 2021-12-06 09:38:02 -05:00
Mike Reeves
73a1a3878f Update HOTFIX 2021-12-06 09:37:07 -05:00
weslambert
ff25d6f80b Merge pull request #6447 from Security-Onion-Solutions/eg_dashes 
Add initial EG dashboards
 2021-12-03 18:05:22 -05:00
Wes Lambert
0571612ea1 Add initial EG dashes 2021-12-03 22:38:30 +00:00
Mike Reeves
f697d88090 Update HOTFIX 2021-12-03 15:36:16 -05:00
Mike Reeves
ad03241910 Merge pull request #6445 from Security-Onion-Solutions/TOoSmOotH-patch-3 
Apply hotfix to all 2.3.90 installs
 2021-12-03 15:24:33 -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
Josh Patterson
5008b647b0 Merge pull request #6441 from Security-Onion-Solutions/hf/soc_append2.3.90 
export LC_CTYPE="en_US.UTF-8" in soup
 2021-12-03 15:10:12 -05:00
m0duspwnens
65b1ab833d run salt-call locally as if no Salt master were present during reinstall - https://github.com/Security-Onion-Solutions/securityonion/discussions/6435 2021-12-03 12:00:29 -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
Mike Reeves
6c7a1f23f5 Merge pull request #6440 from Security-Onion-Solutions/TOoSmOotH-patch-2 
Fix for the clustername used in wrong context
 2021-12-02 15:35:26 -05:00
Mike Reeves
f5761c73a5 Fix for the clustername used in wrong context 2021-12-02 15:30:35 -05:00
Mike Reeves
8448778ecd Merge pull request #6438 from Security-Onion-Solutions/hf/soc_append2.3.90 
hf/soc append2.3.90
 2021-12-02 15:10:51 -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
Jason Ertel
83fab42b6e Merge pull request #6433 from Security-Onion-Solutions/kilo 
Reign in the Wazuh port check to only complain if a non-Docker process is listening on 55000.
 2021-12-02 09:39:14 -05:00
Jason Ertel
e549cfdf82 Reign in the Wazuh port check to only complain if a non-Docker process is listening on 55000. 2021-12-02 09:35:13 -05:00
Josh Brower
c7a9fb1fa3 Merge pull request #6432 from Security-Onion-Solutions/fix/fleet-nginx 
Fix FleetDM nginx errors
 2021-12-02 08:30:28 -05:00
Josh Brower
97cd679d74 Fix FleetDM nginx errors 2021-12-02 08:17:01 -05:00
William Wernert
3bd8bcba12 Merge pull request #6421 from Security-Onion-Solutions/hotfix-merge 
Hotfix merge
 2021-12-01 14:49:05 -05:00
William Wernert
6e7188b4d8 Merge branch 'hotfix/2.3.90' into hotfix-merge 
# Conflicts:
#	HOTFIX
 2021-12-01 14:40:34 -05:00
m0duspwnens
5e0ac89841 merge with master 2021-12-01 14:27:58 -05:00