From d732f506d5651413d107fb73c571c99542e6f781 Mon Sep 17 00:00:00 2001 From: Julia Bardi <90178898+juliaElastic@users.noreply.github.com> Date: Mon, 16 Feb 2026 14:56:55 +0100 Subject: [PATCH 1/8] Add OpAMP field mappings to fleet-agents --- .../src/main/resources/fleet-agents.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) 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 5b023af87d197..84842a3192d68 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 @@ -363,6 +363,18 @@ } } } + }, + "sequence_num": { + "type": "integer" + }, + "capabilities": { + "type": "keyword" + }, + "identifying_attributes": { + "type": "object" + }, + "non_identifying_attributes": { + "type": "object" } } } From 649d714a4bee330c9edc4f14cf908378afbb98d2 Mon Sep 17 00:00:00 2001 From: Julia Bardi <90178898+juliaElastic@users.noreply.github.com> Date: Mon, 16 Feb 2026 15:01:27 +0100 Subject: [PATCH 2/8] Update Fleet.java --- .../src/main/java/org/elasticsearch/xpack/fleet/Fleet.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 2b5dcc52b8d77..8f2023d29da83 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 @@ -77,7 +77,7 @@ 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 = 6; + private static final int FLEET_AGENTS_MAPPINGS_VERSION = 7; 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; From 59721018f4516ac02267db4b45e79112427f742a Mon Sep 17 00:00:00 2001 From: Julia Bardi <90178898+juliaElastic@users.noreply.github.com> Date: Mon, 16 Feb 2026 15:13:30 +0100 Subject: [PATCH 3/8] Update docs/changelog/142550.yaml --- docs/changelog/142550.yaml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 docs/changelog/142550.yaml diff --git a/docs/changelog/142550.yaml b/docs/changelog/142550.yaml new file mode 100644 index 0000000000000..606f6822bb356 --- /dev/null +++ b/docs/changelog/142550.yaml @@ -0,0 +1,5 @@ +area: Infra/Plugins +issues: [] +pr: 142550 +summary: "[Fleet] Add OpAMP field mappings to fleet-agents" +type: enhancement From a51d06bb06f12fa7efa70c901e650a1ee7f4d4a9 Mon Sep 17 00:00:00 2001 From: Julia Bardi Date: Mon, 16 Feb 2026 15:27:51 +0100 Subject: [PATCH 4/8] added agent.type --- .../template-resources/src/main/resources/fleet-agents.json | 3 +++ 1 file changed, 3 insertions(+) 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 84842a3192d68..2afa69e71a166 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 @@ -27,6 +27,9 @@ }, "version": { "type": "keyword" + }, + "type": { + "type": "keyword" } } }, From 3f3a9b9467dab68f3a43ca2907121a8a27aa5cfb Mon Sep 17 00:00:00 2001 From: Julia Bardi Date: Mon, 16 Feb 2026 17:35:49 +0100 Subject: [PATCH 5/8] add identifying and non-identifying attributes mappings --- .../src/main/resources/fleet-agents.json | 43 ++++++++++++++++++- 1 file changed, 41 insertions(+), 2 deletions(-) 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 2afa69e71a166..69d56f4393f14 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 @@ -374,10 +374,49 @@ "type": "keyword" }, "identifying_attributes": { - "type": "object" + "properties": { + "service": { + "properties": { + "name": { + "type": "keyword" + }, + "version": { + "type": "keyword" + }, + "instance": { + "properties": { + "id": { + "type": "keyword" + } + } + } + } + } + } }, "non_identifying_attributes": { - "type": "object" + "properties": { + "host": { + "properties": { + "arch": { + "type": "keyword" + }, + "name": { + "type": "keyword" + } + } + }, + "os": { + "properties": { + "type": { + "type": "keyword" + }, + "description": { + "type": "keyword" + } + } + } + } } } } From 7b9dd5da414dea0de2dee53a5cbc995662f2bf7d Mon Sep 17 00:00:00 2001 From: Julia Bardi <90178898+juliaElastic@users.noreply.github.com> Date: Wed, 18 Feb 2026 09:33:49 +0100 Subject: [PATCH 6/8] added passthrough --- .../template-resources/src/main/resources/fleet-agents.json | 2 ++ 1 file changed, 2 insertions(+) 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 69d56f4393f14..6d7a84024b270 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 @@ -374,6 +374,7 @@ "type": "keyword" }, "identifying_attributes": { + "type": "passthrough", "properties": { "service": { "properties": { @@ -395,6 +396,7 @@ } }, "non_identifying_attributes": { + "type": "passthrough", "properties": { "host": { "properties": { From 2a0d28e4a1f434aac3eb30d4c4c56da9e72fc920 Mon Sep 17 00:00:00 2001 From: Julia Bardi <90178898+juliaElastic@users.noreply.github.com> Date: Wed, 18 Feb 2026 10:15:15 +0100 Subject: [PATCH 7/8] Update fleet-agents.json --- .../template-resources/src/main/resources/fleet-agents.json | 2 ++ 1 file changed, 2 insertions(+) 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 6d7a84024b270..4023ecd5a785e 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 @@ -375,6 +375,7 @@ }, "identifying_attributes": { "type": "passthrough", + "priority": 20, "properties": { "service": { "properties": { @@ -397,6 +398,7 @@ }, "non_identifying_attributes": { "type": "passthrough", + "priority": 20, "properties": { "host": { "properties": { From fc040192c9dbbc7d478cd4bccaf1c9c21d384dec Mon Sep 17 00:00:00 2001 From: Julia Bardi <90178898+juliaElastic@users.noreply.github.com> Date: Wed, 18 Feb 2026 10:42:02 +0100 Subject: [PATCH 8/8] update priority --- .../template-resources/src/main/resources/fleet-agents.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 4023ecd5a785e..a710e0cebb9e2 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 @@ -375,7 +375,7 @@ }, "identifying_attributes": { "type": "passthrough", - "priority": 20, + "priority": 10, "properties": { "service": { "properties": {