IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

elasticsearch: metric and pipeline agg setting json encoding fix

Browse Source
This commit is contained in:
Marcus Efraimsson
2018-05-23 22:21:41 +02:00
parent 4436b8da12
commit 688f5b830c
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/tsdb/elasticsearch/client/models.go
View File

@@ -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)