fix netdev collector for linux #890

dmitriy-lukyanchikov · 2018-04-10T10:46:56Z

header for transmit traffic is differs from recieve, so we cannot use recieve header as transmit, now we can see carier and colls metrics in prometheus

root@dimon-note:~# cat /proc/net/dev
Inter-|   Receive                                                |  Transmit
 face |bytes    packets errs drop fifo frame compressed multicast|bytes    packets errs drop fifo colls carrier compressed
wlp3s0:  615351    3633    0    0    0     0          0         0   139984     968    0    0    0     0       0          0
    lo:  626743    3507    0    0    0     0          0         0   626743    3507    0    0    0     0       0          0
enp2s0: 137449283  136651    0    0    0     0          0      1718 32085642   98565    0    0    0     0       0          0
  tun0: 8585664   20643    0    0    0     0          0         0 14582735   24569    0    0    0     0       0          0
docker0:       0       0    0    0    0     0          0         0        0       0    0    0    0     0       0          0

dmitriy-lukyanchikov · 2018-04-10T11:06:45Z

for some reason the test promt worning

# github.com/prometheus/node_exporter
/tmp/go-link-531251375/000003.o: In function `mygetgrouplist':
/usr/local/go/src/os/user/getgrouplist_unix.go:15: warning: Using 'getgrouplist' in statically linked applications requires at runtime the shared libraries from the glibc version used for linking
/tmp/go-link-531251375/000003.o: In function `mygetgrgid_r':
/usr/local/go/src/os/user/cgo_lookup_unix.go:38: warning: Using 'getgrgid_r' in statically linked applications requires at runtime the shared libraries from the glibc version used for linking
/tmp/go-link-531251375/000003.o: In function `mygetgrnam_r':
/usr/local/go/src/os/user/cgo_lookup_unix.go:43: warning: Using 'getgrnam_r' in statically linked applications requires at runtime the shared libraries from the glibc version used for linking
/tmp/go-link-531251375/000003.o: In function `mygetpwnam_r':
/usr/local/go/src/os/user/cgo_lookup_unix.go:33: warning: Using 'getpwnam_r' in statically linked applications requires at runtime the shared libraries from the glibc version used for linking
/tmp/go-link-531251375/000003.o: In function `mygetpwuid_r':
/usr/local/go/src/os/user/cgo_lookup_unix.go:28: warning: Using 'getpwuid_r' in statically linked applications requires at runtime the shared libraries from the glibc version used for linking
/tmp/go-link-531251375/000001.o: In function `_cgo_b0c710f30cfd_C2func_getaddrinfo':
/tmp/go-build/net/_obj/cgo-gcc-prolog:46: warning: Using 'getaddrinfo' in statically linked applications requires at runtime the shared libraries from the glibc version used for linking

but looks like the problem not in this changes

SuperQ

Thanks for catching this bug.

SuperQ · 2018-04-10T13:42:44Z

collector/netdev_linux.go

@@ -50,12 +50,14 @@ func parseNetDevStats(r io.Reader, ignore *regexp.Regexp) (map[string]map[string
 			scanner.Text())
 	}

-	header := strings.Fields(parts[1])
+        header_recieve := strings.Fields(parts[1])


Please use go-style variable names. For example this should be recieveHeader.

It's also receive, not recieve

SuperQ · 2018-04-10T13:44:47Z

collector/netdev_linux.go

 	netDev := map[string]map[string]string{}
 	for scanner.Scan() {
 		line := strings.TrimLeft(scanner.Text(), " ")
 		parts := procNetDevFieldSep.Split(line, -1)
-		if len(parts) != 2*len(header)+1 {
+		if len(parts) != len(header_recieve)+len(header_transmit)+1 {


Let's move len(header_recieve)+len(header_transmit)+1 up to line 55 as something like this:

headerLength := len(recieveHeader)+len(transmitHeader)+1

Then we can test len(parts) != headerLength.

SuperQ · 2018-04-10T13:45:35Z

The actual test failure is below what you posted.

--- FAIL: TestNetDevStats (0.00s)
	netdev_linux_test.go:43: want netstat tun0 packets 934, got 24

SuperQ · 2018-04-10T13:51:07Z

collector/netdev_linux.go

+                }
+
+                for i := 0; i < len(header_transmit); i++ {
+                        netDev[dev]["transmit_"+header_transmit[i]] = parts[i+1]


The offset on parts here is incorrect. It should be parts[i+1+len(recieveHeader)].

dmitriy-lukyanchikov · 2018-04-10T16:23:48Z

@SuperQ fixed, please review

grobie · 2018-04-10T16:28:51Z

@dmitriy-lukyanchikov the indentation is off. Please ensure that make all passes.

SuperQ · 2018-04-11T10:40:02Z

The end-to-end fixture needs to be updated. You can run ./end-to-end-test.sh -u to do this.

Please also use git commit -s to sign-off your commits. We require that you sign off a Developer Certificate of Origin.

SuperQ · 2018-04-11T12:48:52Z

Please make sure to make format, I'm still seeing some formatting issues.

fix variable name, fix transmitHeader extracting modify fixtures to run tests with updated netdev_linux collector Signed-off-by: dmitriy-lukyanchikov <d.lukyanchikov@anchorfree.com>

dmitriy-lukyanchikov · 2018-04-11T13:14:23Z

@SuperQ thank you for helping with this) now looks like all tests are passsed

SuperQ

LGTM, Awesome.

SuperQ · 2018-04-13T15:29:08Z

Ping @discordianfish / @grobie, any other comments?

discordianfish · 2018-04-14T11:58:16Z

LGTM

fix variable name, fix transmitHeader extracting modify fixtures to run tests with updated netdev_linux collector Signed-off-by: dmitriy-lukyanchikov <d.lukyanchikov@anchorfree.com>

SuperQ requested changes Apr 10, 2018

View reviewed changes

SuperQ reviewed Apr 10, 2018

View reviewed changes

dmitriy-lukyanchikov force-pushed the fix-netdev-transmit-metrics branch from 3a050f5 to e6fc076 Compare April 10, 2018 16:15

dmitriy-lukyanchikov force-pushed the fix-netdev-transmit-metrics branch from 3259656 to 25703b5 Compare April 11, 2018 13:00

fix netdev collector for linux

3420bc7

fix variable name, fix transmitHeader extracting modify fixtures to run tests with updated netdev_linux collector Signed-off-by: dmitriy-lukyanchikov <d.lukyanchikov@anchorfree.com>

dmitriy-lukyanchikov force-pushed the fix-netdev-transmit-metrics branch from 25703b5 to 3420bc7 Compare April 11, 2018 13:05

SuperQ approved these changes Apr 11, 2018

View reviewed changes

discordianfish merged commit eddd1b9 into prometheus:master Apr 14, 2018

SuperQ mentioned this pull request May 18, 2018

Provide option to ease the update for 0.16.0 release #830

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix netdev collector for linux #890

fix netdev collector for linux #890

dmitriy-lukyanchikov commented Apr 10, 2018

dmitriy-lukyanchikov commented Apr 10, 2018

SuperQ left a comment

SuperQ Apr 10, 2018

discordianfish Apr 10, 2018

SuperQ Apr 10, 2018

SuperQ commented Apr 10, 2018

SuperQ Apr 10, 2018

dmitriy-lukyanchikov commented Apr 10, 2018

grobie commented Apr 10, 2018

SuperQ commented Apr 11, 2018

SuperQ commented Apr 11, 2018

dmitriy-lukyanchikov commented Apr 11, 2018 •

edited

SuperQ left a comment

SuperQ commented Apr 13, 2018

discordianfish commented Apr 14, 2018

fix netdev collector for linux #890

fix netdev collector for linux #890

Conversation

dmitriy-lukyanchikov commented Apr 10, 2018

dmitriy-lukyanchikov commented Apr 10, 2018

SuperQ left a comment

Choose a reason for hiding this comment

SuperQ Apr 10, 2018

Choose a reason for hiding this comment

discordianfish Apr 10, 2018

Choose a reason for hiding this comment

SuperQ Apr 10, 2018

Choose a reason for hiding this comment

SuperQ commented Apr 10, 2018

SuperQ Apr 10, 2018

Choose a reason for hiding this comment

dmitriy-lukyanchikov commented Apr 10, 2018

grobie commented Apr 10, 2018

SuperQ commented Apr 11, 2018

SuperQ commented Apr 11, 2018

dmitriy-lukyanchikov commented Apr 11, 2018 • edited

SuperQ left a comment

Choose a reason for hiding this comment

SuperQ commented Apr 13, 2018

discordianfish commented Apr 14, 2018

dmitriy-lukyanchikov commented Apr 11, 2018 •

edited