From 29f21f691058fa939c13ad47771c93cf55080238 Mon Sep 17 00:00:00 2001 From: Wenkai Date: Sat, 12 Apr 2025 18:09:16 +0200 Subject: [PATCH] update queue.max_bytes field in logstash pipeline settings spec (#3925) Co-authored-by: Wenkai Li Co-authored-by: Laura Trotta <153528055+l-trotta@users.noreply.github.com> (cherry picked from commit 1403bac9354d232024184bd992ecc76aaa9e68fa) --- output/openapi/elasticsearch-openapi.json | 9 ++------- .../elasticsearch-serverless-openapi.json | 9 ++------- output/schema/schema-serverless.json | 18 +++--------------- output/schema/schema.json | 18 +++--------------- output/typescript/types.ts | 3 +-- specification/logstash/_types/Pipeline.ts | 6 +----- 6 files changed, 12 insertions(+), 51 deletions(-) diff --git a/output/openapi/elasticsearch-openapi.json b/output/openapi/elasticsearch-openapi.json index d73ead59c7..63e707cf88 100644 --- a/output/openapi/elasticsearch-openapi.json +++ b/output/openapi/elasticsearch-openapi.json @@ -81977,12 +81977,8 @@ "description": "The internal queuing model to use for event buffering.", "type": "string" }, - "queue.max_bytes.number": { + "queue.max_bytes": { "description": "The total capacity of the queue (`queue.type: persisted`) in number of bytes.", - "type": "number" - }, - "queue.max_bytes.units": { - "description": "The total capacity of the queue (`queue.type: persisted`) in terms of units of bytes.", "type": "string" }, "queue.checkpoint.writes": { @@ -81995,8 +81991,7 @@ "pipeline.batch.size", "pipeline.batch.delay", "queue.type", - "queue.max_bytes.number", - "queue.max_bytes.units", + "queue.max_bytes", "queue.checkpoint.writes" ] }, diff --git a/output/openapi/elasticsearch-serverless-openapi.json b/output/openapi/elasticsearch-serverless-openapi.json index 1da46d07ea..82511d14c7 100644 --- a/output/openapi/elasticsearch-serverless-openapi.json +++ b/output/openapi/elasticsearch-serverless-openapi.json @@ -52976,12 +52976,8 @@ "description": "The internal queuing model to use for event buffering.", "type": "string" }, - "queue.max_bytes.number": { + "queue.max_bytes": { "description": "The total capacity of the queue (`queue.type: persisted`) in number of bytes.", - "type": "number" - }, - "queue.max_bytes.units": { - "description": "The total capacity of the queue (`queue.type: persisted`) in terms of units of bytes.", "type": "string" }, "queue.checkpoint.writes": { @@ -52994,8 +52990,7 @@ "pipeline.batch.size", "pipeline.batch.delay", "queue.type", - "queue.max_bytes.number", - "queue.max_bytes.units", + "queue.max_bytes", "queue.checkpoint.writes" ] }, diff --git a/output/schema/schema-serverless.json b/output/schema/schema-serverless.json index 1e10889c41..7ef1d4bac3 100644 --- a/output/schema/schema-serverless.json +++ b/output/schema/schema-serverless.json @@ -131013,7 +131013,7 @@ } } ], - "specLocation": "logstash/_types/Pipeline.ts#L60-L91" + "specLocation": "logstash/_types/Pipeline.ts#L56-L87" }, { "kind": "interface", @@ -131108,19 +131108,7 @@ }, { "description": "The total capacity of the queue (`queue.type: persisted`) in number of bytes.", - "name": "queue.max_bytes.number", - "required": true, - "type": { - "kind": "instance_of", - "type": { - "name": "integer", - "namespace": "_types" - } - } - }, - { - "description": "The total capacity of the queue (`queue.type: persisted`) in terms of units of bytes.", - "name": "queue.max_bytes.units", + "name": "queue.max_bytes", "required": true, "type": { "kind": "instance_of", @@ -131143,7 +131131,7 @@ } } ], - "specLocation": "logstash/_types/Pipeline.ts#L28-L59" + "specLocation": "logstash/_types/Pipeline.ts#L28-L55" }, { "kind": "interface", diff --git a/output/schema/schema.json b/output/schema/schema.json index 6d13e580a9..5a0ab9a570 100644 --- a/output/schema/schema.json +++ b/output/schema/schema.json @@ -164030,7 +164030,7 @@ } } ], - "specLocation": "logstash/_types/Pipeline.ts#L60-L91" + "specLocation": "logstash/_types/Pipeline.ts#L56-L87" }, { "kind": "interface", @@ -164125,19 +164125,7 @@ }, { "description": "The total capacity of the queue (`queue.type: persisted`) in number of bytes.", - "name": "queue.max_bytes.number", - "required": true, - "type": { - "kind": "instance_of", - "type": { - "name": "integer", - "namespace": "_types" - } - } - }, - { - "description": "The total capacity of the queue (`queue.type: persisted`) in terms of units of bytes.", - "name": "queue.max_bytes.units", + "name": "queue.max_bytes", "required": true, "type": { "kind": "instance_of", @@ -164160,7 +164148,7 @@ } } ], - "specLocation": "logstash/_types/Pipeline.ts#L28-L59" + "specLocation": "logstash/_types/Pipeline.ts#L28-L55" }, { "kind": "request", diff --git a/output/typescript/types.ts b/output/typescript/types.ts index 4707bf9b2c..5001b64a78 100644 --- a/output/typescript/types.ts +++ b/output/typescript/types.ts @@ -14603,8 +14603,7 @@ export interface LogstashPipelineSettings { 'pipeline.batch.size': integer 'pipeline.batch.delay': integer 'queue.type': string - 'queue.max_bytes.number': integer - 'queue.max_bytes.units': string + 'queue.max_bytes': string 'queue.checkpoint.writes': integer } diff --git a/specification/logstash/_types/Pipeline.ts b/specification/logstash/_types/Pipeline.ts index 76ff608407..547299ba08 100644 --- a/specification/logstash/_types/Pipeline.ts +++ b/specification/logstash/_types/Pipeline.ts @@ -47,11 +47,7 @@ export class PipelineSettings { /** * The total capacity of the queue (`queue.type: persisted`) in number of bytes. */ - 'queue.max_bytes.number': integer - /** - * The total capacity of the queue (`queue.type: persisted`) in terms of units of bytes. - */ - 'queue.max_bytes.units': string + 'queue.max_bytes': string /** * The maximum number of written events before forcing a checkpoint when persistent queues are enabled (`queue.type: persisted`). */