Commit Graph

12200 Commits

Author SHA1 Message Date
Josh Patterson
736ff2930d Merge pull request #10368 from Security-Onion-Solutions/salt3006.1
Salt3006.1
2023-05-16 13:48:11 -04:00
m0duspwnens
6aff526d9e Merge remote-tracking branch 'origin/2.4/dev' into salt3006.1 2023-05-16 13:08:28 -04:00
Josh Brower
8101171c97 Merge pull request #10367 from Security-Onion-Solutions/2.4/integrationfix
Update Integrations
2023-05-16 12:56:47 -04:00
Josh Brower
000507c366 Update Integrations 2023-05-16 12:50:40 -04:00
Josh Patterson
82fdee45aa Merge pull request #10366 from Security-Onion-Solutions/issue/10229
cwd for catrustscript
2023-05-16 12:11:20 -04:00
m0duspwnens
2419fa43b6 cwd for catrustscript 2023-05-16 12:08:44 -04:00
m0duspwnens
acc7619023 salt 3006.1 2023-05-16 12:04:02 -04:00
Jason Ertel
dcd761ad74 Merge pull request #10364 from Security-Onion-Solutions/kilo
import installs do not use monitor ifaces
2023-05-16 10:15:26 -04:00
Jason Ertel
9871ecd223 import installs do not use monitor ifaces 2023-05-16 10:14:31 -04:00
Josh Patterson
56a7fdcfcd Merge pull request #10363 from Security-Onion-Solutions/issue/10229
Issue/10229
2023-05-16 09:36:31 -04:00
m0duspwnens
6325f6db16 run elasticfleet.config so elasticfleet setup script gets put in place 2023-05-16 09:30:27 -04:00
m0duspwnens
b253cd45ca Merge remote-tracking branch 'origin/2.4/dev' into issue/10229 2023-05-16 09:22:48 -04:00
Jason Ertel
1724565331 Merge pull request #10362 from Security-Onion-Solutions/kilo
ensure automated tests have passwordless sudo
2023-05-16 08:49:00 -04:00
Jason Ertel
00a7beaca2 ensure automated tests have passwordless sudo 2023-05-16 08:43:13 -04:00
Mike Reeves
c129bba7e5 Merge pull request #10361 from Security-Onion-Solutions/TOoSmOotH-patch-3
Update defaults.yaml
2023-05-16 08:19:07 -04:00
Mike Reeves
fb298224fc Update defaults.yaml 2023-05-16 08:17:50 -04:00
Josh Brower
1feed47185 Merge pull request #10360 from Security-Onion-Solutions/2.4/retry
2.4/retry
2023-05-16 08:15:42 -04:00
Josh Brower
923de356e1 Fix typos 2023-05-16 08:06:31 -04:00
Jason Ertel
cea9af4e01 Merge pull request #10359 from Security-Onion-Solutions/kilo
missing braces
2023-05-16 07:25:36 -04:00
Jason Ertel
0f6d894322 missing braces 2023-05-16 07:22:17 -04:00
Josh Brower
9f879164ec Fix broken loop 2023-05-16 06:45:17 -04:00
Jason Ertel
1ddc4b6ff8 Merge pull request #10357 from Security-Onion-Solutions/kilo
ISO tests also use DHCP
2023-05-15 19:04:31 -04:00
Jason Ertel
58f80120bd ISO tests also use DHCP 2023-05-15 18:58:04 -04:00
m0duspwnens
a0e08e4f41 enable elasticfleet via pillar, fix sostatus for elasticfleet 2023-05-15 17:41:09 -04:00
m0duspwnens
2813d67670 import GLOBALS 2023-05-15 16:47:33 -04:00
m0duspwnens
c49b134122 move so-catrust 2023-05-15 16:43:47 -04:00
Mike Reeves
48ce377b02 Merge pull request #10340 from Security-Onion-Solutions/airgaps
Fix IDS Tools
2023-05-15 16:10:03 -04:00
Josh Brower
40de01e8c4 Temp fix 2023-05-15 15:56:21 -04:00
Mike Reeves
2fe88a1e66 Fix verify so copying sigma rules isnt fail 2023-05-15 15:33:52 -04:00
Mike Reeves
214117e0e0 Fix verify so copying sigma rules isnt fail 2023-05-15 15:33:32 -04:00
Josh Brower
bc2d3e43f0 Merge pull request #10356 from Security-Onion-Solutions/2.4/retry
Fix path
2023-05-15 15:20:43 -04:00
Josh Brower
b3528b2139 Fix path 2023-05-15 15:18:49 -04:00
Josh Brower
7ecd067e2b Merge pull request #10355 from Security-Onion-Solutions/2.4/retry
Add retry
2023-05-15 14:57:46 -04:00
Josh Brower
576c1d7cc1 Add retry 2023-05-15 14:55:43 -04:00
m0duspwnens
6320528263 move so-catrust 2023-05-15 14:08:30 -04:00
Josh Brower
6528632861 Merge pull request #10352 from Security-Onion-Solutions/2.4/taglogs
Refactor wrapper
2023-05-15 13:56:38 -04:00
m0duspwnens
928b3b5471 create local kibana pillar dirs before touching pillar files 2023-05-15 13:40:52 -04:00
m0duspwnens
f1c8467e9b create and assign kibana.soc and kibana.adv 2023-05-15 13:13:38 -04:00
m0duspwnens
f5337eba1a Merge remote-tracking branch 'origin/2.4/dev' into issue/10229 2023-05-15 13:08:53 -04:00
Jason Ertel
de28e15805 Merge pull request #10354 from Security-Onion-Solutions/kilo
Relax rate limiting thresholds when installing in test mode
2023-05-15 13:02:07 -04:00
Jason Ertel
09ba15f9bb Merge branch '2.4/dev' into kilo 2023-05-15 12:57:46 -04:00
Jason Ertel
ba9892941d relax login rate limiting when testing 2023-05-15 12:57:41 -04:00
Josh Brower
b381c51246 Merge branch '2.4/dev' into 2.4/taglogs 2023-05-15 12:13:44 -04:00
Josh Brower
64726af69c Change from tmp 2023-05-15 12:09:16 -04:00
m0duspwnens
7a4fea7a12 fix nginx merge conflicts 2023-05-15 11:40:12 -04:00
m0duspwnens
db47256cdd rename 2023-05-15 11:23:27 -04:00
m0duspwnens
ba2392997b enabled/disable elastic-fleet-package-registry via ui 2023-05-15 11:14:21 -04:00
m0duspwnens
1a1bcb3526 enable/disable idh via ui 2023-05-15 10:53:39 -04:00
m0duspwnens
997e6c141a enable/disable idstools in ui 2023-05-15 10:19:15 -04:00
Doug Burks
9a3c997779 Merge pull request #10351 from Security-Onion-Solutions/dougburks-patch-1
Update install_agent_grid.sls
2023-05-15 10:13:55 -04:00