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

use tags instead of logs

Browse Source
This commit is contained in:
bergquist
2017-09-11 18:48:20 +02:00
parent 89c86c7a22
commit e128310045
3 changed files with 10 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/services/alerting/engine.go
View File

@@ -5,7 +5,6 @@ import (
"time" "time"
"github.com/opentracing/opentracing-go" "github.com/opentracing/opentracing-go"
tlog "github.com/opentracing/opentracing-go/log"
"github.com/benbjohnson/clock" "github.com/benbjohnson/clock"
"github.com/grafana/grafana/pkg/log" "github.com/grafana/grafana/pkg/log"
@@ -122,11 +121,10 @@ func (e *Engine) processJob(grafanaCtx context.Context, job *Job) error {
e.evalHandler.Eval(evalContext) e.evalHandler.Eval(evalContext)
e.resultHandler.Handle(evalContext) e.resultHandler.Handle(evalContext)
span.LogFields(
tlog.Int64("alertId", evalContext.Rule.Id), span.SetTag("alertId", evalContext.Rule.Id)
tlog.Int64("dashboardId", evalContext.Rule.DashboardId), span.SetTag("dashboardId", evalContext.Rule.DashboardId)
tlog.Bool("firing", evalContext.Firing), span.SetTag("firing", evalContext.Firing)
)
close(done) close(done)
span.Finish() span.Finish()

9
pkg/tsdb/graphite/graphite.go
View File

@@ -18,7 +18,6 @@ import (
"github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/setting"
"github.com/grafana/grafana/pkg/tsdb" "github.com/grafana/grafana/pkg/tsdb"
opentracing "github.com/opentracing/opentracing-go" opentracing "github.com/opentracing/opentracing-go"
tlog "github.com/opentracing/opentracing-go/log"
) )
type GraphiteExecutor struct { type GraphiteExecutor struct {
@@ -83,11 +82,9 @@ func (e *GraphiteExecutor) Execute(ctx context.Context, queries tsdb.QuerySlice,
} }
span, ctx := opentracing.StartSpanFromContext(ctx, "alerting.graphite") span, ctx := opentracing.StartSpanFromContext(ctx, "alerting.graphite")
span.LogFields( span.SetTag("target", target)
tlog.String("target", target), span.SetTag("from", from)
tlog.String("from", from), span.SetTag("until", until)
tlog.String("until", until),
)
defer span.Finish() defer span.Finish()
opentracing.GlobalTracer().Inject( opentracing.GlobalTracer().Inject(

9
pkg/tsdb/prometheus/prometheus.go
View File

@@ -20,7 +20,6 @@ import (
"github.com/prometheus/common/model" "github.com/prometheus/common/model"
//api "github.com/prometheus/client_golang/api" //api "github.com/prometheus/client_golang/api"
//apiv1 "github.com/prometheus/client_golang/api/prometheus/v1" //apiv1 "github.com/prometheus/client_golang/api/prometheus/v1"
tlog "github.com/opentracing/opentracing-go/log"
) )
type PrometheusExecutor struct { type PrometheusExecutor struct {
@@ -105,11 +104,9 @@ func (e *PrometheusExecutor) Execute(ctx context.Context, queries tsdb.QuerySlic
} }
span, ctx := opentracing.StartSpanFromContext(ctx, "alerting.prometheus") span, ctx := opentracing.StartSpanFromContext(ctx, "alerting.prometheus")
span.LogFields( span.SetTag("expr", query.Expr)
tlog.String("expr", query.Expr), span.SetTag("start_unixnano", int64(query.Start.UnixNano()))
tlog.Int64("start_unixnano", int64(query.Start.UnixNano())), span.SetTag("stop_unixnano", int64(query.End.UnixNano()))
tlog.Int64("stop_unixnano", int64(query.End.UnixNano())),
)
defer span.Finish() defer span.Finish()
value, err := client.QueryRange(ctx, query.Expr, timeRange) value, err := client.QueryRange(ctx, query.Expr, timeRange)