[Metricbeat] Rename http.request.body to http.request.body.content fo…

…r ECS (#10315) The header fields were not touched in this change as not defined yet in ECS.
elastic · Jan 28, 2019 · dc5cf51 · dc5cf51
1 parent 4e78750
commit dc5cf51
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 16 deletions.
diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
@@ -75,6 +75,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 - Refactor Prometheus metric mappings {pull}9948[9948]
 - Removed Prometheus stats metricset in favor of just using Prometheus collector {pull}9948[9948]
 - Adjust Redis.info metricset fields to ECS. {pull}10319[10319]
+- Rename http.request.body field to http.request.body.content. {pull}10315[10315]
 
 *Packetbeat*
 

diff --git a/dev-tools/ecs-migration.yml b/dev-tools/ecs-migration.yml
@@ -1223,6 +1223,12 @@
   alias: true
   beat: metricbeat
 
+### HTTP
+- from: http.request.body
+  to: http.request.body.content
+  alias: false
+  beat: metricbeat
+
 ### Zookeeper
 
 - from: zookeeper.mntr.version

diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc
@@ -10543,16 +10543,6 @@ type: object
 The HTTP headers sent
 
 
---
-
-*`http.request.body`*::
-+
---
-type: keyword
-
-The HTTP payload sent
-
-
 --
 
 [float]

diff --git a/metricbeat/module/http/_meta/fields.yml b/metricbeat/module/http/_meta/fields.yml
@@ -18,10 +18,6 @@
               type: object
               description: >
                 The HTTP headers sent
-            - name: body
-              type: keyword
-              description: >
-                The HTTP payload sent
         - name: response
           type: group
           description: >

diff --git a/metricbeat/module/http/fields.go b/metricbeat/module/http/fields.go
diff --git a/metricbeat/module/http/json/json.go b/metricbeat/module/http/json/json.go
@@ -130,7 +130,9 @@ func (m *MetricSet) processBody(response *http.Response, jsonBody interface{}) c
 			"request": common.MapStr{
 				"headers": m.getHeaders(response.Request.Header),
 				"method":  response.Request.Method,
-				"body":    m.body,
+				"body": common.MapStr{
+					"content": m.body,
+				},
 			},
 		}
 	}