Merge pull request #154 from aofei/master

Only render mem info when its total > 0
This commit is contained in:
xxxserxxx 2020-11-23 14:36:35 -06:00 committed by GitHub
commit ad8adfdf94
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -26,8 +26,10 @@ func NewMemWidget(updateInterval time.Duration, horizontalScale int) *MemWidget
mems := make(map[string]devices.MemoryInfo) mems := make(map[string]devices.MemoryInfo)
devices.UpdateMem(mems) devices.UpdateMem(mems)
for name, mem := range mems { for name, mem := range mems {
widg.Data[name] = []float64{0} if mem.Total > 0 {
widg.renderMemInfo(name, mem) widg.Data[name] = []float64{0}
widg.renderMemInfo(name, mem)
}
} }
go func() { go func() {
@ -35,7 +37,9 @@ func NewMemWidget(updateInterval time.Duration, horizontalScale int) *MemWidget
widg.Lock() widg.Lock()
devices.UpdateMem(mems) devices.UpdateMem(mems)
for label, mi := range mems { for label, mi := range mems {
widg.renderMemInfo(label, mi) if mi.Total > 0 {
widg.renderMemInfo(label, mi)
}
} }
widg.Unlock() widg.Unlock()
} }
@ -47,7 +51,7 @@ func NewMemWidget(updateInterval time.Duration, horizontalScale int) *MemWidget
func (mem *MemWidget) EnableMetric() { func (mem *MemWidget) EnableMetric() {
mems := make(map[string]devices.MemoryInfo) mems := make(map[string]devices.MemoryInfo)
devices.UpdateMem(mems) devices.UpdateMem(mems)
for l, _ := range mems { for l := range mems {
lc := l lc := l
metrics.NewGauge(makeName("memory", l), func() float64 { metrics.NewGauge(makeName("memory", l), func() float64 {
if ds, ok := mem.Data[lc]; ok { if ds, ok := mem.Data[lc]; ok {