prometheus/cadvisor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1547 from 163yun/master

Browse Source 
Fixes partion name, v2 TCP stats
This commit is contained in:
Tim St. Clair 2017-01-03 15:49:59 -08:00 committed by GitHub
commit 476e65ec57
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/fs.go
View File

@ -346,7 +346,7 @@ func (self *RealFsInfo) GetFsInfoForPath(mountSet map[string]struct{}) ([]Fs, er
return filesystems, nil 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) { func getDiskStatsMap(diskStatsFile string) (map[string]DiskStats, error) {
diskStatsMap := make(map[string]DiskStats) diskStatsMap := make(map[string]DiskStats)

2
info/v2/conversion.go
View File

@ -119,6 +119,8 @@ func ContainerStatsFromV1(spec *v1.ContainerSpec, stats []*v1.ContainerStats) []
if spec.HasNetwork { if spec.HasNetwork {
// TODO: Handle TcpStats // TODO: Handle TcpStats
stat.Network = &NetworkStats{ stat.Network = &NetworkStats{
Tcp: TcpStat(val.Network.Tcp),
Tcp6: TcpStat(val.Network.Tcp6),
Interfaces: val.Network.Interfaces, Interfaces: val.Network.Interfaces,
} }
} }