Fix monitor.name being empty by default (#4856) (#4877)

* Fix monitor.name being empty by default * Update dashboards to filter by monitor.type (cherry picked from commit a1031e8)
elastic · Aug 14, 2017 · e341da3 · e341da3
1 parent 2df42cc
commit e341da3
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
@@ -39,6 +39,7 @@ https://github.com/elastic/beats/compare/v6.0.0-beta1...master[Check the HEAD di
 
 *Heartbeat*
 
+- Fix monitor.name being empty by default. {issue}4852[4852]
 - Fix wrong event timestamps. {issue}4851[4851]
 
 *Metricbeat*

diff --git a/heartbeat/_meta/kibana/5.x/search/02014c80-29d2-11e7-a68f-bfaa2341cc52.json b/heartbeat/_meta/kibana/5.x/search/02014c80-29d2-11e7-a68f-bfaa2341cc52.json
@@ -8,7 +8,7 @@
   "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.name\",\n        \"negate\": false,\n        \"value\": \"http\"\n      },\n      \"query\": {\n        \"match\": {\n          \"monitor.name\": {\n            \"query\": \"http\",\n            \"type\": \"phrase\"\n          }\n        }\n      }\n    }\n  ]\n}"
+    "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", 
@@ -21,4 +21,4 @@
     "resolve.rtt.us", 
     "http.rtt.content.us"
   ]
-}
+}
diff --git a/heartbeat/_meta/kibana/default/dashboard/Heartbeat-http-monitor.json b/heartbeat/_meta/kibana/default/dashboard/Heartbeat-http-monitor.json
@@ -96,7 +96,7 @@
         "description": "",
         "hits": 0,
         "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.name\",\n        \"negate\": false,\n        \"value\": \"http\"\n      },\n      \"query\": {\n        \"match\": {\n          \"monitor.name\": {\n            \"query\": \"http\",\n            \"type\": \"phrase\"\n          }\n        }\n      }\n    }\n  ]\n}"
+          "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}"
         },
         "sort": [
           "@timestamp",
@@ -129,4 +129,4 @@
     }
   ],
   "version": "6.0.0-alpha3-SNAPSHOT"
-}
+}
diff --git a/heartbeat/beater/manager.go b/heartbeat/beater/manager.go
@@ -271,7 +271,7 @@ func createWatchUpdater(monitor *monitor) func(content []byte) {
 func (m *monitorTask) createJob(client beat.Client) scheduler.TaskFunc {
 	name := m.config.Name
 	if name == "" {
-		name = m.config.Name
+		name = m.config.Type
 	}
 
 	meta := common.MapStr{