From 3eb2d6625ae6fb795816645e9e925311085772c2 Mon Sep 17 00:00:00 2001 From: Nick Owens Date: Mon, 2 Nov 2015 20:31:34 -0800 Subject: [PATCH] collector: add openbsd support for netdev --- collector/netdev_common.go | 80 +++++++++++++++++++++++++++++++++++++ collector/netdev_freebsd.go | 59 +++++---------------------- collector/netdev_linux.go | 54 ------------------------- collector/netdev_openbsd.go | 68 +++++++++++++++++++++++++++++++ 4 files changed, 158 insertions(+), 103 deletions(-) create mode 100644 collector/netdev_common.go create mode 100644 collector/netdev_openbsd.go diff --git a/collector/netdev_common.go b/collector/netdev_common.go new file mode 100644 index 00000000..e7605737 --- /dev/null +++ b/collector/netdev_common.go @@ -0,0 +1,80 @@ +// Copyright 2015 The Prometheus Authors +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// +build !nonetdev +// +build linux freebsd openbsd + +package collector + +import ( + "flag" + "fmt" + "regexp" + "strconv" + + "github.com/prometheus/client_golang/prometheus" +) + +var ( + netdevIgnoredDevices = flag.String( + "collector.netdev.ignored-devices", "^$", + "Regexp of net devices to ignore for netdev collector.") +) + +type netDevCollector struct { + subsystem string + ignoredDevicesPattern *regexp.Regexp + metricDescs map[string]*prometheus.Desc +} + +func init() { + Factories["netdev"] = NewNetDevCollector +} + +// NewNetDevCollector returns a new Collector exposing network device stats. +func NewNetDevCollector() (Collector, error) { + pattern := regexp.MustCompile(*netdevIgnoredDevices) + return &netDevCollector{ + subsystem: "network", + ignoredDevicesPattern: pattern, + metricDescs: map[string]*prometheus.Desc{}, + }, nil +} + +func (c *netDevCollector) Update(ch chan<- prometheus.Metric) (err error) { + netDev, err := getNetDevStats(c.ignoredDevicesPattern) + if err != nil { + return fmt.Errorf("couldn't get netstats: %s", err) + } + for dev, devStats := range netDev { + for key, value := range devStats { + desc, ok := c.metricDescs[key] + if !ok { + desc = prometheus.NewDesc( + prometheus.BuildFQName(Namespace, c.subsystem, key), + fmt.Sprintf("Network device statistic %s.", key), + []string{"device"}, + nil, + ) + c.metricDescs[key] = desc + } + v, err := strconv.ParseFloat(value, 64) + if err != nil { + return fmt.Errorf("invalid value %s in netstats: %s", value, err) + } + ch <- prometheus.MustNewConstMetric(desc, prometheus.GaugeValue, v, dev) + } + } + return nil +} + diff --git a/collector/netdev_freebsd.go b/collector/netdev_freebsd.go index ede1ca3f..88208570 100644 --- a/collector/netdev_freebsd.go +++ b/collector/netdev_freebsd.go @@ -17,10 +17,10 @@ package collector import ( "errors" - "fmt" "strconv" + "regexp" - "github.com/prometheus/client_golang/prometheus" + "github.com/prometheus/common/log" ) /* @@ -33,52 +33,7 @@ import ( */ import "C" -type netDevCollector struct { - subsystem string - metricDescs map[string]*prometheus.Desc -} - -func init() { - Factories["netdev"] = NewNetDevCollector -} - -// Takes a prometheus registry and returns a new Collector exposing -// Network device stats. -func NewNetDevCollector() (Collector, error) { - return &netDevCollector{ - subsystem: "network", - metricDescs: map[string]*prometheus.Desc{}, - }, nil -} - -func (c *netDevCollector) Update(ch chan<- prometheus.Metric) (err error) { - netDev, err := getNetDevStats() - if err != nil { - return fmt.Errorf("couldn't get netstats: %s", err) - } - for dev, devStats := range netDev { - for key, value := range devStats { - desc, ok := c.metricDescs[key] - if !ok { - desc = prometheus.NewDesc( - prometheus.BuildFQName(Namespace, c.subsystem, key), - fmt.Sprintf("%s from getifaddrs().", key), - []string{"device"}, - nil, - ) - c.metricDescs[key] = desc - } - v, err := strconv.ParseFloat(value, 64) - if err != nil { - return fmt.Errorf("invalid value %s in netstats: %s", value, err) - } - ch <- prometheus.MustNewConstMetric(desc, prometheus.GaugeValue, v, dev) - } - } - return nil -} - -func getNetDevStats() (map[string]map[string]string, error) { +func getNetDevStats(ignore *regexp.Regexp) (map[string]map[string]string, error) { netDev := map[string]map[string]string{} var ifap, ifa *C.struct_ifaddrs @@ -89,6 +44,12 @@ func getNetDevStats() (map[string]map[string]string, error) { for ifa = ifap; ifa != nil; ifa = ifa.ifa_next { if ifa.ifa_addr.sa_family == C.AF_LINK { + dev := C.GoString(ifa.ifa_name) + if ignore.MatchString(dev) { + log.Debugf("Ignoring device: %s", dev) + continue + } + devStats := map[string]string{} data := (*C.struct_if_data)(ifa.ifa_data) @@ -102,7 +63,7 @@ func getNetDevStats() (map[string]map[string]string, error) { 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 + netDev[dev] = devStats } } diff --git a/collector/netdev_linux.go b/collector/netdev_linux.go index 80a8e7f3..3e1bd3fa 100644 --- a/collector/netdev_linux.go +++ b/collector/netdev_linux.go @@ -17,73 +17,19 @@ package collector import ( "bufio" - "flag" "fmt" "io" "os" "regexp" - "strconv" "strings" - "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/common/log" ) var ( procNetDevFieldSep = regexp.MustCompile("[ :] *") - netdevIgnoredDevices = flag.String( - "collector.netdev.ignored-devices", "^$", - "Regexp of net devices to ignore for netdev collector.") ) -type netDevCollector struct { - subsystem string - ignoredDevicesPattern *regexp.Regexp - metricDescs map[string]*prometheus.Desc -} - -func init() { - Factories["netdev"] = NewNetDevCollector -} - -// Takes a prometheus registry and returns a new Collector exposing -// network device stats. -func NewNetDevCollector() (Collector, error) { - pattern := regexp.MustCompile(*netdevIgnoredDevices) - return &netDevCollector{ - subsystem: "network", - ignoredDevicesPattern: pattern, - metricDescs: map[string]*prometheus.Desc{}, - }, nil -} - -func (c *netDevCollector) Update(ch chan<- prometheus.Metric) (err error) { - netDev, err := getNetDevStats(c.ignoredDevicesPattern) - if err != nil { - return fmt.Errorf("couldn't get netstats: %s", err) - } - for dev, devStats := range netDev { - for key, value := range devStats { - desc, ok := c.metricDescs[key] - if !ok { - desc = prometheus.NewDesc( - prometheus.BuildFQName(Namespace, c.subsystem, key), - fmt.Sprintf("Network device statistic %s.", key), - []string{"device"}, - nil, - ) - c.metricDescs[key] = desc - } - v, err := strconv.ParseFloat(value, 64) - if err != nil { - return fmt.Errorf("invalid value %s in netstats: %s", value, err) - } - ch <- prometheus.MustNewConstMetric(desc, prometheus.GaugeValue, v, dev) - } - } - return nil -} - func getNetDevStats(ignore *regexp.Regexp) (map[string]map[string]string, error) { file, err := os.Open(procFilePath("net/dev")) if err != nil { diff --git a/collector/netdev_openbsd.go b/collector/netdev_openbsd.go new file mode 100644 index 00000000..dc2f36f2 --- /dev/null +++ b/collector/netdev_openbsd.go @@ -0,0 +1,68 @@ +// Copyright 2015 The Prometheus Authors +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// +build !nonetdev + +package collector + +import ( + "errors" + "strconv" + "regexp" + + "github.com/prometheus/common/log" +) + +/* +#include +#include +#include +#include +*/ +import "C" + +func getNetDevStats(ignore *regexp.Regexp) (map[string]map[string]string, error) { + netDev := map[string]map[string]string{} + + var ifap, ifa *C.struct_ifaddrs + if C.getifaddrs(&ifap) == -1 { + return nil, errors.New("getifaddrs() failed") + } + defer C.freeifaddrs(ifap) + + for ifa = ifap; ifa != nil; ifa = ifa.ifa_next { + if ifa.ifa_addr.sa_family == C.AF_LINK { + dev := C.GoString(ifa.ifa_name) + if ignore.MatchString(dev) { + log.Debugf("Ignoring device: %s", dev) + continue + } + + devStats := map[string]string{} + data := (*C.struct_if_data)(ifa.ifa_data) + + devStats["receive_packets"] = strconv.Itoa(int(data.ifi_ipackets)) + 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)) + netDev[dev] = devStats + } + } + + return netDev, nil +}