From e3fd9c49eda55be6351d21bbdfe673c11518cc55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paolo=20Chil=C3=A0?= Date: Mon, 15 Sep 2025 21:56:28 +0200 Subject: [PATCH] Add Reason field to elastic-agent upgrade details metadata (#134711) * Add Reason field to elastic-agent upgrade details metadata Add "reason" text field to map a new upgrade details field introduced in PR https://github.com/elastic/elastic-agent/pull/8407 * Update docs/changelog/134711.yaml * Bump FLEET_AGENTS_MAPPINGS_VERSION (cherry picked from commit 67676aebea29aa3e690bbe0ef38831998b446b55) # Conflicts: # x-pack/plugin/fleet/src/main/java/org/elasticsearch/xpack/fleet/Fleet.java --- docs/changelog/134711.yaml | 5 +++++ .../src/main/resources/fleet-agents.json | 9 +++++++++ .../main/java/org/elasticsearch/xpack/fleet/Fleet.java | 4 ++-- 3 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 docs/changelog/134711.yaml diff --git a/docs/changelog/134711.yaml b/docs/changelog/134711.yaml new file mode 100644 index 0000000000000..0789eeb4b69df --- /dev/null +++ b/docs/changelog/134711.yaml @@ -0,0 +1,5 @@ +pr: 134711 +summary: Add Reason field to elastic-agent upgrade details metadata +area: Infra/Plugins +type: enhancement +issues: [] diff --git a/x-pack/plugin/core/template-resources/src/main/resources/fleet-agents.json b/x-pack/plugin/core/template-resources/src/main/resources/fleet-agents.json index b079713508660..0a337035a0576 100644 --- a/x-pack/plugin/core/template-resources/src/main/resources/fleet-agents.json +++ b/x-pack/plugin/core/template-resources/src/main/resources/fleet-agents.json @@ -308,6 +308,15 @@ }, "retry_until": { "type": "date" + }, + "reason": { + "type":"text", + "fields": { + "keyword": { + "type": "keyword", + "ignore_above": 1024 + } + } } } } diff --git a/x-pack/plugin/fleet/src/main/java/org/elasticsearch/xpack/fleet/Fleet.java b/x-pack/plugin/fleet/src/main/java/org/elasticsearch/xpack/fleet/Fleet.java index eb44107c89c2b..1cd50ecc64f9a 100644 --- a/x-pack/plugin/fleet/src/main/java/org/elasticsearch/xpack/fleet/Fleet.java +++ b/x-pack/plugin/fleet/src/main/java/org/elasticsearch/xpack/fleet/Fleet.java @@ -81,8 +81,8 @@ public class Fleet extends Plugin implements SystemIndexPlugin { private static final String MAPPING_VERSION_VARIABLE = "fleet.version"; private static final List ALLOWED_PRODUCTS = List.of("kibana", "fleet"); private static final int FLEET_ACTIONS_MAPPINGS_VERSION = 2; - private static final int FLEET_AGENTS_MAPPINGS_VERSION = 2; - private static final int FLEET_ENROLLMENT_API_KEYS_MAPPINGS_VERSION = 2; + private static final int FLEET_AGENTS_MAPPINGS_VERSION = 4; + private static final int FLEET_ENROLLMENT_API_KEYS_MAPPINGS_VERSION = 3; private static final int FLEET_SECRETS_MAPPINGS_VERSION = 1; private static final int FLEET_POLICIES_MAPPINGS_VERSION = 2; private static final int FLEET_POLICIES_LEADER_MAPPINGS_VERSION = 1;