added leaf name to leafz metric details

nats-io · Oct 31, 2023 · a67860a · a67860a
1 parent 7bd645a
commit a67860a
Showing 1 changed file with 16 additions and 15 deletions.
diff --git a/collector/leafz.go b/collector/leafz.go
@@ -99,42 +99,42 @@ func newLeafMetrics(system, endpoint string) *leafMetrics {
 		info: prometheus.NewDesc(
 			prometheus.BuildFQName(system, endpoint, "info"),
 			"info",
-			[]string{"server_id", "account", "ip", "port"},
+			[]string{"server_id", "account", "ip", "port", "name"},
 			nil),
 		connRtt: prometheus.NewDesc(
 			prometheus.BuildFQName(system, endpoint, "conn_rtt"),
 			"rtt",
-			[]string{"server_id", "account", "ip", "port"},
+			[]string{"server_id", "account", "ip", "port", "name"},
 			nil),
 		connInMsgs: prometheus.NewDesc(
 			prometheus.BuildFQName(system, endpoint, "conn_in_msgs"),
 			"in_msgs",
-			[]string{"server_id", "account", "ip", "port"},
+			[]string{"server_id", "account", "ip", "port", "name"},
 			nil),
 		connOutMsgs: prometheus.NewDesc(
 			prometheus.BuildFQName(system, endpoint, "conn_out_msgs"),
 			"out_msgs",
-			[]string{"server_id", "account", "ip", "port"},
+			[]string{"server_id", "account", "ip", "port", "name"},
 			nil),
 		connInBytes: prometheus.NewDesc(
 			prometheus.BuildFQName(system, endpoint, "conn_in_bytes"),
 			"in_bytes",
-			[]string{"server_id", "account", "ip", "port"},
+			[]string{"server_id", "account", "ip", "port", "name"},
 			nil),
 		connOutBytes: prometheus.NewDesc(
 			prometheus.BuildFQName(system, endpoint, "conn_out_bytes"),
 			"out_bytes",
-			[]string{"server_id", "account", "ip", "port"},
+			[]string{"server_id", "account", "ip", "port", "name"},
 			nil),
 		connSubscriptionsTotal: prometheus.NewDesc(
 			prometheus.BuildFQName(system, endpoint, "conn_subscriptions_total"),
 			"subscriptions_total",
-			[]string{"server_id", "account", "ip", "port"},
+			[]string{"server_id", "account", "ip", "port", "name"},
 			nil),
 		connSubscriptions: prometheus.NewDesc(
 			prometheus.BuildFQName(system, endpoint, "conn_subscriptions"),
 			"subscriptions",
-			[]string{"server_id", "account", "ip", "port", "subscription"},
+			[]string{"server_id", "account", "ip", "port", "subscription", "name"},
 			nil),
 	}
 
@@ -159,26 +159,26 @@ func (lm *leafMetrics) Collect(server *CollectedServer, lf *Leaf, ch chan<- prom
 
 	rtt, _ := time.ParseDuration(lf.RTT)
 	ch <- prometheus.MustNewConstMetric(lm.connRtt, prometheus.GaugeValue, rtt.Seconds(),
-		server.ID, lf.Account, lf.IP, fmt.Sprint(lf.Port))
+		server.ID, lf.Account, lf.IP, fmt.Sprint(lf.Port), lf.Name)
 
 	ch <- prometheus.MustNewConstMetric(lm.connInMsgs, prometheus.GaugeValue, float64(lf.InMsgs),
-		server.ID, lf.Account, lf.IP, fmt.Sprint(lf.Port))
+		server.ID, lf.Account, lf.IP, fmt.Sprint(lf.Port), lf.Name)
 
 	ch <- prometheus.MustNewConstMetric(lm.connOutMsgs, prometheus.GaugeValue, float64(lf.OutMsgs),
-		server.ID, lf.Account, lf.IP, fmt.Sprint(lf.Port))
+		server.ID, lf.Account, lf.IP, fmt.Sprint(lf.Port), lf.Name)
 
 	ch <- prometheus.MustNewConstMetric(lm.connInBytes, prometheus.GaugeValue, float64(lf.InBytes),
-		server.ID, lf.Account, lf.IP, fmt.Sprint(lf.Port))
+		server.ID, lf.Account, lf.IP, fmt.Sprint(lf.Port), lf.Name)
 
 	ch <- prometheus.MustNewConstMetric(lm.connOutBytes, prometheus.GaugeValue, float64(lf.OutBytes),
-		server.ID, lf.Account, lf.IP, fmt.Sprint(lf.Port))
+		server.ID, lf.Account, lf.IP, fmt.Sprint(lf.Port), lf.Name)
 
 	ch <- prometheus.MustNewConstMetric(lm.connSubscriptionsTotal, prometheus.GaugeValue, float64(lf.Subscriptions),
-		server.ID, lf.Account, lf.IP, fmt.Sprint(lf.Port))
+		server.ID, lf.Account, lf.IP, fmt.Sprint(lf.Port), lf.Name)
 
 	for _, sub := range lf.SubscriptionsList {
 		ch <- prometheus.MustNewConstMetric(lm.connSubscriptions, prometheus.GaugeValue, float64(0.0),
-			server.ID, lf.Account, lf.IP, fmt.Sprint(lf.Port), sub)
+			server.ID, lf.Account, lf.IP, fmt.Sprint(lf.Port), lf.Name, sub)
 	}
 }
 
@@ -190,6 +190,7 @@ type Leafz struct {
 
 // Leaf output
 type Leaf struct {
+	Name              string   `json:"name"`
 	Account           string   `json:"account"`
 	IP                string   `json:"ip"`
 	Port              int      `json:"port"`