From 688f5b830ce728f99551b6032a40abd2958a2144 Mon Sep 17 00:00:00 2001 From: Marcus Efraimsson Date: Wed, 23 May 2018 22:21:41 +0200 Subject: [PATCH] elasticsearch: metric and pipeline agg setting json encoding fix --- pkg/tsdb/elasticsearch/client/models.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkg/tsdb/elasticsearch/client/models.go b/pkg/tsdb/elasticsearch/client/models.go index 2d9839dfd53..2f4f5dcd162 100644 --- 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)