From ef1925db7d97e13141ce4fbb41e5caf7fe3895c6 Mon Sep 17 00:00:00 2001 From: stuart nelson Date: Tue, 27 Sep 2016 22:44:13 +0200 Subject: [PATCH] Compile netdev on dragonfly (#314) * Compile netdev on dragonfly * Only run netdev bsd test on bsd * Update README.md --- README.md | 2 +- collector/{netdev_freebsd.go => netdev_bsd.go} | 1 + collector/{netdev_freebsd_test.go => netdev_bsd_test.go} | 3 +++ collector/netdev_common.go | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) rename collector/{netdev_freebsd.go => netdev_bsd.go} (98%) rename collector/{netdev_freebsd_test.go => netdev_bsd_test.go} (96%) diff --git a/README.md b/README.md index b80a3c01..0709e3d7 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ filesystem | Exposes filesystem statistics, such as disk space used. | FreeBSD, loadavg | Exposes load average. | Darwin, Dragonfly, FreeBSD, Linux, NetBSD, OpenBSD, Solaris mdadm | Exposes statistics about devices in `/proc/mdstat` (does nothing if no `/proc/mdstat` present). | Linux meminfo | Exposes memory statistics. | FreeBSD, Linux -netdev | Exposes network interface statistics such as bytes transferred. | FreeBSD, Linux, OpenBSD +netdev | Exposes network interface statistics such as bytes transferred. | Dragonfly, FreeBSD, Linux, OpenBSD netstat | Exposes network statistics from `/proc/net/netstat`. This is the same information as `netstat -s`. | Linux stat | Exposes various statistics from `/proc/stat`. This includes CPU usage, boot time, forks and interrupts. | Linux textfile | Exposes statistics read from local disk. The `--collector.textfile.directory` flag must be set. | _any_ diff --git a/collector/netdev_freebsd.go b/collector/netdev_bsd.go similarity index 98% rename from collector/netdev_freebsd.go rename to collector/netdev_bsd.go index 4960f228..d846daf5 100644 --- a/collector/netdev_freebsd.go +++ b/collector/netdev_bsd.go @@ -12,6 +12,7 @@ // limitations under the License. // +build !nonetdev +// +build freebsd dragonfly package collector diff --git a/collector/netdev_freebsd_test.go b/collector/netdev_bsd_test.go similarity index 96% rename from collector/netdev_freebsd_test.go rename to collector/netdev_bsd_test.go index 32f9d0b8..a661c1cc 100644 --- a/collector/netdev_freebsd_test.go +++ b/collector/netdev_bsd_test.go @@ -11,6 +11,9 @@ // See the License for the specific language governing permissions and // limitations under the License. +// +build !nonetdev +// +build freebsd dragonfly + package collector import "testing" diff --git a/collector/netdev_common.go b/collector/netdev_common.go index 4356a578..41edf5d7 100644 --- a/collector/netdev_common.go +++ b/collector/netdev_common.go @@ -12,7 +12,7 @@ // limitations under the License. // +build !nonetdev -// +build linux freebsd openbsd +// +build linux freebsd openbsd dragonfly package collector