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

Merge pull request #267 from mgit-at/sockstat-rhe4 

sockstat: add support for RHE4
pull/275/head
Brian Brazil 2016-07-07 21:30:23 +01:00 committed by GitHub
parent 3f19ee6f02 4b820427dd
commit f660b32f08
3 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
collector/fixtures/proc/net/sockstat_rhe4 Normal file
View File

@ -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

10
collector/sockstat_linux.go
View File

@ -117,11 +117,13 @@ func parseSockStats(r io.Reader, fileName string) (map[string]map[string]string,
sockStat["TCP"]["mem_bytes"] = strconv.Itoa(pageCount * pageSize) sockStat["TCP"]["mem_bytes"] = strconv.Itoa(pageCount * pageSize)
// Update the UDP mem from page count to bytes. // 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 return sockStat, nil
} }

7
collector/sockstat_linux_test.go
View File

@ -20,7 +20,12 @@ import (
) )
func TestSockStats(t *testing.T) { 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 { if err != nil {
t.Fatal(err) t.Fatal(err)
} }