Merge pull request #1670 from coderZoe/bugfix_for_docker_memory

fix: docker_memory in centos_7.5 & docker_1.13.1
8 months ago · 3f547e4dd4
parent d04251e658 91a267020c
commit 3f547e4dd4
1 changed files with 2 additions and 2 deletions
--- a/docker/docker_linux.go
+++ b/docker/docker_linux.go
@ -193,9 +193,9 @@ func CgroupMemWithContext(ctx context.Context, containerID string, base string)
 			ret.Cache = v
 		case "rss":
 			ret.RSS = v
-		case "rssHuge":
+		case "rssHuge", "rss_huge":
 			ret.RSSHuge = v
-		case "mappedFile":
+		case "mappedFile", "mapped_file":
 			ret.MappedFile = v
 		case "pgpgin":
 			ret.Pgpgin = v