i5354: Harmonize field names between Packetbeat HTTP and Metricbeat M…

…odule
elastic · Nov 10, 2017 · 12fae93 · 12fae93
1 parent 8ae5b4b
commit 12fae93
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 6 deletions.
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
@@ -25,6 +25,7 @@ https://github.com/elastic/beats/compare/v6.0.0-beta2...master[Check the HEAD di
 *Metricbeat*
 
 - Rename `heap_init` field to `heap.init`. {pull}5320[5320]
+- Rename `http.response.status_code` field to `http.response.code`. {pull}5521[5521]
 
 
 *Packetbeat*

diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc
@@ -4546,10 +4546,12 @@ The HTTP headers received
 
 
 [float]
-=== `http.response.status_code`
+=== `http.response.code`
 
 type: keyword
 
+example: 404
+
 The HTTP status code
 
 

diff --git a/metricbeat/module/http/_meta/fields.yml b/metricbeat/module/http/_meta/fields.yml
@@ -33,10 +33,11 @@
               type: object
               description: >
                 The HTTP headers received
-            - name: status_code
+            - name: code
               type: keyword
               description: >
                 The HTTP status code
+              example: 404
             - name: phrase
               type: keyword
               example: Not found

diff --git a/metricbeat/module/http/json/_meta/docs.asciidoc b/metricbeat/module/http/json/_meta/docs.asciidoc
@@ -124,7 +124,7 @@ Example:
         "Server": "Google Frontend",
         "X-Cloud-Trace-Context": "3f532d170112fc5b2a0b94fcbd6493b3"
       },
-      "status_code": 200
+      "code": 200
     }
   },
   "metricset": {

diff --git a/metricbeat/module/http/json/json.go b/metricbeat/module/http/json/json.go
@@ -128,9 +128,9 @@ func (m *MetricSet) Fetch() (common.MapStr, error) {
 		phrase := strings.TrimPrefix(response.Status, strconv.Itoa(response.StatusCode)+" ")
 		event[mb.ModuleDataKey] = common.MapStr{
 			"response": common.MapStr{
-				"status_code": response.StatusCode,
-				"phrase":      phrase,
-				"headers":     m.getHeaders(response.Header),
+				"code":    response.StatusCode,
+				"phrase":  phrase,
+				"headers": m.getHeaders(response.Header),
 			},
 		}
 	}