feat(alerting): calculate avg of valid points

bergquist · bergquist · commit dd3060fdc3dc · 2016-12-07T15:55:37.000+01:00
diff --git a/pkg/services/alerting/conditions/reducer.go b/pkg/services/alerting/conditions/reducer.go
@@ -27,13 +27,17 @@ func (s *SimpleReducer) Reduce(series *tsdb.TimeSeries) null.Float {
 
 	switch s.Type {
 	case "avg":
+		validPointsCount := 0
 		for _, point := range series.Points {
 			if point[0].Valid {
 				value += point[0].Float64
+				validPointsCount += 1
 				allNull = false
 			}
 		}
-		value = value / float64(len(series.Points))
+		if validPointsCount > 0 {
+			value = value / float64(validPointsCount)
+		}
 	case "sum":
 		for _, point := range series.Points {
 			if point[0].Valid {
@@ -90,7 +94,6 @@ func (s *SimpleReducer) Reduce(series *tsdb.TimeSeries) null.Float {
 				value = (values[(length/2)-1] + values[length/2]) / 2
 			}
 		}
-
 	}
 
 	if allNull {
diff --git a/pkg/services/alerting/conditions/reducer_test.go b/pkg/services/alerting/conditions/reducer_test.go
@@ -16,6 +16,20 @@ func TestSimpleReducer(t *testing.T) {
 			So(result, ShouldEqual, float64(2))
 		})
 
+		Convey("avg of none null data", func() {
+			reducer := NewSimpleReducer("avg")
+			series := &tsdb.TimeSeries{
+				Name: "test time serie",
+			}
+
+			series.Points = append(series.Points, tsdb.NewTimePoint(null.FloatFrom(3), 1))
+			series.Points = append(series.Points, tsdb.NewTimePoint(null.FloatFromPtr(nil), 2))
+			series.Points = append(series.Points, tsdb.NewTimePoint(null.FloatFromPtr(nil), 3))
+			series.Points = append(series.Points, tsdb.NewTimePoint(null.FloatFrom(3), 4))
+
+			So(reducer.Reduce(series).Float64, ShouldEqual, float64(3))
+		})
+
 		Convey("sum", func() {
 			result := testReducer("sum", 1, 2, 3)
 			So(result, ShouldEqual, float64(6))

Original file line number	Diff line number	Diff line change
`@@ -27,13 +27,17 @@ func (s SimpleReducer) Reduce(series tsdb.TimeSeries) null.Float {`
`27`	`27`
`28`	`28`	`switch s.Type {`
`29`	`29`	`case "avg":`
	`30`	`+ validPointsCount := 0`
`30`	`31`	`for _, point := range series.Points {`
`31`	`32`	`if point[0].Valid {`
`32`	`33`	`value += point[0].Float64`
	`34`	`+ validPointsCount += 1`
`33`	`35`	`allNull = false`
`34`	`36`	`}`
`35`	`37`	`}`
`36`		`- value = value / float64(len(series.Points))`
	`38`	`+ if validPointsCount > 0 {`
	`39`	`+ value = value / float64(validPointsCount)`
	`40`	`+ }`
`37`	`41`	`case "sum":`
`38`	`42`	`for _, point := range series.Points {`
`39`	`43`	`if point[0].Valid {`
`@@ -90,7 +94,6 @@ func (s SimpleReducer) Reduce(series tsdb.TimeSeries) null.Float {`
`90`	`94`	`value = (values[(length/2)-1] + values[length/2]) / 2`
`91`	`95`	`}`
`92`	`96`	`}`
`93`		`-`
`94`	`97`	`}`
`95`	`98`
`96`	`99`	`if allNull {`