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 |
|
