From 0259789f2ae6b18140b3cdef034e9d331def278d Mon Sep 17 00:00:00 2001 From: Laura Trotta <153528055+l-trotta@users.noreply.github.com> Date: Mon, 14 Oct 2024 11:37:57 +0200 Subject: [PATCH] Xpack settings fixes (#2998) * xpack settings fixes * correct ml place --- output/openapi/elasticsearch-openapi.json | 17 +++-- output/schema/schema.json | 82 ++++++++++++++++------- output/typescript/types.ts | 9 ++- specification/nodes/info/types.ts | 9 ++- 4 files changed, 83 insertions(+), 34 deletions(-) diff --git a/output/openapi/elasticsearch-openapi.json b/output/openapi/elasticsearch-openapi.json index adbc1bbb2..3eb7b30f1 100644 --- a/output/openapi/elasticsearch-openapi.json +++ b/output/openapi/elasticsearch-openapi.json @@ -77834,6 +77834,9 @@ "additionalProperties": { "type": "object" } + }, + "ml": { + "$ref": "#/components/schemas/nodes.info:NodeInfoXpackMl" } }, "required": [ @@ -77905,11 +77908,7 @@ "token": { "$ref": "#/components/schemas/nodes.info:NodeInfoXpackSecurityAuthcToken" } - }, - "required": [ - "realms", - "token" - ] + } }, "nodes.info:NodeInfoXpackSecurityAuthcRealms": { "type": "object", @@ -77959,6 +77958,14 @@ "enabled" ] }, + "nodes.info:NodeInfoXpackMl": { + "type": "object", + "properties": { + "use_auto_machine_memory_percent": { + "type": "boolean" + } + } + }, "nodes.info:NodeInfoScript": { "type": "object", "properties": { diff --git a/output/schema/schema.json b/output/schema/schema.json index ebf51cc25..33eea4b44 100644 --- a/output/schema/schema.json +++ b/output/schema/schema.json @@ -178258,7 +178258,7 @@ } } ], - "specLocation": "nodes/info/types.ts#L306-L311" + "specLocation": "nodes/info/types.ts#L311-L316" }, { "kind": "interface", @@ -178465,7 +178465,7 @@ } } ], - "specLocation": "nodes/info/types.ts#L313-L324" + "specLocation": "nodes/info/types.ts#L318-L329" }, { "kind": "interface", @@ -178497,7 +178497,7 @@ } } ], - "specLocation": "nodes/info/types.ts#L326-L329" + "specLocation": "nodes/info/types.ts#L331-L334" }, { "kind": "interface", @@ -178529,7 +178529,7 @@ } } ], - "specLocation": "nodes/info/types.ts#L331-L334" + "specLocation": "nodes/info/types.ts#L336-L339" }, { "kind": "interface", @@ -178572,7 +178572,7 @@ } } ], - "specLocation": "nodes/info/types.ts#L336-L340" + "specLocation": "nodes/info/types.ts#L341-L345" }, { "kind": "interface", @@ -178670,7 +178670,7 @@ } } ], - "specLocation": "nodes/info/types.ts#L342-L351" + "specLocation": "nodes/info/types.ts#L347-L356" }, { "kind": "interface", @@ -178804,7 +178804,7 @@ } } ], - "specLocation": "nodes/info/types.ts#L284-L287" + "specLocation": "nodes/info/types.ts#L289-L292" }, { "kind": "interface", @@ -178825,7 +178825,7 @@ } } ], - "specLocation": "nodes/info/types.ts#L289-L291" + "specLocation": "nodes/info/types.ts#L294-L296" }, { "kind": "interface", @@ -178846,7 +178846,7 @@ } } ], - "specLocation": "nodes/info/types.ts#L293-L295" + "specLocation": "nodes/info/types.ts#L298-L300" }, { "kind": "interface", @@ -179814,7 +179814,7 @@ } } ], - "specLocation": "nodes/info/types.ts#L353-L357" + "specLocation": "nodes/info/types.ts#L358-L362" }, { "kind": "interface", @@ -179862,9 +179862,20 @@ "kind": "user_defined_value" } } + }, + { + "name": "ml", + "required": false, + "type": { + "kind": "instance_of", + "type": { + "name": "NodeInfoXpackMl", + "namespace": "nodes.info" + } + } } ], - "specLocation": "nodes/info/types.ts#L239-L243" + "specLocation": "nodes/info/types.ts#L239-L244" }, { "kind": "interface", @@ -179885,7 +179896,7 @@ } } ], - "specLocation": "nodes/info/types.ts#L276-L278" + "specLocation": "nodes/info/types.ts#L281-L283" }, { "kind": "interface", @@ -179906,7 +179917,28 @@ } } ], - "specLocation": "nodes/info/types.ts#L280-L282" + "specLocation": "nodes/info/types.ts#L285-L287" + }, + { + "kind": "interface", + "name": { + "name": "NodeInfoXpackMl", + "namespace": "nodes.info" + }, + "properties": [ + { + "name": "use_auto_machine_memory_percent", + "required": false, + "type": { + "kind": "instance_of", + "type": { + "name": "boolean", + "namespace": "_builtins" + } + } + } + ], + "specLocation": "nodes/info/types.ts#L253-L255" }, { "kind": "interface", @@ -179960,7 +179992,7 @@ } } ], - "specLocation": "nodes/info/types.ts#L245-L250" + "specLocation": "nodes/info/types.ts#L246-L251" }, { "kind": "interface", @@ -179971,7 +180003,7 @@ "properties": [ { "name": "realms", - "required": true, + "required": false, "type": { "kind": "instance_of", "type": { @@ -179982,7 +180014,7 @@ }, { "name": "token", - "required": true, + "required": false, "type": { "kind": "instance_of", "type": { @@ -179992,7 +180024,7 @@ } } ], - "specLocation": "nodes/info/types.ts#L256-L259" + "specLocation": "nodes/info/types.ts#L261-L264" }, { "kind": "interface", @@ -180068,7 +180100,7 @@ } } ], - "specLocation": "nodes/info/types.ts#L261-L265" + "specLocation": "nodes/info/types.ts#L266-L270" }, { "kind": "interface", @@ -180100,7 +180132,7 @@ } } ], - "specLocation": "nodes/info/types.ts#L271-L274" + "specLocation": "nodes/info/types.ts#L276-L279" }, { "kind": "interface", @@ -180121,7 +180153,7 @@ } } ], - "specLocation": "nodes/info/types.ts#L267-L269" + "specLocation": "nodes/info/types.ts#L272-L274" }, { "kind": "interface", @@ -180153,7 +180185,7 @@ } } ], - "specLocation": "nodes/info/types.ts#L252-L254" + "specLocation": "nodes/info/types.ts#L257-L259" }, { "kind": "interface", @@ -180328,7 +180360,7 @@ } } ], - "specLocation": "nodes/info/types.ts#L359-L373" + "specLocation": "nodes/info/types.ts#L364-L378" }, { "kind": "interface", @@ -180463,7 +180495,7 @@ } } ], - "specLocation": "nodes/info/types.ts#L375-L392" + "specLocation": "nodes/info/types.ts#L380-L397" }, { "kind": "interface", @@ -180518,7 +180550,7 @@ } } ], - "specLocation": "nodes/info/types.ts#L394-L401" + "specLocation": "nodes/info/types.ts#L399-L406" }, { "kind": "interface", @@ -180594,7 +180626,7 @@ } } ], - "specLocation": "nodes/info/types.ts#L297-L304" + "specLocation": "nodes/info/types.ts#L302-L309" }, { "kind": "request", diff --git a/output/typescript/types.ts b/output/typescript/types.ts index da6d40518..5c05a722c 100644 --- a/output/typescript/types.ts +++ b/output/typescript/types.ts @@ -16898,6 +16898,7 @@ export interface NodesInfoNodeInfoXpack { license?: NodesInfoNodeInfoXpackLicense security: NodesInfoNodeInfoXpackSecurity notification?: Record + ml?: NodesInfoNodeInfoXpackMl } export interface NodesInfoNodeInfoXpackLicense { @@ -16908,6 +16909,10 @@ export interface NodesInfoNodeInfoXpackLicenseType { type: string } +export interface NodesInfoNodeInfoXpackMl { + use_auto_machine_memory_percent?: boolean +} + export interface NodesInfoNodeInfoXpackSecurity { http?: NodesInfoNodeInfoXpackSecuritySsl enabled: string @@ -16916,8 +16921,8 @@ export interface NodesInfoNodeInfoXpackSecurity { } export interface NodesInfoNodeInfoXpackSecurityAuthc { - realms: NodesInfoNodeInfoXpackSecurityAuthcRealms - token: NodesInfoNodeInfoXpackSecurityAuthcToken + realms?: NodesInfoNodeInfoXpackSecurityAuthcRealms + token?: NodesInfoNodeInfoXpackSecurityAuthcToken } export interface NodesInfoNodeInfoXpackSecurityAuthcRealms { diff --git a/specification/nodes/info/types.ts b/specification/nodes/info/types.ts index 065725969..cc74e9673 100644 --- a/specification/nodes/info/types.ts +++ b/specification/nodes/info/types.ts @@ -240,6 +240,7 @@ export class NodeInfoXpack { license?: NodeInfoXpackLicense security: NodeInfoXpackSecurity notification?: Dictionary + ml?: NodeInfoXpackMl } export class NodeInfoXpackSecurity { @@ -249,13 +250,17 @@ export class NodeInfoXpackSecurity { authc?: NodeInfoXpackSecurityAuthc } +export class NodeInfoXpackMl { + use_auto_machine_memory_percent?: boolean +} + export class NodeInfoXpackSecuritySsl { ssl: Dictionary } export class NodeInfoXpackSecurityAuthc { - realms: NodeInfoXpackSecurityAuthcRealms - token: NodeInfoXpackSecurityAuthcToken + realms?: NodeInfoXpackSecurityAuthcRealms + token?: NodeInfoXpackSecurityAuthcToken } export class NodeInfoXpackSecurityAuthcRealms {