From c7103bba38afac315b2f784d622ad2cc1794df60 Mon Sep 17 00:00:00 2001
From: Carson Ip <carsonip@users.noreply.github.com>
Date: Mon, 3 Feb 2025 19:32:25 +0000
Subject: [PATCH] [elastic_agent] Add missing apm-server tail sampling
 monitoring metrics mappings (#12568)

[elastic_agent] Add missing apm-server tail sampling monitoring metrics mappings

Tail-based sampling monitoring metrics were missed in the bugfix in #10414
---
 packages/elastic_agent/changelog.yml          |  5 +++
 .../apm_server_metrics/fields/beat-fields.yml | 34 +++++++++++++++++--
 packages/elastic_agent/manifest.yml           |  2 +-
 3 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/packages/elastic_agent/changelog.yml b/packages/elastic_agent/changelog.yml
index 0b56c3f95db..bcd69d71b44 100644
--- a/packages/elastic_agent/changelog.yml
+++ b/packages/elastic_agent/changelog.yml
@@ -1,4 +1,9 @@
 # newer versions go on top
+- version: "2.0.4"
+  changes:
+    - description: Add missing apm-server tail sampling monitoring metrics mappings
+      type: bugfix
+      link: https://github.com/elastic/integrations/pull/12568
 - version: "2.0.3"
   changes:
     - description: Restore Agent errors visualisation to Elastic-Agent agent info dashboard
diff --git a/packages/elastic_agent/data_stream/apm_server_metrics/fields/beat-fields.yml b/packages/elastic_agent/data_stream/apm_server_metrics/fields/beat-fields.yml
index c70253bf1b5..7f0cbe66f6d 100644
--- a/packages/elastic_agent/data_stream/apm_server_metrics/fields/beat-fields.yml
+++ b/packages/elastic_agent/data_stream/apm_server_metrics/fields/beat-fields.yml
@@ -358,8 +358,38 @@
                       type: long
             - name: unset
               type: long
-        - name: sampling.transactions_dropped
-          type: long
+        - name: sampling
+          type: group
+          fields:
+            - name: tail
+              type: group
+              fields:
+                - name: dynamic_service_groups
+                  type: long
+                - name: events
+                  type: group
+                  fields:
+                    - name: dropped
+                      type: long
+                    - name: failed_writes
+                      type: long
+                    - name: head_unsampled
+                      type: long
+                    - name: processed
+                      type: long
+                    - name: sampled
+                      type: long
+                    - name: stored
+                      type: long
+                - name: storage
+                  type: group
+                  fields:
+                    - name: lsm_size
+                      type: long
+                    - name: value_log_size
+                      type: long
+            - name: transactions_dropped
+              type: long
         - name: server
           type: group
           fields:
diff --git a/packages/elastic_agent/manifest.yml b/packages/elastic_agent/manifest.yml
index 5ce698f063f..6fc6eed84c8 100644
--- a/packages/elastic_agent/manifest.yml
+++ b/packages/elastic_agent/manifest.yml
@@ -1,6 +1,6 @@
 name: elastic_agent
 title: Elastic Agent
-version: 2.0.3
+version: 2.0.4
 description: Collect logs and metrics from Elastic Agents.
 type: integration
 format_version: 3.1.4