Commit Graph

276 Commits

Author SHA1 Message Date
Doug Burks
213cdb479d Update soc_manager.yaml 2023-12-06 14:19:15 -05:00
Mike Reeves
0160cae7d7 Merge branch '2.4/dev' into mergeback 2023-12-06 13:38:53 -05:00
Wes
01a37df7fc Add extra line 2023-12-05 20:02:12 +00:00
Mike Reeves
9446b750c0 Update soup 2023-12-05 11:25:25 -05:00
Mike Reeves
fdd4173632 Update soup 2023-12-05 11:20:56 -05:00
Mike Reeves
90d9e5b927 Update soup 2023-12-05 10:24:31 -05:00
Mike Reeves
0b6ba6d2f2 Update soup 2023-12-04 13:51:12 -05:00
Mike Reeves
55a8b1064d Update soup 2023-12-04 13:36:04 -05:00
m0duspwnens
38868af08a avoid exiting salt when ca state applied in post for 2.4.30 2023-12-04 10:11:38 -05:00
m0duspwnens
265cde5296 move wait_for_salt_minion for hotfix 2023-12-01 15:31:15 -05:00
Jason Ertel
9ee3423b32 Merge branch '2.4/dev' into jertel/hfm 2023-11-21 16:42:50 -05:00
Mike Reeves
458c6de39d Update soup 2023-11-21 10:30:21 -05:00
Mike Reeves
9aa193af3b Update soup 2023-11-21 10:18:02 -05:00
Mike Reeves
14b5aa476e Update soup 2023-11-21 09:55:44 -05:00
Jason Ertel
6356a0bf95 add support for nested keys 2023-11-20 16:18:30 -05:00
Mike Reeves
2ae87de409 Merge branch 'hotfix/2.4.30' into TOoSmOotH-patch-2 2023-11-17 17:05:11 -05:00
Mike Reeves
d89beefc8c Update soup 2023-11-17 16:53:11 -05:00
Josh Brower
9c371fc374 Remove state file 2023-11-17 16:52:34 -05:00
Mike Reeves
e226efa799 Update soup 2023-11-17 16:35:12 -05:00
Josh Brower
7aadc3851f Remove state file 2023-11-17 13:08:15 -05:00
Josh Brower
ca1498fca1 Dont update Defend Integration 2023-11-17 12:19:22 -05:00
Josh Brower
089a111ae8 use updated code 2023-11-17 11:20:13 -05:00
Josh Brower
5920a14478 Move API check logic 2023-11-16 20:34:01 -05:00
Josh Brower
6b8e48c973 Remove highstate 2023-11-16 11:41:20 -05:00
Josh Brower
109ee55d8c Add to pre for .30 soup 2023-11-16 11:37:38 -05:00
Josh Brower
ff8cd194f1 Make sure kibana API is up 2023-11-16 11:21:34 -05:00
Josh Brower
d5dd0d88ed .30 hotfix 2023-11-16 10:58:23 -05:00
Mike Reeves
fe7af49a82 Update soup 2023-11-13 08:37:46 -05:00
Josh Brower
551f7831de Add more clarity to message 2023-11-09 15:01:56 -05:00
Josh Brower
193c9d202e Remove unneeded datastreams 2023-11-09 14:30:00 -05:00
Josh Brower
d1b6ef411b remove state file 2023-11-09 09:01:57 -05:00
Jason Ertel
9231c8d2f2 replace reset sed with new script 2023-11-08 19:17:32 -05:00
Jason Ertel
bc044fa2d5 more coverage 2023-11-08 18:42:06 -05:00
Jason Ertel
9317e51f20 add yaml helper script; refactor python testing 2023-11-08 18:26:37 -05:00
Jason Ertel
33a8ef1568 add yaml helper script; refactor python testing 2023-11-08 18:24:23 -05:00
weslambert
9df3a8fc18 Merge pull request #11740 from Security-Onion-Solutions/fix/elastic_templates
Remove template files
2023-11-08 15:20:01 -05:00
weslambert
36098e6314 Remove template files 2023-11-08 14:32:58 -05:00
Josh Patterson
610374816d Merge pull request #11714 from Security-Onion-Solutions/change/so-minion
apply es and soc states to manager if new search or hn are added
2023-11-03 16:43:16 -04:00
Josh Brower
0086c24729 Upgrade Elastic Agent 2023-11-03 15:21:06 -04:00
m0duspwnens
9d2b84818f apply es and soc states to manager if new search or hn are added 2023-11-03 15:00:13 -04:00
Josh Brower
0dec6693dc Merge pull request #11678 from Security-Onion-Solutions/2.4/fleetreset
Add Elastic Fleet reset script
2023-11-02 11:33:58 -04:00
Josh Brower
5388b92865 Refactor & cleanup 2023-11-02 10:20:32 -04:00
Josh Brower
c230cf4eb7 Formatting 2023-11-01 17:00:32 -04:00
Josh Brower
344dd7d61f Add Elastic Fleet reset script 2023-11-01 16:50:20 -04:00
m0duspwnens
4d7b1095b7 Merge remote-tracking branch 'origin/2.4/dev' into fix/soupagrepo 2023-11-01 10:31:59 -04:00
m0duspwnens
338146fedd fix repo update during soup for airgap 2023-11-01 10:19:56 -04:00
Mike Reeves
cc3a69683c Delete salt/manager/tools/sbin/so-allow-view 2023-10-31 12:55:47 -04:00
Josh Patterson
4bbcc5002a Revert "Revert "Upgrade/salt3006.3""
This reverts commit c41e19ad0b.
2023-10-27 10:56:45 -04:00
Mike Reeves
f1dbea6e2d Merge pull request #11623 from Security-Onion-Solutions/warmui
Warm Node UI Changes
2023-10-27 10:36:23 -04:00
defensivedepth
3b63ef149a Merge remote-tracking branch 'remotes/origin/2.4/dev' into 2.4/kibanauser 2023-10-27 07:50:58 -04:00