Commit Graph

12503 Commits

Author SHA1 Message Date
Mike Reeves
8c9186d8dd Merge pull request #10489 from Security-Onion-Solutions/2.4.2
2.4.2
2023-06-01 09:27:56 -04:00
Mike Reeves
aee842b912 2.4.2 2023-06-01 09:26:24 -04:00
weslambert
3a5a59af59 Merge pull request #10485 from Security-Onion-Solutions/fix/elastic_fleet_dedicated
Add so-fleet role logic
2023-05-31 16:04:40 -04:00
Josh Patterson
8f3a874e61 Merge pull request #10483 from Security-Onion-Solutions/dedfleetES
exclude elasticsearch.ca state from fleet and receiver nodes
2023-05-31 16:02:57 -04:00
m0duspwnens
66dc6274e6 exclude elasticsearch.ca state from fleet and receiver nodes 2023-05-31 15:59:36 -04:00
Wes
302e580d8f Add so-fleet role logic 2023-05-31 19:56:17 +00:00
Mike Reeves
4cf60a6054 Merge pull request #10480 from Security-Onion-Solutions/mreeves/mergefrommain
Mreeves/mergefrommain
2023-05-31 15:32:30 -04:00
Mike Reeves
8f6d82af97 Merge branch '2.4/main' into mreeves/mergefrommain 2023-05-31 15:28:07 -04:00
Mike Reeves
8ab54dcead Merge pull request #10477 from Security-Onion-Solutions/2.4.2
2.4.2
2023-05-31 14:49:34 -04:00
Mike Reeves
9704c8917e 2.4.2 2023-05-31 14:47:34 -04:00
weslambert
540ee156db Merge pull request #10469 from Security-Onion-Solutions/fix/elastic_fleet_dynamic_configuration
Use Fleet pillar instead of Zeek
2023-05-31 12:36:39 -04:00
Wes
344e2bf1d0 Update defaults file 2023-05-31 15:30:03 +00:00
Wes
3441c0684e Create elasticfleet pillar dir 2023-05-31 15:10:35 +00:00
Wes
ed560f19d3 Remove where not applicable 2023-05-31 14:28:43 +00:00
Wes
b3f6012856 Change ordering 2023-05-31 14:22:47 +00:00
Wes
9ae26ec866 Add Fleet to top file 2023-05-31 14:21:39 +00:00
Wes
20aaa79476 Add pillar files for Fleet 2023-05-31 13:45:19 +00:00
Wes
2bb77251b0 Move Elastic Fleet logging exclusions to the Fleet pillar 2023-05-31 13:38:58 +00:00
weslambert
36791665f3 Merge pull request #10462 from Security-Onion-Solutions/feature/elastic_agent_zeek_logging
Dynamic integration configuration and Zeek log exclusions for Elastic Agent
2023-05-30 19:27:13 -04:00
Josh Patterson
4d4744a89b Merge pull request #10465 from Security-Onion-Solutions/suricataimport
dont apply suricata.enabled on import nodes
2023-05-30 16:51:17 -04:00
Wes
f3be63051b Remove Fleet configuration 2023-05-30 20:48:43 +00:00
m0duspwnens
743ed316f8 dont apply suricata.enabled on import nodes 2023-05-30 16:10:41 -04:00
Wes
e4b4bbcfdc Use ZEEKMERGED from zeek/config.map.jinja 2023-05-30 19:51:13 +00:00
Wes
b6e090f29f Move Elastic Fleet logic in so-common to so-elastic-fleet-common 2023-05-30 18:43:56 +00:00
weslambert
25006ed20b Merge pull request #10455 from Security-Onion-Solutions/fix/curator_cluster_delete_delete
Update so-elasticsearch-cluster-space-used and so-curator-cluster-delete-delete
2023-05-30 14:28:22 -04:00
Wes
4469a93a75 Fix typo 2023-05-30 18:24:30 +00:00
Mike Reeves
0027016b5a Merge pull request #10463 from Security-Onion-Solutions/TOoSmOotH-patch-2
Update so-setup
2023-05-30 13:52:30 -04:00
Mike Reeves
0143e2412d Update so-setup 2023-05-30 13:51:20 -04:00
Mike Reeves
20212414c4 Update so-setup 2023-05-30 13:46:24 -04:00
Mike Reeves
8a63ed5124 Update so-setup 2023-05-30 13:33:30 -04:00
Wes
096dadf9bd Change 1024 to 1000 for gigabytes 2023-05-30 17:29:42 +00:00
Wes
b441fe662f Change 1024 to 1000 for gigabytes 2023-05-30 17:28:59 +00:00
Wes
e5117a343d Change description 2023-05-30 17:10:17 +00:00
Wes
b9d692eb0e Remove default value 2023-05-30 17:08:52 +00:00
Wes
36a7f54160 Add extension 2023-05-30 16:46:38 +00:00
Josh Brower
96134684dc Merge pull request #10459 from Security-Onion-Solutions/2.4/fixes
Change Fleet Host URL API Endpoint
2023-05-30 12:13:52 -04:00
Jason Ertel
374ab0779a Merge pull request #10458 from Security-Onion-Solutions/jertel/debugrsa
Add short sleeps around show_top to isolate if there's a race conditi…
2023-05-30 12:09:34 -04:00
Jason Ertel
d0d1cc9106 Add short sleeps around show_top to isolate if there's a race condition causing intermittent RSA key format errors 2023-05-30 12:08:39 -04:00
Jason Ertel
162a32fd08 Merge branch '2.4/dev' into kilo 2023-05-30 11:51:57 -04:00
Wes
9035fa3037 Don't load Elasticsearch integration 2023-05-30 15:46:00 +00:00
Wes
b4b87e5620 Only provide JSON output 2023-05-30 15:43:31 +00:00
Wes
97c53d70a4 Remove integrations 2023-05-30 14:05:40 +00:00
Wes
53b4f7bd5c Add spacing 2023-05-30 14:05:11 +00:00
Mike Reeves
192c8c78c7 Merge pull request #10456 from Security-Onion-Solutions/airgaps
Update verifications
2023-05-30 09:52:07 -04:00
Mike Reeves
62a063dae4 Update verifications 2023-05-30 09:50:43 -04:00
Wes
79014a53ec Remove extra lines 2023-05-30 12:35:32 +00:00
Wes
e910f04beb Add default description and Zeek log exclusions for Elastic Fleet 2023-05-30 03:10:52 +00:00
Wes
ef5b63337b Add check for integration existence and integration update functionality 2023-05-30 02:58:00 +00:00
Wes
799e92e595 Add files 2023-05-30 02:56:23 +00:00
Wes
c835c523a9 Elastic Fleet integration update improvements 2023-05-30 02:54:39 +00:00