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

Merge pull request #13374 from mjtrangoni/fix-megacheck-issues

Browse Source 
Fix megacheck issues
This commit is contained in:
Torkel Ödegaard 2018-09-21 10:15:21 +02:00 committed by GitHub
commit 663a56cba9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/services/sqlstore/user.go
View File

@ -271,9 +271,6 @@ func ChangeUserPassword(cmd *m.ChangeUserPasswordCommand) error {
func UpdateUserLastSeenAt(cmd *m.UpdateUserLastSeenAtCommand) error { func UpdateUserLastSeenAt(cmd *m.UpdateUserLastSeenAtCommand) error {
return inTransaction(func(sess *DBSession) error { return inTransaction(func(sess *DBSession) error {
if cmd.UserId <= 0 {
}
user := m.User{ user := m.User{
Id: cmd.UserId, Id: cmd.UserId,
LastSeenAt: time.Now(), LastSeenAt: time.Now(),

5
pkg/tracing/tracing.go
View File

@ -58,7 +58,8 @@ func (ts *TracingService) parseSettings() {
func (ts *TracingService) initGlobalTracer() error { func (ts *TracingService) initGlobalTracer() error {
cfg := jaegercfg.Configuration{ cfg := jaegercfg.Configuration{
Disabled: !ts.enabled, ServiceName: "grafana",
Disabled: !ts.enabled,
Sampler: &jaegercfg.SamplerConfig{ Sampler: &jaegercfg.SamplerConfig{
Type: ts.samplerType, Type: ts.samplerType,
Param: ts.samplerParam, Param: ts.samplerParam,
@ -78,7 +79,7 @@ func (ts *TracingService) initGlobalTracer() error {
options = append(options, jaegercfg.Tag(tag, value)) options = append(options, jaegercfg.Tag(tag, value))
} }
tracer, closer, err := cfg.New("grafana", options...) tracer, closer, err := cfg.NewTracer(options...)
if err != nil { if err != nil {
return err return err
} }

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

@ -56,9 +56,7 @@ func (b *SearchRequestBuilder) Build() (*SearchRequest, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
for _, agg := range aggArray { sr.Aggs = append(sr.Aggs, aggArray...)
sr.Aggs = append(sr.Aggs, agg)
}
} }
} }
@ -300,9 +298,7 @@ func (b *aggBuilderImpl) Build() (AggArray, error) {
return nil, err return nil, err
} }
for _, childAgg := range childAggs { agg.Aggregation.Aggs = append(agg.Aggregation.Aggs, childAggs...)
agg.Aggregation.Aggs = append(agg.Aggregation.Aggs, childAgg)
}
} }
aggs = append(aggs, agg) aggs = append(aggs, agg)

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
} }
} }