Rename http.response.status to http.response.status_code to align wit…

…h ECS
elastic · Jun 6, 2018 · 0a00884 · 0a00884
1 parent b8f4f59
commit 0a00884
Show file tree

Hide file tree

Showing 8 changed files with 407 additions and 406 deletions.
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
@@ -32,6 +32,7 @@ https://github.com/elastic/beats/compare/v6.2.3...master[Check the HEAD diff]
 
 - Made the URL field of heartbeat aggregatable. {pull}6263[6263]
 - Use `match.Matcher` for checking heartbeat response bodies with regular expressions. {pull}6539[6539]
+- Rename http.response.status to http.response.status_code to align with ECS. {pull}7274[7274]
 
 *Metricbeat*
 

diff --git a/heartbeat/docs/fields.asciidoc b/heartbeat/docs/fields.asciidoc
@@ -483,7 +483,7 @@ Service response parameters.
 
 
 
-*`http.response.status`*::
+*`http.response.status_code`*::
 +
 --
 type: integer

diff --git a/heartbeat/include/fields.go b/heartbeat/include/fields.go
diff --git a/heartbeat/monitors/active/http/_meta/fields.yml b/heartbeat/monitors/active/http/_meta/fields.yml
@@ -23,7 +23,7 @@
           description: >
             Service response parameters.
           fields:
-            - name: status
+            - name: status_code
               type: integer
               description: >
                 Response status code.

diff --git a/...beat/monitors/active/http/_meta/kibana/5/search/02014c80-29d2-11e7-a68f-bfaa2341cc52.json b/...beat/monitors/active/http/_meta/kibana/5/search/02014c80-29d2-11e7-a68f-bfaa2341cc52.json
@@ -1,24 +1,24 @@
 {
   "sort": [
-    "@timestamp", 
+    "@timestamp",
     "desc"
-  ], 
-  "hits": 0, 
-  "description": "", 
-  "title": "Heartbeat HTTP pings", 
-  "version": 1, 
+  ],
+  "hits": 0,
+  "description": "",
+  "title": "Heartbeat HTTP pings",
+  "version": 1,
   "kibanaSavedObjectMeta": {
     "searchSourceJSON": "{\n  \"index\": \"heartbeat-*\",\n  \"highlightAll\": true,\n  \"query\": {\n    \"query_string\": {\n      \"analyze_wildcard\": true,\n      \"query\": \"*\"\n    }\n  },\n  \"filter\": [\n    {\n      \"$state\": {\n        \"store\": \"appState\"\n      },\n      \"meta\": {\n        \"alias\": null,\n        \"disabled\": false,\n        \"index\": \"heartbeat-*\",\n        \"key\": \"monitor.type\",\n        \"negate\": false,\n        \"value\": \"http\"\n      },\n      \"query\": {\n        \"match\": {\n          \"monitor.type\": {\n            \"query\": \"http\",\n            \"type\": \"phrase\"\n          }\n        }\n      }\n    }\n  ]\n}"
-  }, 
+  },
   "columns": [
-    "monitor.id", 
-    "http.url", 
-    "monitor.status", 
-    "http.response.status", 
-    "monitor.duration.us", 
-    "tcp.rtt.connect.us", 
-    "tls.rtt.handshake.us", 
-    "resolve.rtt.us", 
+    "monitor.id",
+    "http.url",
+    "monitor.status",
+    "http.response.status_code",
+    "monitor.duration.us",
+    "tcp.rtt.connect.us",
+    "tls.rtt.handshake.us",
+    "resolve.rtt.us",
     "http.rtt.content.us"
   ]
 }
diff --git a/...nitors/active/http/_meta/kibana/5/visualization/920e8140-eb1a-11e6-be20-559646f8b9ba.json b/...nitors/active/http/_meta/kibana/5/visualization/920e8140-eb1a-11e6-be20-559646f8b9ba.json
@@ -1,11 +1,11 @@
 {
-  "visState": "{\n  \"title\": \"HTTP monitors status\",\n  \"type\": \"pie\",\n  \"params\": {\n    \"addTooltip\": true,\n    \"addLegend\": true,\n    \"legendPosition\": \"bottom\",\n    \"isDonut\": false\n  },\n  \"aggs\": [\n    {\n      \"id\": \"1\",\n      \"enabled\": true,\n      \"type\": \"cardinality\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"field\": \"monitor.id\"\n      }\n    },\n    {\n      \"id\": \"3\",\n      \"enabled\": true,\n      \"type\": \"filters\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"filters\": [\n          {\n            \"input\": {\n              \"query\": {\n                \"query_string\": {\n                  \"query\": \"monitor.status: up\",\n                  \"analyze_wildcard\": true\n                }\n              }\n            },\n            \"label\": \"\"\n          },\n          {\n            \"input\": {\n              \"query\": {\n                \"query_string\": {\n                  \"query\": \"monitor.status: down\",\n                  \"analyze_wildcard\": true\n                }\n              }\n            }\n          }\n        ]\n      }\n    },\n    {\n      \"id\": \"2\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"http.response.status\",\n        \"size\": 5,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\"\n      }\n    }\n  ],\n  \"listeners\": {}\n}", 
-  "description": "", 
-  "title": "HTTP monitors status", 
-  "uiStateJSON": "{\n  \"vis\": {\n    \"colors\": {\n      \"200\": \"#B7DBAB\",\n      \"monitor.status: up\": \"#629E51\",\n      \"monitor.status: down\": \"#E24D42\"\n    },\n    \"legendOpen\": true\n  }\n}", 
-  "version": 1, 
-  "savedSearchId": "02014c80-29d2-11e7-a68f-bfaa2341cc52", 
+  "visState": "{\n  \"title\": \"HTTP monitors status\",\n  \"type\": \"pie\",\n  \"params\": {\n    \"addTooltip\": true,\n    \"addLegend\": true,\n    \"legendPosition\": \"bottom\",\n    \"isDonut\": false\n  },\n  \"aggs\": [\n    {\n      \"id\": \"1\",\n      \"enabled\": true,\n      \"type\": \"cardinality\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"field\": \"monitor.id\"\n      }\n    },\n    {\n      \"id\": \"3\",\n      \"enabled\": true,\n      \"type\": \"filters\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"filters\": [\n          {\n            \"input\": {\n              \"query\": {\n                \"query_string\": {\n                  \"query\": \"monitor.status: up\",\n                  \"analyze_wildcard\": true\n                }\n              }\n            },\n            \"label\": \"\"\n          },\n          {\n            \"input\": {\n              \"query\": {\n                \"query_string\": {\n                  \"query\": \"monitor.status: down\",\n                  \"analyze_wildcard\": true\n                }\n              }\n            }\n          }\n        ]\n      }\n    },\n    {\n      \"id\": \"2\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"http.response.status_code\",\n        \"size\": 5,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\"\n      }\n    }\n  ],\n  \"listeners\": {}\n}",
+  "description": "",
+  "title": "HTTP monitors status",
+  "uiStateJSON": "{\n  \"vis\": {\n    \"colors\": {\n      \"200\": \"#B7DBAB\",\n      \"monitor.status: up\": \"#629E51\",\n      \"monitor.status: down\": \"#E24D42\"\n    },\n    \"legendOpen\": true\n  }\n}",
+  "version": 1,
+  "savedSearchId": "02014c80-29d2-11e7-a68f-bfaa2341cc52",
   "kibanaSavedObjectMeta": {
     "searchSourceJSON": "{\n  \"filter\": []\n}"
   }
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -483,7 +483,7 @@ Service response parameters. @@
-    *`http.response.status`*::
+    *`http.response.status_code`*::
     +
     --
     type: integer
@@ Expand Down @@