Commit Graph

125 Commits

Author SHA1 Message Date
Mike Reeves
1bb77fb07a Activate 18.04 2020-03-04 13:56:49 -05:00
William Wernert
e656e5af45 [fix] so-functions and so-restart 2020-02-12 09:26:34 -05:00
William Wernert
fe2de8c9e4 Merge branch 'master' into dev
# Conflicts:
#	setup/so-functions
2020-02-12 09:13:31 -05:00
Wes Lambert
e76dc73ea6 change Wazuh install order 2020-02-12 03:44:20 +00:00
Mike Reeves
34f6cec8e2 Set Unique ID in Pillar file 2020-02-10 14:32:36 -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
9218121a23 [fix] checksum-offload-disable syntax errors 2020-02-08 12:35:52 -05:00
Mike Reeves
e4a73d9773 Fix Wazuh paths for logstash 2020-02-07 16:16:28 -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
William Wernert
7c00e7c286 [feature] Final changes for so-status re: predefined container list 2020-02-06 15:25:50 -05:00
Josh Patterson
3fff89e538 Merge pull request #308 from Security-Onion-Solutions/quickfix/helix
Quickfix/helix
2020-02-05 15:10:45 -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
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
f042cb074f add helix pipeline pillar 2020-02-05 11:10:12 -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
m0duspwnens
88967c2512 evalfix 2020-01-30 17:36:38 -05:00
weslambert
eba02ef3b4 Merge pull request #279 from Security-Onion-Solutions/features/heavynode
Features/heavynode
2020-01-29 17:07:00 -05:00
m0duspwnens
8b17d3ba6c change ls heap for heavy node - issue 277 2020-01-29 17:05:11 -05:00
m0duspwnens
817044a000 chagne ls heap for eval and mastersearch - https://github.com/Security-Onion-Solutions/securityonion-saltstack/issues/277 2020-01-29 16:26:35 -05:00
Wes Lambert
f187180509 change bro user to zeek 2020-01-29 18:50:09 +00:00
m0duspwnens
306cc1127b heavynode 2020-01-29 12:56:25 -05:00
William Wernert
50d4693a09 Merge branch 'dev' into feature/script-fixes 2020-01-28 21:39:41 -05:00
Wes Lambert
b92cceb986 Fix order of static add 2020-01-28 19:44:56 +00:00
Wes Lambert
1de8902eef Add default to setup 2020-01-28 14:45:29 +00:00
William Wernert
3d4e805b60 Merge branch 'dev' into feature/script-fixes 2020-01-23 17:11:45 -05:00
m0duspwnens
5603afd2bd quick fix for missing master search items in setup 2020-01-23 15:36:26 -05:00
William Wernert
d2a7ef1e64 [fix] Misc script convention changes
* Remove sudo from scripts that are already running as sudo
* Also remove sudo from several so scripts and add sudo check
* Remove .sh extension from user facing scripts
* Remove superfluous # characters from so scripts
* Rename scripts to follow so-{subject}-{verb} naming convention
* Add shebangs where missing
2020-01-23 14:23:26 -05:00
Mike Reeves
bf6c309f16 Update Registry to unpack new repo 2020-01-23 11:09:55 -05:00
Mike Reeves
2c619db6ad Update Registry to unpack new repo 2020-01-23 10:45:08 -05:00
Mike Reeves
e038a8b731 Merge branch 'dev' into feature/issue124 2020-01-21 16:48:26 -05:00
m0duspwnens
a39edad3f6 changes for multipipelines / mastersearch node - https://github.com/Security-Onion-Solutions/securityonion-saltstack/issues/124 2020-01-21 16:39:42 -05:00
Mike Reeves
9f57a9bb4b Update functions.sh 2020-01-17 17:11:09 -05:00
Mike Reeves
be01931520 Upgrade Salt Version to 2019.2.3 2020-01-17 09:19:52 -05:00
Mike Reeves
c19ce2d527 Update Error message if localhsot is in there 2020-01-16 11:32:14 -05:00
Mike Reeves
593c8a9ea5 If contains localhost don't allow to move forward 2020-01-16 11:24:17 -05:00
William Wernert
54fb2ad244 Merge branch 'dev' of github.com:Security-Onion-Solutions/securityonion-saltstack into feature/registry
# Conflicts:
#	salt/common/init.sls
#	salt/elasticsearch/init.sls
#	salt/filebeat/init.sls
#	salt/hive/init.sls
#	salt/kibana/init.sls
#	salt/logstash/init.sls
#	salt/suricata/init.sls
#	salt/tcpreplay/init.sls
#	salt/wazuh/init.sls
2020-01-14 15:48:56 -05:00
Mike Reeves
aa3016d1b8 Speed up Downloads of Containers 2020-01-14 10:56:24 -05:00
Mike Reeves
ae55b59048 Switch to using images in registry 2020-01-14 10:11:26 -05:00
Mike Reeves
d73c3159e7 Need Firewalls 2020-01-13 16:55:19 -05:00
Mike Reeves
a542198289 Need Firewalls 2020-01-13 16:48:28 -05:00
Mike Reeves
e92fcdc67c Need Firewalls 2020-01-13 16:42:35 -05:00
Mike Reeves
b69249b2c0 Break out registry 2020-01-13 16:35:37 -05:00
Mike Reeves
ed3c2b1bac Break out registry 2020-01-13 16:33:20 -05:00
Mike Reeves
4d28224774 Fix Variable for registry 2020-01-13 16:14:53 -05:00
Mike Reeves
28905a4319 Fix docker seed 2020-01-13 16:07:08 -05:00
Mike Reeves
4d00f26c35 Switch to Zeek and download registry 2020-01-13 15:51:38 -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
m0duspwnens
1b8bb8e761 fix writing to PILLARFILE 2019-12-20 16:02:20 -05:00