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

Revamp the netdev collector to use throw-away ConstMetrics.

This commit is contained in:
Martín Ferrari 2015-09-15 15:31:51 +00:00
parent e180b882d6
commit 13672ced48
3 changed files with 85 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
collector/netdev_freebsd.go
View File

@ -21,11 +21,11 @@ import (
import "C" import "C"
const ( const (
netDevSubsystem = "network" subsystem = "network"
) )
type netDevCollector struct { type netDevCollector struct {
metrics map[string]*prometheus.CounterVec metricDescs map[string]*prometheus.Desc
} }
func init() { func init() {
@ -36,7 +36,7 @@ func init() {
// Network device stats. // Network device stats.
func NewNetDevCollector() (Collector, error) { func NewNetDevCollector() (Collector, error) {
return &netDevCollector{ return &netDevCollector{
metrics: map[string]*prometheus.CounterVec{}, metricDescs: map[string]*prometheus.Desc{},
}, nil }, nil
} }
@ -45,39 +45,35 @@ func (c *netDevCollector) Update(ch chan<- prometheus.Metric) (err error) {
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 dev, devStats := range netDev {
for dev, stats := range devStats { for key, value := range devStats {
for t, value := range stats { desc, ok := c.metricDescs[key]
key := direction + "_" + t if !ok {
if _, ok := c.metrics[key]; !ok { desc = prometheus.NewDesc(
c.metrics[key] = prometheus.NewCounterVec( prometheus.BuildFQName(
prometheus.CounterOpts{ Namespace, subsystem, key),
Namespace: Namespace, fmt.Sprintf(
Subsystem: netDevSubsystem, "%s from getifaddrs().", key),
Name: key, []string{"device"},
Help: fmt.Sprintf("%s %s from getifaddrs().", t, direction), nil,
}, )
[]string{"device"}, c.metricDescs[key] = desc
) }
} v, err := strconv.ParseFloat(value, 64)
v, err := strconv.ParseFloat(value, 64) if err != nil {
if err != nil { return fmt.Errorf(
return fmt.Errorf("invalid value %s in netstats: %s", value, err) "Invalid value %s in netstats: %s",
} value, err)
c.metrics[key].WithLabelValues(dev).Set(v)
} }
ch <- prometheus.MustNewConstMetric(
desc, prometheus.GaugeValue, v, dev)
} }
} }
for _, m := range c.metrics { return nil
m.Collect(ch)
}
return err
} }
func getNetDevStats() (map[string]map[string]map[string]string, error) { func getNetDevStats() (map[string]map[string]string, error) {
netDev := map[string]map[string]map[string]string{} netDev := map[string]map[string]string{}
netDev["transmit"] = map[string]map[string]string{}
netDev["receive"] = map[string]map[string]string{}
var ifap, ifa *C.struct_ifaddrs var ifap, ifa *C.struct_ifaddrs
if C.getifaddrs(&ifap) == -1 { if C.getifaddrs(&ifap) == -1 {
@ -87,22 +83,20 @@ func getNetDevStats() (map[string]map[string]map[string]string, error) {
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{} devStats := map[string]string{}
transmit := map[string]string{}
data := (*C.struct_if_data)(ifa.ifa_data) data := (*C.struct_if_data)(ifa.ifa_data)
receive["packets"] = strconv.Itoa(int(data.ifi_ipackets))
transmit["packets"] = strconv.Itoa(int(data.ifi_opackets))
receive["errs"] = strconv.Itoa(int(data.ifi_ierrors))
transmit["errs"] = strconv.Itoa(int(data.ifi_oerrors))
receive["bytes"] = strconv.Itoa(int(data.ifi_ibytes))
transmit["bytes"] = strconv.Itoa(int(data.ifi_obytes))
receive["multicast"] = strconv.Itoa(int(data.ifi_imcasts))
transmit["multicast"] = strconv.Itoa(int(data.ifi_omcasts))
receive["drop"] = strconv.Itoa(int(data.ifi_iqdrops))
transmit["drop"] = strconv.Itoa(int(data.ifi_oqdrops))
netDev["receive"][C.GoString(ifa.ifa_name)] = receive devStats["receive_packets"] = strconv.Itoa(int(data.ifi_ipackets))
netDev["transmit"][C.GoString(ifa.ifa_name)] = transmit devStats["transmit_packets"] = strconv.Itoa(int(data.ifi_opackets))
devStats["receive_errs"] = strconv.Itoa(int(data.ifi_ierrors))
devStats["transmit_errs"] = strconv.Itoa(int(data.ifi_oerrors))
devStats["receive_bytes"] = strconv.Itoa(int(data.ifi_ibytes))
devStats["transmit_bytes"] = strconv.Itoa(int(data.ifi_obytes))
devStats["receive_multicast"] = strconv.Itoa(int(data.ifi_imcasts))
devStats["transmit_multicast"] = strconv.Itoa(int(data.ifi_omcasts))
devStats["receive_drop"] = strconv.Itoa(int(data.ifi_iqdrops))
devStats["transmit_drop"] = strconv.Itoa(int(data.ifi_oqdrops))
netDev[C.GoString(ifa.ifa_name)] = devStats
} }
} }

99
collector/netdev_linux.go
View File

@ -17,19 +17,20 @@ import (
) )
const ( const (
procNetDev = "/proc/net/dev" procNetDev = "/proc/net/dev"
netDevSubsystem = "network" subsystem = "network"
) )
var ( var (
fieldSep = regexp.MustCompile("[ :] *") fieldSep = regexp.MustCompile("[ :] *")
netdevIgnoredDevices = flag.String("collector.netdev.ignored-devices", "^$", "Regexp of net devices to ignore for netdev collector.") netdevIgnoredDevices = flag.String(
"collector.netdev.ignored-devices", "^$",
"Regexp of net devices to ignore for netdev collector.")
) )
type netDevCollector struct { type netDevCollector struct {
ignoredDevicesPattern *regexp.Regexp ignoredDevicesPattern *regexp.Regexp
metricDescs map[string]*prometheus.Desc
metrics map[string]*prometheus.GaugeVec
} }
func init() { func init() {
@ -39,9 +40,10 @@ func init() {
// Takes a prometheus registry and returns a new Collector exposing // Takes a prometheus registry and returns a new Collector exposing
// network device stats. // network device stats.
func NewNetDevCollector() (Collector, error) { func NewNetDevCollector() (Collector, error) {
pattern := regexp.MustCompile(*netdevIgnoredDevices)
return &netDevCollector{ return &netDevCollector{
ignoredDevicesPattern: regexp.MustCompile(*netdevIgnoredDevices), ignoredDevicesPattern: pattern,
metrics: map[string]*prometheus.GaugeVec{}, metricDescs: map[string]*prometheus.Desc{},
}, nil }, nil
} }
@ -50,36 +52,34 @@ func (c *netDevCollector) Update(ch chan<- prometheus.Metric) (err error) {
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 dev, devStats := range netDev {
for dev, stats := range devStats { for key, value := range devStats {
for t, value := range stats { desc, ok := c.metricDescs[key]
key := direction + "_" + t if !ok {
if _, ok := c.metrics[key]; !ok { desc = prometheus.NewDesc(
c.metrics[key] = prometheus.NewGaugeVec( prometheus.BuildFQName(
prometheus.GaugeOpts{ Namespace, subsystem, key),
Namespace: Namespace, fmt.Sprintf(
Subsystem: netDevSubsystem, "%s from /proc/net/dev.", key),
Name: key, []string{"device"},
Help: fmt.Sprintf("%s %s from /proc/net/dev.", t, direction), nil,
}, )
[]string{"device"}, c.metricDescs[key] = desc
) }
} v, err := strconv.ParseFloat(value, 64)
v, err := strconv.ParseFloat(value, 64) if err != nil {
if err != nil { return fmt.Errorf(
return fmt.Errorf("Invalid value %s in netstats: %s", value, err) "Invalid value %s in netstats: %s",
} value, err)
c.metrics[key].WithLabelValues(dev).Set(v)
} }
ch <- prometheus.MustNewConstMetric(
desc, prometheus.GaugeValue, v, dev)
} }
} }
for _, m := range c.metrics { return nil
m.Collect(ch)
}
return err
} }
func getNetDevStats(ignore *regexp.Regexp) (map[string]map[string]map[string]string, error) { func getNetDevStats(ignore *regexp.Regexp) (map[string]map[string]string, error) {
file, err := os.Open(procNetDev) file, err := os.Open(procNetDev)
if err != nil { if err != nil {
return nil, err return nil, err
@ -89,11 +89,7 @@ func getNetDevStats(ignore *regexp.Regexp) (map[string]map[string]map[string]str
return parseNetDevStats(file, ignore) return parseNetDevStats(file, ignore)
} }
func parseNetDevStats(r io.Reader, ignore *regexp.Regexp) (map[string]map[string]map[string]string, error) { func parseNetDevStats(r io.Reader, ignore *regexp.Regexp) (map[string]map[string]string, error) {
netDev := map[string]map[string]map[string]string{}
netDev["transmit"] = map[string]map[string]string{}
netDev["receive"] = map[string]map[string]string{}
scanner := bufio.NewScanner(r) scanner := bufio.NewScanner(r)
scanner.Scan() // skip first header scanner.Scan() // skip first header
scanner.Scan() scanner.Scan()
@ -102,7 +98,9 @@ func parseNetDevStats(r io.Reader, ignore *regexp.Regexp) (map[string]map[string
return nil, fmt.Errorf("Invalid header line in %s: %s", return nil, fmt.Errorf("Invalid header line in %s: %s",
procNetDev, scanner.Text()) procNetDev, scanner.Text())
} }
header := strings.Fields(parts[1]) header := strings.Fields(parts[1])
netDev := map[string]map[string]string{}
for scanner.Scan() { for scanner.Scan() {
line := strings.TrimLeft(string(scanner.Text()), " ") line := strings.TrimLeft(string(scanner.Text()), " ")
parts := fieldSep.Split(line, -1) parts := fieldSep.Split(line, -1)
@ -112,30 +110,15 @@ func parseNetDevStats(r io.Reader, ignore *regexp.Regexp) (map[string]map[string
} }
dev := parts[0][:len(parts[0])] dev := parts[0][:len(parts[0])]
receive, err := parseNetDevLine(parts[1:len(header)+1], header)
if err != nil {
return nil, err
}
transmit, err := parseNetDevLine(parts[len(header)+1:], header)
if err != nil {
return nil, err
}
if ignore.MatchString(dev) { if ignore.MatchString(dev) {
log.Debugf("Ignoring device: %s", dev) log.Debugf("Ignoring device: %s", dev)
continue continue
} }
netDev["transmit"][dev] = transmit netDev[dev] = map[string]string{}
netDev["receive"][dev] = receive for i, v := range header {
netDev[dev]["receive_" + v] = parts[i+1]
netDev[dev]["transmit_" + v] = parts[i+1+len(header)]
}
} }
return netDev, nil return netDev, nil
} }
func parseNetDevLine(parts []string, header []string) (map[string]string, error) {
devStats := map[string]string{}
for i, v := range parts {
devStats[header[i]] = v
}
return devStats, nil
}

10
collector/netdev_linux_test.go
View File

@ -18,23 +18,23 @@ func TestNetDevStats(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
if want, got := "10437182923", netStats["receive"]["wlan0"]["bytes"]; want != got { if want, got := "10437182923", netStats["wlan0"]["receive_bytes"]; want != got {
t.Errorf("want netstat wlan0 bytes %s, got %s", want, got) t.Errorf("want netstat wlan0 bytes %s, got %s", want, got)
} }
if want, got := "68210035552", netStats["receive"]["eth0"]["bytes"]; want != got { if want, got := "68210035552", netStats["eth0"]["receive_bytes"]; want != got {
t.Errorf("want netstat eth0 bytes %s, got %s", want, got) t.Errorf("want netstat eth0 bytes %s, got %s", want, got)
} }
if want, got := "934", netStats["transmit"]["tun0"]["packets"]; want != got { if want, got := "934", netStats["tun0"]["transmit_packets"]; want != got {
t.Errorf("want netstat tun0 packets %s, got %s", want, got) t.Errorf("want netstat tun0 packets %s, got %s", want, got)
} }
if want, got := 6, len(netStats["transmit"]); want != got { if want, got := 6, len(netStats); want != got {
t.Errorf("want count of devices to be %d, got %d", want, got) t.Errorf("want count of devices to be %d, got %d", want, got)
} }
if _, ok := netStats["transmit"]["veth4B09XN"]; ok != false { if _, ok := netStats["veth4B09XN"]["transmit_bytes"]; ok != false {
t.Error("want fixture interface veth4B09XN to not exist, but it does") t.Error("want fixture interface veth4B09XN to not exist, but it does")
} }
} }