Alerting: Fix panic while proxying 4xx responses of requests to cortex/loki (#42570) (#42584)

Fixes a panic that would ocurr as we proxy 4xx responses. When this happens and the content type of the response is JSON we try to check if the response has a "message" key. Then, we assume that the key will contain a value of string but we don't take into account that this value can potentially be `null`.

This adds a type assertion check to to this assumption so that we can keep the original JSON body as the response if we're unable to extract an `message`.

(cherry picked from commit 5b64c4f684)

Co-authored-by: gotjosh <josue@grafana.com>
This commit is contained in:
Grot (@grafanabot)
2021-12-01 14:18:37 +00:00
committed by GitHub
co-authored by gotjosh
parent c25fc34695
commit 4a001c87ee
+4 -1
View File
@@ -116,7 +116,10 @@ func (p *AlertingProxy) withReq(
var m map[string]interface{}
if err := json.Unmarshal(resp.Body(), &m); err == nil {
if message, ok := m["message"]; ok {
errMessage = message.(string)
errMessageStr, isString := message.(string)
if isString {
errMessage = errMessageStr
}
}
}
} else if strings.HasPrefix(resp.Header().Get("Content-Type"), "text/html") {