Browse Source

fix counter type compute func

tags/v5.8.0
Ulric Qin 6 years ago
parent
commit
bf2a4b9ef5
3 changed files with 11 additions and 5 deletions
  1. +1
    -1
      etc/collector.yml
  2. +1
    -1
      src/modules/collector/cache/cache.go
  3. +9
    -3
      src/modules/collector/sys/funcs/push.go

+ 1
- 1
etc/collector.yml View File

@@ -16,7 +16,7 @@ sys:
mountPoint: []
mountIgnorePrefix:
- /var/lib
ignoreMetrics:
- cpu.core.idle
- cpu.core.util


+ 1
- 1
src/modules/collector/cache/cache.go View File

@@ -56,7 +56,7 @@ func (h *History) clean() {
defer h.Unlock()
now := time.Now().Unix()
for key, item := range h.Data {
if now-item.Timestamp > 2*item.Step {
if now-item.Timestamp > 10*item.Step {
delete(h.Data, key)
}
}


+ 9
- 3
src/modules/collector/sys/funcs/push.go View File

@@ -96,17 +96,23 @@ func Push(metricItems []*dataobj.MetricValue) error {

func CounterToGauge(item *dataobj.MetricValue) error {
key := item.PK()

old, exists := cache.MetricHistory.Get(key)
cache.MetricHistory.Set(key, *item)

if !exists {
cache.MetricHistory.Set(key, *item)
return fmt.Errorf("not found old item:%v", item)
}

cache.MetricHistory.Set(key, *item)
if old.Value > item.Value {
return fmt.Errorf("item:%v old value:%v greater than new value:%v", item, old.Value, item.Value)
}
item.ValueUntyped = item.Value - old.Value

if old.Timestamp > item.Timestamp {
return fmt.Errorf("item:%v old timestamp:%v greater than new timestamp:%v", item, old.Timestamp, item.Timestamp)
}

item.ValueUntyped = (item.Value - old.Value) / float64(item.Timestamp-old.Timestamp)
item.CounterType = dataobj.GAUGE
return nil
}

Loading…
Cancel
Save