Commit Graph

2028 Commits

Author SHA1 Message Date
Wes Lambert
ec11b9ea25 Remove Redis config from eval PL 2020-02-05 20:34:32 +00:00
Josh Patterson
3fff89e538 Merge pull request #308 from Security-Onion-Solutions/quickfix/helix
Quickfix/helix
2020-02-05 15:10:45 -05:00
m0duspwnens
799cf32265 fix logstash for so-helix role 2020-02-05 14:45:07 -05:00
William Wernert
981dfa1cb2 chmod +x script changes 2020-02-05 11:39:37 -05:00
Mike Reeves
b69dfd9b25 Helix fix dockers 2020-02-05 11:27:19 -05:00
Josh Patterson
997b50f12b Merge pull request #307 from Security-Onion-Solutions/quickfix/helix
add helix pipeline pillar
2020-02-05 11:16:09 -05:00
m0duspwnens
833c700418 Merge branch 'dev' into quickfix/helix 2020-02-05 11:14:13 -05:00
m0duspwnens
66092ada15 Merge branch 'dev' of https://github.com/Security-Onion-Solutions/securityonion-saltstack into dev 2020-02-05 11:13:10 -05:00
m0duspwnens
d133222a86 Merge branch 'quickfix/helix' into dev 2020-02-05 11:12:51 -05:00
m0duspwnens
f042cb074f add helix pipeline pillar 2020-02-05 11:10:12 -05:00
William Wernert
8a925209e9 Merge pull request #306 from Security-Onion-Solutions/feature/script-fixes
Feature/script fixes
2020-02-05 11:03:17 -05:00
William Wernert
3e97930506 Merge branch 'dev' into feature/script-fixes
# Conflicts:
#	salt/auth/init.sls
#	salt/common/tools/sbin/so-bro-restart
#	salt/common/tools/sbin/so-bro-start
#	salt/common/tools/sbin/so-bro-stop
#	salt/wazuh/files/wazuh-manager-whitelist
2020-02-05 10:58:51 -05:00
Josh Brower
dc89f95d4b Merge pull request #305 from Security-Onion-Solutions/fix/logstash-osquery
Logstash EVAL pipeline fix - osquery
2020-02-05 08:13:10 -05:00
Josh Brower
c1dd26d97e Logstash EVAL pipeline fix - osquery 2020-02-05 08:12:08 -05:00
Josh Patterson
de04cc6631 Merge pull request #304 from Security-Onion-Solutions/quickfix/grafana
fix grafana for zeek
2020-02-04 17:25:04 -05:00
m0duspwnens
ad651dbea4 fix grafana for zeek 2020-02-04 17:21:13 -05:00
Josh Patterson
8148be6ec8 Merge pull request #301 from Security-Onion-Solutions/quickfix/zeek
fix zeek state
2020-02-03 11:17:39 -05:00
m0duspwnens
820462e45a fix zeek state 2020-02-03 11:15:44 -05:00
Josh Brower
6220c92cb2 Merge pull request #300 from Security-Onion-Solutions/fix/tcpreplay
tcpreplay fix
2020-02-03 10:13:16 -05:00
Josh Brower
a6a999af95 tcpreplay fix 2020-02-03 09:59:41 -05:00
Josh Brower
e07f5d30b7 Merge pull request #299 from Security-Onion-Solutions/fix/zeek-bpfv2
Zeek - bpf fixup
2020-01-31 15:08:29 -05:00
Josh Brower
b5bf12f8c8 Zeek - bpf fixup 2020-01-31 15:06:57 -05:00
Josh Brower
f5efc68825 Merge pull request #289 from Security-Onion-Solutions/feature/so-status
feature/so-status
2020-01-31 14:02:15 -05:00
Josh Brower
b21b88a844 Merge pull request #298 from Security-Onion-Solutions/feature/so-scripts-fixes
SO Scripts - fixes
2020-01-31 12:42:13 -05:00
Josh Brower
c96a95e526 SO Scripts - fixes 2020-01-31 12:41:01 -05:00
Josh Patterson
4cdcabbd18 Merge pull request #297 from Security-Onion-Solutions/quickfix/eval
evalmode fix
2020-01-30 17:56:13 -05:00
m0duspwnens
6b580eaba9 evalmode fix 2020-01-30 17:54:24 -05:00
Josh Patterson
daa6905ab4 Merge pull request #295 from Security-Onion-Solutions/quickfix/eval
Quickfix/eval
2020-01-30 17:40:13 -05:00
m0duspwnens
68e7dcfba0 evalfix 2020-01-30 17:38:48 -05:00
m0duspwnens
88967c2512 evalfix 2020-01-30 17:36:38 -05:00
Josh Patterson
cc909682c0 Merge pull request #294 from Security-Onion-Solutions/quickfix/eval
evalfix
2020-01-30 17:13:52 -05:00
Josh Patterson
666ca150f6 Merge branch 'dev' into quickfix/eval 2020-01-30 17:13:35 -05:00
m0duspwnens
d94065fa00 evalfix 2020-01-30 17:09:06 -05:00
William Wernert
025c1972cd Merge pull request #288 from Security-Onion-Solutions/hotfix/auth-init
hotfix/auth-init
2020-01-30 16:34:24 -05:00
Mike Reeves
1e7259c32f Merge pull request #292 from Security-Onion-Solutions/bugfix/evalproblem
Fix Eval Event Pickup x2
2020-01-30 16:17:22 -05:00
Mike Reeves
1e0d0d74e1 Fix Eval Event Pickup x2 2020-01-30 16:16:21 -05:00
Mike Reeves
5c64d19c01 Merge pull request #291 from Security-Onion-Solutions/bugfix/evalproblem
Bugfix/evalproblem
2020-01-30 16:14:16 -05:00
Mike Reeves
c32b2726fa Fix Eval Event Pickup 2020-01-30 16:10:59 -05:00
Mike Reeves
59d6b7cb8a Add log paths 2020-01-30 16:00:57 -05:00
Mike Reeves
e26aad47e5 Merge pull request #290 from Security-Onion-Solutions/bugfix/filebeat
Fix Filebeat
2020-01-30 15:49:24 -05:00
Mike Reeves
048c77695d Fix Filebeat 2020-01-30 15:47:51 -05:00
William Wernert
746bd99f99 Merge branch 'dev' into feature/so-status 2020-01-30 12:41:41 -05:00
William Wernert
f839f38553 Fix for jinja error 2020-01-30 12:40:39 -05:00
William Wernert
5dec2b1c87 Move auth init.sls to docker registry 2020-01-30 12:39:09 -05:00
Josh Patterson
63d0a21a0c Merge pull request #287 from Security-Onion-Solutions/quickfix/ssl
Fix SSL State
2020-01-30 11:11:55 -05:00
Mike Reeves
21e374c82e Fix SSL State 2020-01-30 11:10:52 -05:00
Mike Reeves
a2c75c8fc0 Merge pull request #284 from Security-Onion-Solutions/fix/bpf-zeek
Dep Bro and enabled Zeek BPF
2020-01-30 10:00:09 -05:00
Josh Brower
3fdc5fbef4 Dep Bro and enabled Zeek BPF 2020-01-30 09:45:02 -05:00
Mike Reeves
960bb51218 Merge pull request #280 from Security-Onion-Solutions/fix/zeek_cfg
Update Zeek config
2020-01-29 18:11:17 -05:00
Wes Lambert
3277ca185e Update Zeek config 2020-01-29 22:09:32 +00:00