prometheus/cadvisor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #444 from arkadijs/btrfs

Browse Source 
Process BTRFS and whole-disk filesystem stats
This commit is contained in:
Victor Marmol 2015-02-05 17:46:36 -08:00
commit f2efed3159
3 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs/fs.go
View File

@ -39,7 +39,7 @@ import (
"github.com/golang/glog"
)
var partitionRegex = regexp.MustCompile("(:?s|xv)d[a-z]+\\d")
var partitionRegex = regexp.MustCompile("^(:?(:?s|xv)d[a-z]+\\d*|dm-\\d+)$")
type partition struct {
mountpoint string
@ -58,7 +58,7 @@ func NewFsInfo() (FsInfo, error) {
}
partitions := make(map[string]partition, 0)
for _, mount := range mounts {
if !strings.HasPrefix(mount.Fstype, "ext") {
if !strings.HasPrefix(mount.Fstype, "ext") && mount.Fstype != "btrfs" {
continue
}
// Avoid bind mounts.

12
fs/fs_test.go
View File

@ -23,10 +23,18 @@ func TestGetDiskStatsMap(t *testing.T) {
if err != nil {
t.Errorf("Error calling getDiskStatMap %s", err)
}
if len(diskStatsMap) != 20 {
if len(diskStatsMap) != 30 {
t.Errorf("diskStatsMap %+v not valid", diskStatsMap)
}
keySet := map[string]string{
"/dev/sda": "/dev/sda",
"/dev/sdb": "/dev/sdb",
"/dev/sdc": "/dev/sdc",
"/dev/sdd": "/dev/sdd",
"/dev/sde": "/dev/sde",
"/dev/sdf": "/dev/sdf",
"/dev/sdg": "/dev/sdg",
"/dev/sdh": "/dev/sdh",
"/dev/sdb1": "/dev/sdb1",
"/dev/sdb2": "/dev/sdb2",
"/dev/sda1": "/dev/sda1",
@ -47,6 +55,8 @@ func TestGetDiskStatsMap(t *testing.T) {
"/dev/sdg2": "/dev/sdg2",
"/dev/sdh1": "/dev/sdh1",
"/dev/sdh2": "/dev/sdh2",
"/dev/dm-0": "/dev/dm-0",
"/dev/dm-1": "/dev/dm-1",
}
for device := range diskStatsMap {

4
fs/test_resources/diskstats
View File

@ -49,4 +49,6 @@
8 98 sdg2 395 0 3154 299 1 0 8 0 0 299 299
8 112 sdh 931 1157 7601 895 2 0 16 0 0 841 895
8 113 sdh1 477 1147 3895 264 1 0 8 0 0 264 264
8 114 sdh2 395 0 3154 311 1 0 8 0 0 311 311
8 114 sdh2 395 0 3154 311 1 0 8 0 0 311 311
252 0 dm-0 1251094 0 108121362 21287644 111848 0 52908472 22236936 0 4838500 43524784
252 1 dm-1 58415638 0 2682446960 1719953592 20048040 0 543988240 1975572544 0 262085340 3695556828