Commit Graph

2001 Commits

Author SHA1 Message Date
William Wernert
140feb5515 Fix git merge leftovers 2020-01-10 08:58:50 -05:00
William Wernert
5cb8bd61b6 Merge remote-tracking branch 'origin/dev' into feature/auth
# Conflicts:
#	salt/common/nginx/nginx.conf.so-eval
2020-01-09 18:41:46 -05:00
weslambert
6ea941dfba Merge pull request #205 from Security-Onion-Solutions/feature/soscripts
soscripts - so-elastic-diagnose
2020-01-09 15:07:32 -05:00
William Wernert
1bfb8bbea2 Update SO-Auth version 2020-01-09 12:20:25 -05:00
Josh Brower
209f60d99e soscripts - so-elastic-diagnose 2020-01-08 16:13:10 -05:00
Josh Brower
665b8170ed Merge pull request #204 from Security-Onion-Solutions/cyberchef2core
Remove cyberchef from proxy conf
2020-01-08 09:59:31 -05:00
Wes Lambert
79ef0b6e1f remove cyberchef from proxy conf 2020-01-08 14:27:50 +00:00
weslambert
7b081b10ad Merge pull request #203 from Security-Onion-Solutions/feature/soscripts-elastalert
so scripts - elastalert dev
2020-01-07 17:08:35 -05:00
Josh Brower
243e97f761 so scripts - elastalert dev 2020-01-07 15:19:33 -05:00
weslambert
c91acd654a Merge pull request #202 from Security-Onion-Solutions/feature/playbook-bulkimport
Playbook - redmine.db schema changes
2020-01-06 16:23:02 -05:00
Josh Brower
5ce5a46292 Playbook - redmine.db schema changes 2020-01-05 21:25:01 -05:00
Josh Brower
0c08f8e727 Merge pull request #200 from Security-Onion-Solutions/bugfix/tcpreplay
fix typo
2020-01-03 16:34:12 -05:00
Wes Lambert
a646c1123f fix typo 2020-01-03 21:31:40 +00:00
weslambert
fbf6e5590d Merge pull request #199 from Security-Onion-Solutions/feature/issue127
manage threshold.conf with Salt - #127
2020-01-03 14:57:43 -05:00
m0duspwnens
4dc667d805 change threshold.conf template - https://github.com/Security-Onion-Solutions/securityonion-saltstack/issues/127 2020-01-03 14:50:32 -05:00
m0duspwnens
7415ed8dd0 manage threshold.conf with Salt - https://github.com/Security-Onion-Solutions/securityonion-saltstack/issues/127 2020-01-03 13:31:19 -05:00
weslambert
cc4b536042 Merge pull request #198 from Security-Onion-Solutions/feature/so-scripts
SO Scripts - start|stop|restart
2020-01-02 16:03:41 -05:00
Josh Brower
3d436037e2 SO Scripts - start|stop|restart 2020-01-02 15:58:15 -05:00
weslambert
5358220121 Merge pull request #197 from Security-Onion-Solutions/feature/so-scripts-stop
so-stop scripts - initial commit
2020-01-02 13:38:19 -05:00
Josh Patterson
3ed6baccdf Merge pull request #196 from Security-Onion-Solutions/feature/freqserver
Break out FS & DS into their own states
2020-01-02 12:52:18 -05:00
Josh Brower
4b23d333ef so-stop scripts - initial commit 2020-01-02 12:29:56 -05:00
Josh Brower
5a772e4f1c Break out FS & DS into their own states 2020-01-02 11:43:28 -05:00
Mike Reeves
e39adc65d8 Merge pull request #195 from Security-Onion-Solutions/feature/zeek_clean
add Zeek clean script
2020-01-02 11:05:38 -05:00
Mike Reeves
272a31f31d Merge pull request #194 from Security-Onion-Solutions/feature/thehive_alerter
update TheHiveAlerter module
2020-01-02 11:05:11 -05:00
Mike Reeves
389e3feb05 Merge pull request #193 from Security-Onion-Solutions/feature/wazuh_updates
Add AR whitelist for Wazuh (analyst role)
2020-01-02 11:04:46 -05:00
Wes Lambert
82abdedb02 add license 2020-01-02 15:55:52 +00:00
Wes Lambert
82f1d5718a add exclusion for Zeek clean log and extracted file mgmt 2020-01-02 15:39:38 +00:00
Wes Lambert
566d3ed280 revise message text 2020-01-02 15:20:34 +00:00
Wes Lambert
c4f57f09ee add Zeek clean script 2020-01-02 15:13:46 +00:00
William Wernert
c7e98f17e1 Add volume binding to so-auth-api 2019-12-31 17:19:57 -05:00
Wes Lambert
bc533bef24 update TheHiveAlerter module 2019-12-30 21:10:56 +00:00
Wes Lambert
f597b9f4e5 add AR whitelist for Wazuh 2019-12-30 19:04:54 +00:00
Mike Reeves
bbd95c977c Merge pull request #184 from Security-Onion-Solutions/issues/157
Issues/157
2019-12-30 13:47:46 -05:00
Mike Reeves
c6345a8950 Merge pull request #192 from Security-Onion-Solutions/feature/wazuh_updates
Wazuh: Add auth log path for Centos
2019-12-30 13:47:13 -05:00
Mike Reeves
9ee0273180 Merge pull request #183 from Security-Onion-Solutions/feature/so-scripts
more so-restart scripts
2019-12-30 13:46:41 -05:00
Wes Lambert
df722c173f fix typo and prevent agent from getting re-added 2019-12-30 17:47:00 +00:00
Wes Lambert
ffc116085e add auth log path for Centos 2019-12-30 17:32:54 +00:00
m0duspwnens
1b8bb8e761 fix writing to PILLARFILE 2019-12-20 16:02:20 -05:00
William Wernert
8ded3d0e9b Merge branch 'dev' into feature/auth 2019-12-20 15:43:26 -05:00
William Wernert
ac800782f7 [BUG] Remove unneeded dir from auth salt file
Auth no longer needs a volume mount, so remove its directory
2019-12-20 15:34:23 -05:00
m0duspwnens
2feb14503c changes for https://github.com/Security-Onion-Solutions/securityonion-saltstack/issues/157 2019-12-20 14:40:08 -05:00
William Wernert
74e0092352 Merge branch 'dev' into feature/auth 2019-12-20 14:37:52 -05:00
Josh Brower
beb12663f5 more so-restart scripts 2019-12-20 13:10:53 -05:00
weslambert
8829b5132e Merge pull request #179 from Security-Onion-Solutions/feature/cyberchef_cleanup
Remove Cyberchef from top file since it is now in so-core
2019-12-20 12:40:44 -05:00
Mike Reeves
4ed7751fb8 Merge pull request #182 from Security-Onion-Solutions/quickfix/issue176
rename logstash config for storage to search
2019-12-20 12:39:29 -05:00
m0duspwnens
ed28be4ba9 rename logstash config for storage to search - https://github.com/Security-Onion-Solutions/securityonion-saltstack/issues/176 2019-12-20 11:32:55 -05:00
Wes Lambert
124c552fca remove Cyberchef from top file since it is now in so-core 2019-12-20 15:49:22 +00:00
Mike Reeves
c2a4de3f70 Merge pull request #162 from Security-Onion-Solutions/feature/strelka
Strelka - initial config
2019-12-20 10:28:37 -05:00
Wes Lambert
eea08f3515 add back helix 2019-12-20 01:24:20 +00:00
weslambert
574ee6b97a Merge pull request #174 from Security-Onion-Solutions/quickfix/cyberchef-version
[BUG] Updated missed text in cyberchef init.sls
2019-12-19 18:12:11 -05:00