simono41/ntfy-alertmanager
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use Logger.With to create child loggers for the handlers

Browse source 
With that it will be easier to check on which endpoint a failure
happened.
This commit is contained in:
Thorben Günther 2023-08-13 15:16:26 +02:00
parent dab77f6393
commit 6d64c21549
No known key found for this signature in database
GPG key ID: 415CD778D8C5AFED
2 changed files with 25 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
main.go
View file

@ -352,27 +352,29 @@ func (br *bridge) publish(n *notification) error {
func (br *bridge) handleWebhooks(w http.ResponseWriter, r *http.Request) { func (br *bridge) handleWebhooks(w http.ResponseWriter, r *http.Request) {
defer r.Body.Close() defer r.Body.Close()
logger := br.logger.With(slog.String("handler", "/"))
if r.Method != http.MethodPost { if r.Method != http.MethodPost {
http.Error(w, "Only POST allowed", http.StatusMethodNotAllowed) http.Error(w, "Only POST allowed", http.StatusMethodNotAllowed)
br.logger.Debug(fmt.Sprintf("Illegal HTTP method: expected %q, got %q", "POST", r.Method)) logger.Debug(fmt.Sprintf("Illegal HTTP method: expected %q, got %q", "POST", r.Method))
return return
} }
contentType := r.Header.Get("Content-Type") contentType := r.Header.Get("Content-Type")
if contentType != "application/json" { if contentType != "application/json" {
http.Error(w, "Only application/json allowed", http.StatusUnsupportedMediaType) http.Error(w, "Only application/json allowed", http.StatusUnsupportedMediaType)
br.logger.Debug(fmt.Sprintf("Illegal content type: %s", contentType)) logger.Debug(fmt.Sprintf("Illegal content type: %s", contentType))
return return
} }
var event payload var event payload
if err := json.NewDecoder(r.Body).Decode(&event); err != nil { if err := json.NewDecoder(r.Body).Decode(&event); err != nil {
br.logger.Debug("Failed to decode payload", logger.Debug("Failed to decode payload",
slog.String("error", err.Error())) slog.String("error", err.Error()))
return return
} }
br.logger.Debug("Received alert", logger.Debug("Received alert",
slog.Any("payload", event)) slog.Any("payload", event))
if br.cfg.AlertMode == config.Single { if br.cfg.AlertMode == config.Single {
@ -380,11 +382,11 @@ func (br *bridge) handleWebhooks(w http.ResponseWriter, r *http.Request) {
for _, n := range notifications { for _, n := range notifications {
err := br.publish(n) err := br.publish(n)
if err != nil { if err != nil {
br.logger.Error("Failed to publish notification", logger.Error("Failed to publish notification",
slog.String("error", err.Error())) slog.String("error", err.Error()))
} else { } else {
if err := br.cache.Set(n.fingerprint, n.status); err != nil { if err := br.cache.Set(n.fingerprint, n.status); err != nil {
br.logger.Error("Failed to cache alert", logger.Error("Failed to cache alert",
slog.String("fingerprint", n.fingerprint), slog.String("fingerprint", n.fingerprint),
slog.String("error", err.Error())) slog.String("error", err.Error()))
} }
@ -394,7 +396,7 @@ func (br *bridge) handleWebhooks(w http.ResponseWriter, r *http.Request) {
notification := br.multiAlertNotification(&event) notification := br.multiAlertNotification(&event)
err := br.publish(notification) err := br.publish(notification)
if err != nil { if err != nil {
br.logger.Error("Failed to publish notification", logger.Error("Failed to publish notification",
slog.String("error", err.Error())) slog.String("error", err.Error()))
} }
} }
@ -402,9 +404,10 @@ func (br *bridge) handleWebhooks(w http.ResponseWriter, r *http.Request) {
func (br *bridge) authMiddleware(handler http.Handler) http.Handler { func (br *bridge) authMiddleware(handler http.Handler) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
logger := br.logger.With(slog.String("url", r.URL.String()))
user, pass, ok := r.BasicAuth() user, pass, ok := r.BasicAuth()
if !ok { if !ok {
br.logger.Debug("basic auth failure") logger.Debug("basic auth failure")
return return
} }
@ -418,7 +421,7 @@ func (br *bridge) authMiddleware(handler http.Handler) http.Handler {
if validUser != 1 || validPass != 1 { if validUser != 1 || validPass != 1 {
http.Error(w, "Unauthorized", http.StatusUnauthorized) http.Error(w, "Unauthorized", http.StatusUnauthorized)
br.logger.Debug("basic auth: wrong user or password") logger.Debug("basic auth: wrong user or password")
return return
} }

24
silence.go
View file

@ -40,22 +40,24 @@ type silenceResponse struct {
func (br *bridge) handleSilences(w http.ResponseWriter, r *http.Request) { func (br *bridge) handleSilences(w http.ResponseWriter, r *http.Request) {
defer r.Body.Close() defer r.Body.Close()
logger := br.logger.With(slog.String("handler", "/silences"))
if r.Method != http.MethodPost { if r.Method != http.MethodPost {
http.Error(w, "Only POST allowed", http.StatusMethodNotAllowed) http.Error(w, "Only POST allowed", http.StatusMethodNotAllowed)
br.logger.Debug(fmt.Sprintf("Silences: Illegal HTTP method: expected %q, got %q", "POST", r.Method)) logger.Debug(fmt.Sprintf("Illegal HTTP method: expected %q, got %q", "POST", r.Method))
return return
} }
b, err := io.ReadAll(r.Body) b, err := io.ReadAll(r.Body)
if err != nil { if err != nil {
br.logger.Error("Silences: Failed to read body", logger.Error("Failed to read body",
slog.String("error", err.Error())) slog.String("error", err.Error()))
return return
} }
b, err = base64.StdEncoding.DecodeString(string(b)) b, err = base64.StdEncoding.DecodeString(string(b))
if err != nil { if err != nil {
br.logger.Error("Silences: Failed to decode", logger.Error("Failed to decode",
slog.String("error", err.Error())) slog.String("error", err.Error()))
return return
} }
@ -63,7 +65,7 @@ func (br *bridge) handleSilences(w http.ResponseWriter, r *http.Request) {
var sb silenceBody var sb silenceBody
err = json.Unmarshal(b, &sb) err = json.Unmarshal(b, &sb)
if err != nil { if err != nil {
br.logger.Error("Silences: Failed to unmarshal", logger.Error("Failed to unmarshal",
slog.String("error", err.Error())) slog.String("error", err.Error()))
return return
} }
@ -90,7 +92,7 @@ func (br *bridge) handleSilences(w http.ResponseWriter, r *http.Request) {
b, err = json.Marshal(silence) b, err = json.Marshal(silence)
if err != nil { if err != nil {
br.logger.Error("Silences: Failed to marshal", logger.Error("Failed to marshal",
slog.String("error", err.Error())) slog.String("error", err.Error()))
return return
} }
@ -103,7 +105,7 @@ func (br *bridge) handleSilences(w http.ResponseWriter, r *http.Request) {
req, err := http.NewRequest(http.MethodPost, url, bytes.NewBuffer(b)) req, err := http.NewRequest(http.MethodPost, url, bytes.NewBuffer(b))
if err != nil { if err != nil {
br.logger.Error("Silences: Failed to create request", logger.Error("Failed to create request",
slog.String("error", err.Error())) slog.String("error", err.Error()))
return return
} }
@ -116,7 +118,7 @@ func (br *bridge) handleSilences(w http.ResponseWriter, r *http.Request) {
req.Header.Add("Content-Type", "application/json") req.Header.Add("Content-Type", "application/json")
resp, err := br.client.Do(req) resp, err := br.client.Do(req)
if err != nil { if err != nil {
br.logger.Error("Silences: Failed to POST request", logger.Error("Failed to POST request",
slog.String("error", err.Error())) slog.String("error", err.Error()))
return return
} }
@ -124,24 +126,24 @@ func (br *bridge) handleSilences(w http.ResponseWriter, r *http.Request) {
b, err = io.ReadAll(resp.Body) b, err = io.ReadAll(resp.Body)
if err != nil { if err != nil {
br.logger.Error("Silences: Failed to read response body", logger.Error("Failed to read response body",
slog.String("error", err.Error())) slog.String("error", err.Error()))
return return
} }
if resp.StatusCode != http.StatusOK { if resp.StatusCode != http.StatusOK {
br.logger.Error("Silences: Received non-200 status code", logger.Error("Received non-200 status code",
slog.Int("status", resp.StatusCode)) slog.Int("status", resp.StatusCode))
return return
} }
var id silenceResponse var id silenceResponse
if err := json.Unmarshal(b, &id); err != nil { if err := json.Unmarshal(b, &id); err != nil {
br.logger.Error("Silences: Failed to unmarshal response", logger.Error("Failed to unmarshal response",
slog.String("error", err.Error())) slog.String("error", err.Error()))
return return
} }
br.logger.Info("Silences: Created new silence", logger.Info("Created new silence",
slog.String("ID", id.ID)) slog.String("ID", id.ID))
} }