From 2d8949dc695bf6ba80c43a2304a3a42c8a8cfbdb Mon Sep 17 00:00:00 2001 From: Martin/Geno Date: Thu, 6 Sep 2018 13:42:29 +0200 Subject: [PATCH] [TASK] improve log message in webhooks --- input/webhook/circleci/main.go | 7 +++++-- input/webhook/grafana/main.go | 16 +++++++++++----- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/input/webhook/circleci/main.go b/input/webhook/circleci/main.go index 1a477d1..4b3db2e 100644 --- a/input/webhook/circleci/main.go +++ b/input/webhook/circleci/main.go @@ -43,10 +43,13 @@ func handler(_ http.Header, body interface{}) *log.Entry { } entry := log.NewEntry(nil) - entry = entry.WithField("hostname", request.Payload.VCSURL) + entry = entry.WithFields(map[string]interface{}{ + "hostname": request.Payload.VCSURL, + "url": request.Payload.BuildURL, + }) entry.Time = time.Now() entry.Level = HookstatusMap[request.Payload.Status] - entry.Message = fmt.Sprintf("#%0.f (%0.fs): %s - %s", request.Payload.BuildNum, request.Payload.BuildTime/1000, request.Payload.Subject, request.Payload.BuildURL) + entry.Message = fmt.Sprintf("#%0.f (%0.fs): %s", request.Payload.BuildNum, request.Payload.BuildTime/1000, request.Payload.Subject) return entry } diff --git a/input/webhook/grafana/main.go b/input/webhook/grafana/main.go index 1c6ff16..3508207 100644 --- a/input/webhook/grafana/main.go +++ b/input/webhook/grafana/main.go @@ -51,14 +51,20 @@ func handler(_ http.Header, body interface{}) *log.Entry { } entry := log.NewEntry(nil) - entry = entry.WithField("hostname", request.RuleURL) + entry = entry.WithFields(map[string]interface{}{ + "hostname": request.RuleURL, + "ruleid": request.RuleID, + "url": request.RuleURL, + }) + if request.ImageURL != "" { + entry = entry.WithField("imageurl", request.ImageURL) + } entry.Time = time.Now() entry.Level = HookstateMap[request.State] - if request.Message == "" { - entry.Message = fmt.Sprintf("%s - %s: %s", request.Title, request.State, request.RuleURL) - } else { - entry.Message = fmt.Sprintf("%s - %s: %s %s", request.Title, request.State, request.Message, request.RuleURL) + for _, e := range request.EvalMatches { + entry = entry.WithField(e.Metric, e.Value) } + entry.Message = fmt.Sprintf("%s: %s", request.Title, request.Message) return entry }