Commit Graph

401 Commits

Author SHA1 Message Date
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
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
fd87e7bc1d breakout common state - https://github.com/Security-Onion-Solutions/securityonion-saltstack/issues/587 2020-04-21 13:01:56 -04:00
m0duspwnens
8fd79fb6c8 add missing , 2020-04-18 19:11:18 -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
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
m0duspwnens
ff56b0db2b update nsm threshholds for searchnode 2020-04-18 19:03:10 -04:00
m0duspwnens
e6f1d487a9 changes to master dashboard 2020-04-18 19:03:10 -04:00
m0duspwnens
2cca01fdee update master dashboard 2020-04-18 19:03:10 -04:00
m0duspwnens
c95ecac7a3 rename forward node to sensor node for grafana 2020-04-18 19:03:09 -04:00
m0duspwnens
b33eccf929 rename forward node to sensor node for grafana 2020-04-18 19:03:09 -04:00
m0duspwnens
4b35098dfe rename forward node to sensor node for grafana 2020-04-18 19:03:09 -04:00
m0duspwnens
9d04c7fb7c remove graph from uptime eval 2020-04-18 19:03:08 -04:00
m0duspwnens
e8990b4009 zeek restart count red if >= 1 2020-04-18 19:03:08 -04:00
m0duspwnens
70010db77b fix spacing in zeek packet loss grafana panel 2020-04-18 19:03:07 -04:00
m0duspwnens
812e439d85 changes to eval grafana dashboard 2020-04-18 19:03:07 -04:00
Jason Ertel
ad26900a01 Ensure Path=/ is specified for cookie for eval mode 2020-04-18 18:58:24 -04:00
Jason Ertel
f205d97f26 support auto redirect on login 2020-04-18 18:56:34 -04:00
Jason Ertel
9c2975a546 Continued auth improvements 2020-04-18 18:56:33 -04:00
m0duspwnens
38d4687b78 fix missing telegraf data for /nsm 2020-04-18 18:54:42 -04:00
Wes Lambert
f2b3ca8763 add Kibana config export command 2020-04-18 18:08:41 -04:00
m0duspwnens
38d0d5285e add missing , 2020-04-16 00:19:16 -04:00
m0duspwnens
e4f384f25c remove space - https://github.com/Security-Onion-Solutions/securityonion-saltstack/issues/571 2020-04-15 16:09:12 -04:00
m0duspwnens
a7dea8b087 fix bug not allowing grafana to install on mastersearch - https://github.com/Security-Onion-Solutions/securityonion-saltstack/issues/571 2020-04-15 16:06:17 -04:00
Mike Reeves
acc323f5ca Merge branch 'dev' of https://github.com/Security-Onion-Solutions/securityonion-saltstack into dev 2020-04-15 15:38:05 -04:00
Mike Reeves
d9e27a5444 Update Versions 2020-04-15 15:37:59 -04:00
m0duspwnens
11be93e9a4 fix nsm threshold sensor dashboard 2020-04-15 14:57:00 -04:00
Josh Patterson
19190cd137 Merge pull request #565 from Security-Onion-Solutions/issue/551
Issue/551
2020-04-15 10:21:33 -04:00
m0duspwnens
2e5877ff68 update nsm threshholds for searchnode 2020-04-15 10:16:30 -04:00
m0duspwnens
bef6d6d9f7 changes to master dashboard 2020-04-15 10:16:01 -04:00
m0duspwnens
e38d199e25 update master dashboard 2020-04-15 09:04:42 -04:00
m0duspwnens
eb3a069e8d rename forward node to sensor node for grafana 2020-04-14 19:02:44 -04:00
m0duspwnens
bb7c78891e rename forward node to sensor node for grafana 2020-04-14 18:55:08 -04:00
m0duspwnens
274ab07ce8 rename forward node to sensor node for grafana 2020-04-14 18:48:33 -04:00
m0duspwnens
41fd4fe715 remove graph from uptime eval 2020-04-14 18:47:49 -04:00
m0duspwnens
51b68fde2d zeek restart count red if >= 1 2020-04-14 15:36:57 -04:00
m0duspwnens
efd43f6fe4 fix spacing in zeek packet loss grafana panel 2020-04-14 15:13:16 -04:00
m0duspwnens
28b4381e3c changes to eval grafana dashboard 2020-04-14 14:25:46 -04:00
Jason Ertel
c5a4e567d9 Ensure Path=/ is specified for cookie for eval mode 2020-04-10 16:35:58 -04:00
Jason Ertel
3bf7a5aab5 Merge pull request #549 from Security-Onion-Solutions/feature/auth
Feature/auth
2020-04-09 17:39:23 -04:00
Jason Ertel
c130c8fbf4 Merge branch 'dev' into feature/auth 2020-04-09 17:37:09 -04:00
Jason Ertel
bb470be4e6 support auto redirect on login 2020-04-09 17:37:03 -04:00
m0duspwnens
7fe25f4c96 fix missing telegraf data for /nsm 2020-04-08 17:36:16 -04:00