Commit Graph

3686 Commits

Author SHA1 Message Date
William Wernert
49e5cb311e [fix][WIP] set ssl cert for redirect 443 server block 2020-07-08 16:05:48 -04:00
William Wernert
533ed395e7 [fix][WIP] Remove ssl and http2 from redirect server block 2020-07-08 15:59:31 -04:00
William Wernert
a0ffe26334 [fix] Only one default_server is allowed per port 2020-07-08 15:56:36 -04:00
William Wernert
0c3e35c55e [fix] correct jinja template syntax 2020-07-08 14:30:27 -04:00
William Wernert
cfd1b82e00 [refactor] Redirect to correct url_base + combine configs 2020-07-08 13:49:33 -04:00
weslambert
beda67d2a9 Merge pull request #955 from Security-Onion-Solutions/fix/strelka_message_drop
Drop message field and original exiftool keys
2020-07-08 10:56:06 -04:00
weslambert
4cf31e1ee7 Drop message field and original exiftool keys 2020-07-08 10:55:40 -04:00
Doug Burks
fef803a86c Add ignore_failure to geoip processor calls #942 2020-07-08 10:41:14 -04:00
Josh Patterson
3352eb77e9 Merge pull request #954 from Security-Onion-Solutions/issue/825
add pillar example for filebeat inputs/output
2020-07-08 09:53:18 -04:00
m0duspwnens
5f68542241 add pillar example for filebeat inputs/output 2020-07-08 09:52:25 -04:00
weslambert
9c11de5455 Merge pull request #953 from Security-Onion-Solutions/fix/zeek_files_uid
Rename uids to uid
2020-07-08 09:40:04 -04:00
weslambert
b25a3b6986 Rename uids to uid 2020-07-08 09:39:37 -04:00
weslambert
88b7a31195 Merge pull request #952 from Security-Onion-Solutions/fix/wazuh_authdport
Add Wazuh Authd Port
2020-07-08 09:26:28 -04:00
weslambert
987acaeb7b Add Wazuh Authd Port 2020-07-08 09:26:04 -04:00
Josh Brower
10cbc96f48 Merge pull request #948 from Security-Onion-Solutions/fix/fleet
Fleet setup bugfix
2020-07-07 20:56:43 -04:00
Josh Brower
b4b122dbd9 Fleet setup bugfix 2020-07-07 20:55:47 -04:00
William Wernert
4231fb1d1a Merge branch 'dev' of github.com:Security-Onion-Solutions/securityonion-saltstack into dev 2020-07-07 17:38:30 -04:00
William Wernert
72a98b33a7 [fix] Change test to check value of $SO_ERROR 2020-07-07 17:38:23 -04:00
Mike Reeves
cdce804c9f Update 9700_output_strelka.conf.jinja 2020-07-07 17:36:49 -04:00
weslambert
2992938596 Merge pull request #947 from Security-Onion-Solutions/fix/strelka_exiftool
Add fields for exiftool keys
2020-07-07 17:13:57 -04:00
Mike Reeves
fc377cd3c1 Merge pull request #945 from Security-Onion-Solutions/issue/929
SSL Lockdown
2020-07-07 16:31:33 -04:00
Mike Reeves
1954a389b0 Update so-functions 2020-07-07 16:12:07 -04:00
Mike Reeves
9576151993 Merge pull request #944 from Security-Onion-Solutions/issue/937
Issue/937
2020-07-07 16:07:47 -04:00
Wes Lambert
3b50ce032a Add fields for exiftool keys 2020-07-07 20:02:09 +00:00
Josh Patterson
07cc89e4d6 Merge pull request #943 from Security-Onion-Solutions/issue/825
Pillarize filebeat inputs and output
2020-07-07 15:51:08 -04:00
m0duspwnens
fff713db85 changes for https://github.com/Security-Onion-Solutions/securityonion/issues/825 2020-07-07 15:48:47 -04:00
Mike Reeves
eccfaf94fb Merge branch 'dev' of https://github.com/Security-Onion-Solutions/securityonion into issue/937 2020-07-07 15:10:12 -04:00
Jason Ertel
f4f189cc50 correct capitalization of true 2020-07-07 14:28:11 -04:00
William Wernert
640cfee3e1 Merge branch 'dev' of github.com:Security-Onion-Solutions/securityonion-saltstack into dev 2020-07-07 13:13:28 -04:00
William Wernert
3815f7e58e [refactor] Edit logic around setup failure/completion
* Always run `install_cleanup` and `so-allow`
* Change if statement to check whether `$success != 0` or if `$SO_ERROR` was set
* Set `$IP` only for `so-allow` instead of exporting it
2020-07-07 13:12:46 -04:00
William Wernert
1d47cec928 [refactor] Move install_cleanup outside of whiptail functions 2020-07-07 13:02:58 -04:00
William Wernert
0b995533ea [refactor] Only notify user of error found during setup 2020-07-07 13:01:29 -04:00
Mike Reeves
ec89ab39ac Update 9999_output_redis.conf.jinja 2020-07-07 11:56:45 -04:00
weslambert
34e06ecde1 Merge pull request #940 from Security-Onion-Solutions/feature/strelka_fuid
Add Zeek FUID for Strelka records
2020-07-07 11:01:09 -04:00
Wes Lambert
e0570e1db7 Add Zeek FUID for Strelka records 2020-07-07 15:00:01 +00:00
Mike Reeves
c59096d9bd rename node pillar to elasticsearch 2020-07-07 10:42:12 -04:00
Jason Ertel
62cc02301e Do not attempt to install a plugin or bc command if already exists 2020-07-07 10:28:15 -04:00
weslambert
d334d5ab83 Merge pull request #938 from Security-Onion-Solutions/fix/strelka_filebeat
Fix pillar reference for Strelka/FB
2020-07-07 09:48:19 -04:00
Wes Lambert
2fdd5fd77b Fix pillar reference for Strelka/FB 2020-07-07 13:46:57 +00:00
William Wernert
e2c9184b29 [fix][refactor] Don't use relative path in so-setup-network 2020-07-07 08:45:28 -04:00
Mike Reeves
291ac3c597 Fix SSL Perms 2020-07-06 17:24:04 -04:00
Mike Reeves
be5f4b04c6 Fix SSL Perms 2020-07-06 17:21:23 -04:00
Mike Reeves
cc6d0c1cb5 Merge pull request #935 from Security-Onion-Solutions/issue/929
Change grafana to use anon auth
2020-07-06 16:45:19 -04:00
Mike Reeves
3b452ab597 Change grafana to use anon auth 2020-07-06 16:39:43 -04:00
Mike Reeves
cc2f023840 Merge pull request #934 from Security-Onion-Solutions/issue/142
Issue/142
2020-07-06 16:12:48 -04:00
Mike Reeves
f05e366d49 Fix salt upgrade script 2020-07-06 15:56:55 -04:00
Mike Reeves
be3390a796 Fix Logstash state 2020-07-06 15:53:21 -04:00
Josh Patterson
da0a0ae6ae Merge pull request #933 from Security-Onion-Solutions/quickfix/firewall
add elasticsearch_rest to assigned hostgroups where missing
2020-07-06 15:20:00 -04:00
m0duspwnens
b4e556496b add elasticsearch_rest to assigned hostgroups where missing 2020-07-06 15:18:47 -04:00
Mike Reeves
623c37f1f5 Merge remote-tracking branch 'remotes/origin/dev' into issue/142 2020-07-06 14:35:46 -04:00