diff --git a/node/disk.go b/node/disk.go index 5cb88ea..0a90277 100644 --- a/node/disk.go +++ b/node/disk.go @@ -10,7 +10,7 @@ import ( "k8s.io/klog/v2" ) -var blockDevice = regexp.MustCompile(`^(dm-\d+|(s|h|xv|v)d[a-z]|md\d+|nvme\d+n\d+|rbd\d+)`) +var blockDevice = regexp.MustCompile(`^(dm-\d+|(s|h|xv|v)d[a-z]|md\d+|mmcblk\d+|nvme\d+n\d+|rbd\d+)`) type DevStat struct { Name string diff --git a/node/disk_test.go b/node/disk_test.go index 24fa329..5f3b5e3 100644 --- a/node/disk_test.go +++ b/node/disk_test.go @@ -48,7 +48,7 @@ func TestGetNodeDisks(t *testing.T) { } assert.Equal(t, - []string{"dm-0", "md1", "nvme0n1", "nvme1n1", "rbd0", "rbd1", "sda", "sdb", "vda", "xvda"}, + []string{"dm-0", "md1", "mmcblk1", "mmcblk2", "nvme0n1", "nvme1n1", "rbd0", "rbd1", "sda", "sdb", "vda", "xvda"}, names(d.BlockDevices()), ) } diff --git a/node/fixtures/diskstats b/node/fixtures/diskstats index d898c3c..33a249b 100644 --- a/node/fixtures/diskstats +++ b/node/fixtures/diskstats @@ -24,4 +24,6 @@ 252 0 dm-0 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 2 0 fd0 0 0 0 0 0 0 0 0 0 0 0 251 0 rbd0 216 0 8642 82 1355 2670 107408 6863 0 6228 6946 0 0 0 0 0 0 - 251 16 rbd1 121 0 4474 167 1070 2045 97928 4940 0 4664 5107 0 0 0 0 0 0 \ No newline at end of file + 251 16 rbd1 121 0 4474 167 1070 2045 97928 4940 0 4664 5107 0 0 0 0 0 0 + 179 0 mmcblk2 1507813 57817 41091023 964555 22224580 788926 129513803 19667753 0 11731380 25835227 0 0 0 0 7614434 5202918 + 179 24 mmcblk1 144 0 7784 338 0 0 0 0 0 260 338 0 0 0 0 0 0