From 95153bb8572fea71b9bca1eee057773f7618d6cd Mon Sep 17 00:00:00 2001
From: fzu-huang <503582241@qq.com>
Date: Tue, 27 Dec 2016 00:09:51 +0800
Subject: [PATCH] Fixes partion name, v2 TCP stats

---
 fs/fs.go              | 2 +-
 info/v2/conversion.go | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/fs/fs.go b/fs/fs.go
index 46756d4e..a879e59f 100644
--- a/fs/fs.go
+++ b/fs/fs.go
@@ -346,7 +346,7 @@ func (self *RealFsInfo) GetFsInfoForPath(mountSet map[string]struct{}) ([]Fs, er
 	return filesystems, nil
 }
 
-var partitionRegex = regexp.MustCompile(`^(?:(?:s|xv)d[a-z]+\d*|dm-\d+)$`)
+var partitionRegex = regexp.MustCompile(`^(?:(?:s|v|xv)d[a-z]+\d*|dm-\d+)$`)
 
 func getDiskStatsMap(diskStatsFile string) (map[string]DiskStats, error) {
 	diskStatsMap := make(map[string]DiskStats)
diff --git a/info/v2/conversion.go b/info/v2/conversion.go
index 03dfe096..dc24c9fe 100644
--- a/info/v2/conversion.go
+++ b/info/v2/conversion.go
@@ -119,6 +119,8 @@ func ContainerStatsFromV1(spec *v1.ContainerSpec, stats []*v1.ContainerStats) []
 		if spec.HasNetwork {
 			// TODO: Handle TcpStats
 			stat.Network = &NetworkStats{
+				Tcp:        TcpStat(val.Network.Tcp),
+				Tcp6:       TcpStat(val.Network.Tcp6),
 				Interfaces: val.Network.Interfaces,
 			}
 		}