From 73c9b9fb7739daf55768369e48e14620f4a306c5 Mon Sep 17 00:00:00 2001 From: Martin/Geno Date: Mon, 17 Jun 2019 15:28:52 +0200 Subject: [PATCH] Update main.go --- prometheus/main.go | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/prometheus/main.go b/prometheus/main.go index 8df1df4..95440b3 100644 --- a/prometheus/main.go +++ b/prometheus/main.go @@ -24,21 +24,22 @@ func init() { logger := log.WithField("type", hookType) var request notify.WebhookMessage - if err := libHTTP.Read(r, &request); err != nil { - logger.Errorf("no readable payload: %s", err) - http.Error(w, fmt.Sprintf("no readable payload"), http.StatusInternalServerError) - return - } - - firingAlerts := len(request.Alerts.Firing()) - if firingAlerts > 0 { - content := fmt.Sprintf("[%s:%d] %s", request.Status, firingAlerts, strings.Join(request.CommonAnnotations.Values()," ")) - } else { - content := fmt.Sprintf("[%s] %s", request.Status, strings.Join(request.CommonAnnotations.Values()," ")) - } + if err := libHTTP.Read(r, &request); err != nil { + logger.Errorf("no readable payload: %s", err) + http.Error(w, fmt.Sprintf("no readable payload"), http.StatusInternalServerError) + return + } + + content := "" + firingAlerts := len(request.Alerts.Firing()) + if firingAlerts > 0 { + content = fmt.Sprintf("[%s:%d] %s", request.Status, firingAlerts, strings.Join(request.CommonAnnotations.Values()," ")) + } else { + content = fmt.Sprintf("[%s] %s", request.Status, strings.Join(request.CommonAnnotations.Values()," ")) + } - logger = logger.WithField("body", content) + logger = logger.WithField("body", content) ok := false for _, hook := range hooks {