Move heartbeat dashboards to monitors

Apply decoding of dashboards also to Heartbeat. See elastic#7224 for more details.
ruflin · Jun 5, 2018 · 341c7fa · 341c7fa
1 parent 9462a10
commit 341c7fa
Show file tree

Hide file tree

Showing 11 changed files with 713 additions and 134 deletions.
diff --git a/heartbeat/.gitignore b/heartbeat/.gitignore
@@ -4,7 +4,7 @@
 
 heartbeat
 
-_meta/kibana/*/index-pattern
+_meta/kibana
 
 build
 /tests/load/logs
diff --git a/heartbeat/Makefile b/heartbeat/Makefile
@@ -15,7 +15,7 @@ before-build:
 
 # Collects all dependencies and then calls update
 .PHONY: collect
-collect: fields imports
+collect: fields imports kibana
 
 # Generate imports for all monitors
 .PHONY: imports
@@ -27,3 +27,12 @@ imports: python-env
 .PHONY: create-monitor
 create-monitor:
 	go run scripts/generate_monitor/main.go -monitor=${MONITOR}
+
+# Collects all module dashboards
+.PHONY: kibana
+kibana:
+	@rm -rf _meta/kibana
+	@mkdir -p _meta/kibana
+	@-cp -r monitors/active/*/_meta/kibana _meta/
+	@# Convert all dashboards to string
+	@python ${ES_BEATS}/libbeat/scripts/unpack_dashboards.py --glob="./_meta/kibana/6/dashboard/*.json"
diff --git a/heartbeat/_meta/kibana/6/dashboard/Heartbeat-http-monitor.json b/heartbeat/_meta/kibana/6/dashboard/Heartbeat-http-monitor.json
diff --git a/...f3e771c0-eb19-11e6-be20-559646f8b9ba.json → ...f3e771c0-eb19-11e6-be20-559646f8b9ba.json b/...f3e771c0-eb19-11e6-be20-559646f8b9ba.json → ...f3e771c0-eb19-11e6-be20-559646f8b9ba.json
diff --git a/...02014c80-29d2-11e7-a68f-bfaa2341cc52.json → ...02014c80-29d2-11e7-a68f-bfaa2341cc52.json b/...02014c80-29d2-11e7-a68f-bfaa2341cc52.json → ...02014c80-29d2-11e7-a68f-bfaa2341cc52.json
diff --git a/...091c3a90-eb1e-11e6-be20-559646f8b9ba.json → ...091c3a90-eb1e-11e6-be20-559646f8b9ba.json b/...091c3a90-eb1e-11e6-be20-559646f8b9ba.json → ...091c3a90-eb1e-11e6-be20-559646f8b9ba.json
diff --git a/...0f4c0560-eb20-11e6-9f11-159ff202874a.json → ...0f4c0560-eb20-11e6-9f11-159ff202874a.json b/...0f4c0560-eb20-11e6-9f11-159ff202874a.json → ...0f4c0560-eb20-11e6-9f11-159ff202874a.json
diff --git a/...1738dbc0-eb1d-11e6-be20-559646f8b9ba.json → ...1738dbc0-eb1d-11e6-be20-559646f8b9ba.json b/...1738dbc0-eb1d-11e6-be20-559646f8b9ba.json → ...1738dbc0-eb1d-11e6-be20-559646f8b9ba.json
diff --git a/...920e8140-eb1a-11e6-be20-559646f8b9ba.json → ...920e8140-eb1a-11e6-be20-559646f8b9ba.json b/...920e8140-eb1a-11e6-be20-559646f8b9ba.json → ...920e8140-eb1a-11e6-be20-559646f8b9ba.json
diff --git a/...c65ef340-eb19-11e6-be20-559646f8b9ba.json → ...c65ef340-eb19-11e6-be20-559646f8b9ba.json b/...c65ef340-eb19-11e6-be20-559646f8b9ba.json → ...c65ef340-eb19-11e6-be20-559646f8b9ba.json