Commit Graph

3292 Commits

Author SHA1 Message Date
m0duspwnens
a84203be7c Merge remote-tracking branch 'remotes/origin/dev' into issue/749 2020-05-29 16:38:10 -04:00
Josh Patterson
828f8a0df8 Merge pull request #800 from Security-Onion-Solutions/quickfix/node
fix minion_type for *NODE install_type
2020-05-29 16:37:04 -04:00
m0duspwnens
d7e904e1ab fix minion_type for *NODE install_type 2020-05-29 16:35:39 -04:00
m0duspwnens
9ae68b52ef Merge remote-tracking branch 'remotes/origin/dev' into issue/749 2020-05-29 16:22:00 -04:00
Josh Patterson
16d6e4ae2e Merge pull request #799 from Security-Onion-Solutions/quickfix/distrib_install_firewall
Quickfix/distrib install firewall
2020-05-29 15:36:53 -04:00
m0duspwnens
52954d8e5d set_intial_firewall policy sooner in install process so packages can be installed if masterupdates are enabled 2020-05-29 15:34:18 -04:00
m0duspwnens
15fc97e516 adding suricata.master state to mastersearch - https://github.com/Security-Onion-Solutions/securityonion-saltstack/issues/749 2020-05-29 13:11:55 -04:00
m0duspwnens
6db8470de7 Merge remote-tracking branch 'remotes/origin/dev' into issue/749 2020-05-29 13:09:49 -04:00
m0duspwnens
42ea39ee35 Merge branch 'dev' of https://github.com/Security-Onion-Solutions/securityonion-saltstack into dev 2020-05-29 13:09:26 -04:00
Josh Patterson
aa24dacb86 Merge pull request #798 from Security-Onion-Solutions/quickfix/master_navigator
add navigator to master if enabled
2020-05-29 13:08:43 -04:00
m0duspwnens
3143643692 add navigator to master if enabled 2020-05-29 13:05:26 -04:00
m0duspwnens
30641d0fa9 Merge branch 'dev' of https://github.com/Security-Onion-Solutions/securityonion-saltstack into dev 2020-05-29 13:01:08 -04:00
m0duspwnens
2db2054cce update instructions in logstash customer pipelines and templates - https://github.com/Security-Onion-Solutions/securityonion-saltstack/issues/749 2020-05-29 10:58:53 -04:00
m0duspwnens
7957b51409 change master roots priority to local 2020-05-29 10:57:43 -04:00
weslambert
2601ffe902 Merge pull request #797 from Security-Onion-Solutions/fix/radius_parsing
fix framed_addr field
2020-05-29 07:56:22 -04:00
Wes Lambert
4059121dd6 fix framed_addr field 2020-05-29 11:55:18 +00:00
m0duspwnens
40fa5293bf move fileserve update to suricata.master 2020-05-28 15:54:11 -04:00
Jason Ertel
3952faba85 Add missing semi-colons to break out of the case block 2020-05-28 15:27:14 -04:00
weslambert
f5300d3d5a Merge pull request #794 from Security-Onion-Solutions/feature/zeek-stats
Add basic Zeek stats script
2020-05-28 13:55:43 -04:00
Wes Lambert
7f75050682 Add basic Zeek stats script 2020-05-28 17:54:15 +00:00
m0duspwnens
71d381aeae apply suricata.master state during setup - https://github.com/Security-Onion-Solutions/securityonion-saltstack/issues/749 2020-05-28 13:19:38 -04:00
weslambert
7c232318ad Merge pull request #793 from Security-Onion-Solutions/fix/so-stop-exact-match
Update for exact match (ex. thehive, thehive-es, thehive-cortex)
2020-05-28 13:17:56 -04:00
weslambert
b835c2e27e Update for exact match (ex. thehive, thehive-es, thehive-cortex) 2020-05-28 13:17:31 -04:00
weslambert
ae6f028666 Merge pull request #792 from Security-Onion-Solutions/fix/suricata_config_nsm
Move eve.json to /nsm
2020-05-28 13:00:15 -04:00
weslambert
12f426d4f4 Move eve.json to /nsm 2020-05-28 12:59:41 -04:00
weslambert
8291de40cf Merge pull request #791 from Security-Onion-Solutions/fix/socto-ip-hostname
add master to SOCtopus hosts file
2020-05-28 12:46:57 -04:00
Wes Lambert
869bfb947d add master to SOCtopus hosts file 2020-05-28 16:45:48 +00:00
weslambert
9de1a25703 Merge pull request #789 from Security-Onion-Solutions/fix/filebeat_init
Fix filebeat init
2020-05-28 12:11:39 -04:00
weslambert
d2263db0ff Update init.sls 2020-05-28 12:11:08 -04:00
m0duspwnens
4f15de8b77 refresh salt fileserver if suricata rule symlink is created 2020-05-28 12:00:22 -04:00
Jason Ertel
6c4946f4e2 Provide option to skip reboot after setup completes 2020-05-28 10:20:44 -04:00
weslambert
c775e583dd Merge pull request #788 from Security-Onion-Solutions/feature/filebeat-syslog-fw
allow syslog
2020-05-28 09:58:15 -04:00
Wes Lambert
b7d7747f65 allow syslog 2020-05-28 13:56:02 +00:00
Mike Reeves
2b4cfe2b02 Merge pull request #786 from Security-Onion-Solutions/feature/suri5
Feature/suri5
2020-05-28 09:41:41 -04:00
Mike Reeves
8304d91b0b Merge branch 'dev' into feature/suri5 2020-05-28 09:41:28 -04:00
m0duspwnens
091cc8b789 fix how local salt and pillar dirs are created - https://github.com/Security-Onion-Solutions/securityonion-saltstack/issues/749 2020-05-28 08:57:07 -04:00
weslambert
3883c8bfe0 Merge pull request #784 from Security-Onion-Solutions/feature/filebeat-syslog
Feature/filebeat syslog
2020-05-28 08:39:11 -04:00
Wes Lambert
d2b93d531e Basic syslog config 2020-05-28 12:36:29 +00:00
Wes Lambert
5afc05feb2 Update FB init for syslog 2020-05-28 12:35:22 +00:00
Wes Lambert
b9bdca509e update Filebeat config for syslog 2020-05-28 12:33:41 +00:00
Doug Burks
f3efafc9ca combine two notice queries into one query with multiple groupby 2020-05-28 08:01:33 -04:00
Doug Burks
60cc3e9675 remove address from DHCP leases query 2020-05-28 07:50:52 -04:00
Jason Ertel
2a21d7403f Open firewall from all networks for automated testing 2020-05-28 00:47:46 -04:00
Jason Ertel
a75301cd0e Ensure IP is available to child process executing so-allow 2020-05-27 22:00:58 -04:00
Jason Ertel
1e5d5397a4 Support multiple command line options for setup, along with dynamic values per option 2020-05-27 19:42:48 -04:00
m0duspwnens
8b83799253 create local dirs sooner - https://github.com/Security-Onion-Solutions/securityonion-saltstack/issues/749 2020-05-27 18:16:02 -04:00
m0duspwnens
63e0a1e8a2 create local salt and pillar dirs - https://github.com/Security-Onion-Solutions/securityonion-saltstack/issues/749 2020-05-27 17:18:17 -04:00
m0duspwnens
59cc927878 Merge remote-tracking branch 'remotes/origin/dev' into issue/749 2020-05-27 15:56:38 -04:00
William Wernert
3712eb0acb [fix] Redirect so-allow output to log 2020-05-27 15:49:41 -04:00
weslambert
04800277c2 Merge pull request #783 from Security-Onion-Solutions/fix/hive_rename_bug
Hive to TheHive
2020-05-27 15:44:22 -04:00