Commit Graph

9432 Commits

Author SHA1 Message Date
Mike Reeves
d8d429c71a Update HOTFIX 2021-11-23 09:19:41 -05:00
Mike Reeves
3bfc3b8943 Merge pull request #6301 from Security-Onion-Solutions/dev
2.3.90
2.3.90
2021-11-22 13:15:23 -05:00
Mike Reeves
4ad6d616ae Merge pull request #6313 from Security-Onion-Solutions/2390update
2390update
2021-11-22 09:04:16 -05:00
Mike Reeves
759c0b858a 2.3.90 2021-11-22 09:01:12 -05:00
Mike Reeves
c17a49a730 Merge pull request #6302 from Security-Onion-Solutions/fix/md5soup
Fix/md5soup
2021-11-19 16:45:02 -05:00
m0duspwnens
c0f183fb5e add comment 2021-11-19 16:37:27 -05:00
m0duspwnens
d602339c45 render and md5sum soup and so-common 2021-11-19 16:32:59 -05:00
Mike Reeves
0122e62920 Merge pull request #6300 from Security-Onion-Solutions/2390
2.3.90
2021-11-19 14:09:02 -05:00
Mike Reeves
1634105780 2.3.90 2021-11-19 14:07:03 -05:00
Josh Patterson
198a690ba1 Merge pull request #6298 from Security-Onion-Solutions/fix/soup-script-check
Check soup in /usr/sbin rather than the saltstack default dir
2021-11-19 11:24:48 -05:00
William Wernert
bebd62187d Check soup in /usr/sbin rather than the saltstack default dir 2021-11-19 11:23:32 -05:00
Mike Reeves
a91564605c Merge pull request #6297 from Security-Onion-Solutions/fix/soup-playbook-secrets
Fix indent on playbook_admin and playbook_automation secrets
2021-11-19 10:28:11 -05:00
William Wernert
23b91ee7e5 Fix indent on playbook_admin and playbook_automation secrets 2021-11-19 10:27:11 -05:00
Mike Reeves
d3f25f8d74 Merge pull request #6293 from Security-Onion-Solutions/fix/fleet-stats
Fix FleetDM - disable stats
2021-11-19 09:53:26 -05:00
Josh Brower
8bd4ba3acd Fix FleetDM - disable stats 2021-11-19 09:49:34 -05:00
Josh Patterson
e5927d0bf7 Merge pull request #6290 from Security-Onion-Solutions/fleet_startup_eval
run redis state before fleet state for eval highstate
2021-11-18 17:54:26 -05:00
m0duspwnens
9dd89f6be7 run redis state before fleet state for eval highstate 2021-11-18 17:41:56 -05:00
Mike Reeves
796eb59dc6 Merge pull request #6288 from Security-Onion-Solutions/syncesusers_so-kratos
wait for up to 5 minutes for kratos to respond before proceeding
2021-11-18 16:42:18 -05:00
m0duspwnens
55fed43469 wait for up to 5 minutes for kratos to respond before proceeding 2021-11-18 16:35:35 -05:00
William Wernert
af83019427 Merge pull request #6287 from Security-Onion-Solutions/feat/cidr-extra-validation
Check for more invalid cidr syntax
2021-11-18 15:21:58 -05:00
William Wernert
4149236cda Check for more invalid cidr syntax 2021-11-18 15:18:12 -05:00
Josh Patterson
825106d074 Merge pull request #6286 from Security-Onion-Solutions/fix/docker-upgrade
Prevent downgrade of docker, containerd, and docker-cli
2021-11-18 15:15:37 -05:00
William Wernert
1a3324868a Specify version of docker-ce-rootless-extras 2021-11-18 15:12:47 -05:00
William Wernert
bc87bb4770 Specify docker cli version as well 2021-11-18 14:51:26 -05:00
William Wernert
6aae48bdae Don't upgrade docker or containerd before versionlock is applied 2021-11-18 14:14:18 -05:00
Mike Reeves
a0425a48e6 Merge pull request #6282 from Security-Onion-Solutions/syncesusers_so-kratos
remove restart policy for kratos container
2021-11-18 11:43:16 -05:00
m0duspwnens
4b89bf7bbc remove restart policy for kratos container 2021-11-18 11:41:07 -05:00
Mike Reeves
5fc5afa9ea Merge pull request #6281 from Security-Onion-Solutions/syncesusers_so-kratos
install specific docker verison
2021-11-18 11:32:38 -05:00
m0duspwnens
ddec8e4da0 install specific docker verison 2021-11-18 11:29:22 -05:00
Jason Ertel
9c0e8cedba Merge pull request #6279 from Security-Onion-Solutions/syncesusers_so-kratos
restart kratos if failure
2021-11-18 10:49:12 -05:00
m0duspwnens
5054da0027 restart kratos if failure 2021-11-18 10:48:06 -05:00
Jason Ertel
96f1f0174b Merge pull request #6275 from Security-Onion-Solutions/syncesusers_so-kratos
break kratos state out from soc state
2021-11-18 09:13:10 -05:00
m0duspwnens
cd1f0c0440 break kratos state out from soc state 2021-11-18 09:10:00 -05:00
Mike Reeves
12546a8efa Merge pull request #6271 from Security-Onion-Solutions/fix/fleet-users
Fix soup - fleetdm SA user
2021-11-17 19:48:15 -05:00
Josh Brower
3f5956b56d Fix soup - fleetdm SA user 2021-11-17 19:47:16 -05:00
Mike Reeves
6e49ab0558 Merge pull request #6270 from Security-Onion-Solutions/fix/whiptail-text
Fix text cutoff
2021-11-17 19:18:46 -05:00
William Wernert
c52df32f05 Fix text cutoff 2021-11-17 19:08:10 -05:00
Josh Patterson
c0602f4222 Merge pull request #6269 from Security-Onion-Solutions/syncesusers_so-kratos
run elasticsearch.auth state and so-elastic-auth true before manager …
2021-11-17 18:41:18 -05:00
m0duspwnens
d4b412bcbe run elasticsearch.auth state and so-elastic-auth true before manager in setup for syncesusers in manager state 2021-11-17 18:38:13 -05:00
Josh Brower
66e2de0934 Merge pull request #6268 from Security-Onion-Solutions/fix/fleet-users
Fix soup - fleetdm SA user
2021-11-17 18:26:11 -05:00
Josh Brower
c93794a402 Fix soup - fleetdm SA user 2021-11-17 18:22:34 -05:00
Josh Patterson
98efc6f2ed Merge pull request #6267 from Security-Onion-Solutions/syncesusers_so-kratos
syncesusers require so-kratos
2021-11-17 18:20:53 -05:00
m0duspwnens
59ef734064 syncesusers require so-kratos 2021-11-17 18:16:06 -05:00
Josh Brower
922657afbc Merge pull request #6266 from Security-Onion-Solutions/fix/fleet-users
Unset pw reset for new Fleet users
2021-11-17 17:10:27 -05:00
Josh Brower
5f3601ac78 Unset pw reset for new Fleet users 2021-11-17 17:06:01 -05:00
Josh Brower
2fe4fa06a6 Merge pull request #6265 from Security-Onion-Solutions/fix/fleet-users
Fix FleetDM SA Creation for SOUP
2021-11-17 14:09:59 -05:00
Josh Brower
773c580e77 Fix FleetDM SA Creation for SOUP 2021-11-17 14:08:34 -05:00
Mike Reeves
aca684d55a Merge pull request #6264 from Security-Onion-Solutions/fix/fleet-users
Migrate FleetDM user mgt to fleetctl
2021-11-17 13:16:05 -05:00
Josh Brower
6f391dbe50 Migrate FleetDM user mgt to fleetctl 2021-11-17 13:13:25 -05:00
William Wernert
8d033264e7 Merge pull request #6262 from Security-Onion-Solutions/fix/new-cidr-test
Add new ipv4 address w/ cidr mask validator
2021-11-17 13:09:04 -05:00