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

pkg/tsdb/elasticsearch/response_parser.go: simplify redundant code

Browse Source 
$ gometalinter --vendor --disable-all --enable=megacheck --disable=gotype --deadline=6m ./...
pkg/tsdb/elasticsearch/response_parser.go:95:41⚠️ should use make(map[string]string) instead (S1019) (megacheck)
pkg/tsdb/elasticsearch/response_parser.go:125:41⚠️ should use make(map[string]string) instead (S1019) (megacheck)
pkg/tsdb/elasticsearch/response_parser.go:317:5⚠️ redundant break statement (S1023) (megacheck)
pkg/tsdb/elasticsearch/response_parser.go:358:5⚠️ redundant break statement (S1023) (megacheck)
This commit is contained in:
Mario Trangoni 2018-09-20 20:05:19 +02:00
parent b609d81194
commit 303e70db25
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/tsdb/elasticsearch/response_parser.go
View File

@ -92,7 +92,7 @@ func (rp *responseParser) processBuckets(aggs map[string]interface{}, target *Qu
} else { } else {
for _, b := range esAgg.Get("buckets").MustArray() { for _, b := range esAgg.Get("buckets").MustArray() {
bucket := simplejson.NewFromAny(b) bucket := simplejson.NewFromAny(b)
newProps := make(map[string]string, 0) newProps := make(map[string]string)
for k, v := range props { for k, v := range props {
newProps[k] = v newProps[k] = v
@ -122,7 +122,7 @@ func (rp *responseParser) processBuckets(aggs map[string]interface{}, target *Qu
for _, bucketKey := range bucketKeys { for _, bucketKey := range bucketKeys {
bucket := simplejson.NewFromAny(buckets[bucketKey]) bucket := simplejson.NewFromAny(buckets[bucketKey])
newProps := make(map[string]string, 0) newProps := make(map[string]string)
for k, v := range props { for k, v := range props {
newProps[k] = v newProps[k] = v
@ -314,7 +314,6 @@ func (rp *responseParser) processAggregationDocs(esAgg *simplejson.Json, aggDef
switch metric.Type { switch metric.Type {
case "count": case "count":
addMetricValue(&values, rp.getMetricName(metric.Type), castToNullFloat(bucket.Get("doc_count"))) addMetricValue(&values, rp.getMetricName(metric.Type), castToNullFloat(bucket.Get("doc_count")))
break
case "extended_stats": case "extended_stats":
metaKeys := make([]string, 0) metaKeys := make([]string, 0)
meta := metric.Meta.MustMap() meta := metric.Meta.MustMap()
@ -355,7 +354,6 @@ func (rp *responseParser) processAggregationDocs(esAgg *simplejson.Json, aggDef
} }
addMetricValue(&values, metricName, castToNullFloat(bucket.GetPath(metric.ID, "value"))) addMetricValue(&values, metricName, castToNullFloat(bucket.GetPath(metric.ID, "value")))
break
} }
} }