Merge pull request #517 from mackerelio/fix-darwin-vm-volume

[darwin] fix filesystem metrics for APFS vm partition volume
mackerelio · Aug 30, 2018 · 80885e9 · 80885e9
2 parents 6d24cc9 + 4b929ce
commit 80885e9
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/util/filesystem.go b/util/filesystem.go
@@ -101,8 +101,20 @@ func parseDfLines(out string) []*DfStat {
 			continue
 		}
 
-		if runtime.GOOS == "darwin" && strings.HasPrefix(dfstat.Mounted, "/Volumes/") {
-			continue
+		if runtime.GOOS == "darwin" {
+			if strings.HasPrefix(dfstat.Mounted, "/Volumes/") {
+				continue
+			}
+			// Skip APFS vm partition, add its usage to the root filesystem.
+			if dfstat.Mounted == "/private/var/vm" {
+				for _, fs := range filesystems {
+					if fs.Mounted == "/" {
+						fs.Used += dfstat.Used
+						break
+					}
+				}
+				continue
+			}
 		}
 
 		filesystems = append(filesystems, dfstat)