elasticsearch: metric and pipeline agg setting json encoding fix

7 years ago · 688f5b830c
parent 4436b8da12
commit 688f5b830c
1 changed files with 6 additions and 2 deletions
--- a/pkg/tsdb/elasticsearch/client/models.go
+++ b/pkg/tsdb/elasticsearch/client/models.go
@ -278,7 +278,9 @@ func (a *MetricAggregation) MarshalJSON() ([]byte, error) {
 	}

 	for k, v := range a.Settings {
-		root[k] = v
+		if k != "" && v != nil {
+			root[k] = v
+		}
 	}

 	return json.Marshal(root)
@ -297,7 +299,9 @@ func (a *PipelineAggregation) MarshalJSON() ([]byte, error) {
 	}

 	for k, v := range a.Settings {
-		root[k] = v
+		if k != "" && v != nil {
+			root[k] = v
+		}
 	}

 	return json.Marshal(root)