Skip to content

Commit 613c2c4

Browse files
logging messages returned from alert manager (#6008)
1 parent df0693c commit 613c2c4

File tree

1 file changed

+23
-2
lines changed

1 file changed

+23
-2
lines changed

pkg/ruler/manager.go

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package ruler
33
import (
44
"context"
55
"fmt"
6+
"io"
67
"net/http"
78
"os"
89
"sync"
@@ -293,6 +294,8 @@ func (r *DefaultMultiTenantManager) getOrCreateNotifier(userID string, userManag
293294
return n.notifier, nil
294295
}
295296

297+
logger := log.With(r.logger, "user", userID)
298+
296299
n = newRulerNotifier(&notifier.Options{
297300
QueueCapacity: r.cfg.NotificationQueueCapacity,
298301
Registerer: userManagerRegistry,
@@ -309,9 +312,27 @@ func (r *DefaultMultiTenantManager) getOrCreateNotifier(userID string, userManag
309312
defer sp.Finish()
310313
ctx = ot.ContextWithSpan(ctx, sp)
311314
_ = ot.GlobalTracer().Inject(sp.Context(), ot.HTTPHeaders, ot.HTTPHeadersCarrier(req.Header))
312-
return ctxhttp.Do(ctx, client, req)
315+
resp, err := ctxhttp.Do(ctx, client, req)
316+
if err != nil {
317+
level.Error(logger).Log("msg", "error occurred while sending alerts", "error", err)
318+
return resp, err
319+
}
320+
defer resp.Body.Close()
321+
if resp.StatusCode/100 != 2 {
322+
bodyBytes, err := io.ReadAll(resp.Body)
323+
if err != nil {
324+
level.Error(logger).Log("msg", "error reading response body", "error", err, "response code", resp.StatusCode)
325+
return resp, err
326+
}
327+
customErrorMessage := string(bodyBytes)
328+
if len(customErrorMessage) >= 150 {
329+
customErrorMessage = customErrorMessage[:150]
330+
}
331+
level.Error(logger).Log("msg", "error occurred sending notification", "error", customErrorMessage, "response code", resp.StatusCode)
332+
}
333+
return resp, err
313334
},
314-
}, log.With(r.logger, "user", userID), userManagerRegistry, r.notifiersDiscoveryMetrics)
335+
}, logger, userManagerRegistry, r.notifiersDiscoveryMetrics)
315336

316337
n.run()
317338

0 commit comments

Comments
 (0)