Sort by names, then IPs

config.yaml

@@ -124,7 +124,7 @@ locations:
     - "ac:44:f2:4e:87:27" # MAIN2-R bridge interface
     - ART6 # Wash
     - ART7 # Wash
-    - DMX32 # Wash
+    - DMX148 # wash6
     - ART19 # Focus
 
 - name: Booth

http.go

@@ -228,7 +228,13 @@ func (t *Tendrils) getNodes() []*Node {
 		nodes = append(nodes, node)
 	}
 	sort.Slice(nodes, func(i, j int) bool {
+		if nodes[i].DisplayName() != nodes[j].DisplayName() {
 			return sortorder.NaturalLess(nodes[i].DisplayName(), nodes[j].DisplayName())
+		}
+		if nodes[i].FirstIP() != nodes[j].FirstIP() {
+			return sortorder.NaturalLess(nodes[i].FirstIP(), nodes[j].FirstIP())
+		}
+		return sortorder.NaturalLess(nodes[i].FirstMAC(), nodes[j].FirstMAC())
 	})
 
 	return nodes

types.go

@@ -266,5 +266,14 @@ func (n *Node) FirstMAC() string {
 			return string(iface.MAC)
 		}
 	}
-	return "??"
+	return ""
+}
+
+func (n *Node) FirstIP() string {
+	for _, iface := range n.Interfaces {
+		for ip := range iface.IPs {
+			return ip
+		}
+	}
+	return ""
 }