Merge bd62a0b into 003c44f

data/statistics.go

@@ -9,6 +9,7 @@ package data
 type Statistics struct {
 	NodeID         string  `json:"node_id"`
 	Clients        Clients `json:"clients"`
+	DHCP           *DHCP   `json:"dhcp"`
 	RootFsUsage    float64 `json:"rootfs_usage,omitempty"`
 	LoadAverage    float64 `json:"loadavg,omitempty"`
 	Memory         Memory  `json:"memory,omitempty"`
@@ -64,6 +65,24 @@ type Clients struct {
 	Total  uint32 `json:"total"`
 }
 
+// DHCP struct
+type DHCP struct {
+	// counters
+	Decline  int64 `json:"dhcp_decline"`
+	Offer    int64 `json:"dhcp_offer"`
+	Ack      int64 `json:"dhcp_ack"`
+	Nak      int64 `json:"dhcp_nak"`
+	Request  int64 `json:"dhcp_request"`
+	Discover int64 `json:"dhcp_discover"`
+	Inform   int64 `json:"dhcp_inform"`
+	Release  int64 `json:"dhcp_release"`
+
+	// gauge
+	LeasesCurrent   int64 `json:"leases_current"`
+	LeasesAllocated int64 `json:"leases_allocated"`
+	LeasesPruned    int64 `json:"leases_pruned"`
+}
+
 // Memory struct
 type Memory struct {
 	Cached  int64 `json:"cached"`

database/influxdb/node.go

@@ -126,6 +126,21 @@ func (conn *Connection) InsertNode(node *runtime.Node) {
 		fields["traffic.mgmt_tx.packets"] = t.Packets
 	}
 
+	if dhcp := stats.DHCP; dhcp != nil {
+		fields["dhcp.decline"] = dhcp.Decline
+		fields["dhcp.offer"] = dhcp.Offer
+		fields["dhcp.ack"] = dhcp.Ack
+		fields["dhcp.nak"] = dhcp.Nak
+		fields["dhcp.request"] = dhcp.Request
+		fields["dhcp.discover"] = dhcp.Discover
+		fields["dhcp.inform"] = dhcp.Inform
+		fields["dhcp.release"] = dhcp.Release
+
+		fields["dhcp.leases.current"] = dhcp.LeasesCurrent
+		fields["dhcp.leases.allocated"] = dhcp.LeasesAllocated
+		fields["dhcp.leases.pruned"] = dhcp.LeasesPruned
+	}
+
 	for _, airtime := range stats.Wireless {
 		suffix := airtime.FrequencyName()
 		fields["airtime"+suffix+".chan_util"] = airtime.ChanUtil