Merge pull request #46 from kormat/master

Match fd0, not fda0

collector/diskstats.go

@@ -22,7 +22,7 @@ const (
 )
 
 var (
-	ignoredDevices = flag.String("diskstatsIgnoredDevices", "^(ram|loop|(f|h|s|v|xv)d[a-z])\\d+$", "Regexp of devices to ignore for diskstats.")
+	ignoredDevices = flag.String("diskstatsIgnoredDevices", "^(ram|loop|fd|(h|s|v|xv)d[a-z])\\d+$", "Regexp of devices to ignore for diskstats.")
 )
 
 type diskstatsCollector struct {

collector/fixtures/diskstats

@@ -36,3 +36,8 @@
  179       0 mmcblk0 192 3 1560 156 0 0 0 0 0 136 156
  179       1 mmcblk0p1 17 3 160 24 0 0 0 0 0 24 24
  179       2 mmcblk0p2 95 0 760 68 0 0 0 0 0 68 68
+   2       0 fd0 2 0 16 80 0 0 0 0 0 80 80
+ 254       0 vda 1775784 15386 32670882 8655768 6038856 20711856 213637440 2069221364 0 41614592 2077872228
+ 254       1 vda1 668 85 5984 956 207 4266 35784 32772 0 8808 33720
+ 254       2 vda2 1774936 15266 32663262 8654692 5991028 20707590 213601656 2069152216 0 41607628 2077801992
+  11       0 sr0 0 0 0 0 0 0 0 0 0 0 0