[WIP] Update heartbeat event structure

heartbeat/beater/manager.go

@@ -241,7 +241,8 @@ func createJobTask(
 		}
 
 		if event != nil {
-			event["monitor"] = name
+
+			event["monitor"].(common.MapStr)["name"] = name
 			client.PublishEvent(event)
 		}
 

heartbeat/monitors/active/dialchain/dialchain.go

@@ -101,7 +101,7 @@ func (c *DialerChain) AddLayer(l Layer) {
 
 func measureEventRTT(event common.MapStr, name string) DialLayerCallback {
 	return &MeasureLayerRTTCB{Callback: func(start, end time.Time) {
-		event[name] = look.RTT(end.Sub(start))
+		event.Put(name, look.RTT(end.Sub(start)))
 	}}
 }
 

heartbeat/monitors/active/http/task.go

@@ -114,7 +114,7 @@ func createPingFactory(
 	return monitors.MakePingIPFactory(fields, func(ip *net.IPAddr) (common.MapStr, error) {
 		addr := net.JoinHostPort(ip.String(), strconv.Itoa(int(port)))
 		d := &dialchain.DialerChain{
-			Net: dialchain.ConstAddrDialer("tcp_connect_rtt", addr, timeout),
+			Net: dialchain.ConstAddrDialer("tcp.rtt.connect", addr, timeout),
 		}
 		if isTLS {
 			d.AddLayer(dialchain.TLSLayer("tls_handshake_rtt", tls, timeout))

heartbeat/monitors/active/icmp/icmp.go

@@ -94,7 +94,7 @@ func createPingIPFactory(config *Config) func(*net.IPAddr) (common.MapStr, error
 		}
 
 		return common.MapStr{
-			"icmp_rtt": look.RTT(rtt),
+			"rtt": look.RTT(rtt),
 		}, nil
 	}
 }

heartbeat/monitors/active/tcp/task.go

@@ -133,7 +133,9 @@ func pingHost(
 
 	end := time.Now()
 	event := common.MapStr{
-		"validate_rtt": look.RTT(end.Sub(validateStart)),
+		"rtt": common.MapStr{
+			"validate": look.RTT(end.Sub(validateStart)),
+		},
 	}
 	if err != nil {
 		event["error"] = reason.FailValidate(err)
@@ -169,7 +171,7 @@ func buildDialerChain(
 	config *Config,
 ) (*dialchain.DialerChain, error) {
 	d := &dialchain.DialerChain{
-		Net: dialchain.TCPDialer("tcp_connect_rtt", config.Timeout),
+		Net: dialchain.TCPDialer("rtt.connect", config.Timeout),
 	}
 	if config.Socks5.URL != "" {
 		d.AddLayer(dialchain.SOCKS5Layer("socks5_connect_rtt", &config.Socks5))
@@ -203,7 +205,7 @@ func buildHostDialerChainFactory(
 		}
 
 		return &dialchain.DialerChain{
-			Net:    dialchain.ConstAddrDialer("tcp_connect_rtt", addr, config.Timeout),
+			Net:    dialchain.ConstAddrDialer("rtt.connect", addr, config.Timeout),
 			Layers: template.Layers,
 		}
 	}, nil

heartbeat/monitors/util.go

@@ -193,8 +193,10 @@ func MakeByHostJob(
 
 			dnsEnd := time.Now()
 			dnsRTT := dnsEnd.Sub(dnsStart)
-			event["resolve_rtt"] = look.RTT(dnsRTT)
-			event["ip"] = ip.String()
+			event["resolve"] = common.MapStr{
+				"rtt": look.RTT(dnsRTT),
+				"ip":  ip.String(),
+			}
 
 			return WithFields(event, pingFactory(ip)).Run()
 		}), nil
@@ -304,12 +306,47 @@ func annotated(start time.Time, typ string, fn func() (common.MapStr, []TaskRunn
 		}
 
 		if event != nil {
-			event.Update(common.MapStr{
+
+			monitor := common.MapStr{
+				"type":     typ,
+				"duration": look.RTT(time.Now().Sub(start)),
+				"status":   "down",
+			}
+
+			if err == nil {
+				monitor["status"] = "up"
+			}
+
+			if host, ok := event["host"]; ok {
+				monitor["host"] = host
+				delete(event, "host")
+			}
+
+			if ip, ok := event["ip"]; ok {
+				monitor["ip"] = ip
+				delete(event, "ip")
+			}
+
+			var resolve common.MapStr
+			if r, ok := event["resolve"]; ok {
+				resolve = r.(common.MapStr)
+				delete(event, "resolve")
+			}
+
+			if duration, ok := event["duration"]; ok {
+				monitor["duration"] = duration
+				delete(event, "duration")
+			}
+
+			event = common.MapStr{
 				"@timestamp": look.Timestamp(start),
-				"duration":   look.RTT(time.Now().Sub(start)),
-				"type":       typ,
-				"up":         err == nil,
-			})
+				"monitor":    monitor,
+				typ:          event,
+			}
+
+			if resolve != nil {
+				event["resolve"] = resolve
+			}
 		}
 
 		for i := range cont {