William Wernert
|
5805d68b58
|
[fix] Fix dev merge issues
|
2020-05-04 10:55:00 -04:00 |
|
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
|
26e40f433b
|
[fix] Pull docker/config.sls changes from dev
|
2020-05-04 10:28:44 -04:00 |
|
William Wernert
|
c82f55695c
|
[fix] Docker container list fix
|
2020-05-04 10:27:07 -04:00 |
|
m0duspwnens
|
2dd2289c94
|
fix some happy mistakes - https://github.com/Security-Onion-Solutions/securityonion-saltstack/issues/619
|
2020-05-01 15:37:54 -04:00 |
|
William Wernert
|
0ee4aa9eb9
|
[fix] Move common pillar values to the bottom of the top file
|
2020-04-29 18:13:22 -04:00 |
|
William Wernert
|
5e18eb6e4d
|
[fix] Use False instead of 0 as default val in docker/config.sls
|
2020-04-29 18:12:50 -04:00 |
|
William Wernert
|
bf41fe838c
|
[fix] Correct order of setup salt states
|
2020-04-28 22:40:21 -04:00 |
|
m0duspwnens
|
fdf5450a2e
|
remove stuff.sls
|
2020-04-28 14:29:44 -04:00 |
|
m0duspwnens
|
8d2ca003fb
|
change how we populate local.zeek - https://github.com/Security-Onion-Solutions/securityonion-saltstack/issues/585
|
2020-04-28 14:10:57 -04:00 |
|
m0duspwnens
|
b6741daca6
|
pillarize local.zeek and move zeekctl from defaults.yml to zeek pillar - https://github.com/Security-Onion-Solutions/securityonion-saltstack/issues/585
|
2020-04-28 09:44:37 -04:00 |
|
William Wernert
|
3bfaa6f8de
|
[merge] Merge master into feature/setup-refactor
|
2020-04-28 01:35:09 -04:00 |
|
m0duspwnens
|
7e34595f99
|
rename docker container so-core to so-nginx - https://github.com/Security-Onion-Solutions/securityonion-saltstack/issues/587
|
2020-04-21 15:16:08 -04:00 |
|
m0duspwnens
|
eca8cf5502
|
remove logstash pillars from eval in top
|
2020-04-18 19:12:21 -04:00 |
|
Josh Brower
|
294fb67007
|
so-status Fleet node
|
2020-04-18 18:54:42 -04:00 |
|
William Wernert
|
87e6763859
|
[fix] Change script permissions to allow execution
|
2020-04-18 18:53:43 -04:00 |
|
m0duspwnens
|
a8bd50a0cd
|
adding searchnode to pillar/top
|
2020-04-18 18:10:33 -04:00 |
|
m0duspwnens
|
93c0730a2f
|
remove logstash pillars from eval in top
|
2020-04-16 16:12:24 -04:00 |
|
Josh Brower
|
55ae5fa9f3
|
so-status Fleet node
|
2020-04-09 10:04:18 -04:00 |
|
m0duspwnens
|
f28187099d
|
adding searchnode to pillar/top
|
2020-04-08 14:43:06 -04:00 |
|
Josh Brower
|
051f6d2310
|
Fleet pipeline fixes
|
2020-04-03 16:10:38 -04:00 |
|
m0duspwnens
|
5411307856
|
change default healthcheck schedule to 300 seconds
|
2020-04-02 19:46:29 -04:00 |
|
m0duspwnens
|
290abaf1d7
|
merge with dev and resolve conflicts
|
2020-04-02 15:24:23 -04:00 |
|
m0duspwnens
|
ec60b7a2d4
|
changing back from beacon to scheduled jobs for healthcheck
|
2020-04-02 15:22:20 -04:00 |
|
Mike Reeves
|
4368bebbd5
|
Merge pull request #503 from Security-Onion-Solutions/feature/soremote
Feature/soremote
|
2020-04-02 15:13:28 -04:00 |
|
Mike Reeves
|
e270b18d94
|
Remove special character in logstash pillar
|
2020-04-02 14:25:58 -04:00 |
|
Jason Ertel
|
a25c16508f
|
Renamed auth pillar to secrets pillar; removed remnants from old auth saltstack
|
2020-04-02 11:24:13 -04:00 |
|
Josh Patterson
|
7e21dd92ba
|
Merge pull request #496 from Security-Onion-Solutions/issue/90
adding auth and comment back to pillar and salt top
|
2020-04-01 15:37:21 -04:00 |
|
m0duspwnens
|
884e267db5
|
adding auth and comment back to pillar and salt top
|
2020-04-01 15:36:15 -04:00 |
|
weslambert
|
edbe512d82
|
Bro to Zeek
|
2020-04-01 15:18:30 -04:00 |
|
Wes Lambert
|
22e7777d67
|
update search sls
|
2020-04-01 19:12:07 +00:00 |
|
weslambert
|
9f58081ce8
|
Typo
|
2020-04-01 14:57:47 -04:00 |
|
weslambert
|
d0ad7e7ef9
|
Update config for search pipeline
|
2020-04-01 14:57:32 -04:00 |
|
m0duspwnens
|
62e8aa1063
|
fix conflict in salt/top.sls
|
2020-04-01 13:09:23 -04:00 |
|
m0duspwnens
|
9acaa514cf
|
monitoring zeek - https://github.com/Security-Onion-Solutions/securityonion-saltstack/issues/90
|
2020-04-01 13:06:37 -04:00 |
|
Jason Ertel
|
cbd710bcf2
|
Replaced auth system with new identity management system.
|
2020-03-30 19:27:56 -04:00 |
|
m0duspwnens
|
c14f32fcc9
|
more changes for healthcheck - https://github.com/Security-Onion-Solutions/securityonion-saltstack/issues/90
|
2020-03-26 15:45:19 -04:00 |
|
m0duspwnens
|
cfdaedb89c
|
changes to healthcheck. specify mount points for telegraf
|
2020-03-26 11:00:46 -04:00 |
|
Josh Brower
|
9bcba41882
|
Feature/Fleet-Standalone
|
2020-03-24 20:57:24 -04:00 |
|
Wes Lambert
|
81da44b85d
|
fix Logstash Eval SLS
|
2020-03-15 00:32:29 +00:00 |
|
Josh Patterson
|
8b0509aa4a
|
Merge pull request #415 from Security-Onion-Solutions/issue/136
Issue/136
|
2020-03-12 17:46:38 -04:00 |
|
m0duspwnens
|
804a87eb21
|
append role to minion id and use it to target in top - https://github.com/Security-Onion-Solutions/securityonion-saltstack/issues/136
|
2020-03-12 17:42:32 -04:00 |
|
Wes Lambert
|
84e54a8fae
|
update Eval pillar
|
2020-03-11 12:09:34 +00:00 |
|
weslambert
|
4a4c378327
|
Add bro template
|
2020-03-09 09:18:14 -04:00 |
|
Wes Lambert
|
b75bd35bc2
|
remove Strelka from LS PL
|
2020-03-03 21:19:54 +00:00 |
|
Wes Lambert
|
3fbb81f6d1
|
cleanup default config files
|
2020-03-03 18:03:45 +00:00 |
|
Wes Lambert
|
880c5abe6b
|
prune default loaded configs for Eval Mode
|
2020-03-02 19:58:46 +00:00 |
|
m0duspwnens
|
0c4973ad77
|
pillarize logstash config,parsers,templates and docker port bindings
|
2020-02-25 17:44:32 -05:00 |
|
m0duspwnens
|
2b34bdece9
|
logstash cleanup - https://github.com/Security-Onion-Solutions/securityonion-saltstack/issues/326
|
2020-02-20 16:47:40 -05:00 |
|
m0duspwnens
|
6a7580404d
|
directory cleanup - logstash pipeline rework
|
2020-02-19 13:08:14 -05:00 |
|