Merge branch 'main' into kbn-129754-flaky-status

elastic · Jan 10, 2023 · 34bec43 · 34bec43
2 parents dcb1f1c + 7d24284
commit 34bec43
Show file tree

Hide file tree

Showing 129 changed files with 4,904 additions and 907 deletions.
diff --git a/.buildkite/package-lock.json b/.buildkite/package-lock.json
diff --git a/.buildkite/package.json b/.buildkite/package.json
@@ -18,10 +18,10 @@
     "@types/chai": "^4.2.10",
     "@types/js-yaml": "^4.0.5",
     "@types/minimatch": "^3.0.5",
-    "@types/mocha": "^8.2.3",
+    "@types/mocha": "^10.0.1",
     "@types/node": "^15.12.2",
     "chai": "^4.2.0",
-    "mocha": "^8.4.0",
+    "mocha": "^10.2.0",
     "nock": "^12.0.2",
     "ts-node": "^10.7.0",
     "typescript": "^4.6.4"

diff --git a/src/core/server/integration_tests/saved_objects/migrations/check_registered_types.test.ts b/src/core/server/integration_tests/saved_objects/migrations/check_registered_types.test.ts
@@ -104,7 +104,7 @@ describe('checking migration metadata changes on all registered SO types', () =>
         "infrastructure-ui-source": "7c8dbbc0a608911f1b683a944f4a65383f6153ed",
         "ingest-agent-policies": "54d586fdafae83ba326e47d1a3727b0d9c910a12",
         "ingest-download-sources": "1e69dabd6db5e320fe08c5bda8f35f29bafc6b54",
-        "ingest-outputs": "4888b16d55a452bf5fff2bb407e0361567eae63a",
+        "ingest-outputs": "29181ecfdc7723f544325ecef7266bccbc691a54",
         "ingest-package-policies": "d93048bf153f9043946e8965065a88014f7ccb41",
         "ingest_manager_settings": "6f36714825cc15ea8d7cda06fde7851611a532b4",
         "inventory-view": "bc2bd1e7ec7c186159447ab228d269f22bd39056",

diff --git a/x-pack/plugins/fleet/common/openapi/bundled.json b/x-pack/plugins/fleet/common/openapi/bundled.json
@@ -6363,6 +6363,35 @@
                 "type": "string"
               }
             }
+          },
+          "proxy_id": {
+            "type": "string"
+          },
+          "shipper": {
+            "type": "object",
+            "properties": {
+              "disk_queue_enabled": {
+                "type": "boolean"
+              },
+              "disk_queue_path": {
+                "type": "string"
+              },
+              "disk_queue_max_size": {
+                "type": "number"
+              },
+              "disk_queue_encryption_enabled": {
+                "type": "boolean"
+              },
+              "disk_queue_compression_enabled": {
+                "type": "boolean"
+              },
+              "compression_level": {
+                "type": "number"
+              },
+              "loadbalance": {
+                "type": "boolean"
+              }
+            }
           }
         },
         "required": [

diff --git a/x-pack/plugins/fleet/common/openapi/bundled.yaml b/x-pack/plugins/fleet/common/openapi/bundled.yaml
@@ -4075,6 +4075,25 @@ components:
               type: string
             key:
               type: string
+        proxy_id:
+          type: string
+        shipper:
+          type: object
+          properties:
+            disk_queue_enabled:
+              type: boolean
+            disk_queue_path:
+              type: string
+            disk_queue_max_size:
+              type: number
+            disk_queue_encryption_enabled:
+              type: boolean
+            disk_queue_compression_enabled:
+              type: boolean
+            compression_level:
+              type: number
+            loadbalance:
+              type: boolean
       required:
         - id
         - is_default

diff --git a/x-pack/plugins/fleet/common/openapi/components/schemas/output.yaml b/x-pack/plugins/fleet/common/openapi/components/schemas/output.yaml
@@ -35,6 +35,25 @@ properties:
         type: string
       key:
         type: string
+  proxy_id:
+    type: string
+  shipper:
+    type: object
+    properties:
+      disk_queue_enabled:
+        type: boolean
+      disk_queue_path:
+        type: string
+      disk_queue_max_size:
+        type: number
+      disk_queue_encryption_enabled:
+        type: boolean
+      disk_queue_compression_enabled:
+        type: boolean
+      compression_level:
+        type: number
+      loadbalance:
+        type: boolean
 required:
   - id
   - is_default

diff --git a/x-pack/plugins/fleet/common/types/models/output.ts b/x-pack/plugins/fleet/common/types/models/output.ts
@@ -26,6 +26,7 @@ export interface NewOutput {
     key?: string;
   } | null;
   proxy_id?: string | null;
+  shipper?: ShipperOutput | null;
 }
 
 export type OutputSOAttributes = NewOutput & {
@@ -36,3 +37,16 @@ export type OutputSOAttributes = NewOutput & {
 export type Output = NewOutput & {
   id: string;
 };
+
+export interface ShipperOutput {
+  disk_queue_enabled?: boolean | null;
+  disk_queue_path?: string | null;
+  disk_queue_max_size?: number | null;
+  disk_queue_encryption_enabled?: boolean | null;
+  disk_queue_compression_enabled?: boolean | null;
+  compression_level?: number | null;
+  loadbalance?: boolean | null;
+  mem_queue_events?: number | null;
+  queue_flush_timeout?: number | null;
+  max_batch_bytes?: number | null;
+}
diff --git a/x-pack/plugins/fleet/common/types/rest_spec/output.ts b/x-pack/plugins/fleet/common/types/rest_spec/output.ts
@@ -41,6 +41,18 @@ export interface PutOutputRequest {
       certificate?: string;
       key?: string;
     };
+    shipper?: {
+      disk_queue_enabled?: boolean;
+      disk_queue_path?: string;
+      disk_queue_max_size?: number;
+      disk_queue_encryption_enabled?: boolean;
+      disk_queue_compression_enabled?: boolean;
+      compression_level?: number;
+      loadbalance?: boolean;
+      mem_queue_events?: number;
+      queue_flush_timeout?: number;
+      max_batch_bytes?: number;
+    };
   };
 }
 
@@ -61,6 +73,18 @@ export interface PostOutputRequest {
       key?: string;
     };
     proxy_id?: string | null;
+    shipper?: {
+      disk_queue_enabled?: boolean;
+      disk_queue_path?: string;
+      disk_queue_max_size?: number;
+      disk_queue_encryption_enabled?: boolean;
+      disk_queue_compression_enabled?: boolean;
+      compression_level?: number;
+      loadbalance?: boolean;
+      mem_queue_events?: number;
+      queue_flush_timeout?: number;
+      max_batch_bytes?: number;
+    };
   };
 }