diff options
author | Sean E. Russell <ser@ser1.net> | 2020-02-28 10:03:41 -0600 |
---|---|---|
committer | Sean E. Russell <ser@ser1.net> | 2020-02-28 10:06:05 -0600 |
commit | 231b0d03fed93ccc4b5f953f503763966341ec48 (patch) | |
tree | 9bb07a88dd0ac7e73fa82935d0909ef4dd0810a8 /widgets | |
parent | 7a89225d729d4c54c5bc95b21979f48f9cd046b1 (diff) |
Extensions.v3.4.x
Diffstat (limited to 'widgets')
-rw-r--r-- | widgets/cpu.go | 20 | ||||
-rw-r--r-- | widgets/mem.go | 5 |
2 files changed, 14 insertions, 11 deletions
diff --git a/widgets/cpu.go b/widgets/cpu.go index e56cd3d..53f5529 100644 --- a/widgets/cpu.go +++ b/widgets/cpu.go @@ -48,10 +48,10 @@ func NewCpuWidget(updateInterval time.Duration, horizontalScale int, showAverage } if self.ShowPerCpuLoad { - cpus := make(map[string]float64) + cpus := make(map[string]int) devices.UpdateCPU(cpus, self.updateInterval, self.ShowPerCpuLoad) for k, v := range cpus { - self.Data[k] = []float64{v} + self.Data[k] = []float64{float64(v)} } } @@ -74,7 +74,7 @@ func (self *CpuWidget) EnableMetric() { Name: "avg", }) } else { - cpus := make(map[string]float64) + cpus := make(map[string]int) devices.UpdateCPU(cpus, self.updateInterval, self.ShowPerCpuLoad) self.metric = make(map[string]prometheus.Gauge) for key, perc := range cpus { @@ -83,7 +83,7 @@ func (self *CpuWidget) EnableMetric() { Subsystem: "cpu", Name: key, }) - gauge.Set(perc) + gauge.Set(float64(perc)) prometheus.MustRegister(gauge) self.metric[key] = gauge } @@ -97,7 +97,7 @@ func (b *CpuWidget) Scale(i int) { func (self *CpuWidget) update() { if self.ShowAverageLoad { go func() { - cpus := make(map[string]float64) + cpus := make(map[string]int) devices.UpdateCPU(cpus, self.updateInterval, false) self.Lock() defer self.Unlock() @@ -105,7 +105,7 @@ func (self *CpuWidget) update() { defer self.updateLock.Unlock() var val float64 for _, v := range cpus { - val = v + val = float64(v) break } self.Data["AVRG"] = append(self.Data["AVRG"], val) @@ -118,20 +118,20 @@ func (self *CpuWidget) update() { if self.ShowPerCpuLoad { go func() { - cpus := make(map[string]float64) + cpus := make(map[string]int) devices.UpdateCPU(cpus, self.updateInterval, true) self.Lock() defer self.Unlock() self.updateLock.Lock() defer self.updateLock.Unlock() for key, percent := range cpus { - self.Data[key] = append(self.Data[key], percent) - self.Labels[key] = fmt.Sprintf("%3.0f%%", percent) + self.Data[key] = append(self.Data[key], float64(percent)) + self.Labels[key] = fmt.Sprintf("%d%%", percent) if self.metric != nil { if self.metric[key] == nil { log.Printf("no metrics for %s", key) } else { - self.metric[key].Set(percent) + self.metric[key].Set(float64(percent)) } } } diff --git a/widgets/mem.go b/widgets/mem.go index f0494cf..b80b68c 100644 --- a/widgets/mem.go +++ b/widgets/mem.go @@ -2,6 +2,7 @@ package widgets import ( "fmt" + "log" "time" "github.com/prometheus/client_golang/prometheus" @@ -27,7 +28,8 @@ func NewMemWidget(updateInterval time.Duration, horizontalScale int) *MemWidget mems := make(map[string]devices.MemoryInfo) devices.UpdateMem(mems) for name, mem := range mems { - self.Data[name] = []float64{mem.UsedPercent} + log.Printf("setting %s to %v", name, mem) + self.Data[name] = []float64{0} self.renderMemInfo(name, mem) } @@ -36,6 +38,7 @@ func NewMemWidget(updateInterval time.Duration, horizontalScale int) *MemWidget self.Lock() devices.UpdateMem(mems) for label, mi := range mems { + log.Printf(" updating %s to %v", label, mi) self.renderMemInfo(label, mi) if self.metrics != nil && self.metrics[label] != nil { self.metrics[label].Set(mi.UsedPercent) |