public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[v10.4.x] Alerting/Annotations: Prevent panics from composite store jobs from crashing Grafana (#84596)

Browse Source 
Alerting/Annotations: Prevent panics from composite store jobs from crashing Grafana (#83459)

* Don't directly use pointer to json

* Don't crash entire process if a store job panics

* Add debug logs when failing to parse/handle Loki entries

(cherry picked from commit af528d2f66)

Co-authored-by: William Wernert <william.wernert@grafana.com>
This commit is contained in:
grafana-delivery-bot[bot]
2024-03-15 18:59:14 +02:00
committed by GitHub
co-authored by William Wernert
parent de5b771270
commit 591cb82b90
7 changed files with 116 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/annotations/annotationsimpl/annotations.go
+1 -1
View File
@@ -38,7 +38,7 @@ func ProvideService(
historianStore := loki.NewLokiHistorianStore(cfg.UnifiedAlerting.StateHistory, features, db, log.New("annotations.loki"))
if historianStore != nil {
l.Debug("Using composite read store")
read = NewCompositeStore(xormStore, historianStore)
read = NewCompositeStore(log.New("annotations.composite"), xormStore, historianStore)
} else {
l.Debug("Using xorm read store")
read = write