RepoMirrors
/
node_exporter
mirror of https://github.com/prometheus/node_exporter
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

netdev: Code cleanup.

This commit is contained in:
Siavash Safi 2015-06-24 16:32:12 +04:30
parent 78bf63ffd8
commit 720198e047
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
collector/netdev_freebsd.go
View File

@ -11,6 +11,7 @@ import (
) )
/* /*
#cgo CFLAGS: -D_IFI_OQDROPS
#include <stdio.h> #include <stdio.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
@ -31,7 +32,8 @@ func init() {
Factories["netdev"] = NewNetDevCollector Factories["netdev"] = NewNetDevCollector
} }
// network device stats. // Takes a prometheus registry and returns a new Collector exposing
// Network device stats.
func NewNetDevCollector() (Collector, error) { func NewNetDevCollector() (Collector, error) {
return &netDevCollector{ return &netDevCollector{
metrics: map[string]*prometheus.CounterVec{}, metrics: map[string]*prometheus.CounterVec{},
@ -41,7 +43,7 @@ func NewNetDevCollector() (Collector, error) {
func (c *netDevCollector) Update(ch chan<- prometheus.Metric) (err error) { func (c *netDevCollector) Update(ch chan<- prometheus.Metric) (err error) {
netDev, err := getNetDevStats() netDev, err := getNetDevStats()
if err != nil { if err != nil {
return fmt.Errorf("Couldn't get netstats: %s", err) return fmt.Errorf("couldn't get netstats: %s", err)
} }
for direction, devStats := range netDev { for direction, devStats := range netDev {
for dev, stats := range devStats { for dev, stats := range devStats {
@ -60,7 +62,7 @@ func (c *netDevCollector) Update(ch chan<- prometheus.Metric) (err error) {
} }
v, err := strconv.ParseFloat(value, 64) v, err := strconv.ParseFloat(value, 64)
if err != nil { if err != nil {
return fmt.Errorf("Invalid value %s in netstats: %s", value, err) return fmt.Errorf("invalid value %s in netstats: %s", value, err)
} }
c.metrics[key].WithLabelValues(dev).Set(v) c.metrics[key].WithLabelValues(dev).Set(v)
} }
@ -81,11 +83,12 @@ func getNetDevStats() (map[string]map[string]map[string]string, error) {
if C.getifaddrs(&ifap) == -1 { if C.getifaddrs(&ifap) == -1 {
return nil, errors.New("getifaddrs() failed!") return nil, errors.New("getifaddrs() failed!")
} }
defer C.freeifaddrs(ifap)
for ifa = ifap; ifa != nil; ifa = ifa.ifa_next { for ifa = ifap; ifa != nil; ifa = ifa.ifa_next {
if ifa.ifa_addr.sa_family == C.AF_LINK { if ifa.ifa_addr.sa_family == C.AF_LINK {
receive := map[string]string{} receive := map[string]string{}
transmit := map[string]string{} transmit := map[string]string{}
//var data *C.struct_if_data
data := (*C.struct_if_data)(ifa.ifa_data) data := (*C.struct_if_data)(ifa.ifa_data)
receive["packets"] = strconv.Itoa(int(data.ifi_ipackets)) receive["packets"] = strconv.Itoa(int(data.ifi_ipackets))
transmit["packets"] = strconv.Itoa(int(data.ifi_opackets)) transmit["packets"] = strconv.Itoa(int(data.ifi_opackets))
@ -96,13 +99,12 @@ func getNetDevStats() (map[string]map[string]map[string]string, error) {
receive["multicast"] = strconv.Itoa(int(data.ifi_imcasts)) receive["multicast"] = strconv.Itoa(int(data.ifi_imcasts))
transmit["multicast"] = strconv.Itoa(int(data.ifi_omcasts)) transmit["multicast"] = strconv.Itoa(int(data.ifi_omcasts))
receive["drop"] = strconv.Itoa(int(data.ifi_iqdrops)) receive["drop"] = strconv.Itoa(int(data.ifi_iqdrops))
//transmit["drops"] = strconv.Itoa(int(data.ifi_oqdrops)) transmit["drop"] = strconv.Itoa(int(data.ifi_oqdrops))
netDev["receive"][C.GoString(ifa.ifa_name)] = receive netDev["receive"][C.GoString(ifa.ifa_name)] = receive
netDev["transmit"][C.GoString(ifa.ifa_name)] = transmit netDev["transmit"][C.GoString(ifa.ifa_name)] = transmit
} }
} }
defer C.freeifaddrs(ifap)
return netDev, nil return netDev, nil
} }