[8.18](backport #42569) metricbeat: Update beat module with apm-serve…

…r tail sampling monitoring metrics fields (#42576) * metricbeat: Update beat module with apm-server tail sampling monitoring metrics fields (#42569) Update metricbeat beat module mapping to add back missing apm-server tail sampling montioring metrics fields. The fields were missed in #40127 (cherry picked from commit 9134522) * Fix backport merge --------- Co-authored-by: Carson Ip <[email protected]> Co-authored-by: Carson Ip <[email protected]>
elastic · Feb 3, 2025 · 47d83f1 · 47d83f1
1 parent aa39888
commit 47d83f1
Show file tree

Hide file tree

Showing 6 changed files with 293 additions and 56 deletions.
diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
@@ -386,6 +386,7 @@ https://github.com/elastic/beats/compare/v8.8.1\...main[Check the HEAD diff]
 - Add support of additional `collstats` metrics in mongodb module. {pull}42171[42171]
 - Preserve queries for debugging when `merge_results: true` in SQL module {pull}42271[42271]
 - Collect more fields from ES node/stats metrics and only those that are necessary {pull}42421[42421]
+- Update beat module with apm-server tail sampling monitoring metrics fields {pull}42569[42569]
 
 *Metricbeat*
 - Add benchmark module {pull}41801[41801]

diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc
@@ -7573,6 +7573,91 @@ alias to: beat.stats.apm_server.root.unset
 
 --
 
+
+
+*`beats_stats.apm-server.sampling.tail.dynamic_service_groups`*::
++
+--
+type: alias
+
+alias to: beat.stats.apm_server.sampling.tail.dynamic_service_groups
+
+--
+
+
+*`beats_stats.apm-server.sampling.tail.events.dropped`*::
++
+--
+type: alias
+
+alias to: beat.stats.apm_server.sampling.tail.events.dropped
+
+--
+
+*`beats_stats.apm-server.sampling.tail.events.failed_writes`*::
++
+--
+type: alias
+
+alias to: beat.stats.apm_server.sampling.tail.events.failed_writes
+
+--
+
+*`beats_stats.apm-server.sampling.tail.events.head_unsampled`*::
++
+--
+type: alias
+
+alias to: beat.stats.apm_server.sampling.tail.events.head_unsampled
+
+--
+
+*`beats_stats.apm-server.sampling.tail.events.processed`*::
++
+--
+type: alias
+
+alias to: beat.stats.apm_server.sampling.tail.events.processed
+
+--
+
+*`beats_stats.apm-server.sampling.tail.events.sampled`*::
++
+--
+type: alias
+
+alias to: beat.stats.apm_server.sampling.tail.events.sampled
+
+--
+
+*`beats_stats.apm-server.sampling.tail.events.stored`*::
++
+--
+type: alias
+
+alias to: beat.stats.apm_server.sampling.tail.events.stored
+
+--
+
+
+*`beats_stats.apm-server.sampling.tail.storage.lsm_size`*::
++
+--
+type: alias
+
+alias to: beat.stats.apm_server.sampling.tail.storage.lsm_size
+
+--
+
+*`beats_stats.apm-server.sampling.tail.storage.value_log_size`*::
++
+--
+type: alias
+
+alias to: beat.stats.apm_server.sampling.tail.storage.value_log_size
+
+--
+
 *`beats_stats.apm-server.sampling.transactions_dropped`*::
 +
 --
@@ -9663,6 +9748,73 @@ type: long
 
 --
 
+
+
+*`beat.stats.apm_server.sampling.tail.dynamic_service_groups`*::
++
+--
+type: long
+
+--
+
+
+*`beat.stats.apm_server.sampling.tail.events.dropped`*::
++
+--
+type: long
+
+--
+
+*`beat.stats.apm_server.sampling.tail.events.failed_writes`*::
++
+--
+type: long
+
+--
+
+*`beat.stats.apm_server.sampling.tail.events.head_unsampled`*::
++
+--
+type: long
+
+--
+
+*`beat.stats.apm_server.sampling.tail.events.processed`*::
++
+--
+type: long
+
+--
+
+*`beat.stats.apm_server.sampling.tail.events.sampled`*::
++
+--
+type: long
+
+--
+
+*`beat.stats.apm_server.sampling.tail.events.stored`*::
++
+--
+type: long
+
+--
+
+
+*`beat.stats.apm_server.sampling.tail.storage.lsm_size`*::
++
+--
+type: long
+
+--
+
+*`beat.stats.apm_server.sampling.tail.storage.value_log_size`*::
++
+--
+type: long
+
+--
+
 *`beat.stats.apm_server.sampling.transactions_dropped`*::
 +
 --

diff --git a/metricbeat/module/beat/_meta/fields.yml b/metricbeat/module/beat/_meta/fields.yml
@@ -477,9 +477,48 @@
                 - name: unset
                   type: alias
                   path: beat.stats.apm_server.root.unset
-            - name: sampling.transactions_dropped
-              type: alias
-              path: beat.stats.apm_server.sampling.transactions_dropped
+            - name: sampling
+              type: group
+              fields:
+                - name: tail
+                  type: group
+                  fields:
+                    - name: dynamic_service_groups
+                      type: alias
+                      path: beat.stats.apm_server.sampling.tail.dynamic_service_groups
+                    - name: events
+                      type: group
+                      fields:
+                        - name: dropped
+                          type: alias
+                          path: beat.stats.apm_server.sampling.tail.events.dropped
+                        - name: failed_writes
+                          type: alias
+                          path: beat.stats.apm_server.sampling.tail.events.failed_writes
+                        - name: head_unsampled
+                          type: alias
+                          path: beat.stats.apm_server.sampling.tail.events.head_unsampled
+                        - name: processed
+                          type: alias
+                          path: beat.stats.apm_server.sampling.tail.events.processed
+                        - name: sampled
+                          type: alias
+                          path: beat.stats.apm_server.sampling.tail.events.sampled
+                        - name: stored
+                          type: alias
+                          path: beat.stats.apm_server.sampling.tail.events.stored
+                    - name: storage
+                      type: group
+                      fields:
+                        - name: lsm_size
+                          type: alias
+                          path: beat.stats.apm_server.sampling.tail.storage.lsm_size
+                        - name: value_log_size
+                          type: alias
+                          path: beat.stats.apm_server.sampling.tail.storage.value_log_size
+                - name: transactions_dropped
+                  type: alias
+                  path: beat.stats.apm_server.sampling.transactions_dropped
             - name: server
               type: group
               fields:

diff --git a/metricbeat/module/beat/fields.go b/metricbeat/module/beat/fields.go
diff --git a/metricbeat/module/beat/stats/_meta/fields.yml b/metricbeat/module/beat/stats/_meta/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: