[Fleet][Kafka Output] Tweaks for Kafka UI/API

packages/kbn-check-mappings-update-cli/current_mappings.json

@@ -629,17 +629,6 @@
       }
     }
   },
-  "search": {
-    "dynamic": false,
-    "properties": {
-      "title": {
-        "type": "text"
-      },
-      "description": {
-        "type": "text"
-      }
-    }
-  },
   "alert": {
     "dynamic": false,
     "properties": {
@@ -931,6 +920,17 @@
       }
     }
   },
+  "search": {
+    "dynamic": false,
+    "properties": {
+      "title": {
+        "type": "text"
+      },
+      "description": {
+        "type": "text"
+      }
+    }
+  },
   "visualization": {
     "dynamic": false,
     "properties": {
@@ -1657,6 +1657,9 @@
       "auth_type": {
         "type": "keyword"
       },
+      "connection_type": {
+        "type": "keyword"
+      },
       "username": {
         "type": "keyword"
       },
@@ -1743,6 +1746,12 @@
       },
       "broker_buffer_size": {
         "type": "integer"
+      },
+      "required_acks": {
+        "type": "integer"
+      },
+      "channel_buffer_size": {
+        "type": "integer"
       }
     }
   },

src/core/server/integration_tests/saved_objects/migrations/group2/check_registered_types.test.ts

@@ -105,7 +105,7 @@ describe('checking migration metadata changes on all registered SO types', () =>
         "infrastructure-ui-source": "113182d6895764378dfe7fa9fa027244f3a457c4",
         "ingest-agent-policies": "f11cc19275f4c3e4ee7c5cd6423b6706b21b989d",
         "ingest-download-sources": "d7edc5e588d9afa61c4b831604582891c54ef1c7",
-        "ingest-outputs": "bffa0fd93dfdde904d7f5aff77df72d1c35938d9",
+        "ingest-outputs": "b4e636b13a5d0f89f0400fb67811d4cca4736eb0",
         "ingest-package-policies": "55816507db0134b8efbe0509e311a91ce7e1c6cc",
         "ingest_manager_settings": "418311b03c8eda53f5d2ea6f54c1356afaa65511",
         "inventory-view": "b8683c8e352a286b4aca1ab21003115a4800af83",

x-pack/plugins/fleet/common/constants/output.ts

@@ -42,6 +42,12 @@ export const kafkaAuthType = {
   Userpass: 'user_pass',
   Ssl: 'ssl',
   Kerberos: 'kerberos',
+  None: 'none',
+} as const;
+
+export const kafkaConnectionType = {
+  Plaintext: 'plaintext',
+  Encryption: 'encryption',
 } as const;
 
 export const kafkaSaslMechanism = {
@@ -60,18 +66,19 @@ export const kafkaTopicWhenType = {
   Equals: 'equals',
   Contains: 'contains',
   Regexp: 'regexp',
-  Range: 'range',
-  Network: 'network',
-  HasFields: 'has_fields',
-  Or: 'or',
-  And: 'and',
-  Not: 'not',
 } as const;
 
 export const kafkaAcknowledgeReliabilityLevel = {
-  Commit: 'Wait for local commit',
-  Replica: 'Wait for all replicas to commit',
-  DoNotWait: 'Do not wait',
+  Commit: 1,
+  Replica: -1,
+  DoNotWait: 0,
+} as const;
+
+export const kafkaVerificationModes = {
+  Full: 'full',
+  None: 'none',
+  Strict: 'strict',
+  Certificate: 'certificate',
 } as const;
 
 export const kafkaSupportedVersions = [

x-pack/plugins/fleet/common/openapi/bundled.json

@@ -7701,6 +7701,15 @@
               },
               "key": {
                 "type": "string"
+              },
+              "verification_mode": {
+                "type": "string",
+                "enum": [
+                  "none",
+                  "full",
+                  "certificate",
+                  "strict"
+                ]
               }
             }
           },
@@ -7751,6 +7760,13 @@
           "auth_type": {
             "type": "string"
           },
+          "connection_type": {
+            "type": "string",
+            "enum": [
+              "plaintext",
+              "encryption"
+            ]
+          },
           "username": {
             "type": "string"
           },
@@ -7826,11 +7842,8 @@
           "broker_timeout": {
             "type": "number"
           },
-          "broker_buffer_size": {
+          "required_acks": {
             "type": "number"
-          },
-          "broker_ack_reliability": {
-            "type": "string"
           }
         },
         "required": [
@@ -8103,6 +8116,15 @@
               },
               "key": {
                 "type": "string"
+              },
+              "verification_mode": {
+                "type": "string",
+                "enum": [
+                  "none",
+                  "full",
+                  "certificate",
+                  "strict"
+                ]
               }
             }
           },
@@ -8153,6 +8175,13 @@
           "auth_type": {
             "type": "string"
           },
+          "connection_type": {
+            "type": "string",
+            "enum": [
+              "plaintext",
+              "encryption"
+            ]
+          },
           "username": {
             "type": "string"
           },
@@ -8228,10 +8257,7 @@
           "broker_timeout": {
             "type": "number"
           },
-          "broker_ack_reliability": {
-            "type": "string"
-          },
-          "broker_buffer_size": {
+          "required_acks": {
             "type": "number"
           }
         },

x-pack/plugins/fleet/common/openapi/bundled.yaml

@@ -4959,6 +4959,13 @@ components:
               type: string
             key:
               type: string
+            verification_mode:
+              type: string
+              enum:
+                - none
+                - full
+                - certificate
+                - strict
         proxy_id:
           type: string
         shipper:
@@ -4990,6 +4997,11 @@ components:
           type: string
         auth_type:
           type: string
+        connection_type:
+          type: string
+          enum:
+            - plaintext
+            - encryption
         username:
           type: string
         password:
@@ -5038,10 +5050,8 @@ components:
           type: number
         broker_timeout:
           type: number
-        broker_buffer_size:
+        required_acks:
           type: number
-        broker_ack_reliability:
-          type: string
       required:
         - name
         - type
@@ -5223,6 +5233,13 @@ components:
               type: string
             key:
               type: string
+            verification_mode:
+              type: string
+              enum:
+                - none
+                - full
+                - certificate
+                - strict
         proxy_id:
           type: string
         shipper:
@@ -5254,6 +5271,11 @@ components:
           type: string
         auth_type:
           type: string
+        connection_type:
+          type: string
+          enum:
+            - plaintext
+            - encryption
         username:
           type: string
         password:
@@ -5302,9 +5324,7 @@ components:
           type: number
         broker_timeout:
           type: number
-        broker_ack_reliability:
-          type: string
-        broker_buffer_size:
+        required_acks:
           type: number
       required:
         - name

x-pack/plugins/fleet/common/openapi/components/schemas/output_create_request_kafka.yaml

@@ -35,6 +35,9 @@ properties:
         type: string
       key:
         type: string
+      verification_mode:
+        type: string
+        enum: ['none', 'full', 'certificate', 'strict']
   proxy_id:
     type: string
   shipper:
@@ -66,6 +69,9 @@ properties:
     type: string
   auth_type:
     type: string
+  connection_type:
+    type: string
+    enum: ['plaintext', 'encryption']
   username:
     type: string
   password:
@@ -114,10 +120,8 @@ properties:
     type: number
   broker_timeout:
     type: number
-  broker_buffer_size:
+  required_acks:
     type: number
-  broker_ack_reliability:
-    type: string
 required:
   - name
   - type

x-pack/plugins/fleet/common/openapi/components/schemas/output_update_request_kafka.yaml

@@ -35,6 +35,9 @@ properties:
         type: string
       key:
         type: string
+      verification_mode:
+        type: string
+        enum: ['none', 'full', 'certificate', 'strict']
   proxy_id:
     type: string
   shipper:
@@ -66,6 +69,9 @@ properties:
     type: string
   auth_type:
     type: string
+  connection_type:
+    type: string
+    enum: ['plaintext', 'encryption']
   username:
     type: string
   password:
@@ -114,9 +120,7 @@ properties:
     type: number
   broker_timeout:
     type: number
-  broker_ack_reliability:
-    type: string
-  broker_buffer_size:
+  required_acks:
     type: number
 required:
   - name

x-pack/plugins/fleet/common/types/models/output.ts

@@ -11,14 +11,18 @@ import type { kafkaAuthType, kafkaCompressionType, kafkaSaslMechanism } from '..
 import type { kafkaPartitionType } from '../../constants';
 import type { kafkaTopicWhenType } from '../../constants';
 import type { kafkaAcknowledgeReliabilityLevel } from '../../constants';
+import type { kafkaVerificationModes } from '../../constants';
+import type { kafkaConnectionType } from '../../constants';
 
 export type OutputType = typeof outputType;
 export type KafkaCompressionType = typeof kafkaCompressionType;
 export type KafkaAuthType = typeof kafkaAuthType;
+export type KafkaConnectionTypeType = typeof kafkaConnectionType;
 export type KafkaSaslMechanism = typeof kafkaSaslMechanism;
 export type KafkaPartitionType = typeof kafkaPartitionType;
 export type KafkaTopicWhenType = typeof kafkaTopicWhenType;
 export type KafkaAcknowledgeReliabilityLevel = typeof kafkaAcknowledgeReliabilityLevel;
+export type KafkaVerificationMode = typeof kafkaVerificationModes;
 
 interface NewBaseOutput {
   is_default: boolean;
@@ -34,6 +38,7 @@ interface NewBaseOutput {
     certificate_authorities?: string[];
     certificate?: string;
     key?: string;
+    verification_mode?: ValueOf<KafkaVerificationMode>;
   } | null;
   proxy_id?: string | null;
   shipper?: ShipperOutput | null;
@@ -76,6 +81,7 @@ export interface KafkaOutput extends NewBaseOutput {
   compression?: ValueOf<KafkaCompressionType>;
   compression_level?: number;
   auth_type?: ValueOf<KafkaAuthType>;
+  connection_type?: ValueOf<KafkaConnectionTypeType>;
   username?: string;
   password?: string;
   sasl?: {
@@ -105,6 +111,5 @@ export interface KafkaOutput extends NewBaseOutput {
   }>;
   timeout?: number;
   broker_timeout?: number;
-  broker_ack_reliability?: ValueOf<KafkaAcknowledgeReliabilityLevel>;
-  broker_buffer_size?: number;
+  required_acks?: ValueOf<KafkaAcknowledgeReliabilityLevel>;
 }