[7.17](backport #30324) [Heartbeat] Add keyword mapping for service.n…

…ame (#30352) * [Heartbeat] Add keyword mapping for service.name (#30324) * [Heartbeat] Add keyword mapping for service.name Fixes elastic/uptime#452 by adding the proper mapping for this field that was introduced some time ago * changelog (cherry picked from commit 8f67fbe) # Conflicts: # heartbeat/include/fields.go # x-pack/heartbeat/include/fields.go * update fields.go * fix changelog and fields Co-authored-by: Andrew Cholakian <[email protected]> Co-authored-by: vigneshshanmugam <[email protected]>
elastic · Feb 15, 2022 · 4d2b6e3 · 4d2b6e3
1 parent ecfd429
commit 4d2b6e3
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 3 deletions.
diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
@@ -43,11 +43,14 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 - Fix broken Kafka input {issue}29746[29746] {pull}30277[30277]
 - cisco module: Fix change the broke ASA and FTD configs that used `var.input: syslog`. {pull}30072[30072]
 - aws-s3: fix race condition in states used by s3-poller. {issue}30123[30123] {pull}30131[30131]
-
+- tcp/unix input: Stop accepting connections after socket is closed. {pull}29712[29712]
+- Fix using log_group_name_prefix in aws-cloudwatch input. {pull}29695[29695]
+- Fix multiple instances of the same module configured within `filebeat.modules` in filebeat.yml. {issue}29649[29649] {pull}29952[29952]
 
 *Heartbeat*
 
 - Add fonts to support more different types of characters for multiple languages. {pull}29861[29861]
+- Fix missing mapping for `service.name`. {pull}30324[30324]
 
 *Metricbeat*
 

diff --git a/heartbeat/_meta/fields.common.yml b/heartbeat/_meta/fields.common.yml
@@ -92,6 +92,13 @@
           type: integer
           description: >
             The number of endpoints that failed
+- key: service
+  title: "APM Service"
+  description:
+  fields:
+    - name: name
+      type: keyword
+      description: APM service name this monitor is linked to
 
 - key: resolve
   title: "Host lookup"

diff --git a/heartbeat/docs/fields.asciidoc b/heartbeat/docs/fields.asciidoc
@@ -24,6 +24,7 @@ grouped in the following categories:
 * <<exported-fields-kubernetes-processor>>
 * <<exported-fields-process>>
 * <<exported-fields-resolve>>
+* <<exported-fields-service>>
 * <<exported-fields-socks5>>
 * <<exported-fields-summary>>
 * <<exported-fields-synthetics>>
@@ -15081,6 +15082,21 @@ type: long
 
 --
 
+[[exported-fields-service]]
+== APM Service fields
+
+None
+
+
+*`name`*::
++
+--
+APM service name this monitor is linked to
+
+type: keyword
+
+--
+
 [[exported-fields-socks5]]
 == SOCKS5 proxy fields
 

diff --git a/heartbeat/include/fields.go b/heartbeat/include/fields.go
diff --git a/x-pack/heartbeat/include/fields.go b/x-pack/heartbeat/include/fields.go