sockstat: add support for RHE4

collector/fixtures/proc/net/sockstat_rhe4

@@ -0,0 +1,5 @@
+sockets: used 229
+TCP: inuse 4 orphan 0 tw 4 alloc 17 mem 1
+UDP: inuse 0
+RAW: inuse 0
+FRAG: inuse 0 memory 0

collector/sockstat_linux.go

@@ -117,11 +117,13 @@ func parseSockStats(r io.Reader, fileName string) (map[string]map[string]string,
 	sockStat["TCP"]["mem_bytes"] = strconv.Itoa(pageCount * pageSize)
 
 	// Update the UDP mem from page count to bytes.
-	pageCount, err = strconv.Atoi(sockStat["UDP"]["mem"])
+	if udpMem := sockStat["UDP"]["mem"]; udpMem != "" {
-	if err != nil {
+		pageCount, err = strconv.Atoi(udpMem)
-		return nil, fmt.Errorf("invalid value %s in sockstats: %s", sockStat["UDP"]["mem"], err)
+		if err != nil {
+			return nil, fmt.Errorf("invalid value %s in sockstats: %s", sockStat["UDP"]["mem"], err)
+		}
+		sockStat["UDP"]["mem_bytes"] = strconv.Itoa(pageCount * pageSize)
 	}
-	sockStat["UDP"]["mem_bytes"] = strconv.Itoa(pageCount * pageSize)
 
 	return sockStat, nil
 }

collector/sockstat_linux_test.go

@@ -20,7 +20,12 @@ import (
 )
 
 func TestSockStats(t *testing.T) {
-	file, err := os.Open("fixtures/proc/net/sockstat")
+	testSockStats(t, "fixtures/proc/net/sockstat")
+	testSockStats(t, "fixtures/proc/net/sockstat_rhe4")
+}
+
+func testSockStats(t *testing.T, fixture string) {
+	file, err := os.Open(fixture)
 	if err != nil {
 		t.Fatal(err)
 	}