Josh Brower
|
bc34c67f47
|
Merge remote-tracking branch 'remotes/origin/dev' into bugfix/playbook-mysql
|
2020-05-06 08:30:45 -04:00 |
|
Josh Brower
|
2e3bcf600f
|
Playbook mysql
|
2020-05-06 08:29:14 -04:00 |
|
Josh Patterson
|
d9dff52104
|
Merge pull request #627 from Security-Onion-Solutions/issue/623
nginx portion of https://github.com/Security-Onion-Solutions/securityonion-saltstack/issues/623
|
2020-05-04 15:45:23 -04:00 |
|
m0duspwnens
|
9adf08522c
|
nginx portion of https://github.com/Security-Onion-Solutions/securityonion-saltstack/issues/623
|
2020-05-04 15:43:09 -04:00 |
|
William Wernert
|
c42c22dc66
|
[fix] Correct require in fleet sls
|
2020-05-04 13:49:27 -04:00 |
|
William Wernert
|
80aee06a67
|
[fix] Remove files that are no longer in dev
|
2020-05-04 10:57:46 -04:00 |
|
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 |
|
m0duspwnens
|
2dd2289c94
|
fix some happy mistakes - https://github.com/Security-Onion-Solutions/securityonion-saltstack/issues/619
|
2020-05-01 15:37:54 -04:00 |
|
m0duspwnens
|
e2244bd839
|
use maps for so-status - https://github.com/Security-Onion-Solutions/securityonion-saltstack/issues/619
|
2020-05-01 13:21:11 -04:00 |
|
William Wernert
|
3d04ab59d5
|
[fix] Comment template lines in so-status
|
2020-04-29 18:14:28 -04:00 |
|
m0duspwnens
|
9833d1754a
|
only do sed if fleet_node is true - https://github.com/Security-Onion-Solutions/securityonion-saltstack/issues/613
|
2020-04-29 11:19:28 -04:00 |
|
William Wernert
|
fcc15e283a
|
[fix] Remove duplicate salt state
|
2020-04-28 22:38:52 -04:00 |
|
William Wernert
|
e1a457e445
|
[fix] Correct mysql port
|
2020-04-28 22:38:36 -04:00 |
|
William Wernert
|
05c55efe12
|
[fix] Test for 3306 on MASTERIP, not localhost
|
2020-04-28 16:19:08 -04:00 |
|
William Wernert
|
3cff145e2d
|
[fix] Verify vm.max_map_count is present before so-thehive-es
|
2020-04-28 16:18:48 -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 |
|
William Wernert
|
fa09a0ef4d
|
[fix] Add back missing containers
|
2020-04-28 13:19:01 -04:00 |
|
m0duspwnens
|
c46a45f00f
|
LOAD to LOCAL in local.zeek and sort local.zeek and zeekctl.cfg output
|
2020-04-28 12:08:32 -04:00 |
|
m0duspwnens
|
ca42850a0c
|
add missing )
|
2020-04-28 11:31:19 -04:00 |
|
William Wernert
|
968e3189e7
|
[fix] Fix indentation on mysql init.sls + depend on mysql container for fleet
|
2020-04-28 10:57:14 -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
|
d88382af12
|
[refactor] Change fleet sls to depend on mysql
|
2020-04-28 01:36:57 -04:00 |
|
William Wernert
|
3bfaa6f8de
|
[merge] Merge master into feature/setup-refactor
|
2020-04-28 01:35:09 -04:00 |
|
Josh Patterson
|
90aabde4c9
|
Merge pull request #607 from Security-Onion-Solutions/issue/587
remove nginx from unneeded states
|
2020-04-27 15:10:12 -04:00 |
|
m0duspwnens
|
aff02e1f1c
|
remove nginx from unneeded states
|
2020-04-27 15:02:30 -04:00 |
|
Jason Ertel
|
e4afc20366
|
Update Kratos config to match latest version of Kratos
|
2020-04-24 16:27:36 -04:00 |
|
m0duspwnens
|
8a64ba727f
|
remote html bind for nginx
|
2020-04-24 16:18:55 -04:00 |
|
Mike Reeves
|
d695514929
|
Fix Error locations
|
2020-04-24 14:28:23 -04:00 |
|
m0duspwnens
|
3136affc91
|
updating nginx index.html - issue/587
|
2020-04-24 14:24:33 -04:00 |
|
Mike Reeves
|
09abd723d1
|
Add favicons back
|
2020-04-24 13:42:08 -04:00 |
|
m0duspwnens
|
766b56a944
|
update dockers to 1.2.2
|
2020-04-23 10:11:26 -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
|
fd87e7bc1d
|
breakout common state - https://github.com/Security-Onion-Solutions/securityonion-saltstack/issues/587
|
2020-04-21 13:01:56 -04:00 |
|
Mike Reeves
|
c024bdf427
|
remove proxy declaration
|
2020-04-20 15:31:13 -04:00 |
|
Wes Lambert
|
7ea861650f
|
updated placeholder in saved objects
|
2020-04-18 19:11:20 -04:00 |
|
Wes Lambert
|
8622dab0d2
|
update load script
|
2020-04-18 19:11:19 -04:00 |
|
Mike Reeves
|
977cf8d3d1
|
Update Notes
|
2020-04-18 19:11:19 -04:00 |
|
Mike Reeves
|
ff29c9741e
|
Update JOSN for release
|
2020-04-18 19:11:18 -04:00 |
|
m0duspwnens
|
8fd79fb6c8
|
add missing ,
|
2020-04-18 19:11:18 -04:00 |
|
Josh Brower
|
e660de236a
|
osquery pipeline fix
|
2020-04-18 19:11:18 -04:00 |
|
Mike Reeves
|
698a0d285c
|
Fix the Strelka redis
|
2020-04-18 19:11:17 -04:00 |
|
m0duspwnens
|
e2c8bdcd40
|
remove space - https://github.com/Security-Onion-Solutions/securityonion-saltstack/issues/571
|
2020-04-18 19:11:17 -04:00 |
|
m0duspwnens
|
1e8bb8b887
|
fix bug not allowing grafana to install on mastersearch - https://github.com/Security-Onion-Solutions/securityonion-saltstack/issues/571
|
2020-04-18 19:11:16 -04:00 |
|
William Wernert
|
8083550bb4
|
[fix] Revert find+replace error in suricata yaml
|
2020-04-18 19:10:35 -04:00 |
|
William Wernert
|
fcbd22318a
|
[feat] Add dependence on mysql state to fleet state
|
2020-04-18 19:10:34 -04:00 |
|
William Wernert
|
068672ea12
|
[feat] Add a port check to the mysql state
|
2020-04-18 19:10:34 -04:00 |
|
William Wernert
|
3ef3c157f3
|
[refactor][WIP] Setup changes part 6
|
2020-04-18 19:10:33 -04:00 |
|
m0duspwnens
|
860e4fcead
|
fix nsm threshold sensor dashboard
|
2020-04-18 19:04:24 -04:00 |
|
Mike Reeves
|
759204e77b
|
Update Versions
|
2020-04-18 19:04:23 -04:00 |
|