Mike Reeves
|
e4a73d9773
|
Fix Wazuh paths for logstash
|
2020-02-07 16:16:28 -05:00 |
|
Mike Reeves
|
6ceb127c46
|
Fix Wazuh paths for logstash/fb
|
2020-02-07 08:52:09 -05:00 |
|
Josh Patterson
|
afdb2f93f0
|
Merge pull request #314 from Security-Onion-Solutions/quickfix/issue277
adjusting logstash heapsize for https://github.com/Security-Onion-Sol…
|
2020-02-06 16:19:42 -05:00 |
|
m0duspwnens
|
2f055d4c00
|
adjusting logstash heapsize for https://github.com/Security-Onion-Solutions/securityonion-saltstack/issues/277
|
2020-02-06 15:41:13 -05:00 |
|
Josh Brower
|
3b083970e6
|
Merge pull request #313 from Security-Onion-Solutions/fix/logstash-restart
Logstash restart script
|
2020-02-06 15:36:15 -05:00 |
|
Josh Brower
|
12d3ae92e7
|
Logstash restart script
|
2020-02-06 15:35:15 -05:00 |
|
William Wernert
|
f8b8bdaaf3
|
Merge pull request #312 from Security-Onion-Solutions/hotfix/auth-timeout
[fix] Various timeout fixes for so-auth
|
2020-02-06 15:28:49 -05:00 |
|
William Wernert
|
f4b8211938
|
[fix] Various timeout fixes for so-auth
|
2020-02-06 15:27:56 -05:00 |
|
William Wernert
|
3d7c0e5eef
|
Merge pull request #311 from Security-Onion-Solutions/feature/so-status
feature/so-status
|
2020-02-06 15:26:04 -05:00 |
|
William Wernert
|
7c00e7c286
|
[feature] Final changes for so-status re: predefined container list
|
2020-02-06 15:25:50 -05:00 |
|
Mike Reeves
|
d2dd0f09e9
|
fix zeek path
|
2020-02-06 10:25:01 -05:00 |
|
Mike Reeves
|
79dc6c84d9
|
add auth to mastersearch
|
2020-02-05 21:19:07 -05:00 |
|
Mike Reeves
|
725b56c858
|
add registry to mastersearch
|
2020-02-05 21:07:08 -05:00 |
|
Mike Reeves
|
bdfa47143e
|
Merge pull request #310 from Security-Onion-Solutions/bugfix/filebeatformaster
Fix Filebeat Cert
|
2020-02-05 18:43:46 -05:00 |
|
Mike Reeves
|
9f53d2ce3e
|
Fix Filebeat Cert
|
2020-02-05 18:42:55 -05:00 |
|
William Wernert
|
c5fa0fcdf7
|
Merge branch 'dev' of github.com:Security-Onion-Solutions/securityonion-saltstack into dev
|
2020-02-05 18:17:36 -05:00 |
|
William Wernert
|
9779037e99
|
crossthestream -> crossthestreams
|
2020-02-05 18:16:43 -05:00 |
|
weslambert
|
aeec5563eb
|
Merge pull request #309 from Security-Onion-Solutions/fix/redis_conf
Remove Redis config from eval PL
|
2020-02-05 15:36:04 -05:00 |
|
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 |
|