Add MTU to connection status

weaveworks · Dec 1, 2016 · 1ae6cab · 1ae6cab
1 parent d501c78
commit 1ae6cab
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/prog/weaver/http.go b/prog/weaver/http.go
@@ -211,7 +211,7 @@ var targetsTemplate = defTemplate("targetsTemplate", `\
 
 var connectionsTemplate = defTemplate("connectionsTemplate", `\
 {{range .Router.Connections}}\
-{{if .Outbound}}->{{else}}<-{{end}} {{printf "%-21v" .Address}} {{printf "%-11v" .State}} {{.Info}}
+{{if .Outbound}}->{{else}}<-{{end}} {{printf "%-21v" .Address}} {{printf "%-11v" .State}} {{.Info}} {{range $key,$element := .Attrs}}{{$key}}={{$element}}{{end}}
 {{end}}\
 `)
 

diff --git a/router/awsvpc.go b/router/awsvpc.go
@@ -32,8 +32,8 @@ func (conn *AWSVPCConnection) Stop() {}
 func (conn *AWSVPCConnection) ControlMessage(tag byte, msg []byte) {
 }
 
-func (conn *AWSVPCConnection) DisplayName() string {
-	return "awsvpc"
+func (conn *AWSVPCConnection) GetDisplayNameAndAttrs() (string, map[string]interface{}) {
+	return "awsvpc", nil
 }
 
 // OverlayForwarder

diff --git a/router/fastdp.go b/router/fastdp.go
@@ -771,8 +771,8 @@ func (fwd *fastDatapathForwarder) ControlMessage(tag byte, msg []byte) {
 	}
 }
 
-func (fwd *fastDatapathForwarder) DisplayName() string {
-	return "fastdp"
+func (fwd *fastDatapathForwarder) GetDisplayNameAndAttrs() (string, map[string]interface{}) {
+	return "fastdp", map[string]interface{}{"mtu": fwd.fastdp.iface.MTU}
 }
 
 func (fwd *fastDatapathForwarder) handleHeartbeatAck() {

diff --git a/router/overlay_switch.go b/router/overlay_switch.go
@@ -424,7 +424,7 @@ func (fwd *overlaySwitchForwarder) ControlMessage(tag byte, msg []byte) {
 	}
 }
 
-func (fwd *overlaySwitchForwarder) DisplayName() string {
+func (fwd *overlaySwitchForwarder) GetDisplayNameAndAttrs() (string, map[string]interface{}) {
 	var best OverlayForwarder
 
 	fwd.lock.Lock()
@@ -434,8 +434,8 @@ func (fwd *overlaySwitchForwarder) DisplayName() string {
 	fwd.lock.Unlock()
 
 	if best != nil {
-		return best.DisplayName()
+		return best.GetDisplayNameAndAttrs()
 	}
 
-	return "none"
+	return "none", nil
 }
diff --git a/router/sleeve.go b/router/sleeve.go
@@ -606,8 +606,8 @@ func (fwd *sleeveForwarder) ControlMessage(tag byte, msg []byte) {
 	}
 }
 
-func (fwd *sleeveForwarder) DisplayName() string {
-	return "sleeve"
+func (fwd *sleeveForwarder) GetDisplayNameAndAttrs() (string, map[string]interface{}) {
+	return "sleeve", map[string]interface{}{"mtu": fwd.mtu}
 }
 
 func (fwd *sleeveForwarder) Stop() {

diff --git a/vendor/github.com/weaveworks/mesh b/vendor/github.com/weaveworks/mesh