Commit Graph

2062 Commits

Author SHA1 Message Date
William Wernert
aa43cc4e01 Merge pull request #322 from Security-Onion-Solutions/hotfix/so-status
hotfix/so-status
2020-02-09 22:46:43 -05:00
William Wernert
301ff77501 [fix] Jinja2 templating comparisons 2020-02-09 22:30:39 -05:00
William Wernert
d29cd1caee [fix] Elastalert typo 2020-02-09 22:30:37 -05:00
William Wernert
2804247f88 [fix] Syntax errors in so-status 2020-02-09 22:30:36 -05:00
William Wernert
95c394cae8 Merge pull request #321 from Security-Onion-Solutions/hotfix/checksum-offload-dir
hotfix/checksum-offload-dir
2020-02-08 18:46:28 -05:00
William Wernert
b341a7f0cd [fix] Move checksum offload script dir to pre-up.d 2020-02-08 18:43:33 -05:00
William Wernert
319c22d740 Merge pull request #320 from Security-Onion-Solutions/hotfix/checksum-offload
hotfix/checksum-offload
2020-02-08 12:38:41 -05:00
William Wernert
9218121a23 [fix] checksum-offload-disable syntax errors 2020-02-08 12:35:52 -05:00
Mike Reeves
fe6990dfb3 Merge pull request #318 from Security-Onion-Solutions/bugfix/wazuhpath
Bugfix/wazuhpath
2020-02-07 16:49:11 -05:00
Mike Reeves
3dc73278a2 Fix Wazuh paths for logstash 2020-02-07 16:47:45 -05:00
Mike Reeves
9740b23b1d Fix Wazuh paths for logstash 2020-02-07 16:42:16 -05:00
Mike Reeves
98a6a1d1d5 Merge pull request #317 from Security-Onion-Solutions/bugfix/wazuhpath
Fix Wazuh paths for logstash
2020-02-07 16:18:14 -05:00
Mike Reeves
e4a73d9773 Fix Wazuh paths for logstash 2020-02-07 16:16:28 -05:00
Mike Reeves
7fc0a09abf Merge pull request #316 from Security-Onion-Solutions/bugfix/wazuhpath
Fix Wazuh paths for logstash/fb
2020-02-07 08:54:44 -05:00
Mike Reeves
bf6101fc30 Merge branch 'dev' into bugfix/wazuhpath 2020-02-07 08:54:32 -05:00
Mike Reeves
6ceb127c46 Fix Wazuh paths for logstash/fb 2020-02-07 08:52:09 -05:00
Mike Reeves
a77f44cf29 Merge pull request #315 from Security-Onion-Solutions/bugfix/wazuh
Fix Wazuh perms
2020-02-06 18:56:20 -05:00
Mike Reeves
3cfec72b40 Fix Wazuh perms 2020-02-06 18:55:23 -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