IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Alerting: Pass logger into NewRemoteLokiBackend. (#87029)

Browse Source 
Tiny refactor to allow a logger to be passed into NewRemoteLokiBackend.
This commit is contained in:
Steve Simpson 2024-04-29 12:10:23 +02:00 committed by GitHub
parent 706110be62
commit fbaa847a3c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/services/ngalert/ngalert.go
View File

@ -480,7 +480,8 @@ func configureHistorianBackend(ctx context.Context, cfg setting.UnifiedAlertingS
return nil, fmt.Errorf("invalid remote loki configuration: %w", err) return nil, fmt.Errorf("invalid remote loki configuration: %w", err)
} }
req := historian.NewRequester() req := historian.NewRequester()
backend := historian.NewRemoteLokiBackend(lcfg, req, met) lokiBackendLogger := log.New("ngalert.state.historian", "backend", "loki")
backend := historian.NewRemoteLokiBackend(lokiBackendLogger, lcfg, req, met)
testConnCtx, cancelFunc := context.WithTimeout(ctx, 10*time.Second) testConnCtx, cancelFunc := context.WithTimeout(ctx, 10*time.Second)
defer cancelFunc() defer cancelFunc()

3
pkg/services/ngalert/state/historian/loki.go
View File

@ -55,8 +55,7 @@ type RemoteLokiBackend struct {
log log.Logger log log.Logger
} }
func NewRemoteLokiBackend(cfg LokiConfig, req client.Requester, metrics *metrics.Historian) *RemoteLokiBackend { func NewRemoteLokiBackend(logger log.Logger, cfg LokiConfig, req client.Requester, metrics *metrics.Historian) *RemoteLokiBackend {
logger := log.New("ngalert.state.historian", "backend", "loki")
return &RemoteLokiBackend{ return &RemoteLokiBackend{
client: NewLokiClient(cfg, req, metrics, logger), client: NewLokiClient(cfg, req, metrics, logger),
externalLabels: cfg.ExternalLabels, externalLabels: cfg.ExternalLabels,

3
pkg/services/ngalert/state/historian/loki_test.go
View File

@ -513,7 +513,8 @@ func createTestLokiBackend(req client.Requester, met *metrics.Historian) *Remote
Encoder: JsonEncoder{}, Encoder: JsonEncoder{},
ExternalLabels: map[string]string{"externalLabelKey": "externalLabelValue"}, ExternalLabels: map[string]string{"externalLabelKey": "externalLabelValue"},
} }
return NewRemoteLokiBackend(cfg, req, met) lokiBackendLogger := log.New("ngalert.state.historian", "backend", "loki")
return NewRemoteLokiBackend(lokiBackendLogger, cfg, req, met)
} }
func singleFromNormal(st *state.State) []state.StateTransition { func singleFromNormal(st *state.State) []state.StateTransition {