Commit Graph

87 Commits

Author SHA1 Message Date
William Wernert
714cd522cb Merge branch 'dev' into feature/setup-refactor
# Conflicts:
#	README.md
#	VERSION
#	pillar/top.sls
#	salt/common/grafana/grafana_dashboards/eval/eval.json
#	salt/common/init.sls
#	salt/common/tools/sbin/so-status
#	salt/curator/init.sls
#	salt/elastalert/init.sls
#	salt/elasticsearch/init.sls
#	salt/filebeat/init.sls
#	salt/fleet/files/scripts/so-fleet-setup
#	salt/fleet/init.sls
#	salt/grafana/dashboards/sensor_nodes/sensor.json
#	salt/hive/init.sls
#	salt/idstools/init.sls
#	salt/kibana/bin/so-kibana-config-load
#	salt/logstash/init.sls
#	salt/master/init.sls
#	salt/mysql/init.sls
#	salt/nginx/etc/index.html
#	salt/pcap/init.sls
#	salt/playbook/init.sls
#	salt/reactor/fleet.sls
#	salt/redis/init.sls
#	salt/sensoroni/init.sls
#	salt/soctopus/init.sls
#	salt/strelka/init.sls
#	salt/suricata/init.sls
#	salt/tcpreplay/init.sls
#	salt/wazuh/init.sls
#	salt/zeek/init.sls
#	setup/so-functions
#	setup/so-setup
#	setup/so-whiptail
2020-05-04 10:35:53 -04:00
William Wernert
3bfaa6f8de [merge] Merge master into feature/setup-refactor 2020-04-28 01:35:09 -04:00
m0duspwnens
766b56a944 update dockers to 1.2.2 2020-04-23 10:11:26 -04:00
Josh Brower
e660de236a osquery pipeline fix 2020-04-18 19:11:18 -04:00
Mike Reeves
759204e77b Update Versions 2020-04-18 19:04:23 -04:00
Wes Lambert
b67229783b update parsing for Zeek files 2020-04-18 18:59:21 -04:00
Josh Brower
9216d92488 osquery ingest ecs 2020-04-18 18:58:27 -04:00
Josh Brower
12af856d00 fleet osquery fixes 2020-04-18 18:58:25 -04:00
Mike Reeves
18450815d8 Have templates applied on the master only 2020-04-18 18:55:44 -04:00
Mike Reeves
d3699cb9e3 Remove ES watch 2020-04-18 18:54:43 -04:00
Mike Reeves
a7c8df7f45 Fix ES Watch 2020-04-18 18:54:43 -04:00
Mike Reeves
786454c8d4 Make Kibana run faster on checkins 2020-04-18 18:53:50 -04:00
Josh Brower
6332509a33 osquery pipeline fix 2020-04-15 20:22:54 -04:00
Mike Reeves
d9e27a5444 Update Versions 2020-04-15 15:37:59 -04:00
Wes Lambert
59787a6532 update parsing for Zeek files 2020-04-14 13:08:31 +00:00
Josh Brower
634100318e osquery ingest ecs 2020-04-13 10:58:13 -04:00
Josh Brower
edae63097c fleet osquery fixes 2020-04-10 16:56:37 -04:00
Mike Reeves
6625e17bf2 Have templates applied on the master only 2020-04-09 12:22:27 -04:00
Mike Reeves
ac52c014d1 Remove ES watch 2020-04-09 11:30:24 -04:00
Mike Reeves
0b07d0f25f Fix ES Watch 2020-04-09 11:25:46 -04:00
Mike Reeves
5692f2a672 Make Kibana run faster on checkins 2020-04-09 11:16:36 -04:00
Wes Lambert
9e50387eec update ingest files 2020-04-05 20:40:00 +00:00
Wes Lambert
e023aeb9be use agent name for observer name 2020-04-01 21:27:25 +00:00
weslambert
f13093dc51 Add message rename 2020-04-01 11:31:57 -04:00
Josh Brower
0e76447d11 osquery ingest - initial support 2020-04-01 10:17:36 -04:00
Wes Lambert
eacd3c9bfd update zeek.common 2020-03-31 00:36:42 +00:00
Wes Lambert
ad50093315 add community_id parsing for ingest 2020-03-30 15:49:36 +00:00
Wes Lambert
93c3c86e2f update wazuh fields and category 2020-03-30 14:24:01 +00:00
Wes Lambert
ef808875f4 fix ossec fields 2020-03-24 15:42:31 +00:00
Wes Lambert
083c588a87 add some more fields 2020-03-24 03:43:31 +00:00
Wes Lambert
a5ff21c528 remove agent field for non-Wazuh logs 2020-03-17 15:20:46 +00:00
Wes Lambert
b80e7fedcb remove agent field for non-Wazuh logs 2020-03-17 15:20:31 +00:00
Wes Lambert
488858f8bc remove beat field removal 2020-03-17 15:19:08 +00:00
Wes Lambert
faea67c9cf update env vars 2020-03-17 15:17:13 +00:00
Wes Lambert
b6ba8e483d update ES init 2020-03-14 12:06:32 +00:00
Wes Lambert
c52220330b modify pipelines 2020-03-14 12:03:32 +00:00
Wes Lambert
648b0ba790 remove old config 2020-03-11 12:14:22 +00:00
Wes Lambert
9ad16e8c71 upadte ingest config 2020-03-11 12:13:53 +00:00
Wes Lambert
b1203cfb9f add initial Strelka ingest config 2020-03-03 21:20:45 +00:00
Wes Lambert
ec6638a276 src/dst ip/port fields to ECS 2020-03-02 19:10:18 +00:00
Wes Lambert
e4fee51ed6 Change Bro Files source to file_source 2020-03-02 19:09:24 +00:00
m0duspwnens
306cc1127b heavynode 2020-01-29 12:56:25 -05:00
Wes Lambert
fbb9f099f9 Update Elastic state files 2020-01-28 14:49:58 +00: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
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
e141443238 Fix some contianer links 2020-01-14 11:05:36 -05:00
Mike Reeves
ae55b59048 Switch to using images in registry 2020-01-14 10:11:26 -05:00
Wes Lambert
7e1870e9d0 update image versions 2020-01-13 13:52:30 +00:00
Josh Brower
5a772e4f1c Break out FS & DS into their own states 2020-01-02 11:43:28 -05:00