From 311b563c9bd06fb84f95b3d0590ed7aff4df82f3 Mon Sep 17 00:00:00 2001
From: Kyle Brandt <kyle@grafana.com>
Date: Mon, 7 Dec 2020 15:07:18 -0500
Subject: [PATCH] Expr: make reduction nan/null more consistent (#29665)

---
 pkg/expr/mathexp/reduce.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkg/expr/mathexp/reduce.go b/pkg/expr/mathexp/reduce.go
index dd1432a19f6..1c0d63118aa 100644
--- a/pkg/expr/mathexp/reduce.go
+++ b/pkg/expr/mathexp/reduce.go
@@ -11,7 +11,7 @@ func Sum(v *data.Field) *float64 {
 	var sum float64
 	for i := 0; i < v.Len(); i++ {
 		if f, ok := v.At(i).(*float64); ok {
-			if f == nil {
+			if f == nil || math.IsNaN(*f) {
 				nan := math.NaN()
 				return &nan
 			}
@@ -35,7 +35,7 @@ func Min(fv *data.Field) *float64 {
 	}
 	for i := 0; i < fv.Len(); i++ {
 		if v, ok := fv.At(i).(*float64); ok {
-			if v == nil {
+			if v == nil || math.IsNaN(*v) {
 				nan := math.NaN()
 				return &nan
 			}
@@ -55,7 +55,7 @@ func Max(fv *data.Field) *float64 {
 	}
 	for i := 0; i < fv.Len(); i++ {
 		if v, ok := fv.At(i).(*float64); ok {
-			if v == nil {
+			if v == nil || math.IsNaN(*v) {
 				nan := math.NaN()
 				return &nan
 			}