Commit Graph

1675 Commits

Author SHA1 Message Date
m0duspwnens
d94a76a2c7 fix docker_container_cpu calculations for grafana 2020-05-13 12:06:02 -04:00
m0duspwnens
581000b920 add grafana dashboard for mastersearch node - https://github.com/Security-Onion-Solutions/securityonion-saltstack/issues/227 2020-05-13 11:52:10 -04:00
m0duspwnens
56b92afb6b fix telegraf.conf for different roles 2020-05-12 16:54:38 -04:00
Josh Brower
abd907fee1 Merge pull request #659 from Security-Onion-Solutions/bugfix/nids-parsing-alerting
suricata parsing
2020-05-12 14:07:51 -04:00
Josh Brower
62bec93190 suricata parsing 2020-05-12 14:04:02 -04:00
Mike Reeves
0b7568e08f Update soc.json with default search info 2020-05-12 13:57:40 -04:00
Josh Brower
d1eac195d8 Enable Navigator 2020-05-11 22:41:54 -04:00
Josh Brower
4bd8e136be Enabled playbook 2020-05-11 22:41:02 -04:00
Josh Brower
09ce3e088a playbook mysql fixes 2020-05-11 22:39:13 -04:00
Josh Brower
b658f7133b Update top.sls 2020-05-11 09:48:24 -04:00
Mike Reeves
09e2413695 Remove version hardcode 2020-05-10 17:31:50 -04:00
Josh Brower
20e7331bb9 navigator fixes 2020-05-10 11:57:20 -04:00
Josh Brower
4977a8b17c Merge pull request #648 from Security-Onion-Solutions/bugfix/playbook-mysql
Fix playbook mysql errors
2020-05-10 07:58:39 -04:00
Josh Brower
02160b12ee Fix playbook mysql errors 2020-05-10 07:57:45 -04:00
Josh Brower
170d799470 Merge pull request #647 from Security-Onion-Solutions/bugfix/playbook-mysql
feature/playbook mysql
2020-05-09 16:30:50 -04:00
Jason Ertel
47295d42f5 Initial iteration of new SOC Event search module 2020-05-08 17:00:06 -04:00
Josh Brower
e3a3a01ee1 Merge remote-tracking branch 'remotes/origin/dev' into bugfix/playbook-mysql 2020-05-08 16:49:38 -04:00
Josh Brower
9b54a432fc mysql playbook 2020-05-08 16:36:59 -04:00
m0duspwnens
2e6e474a54 require with onchanges is redundant 2020-05-06 16:48:27 -04:00
m0duspwnens
0662245590 fix for https://github.com/Security-Onion-Solutions/securityonion-saltstack/issues/632 2020-05-06 16:38:39 -04:00
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