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/Chore: Remove unused parameters (#88045)

Browse Source 
Alerting/Chore: Remove unused parameters from redisPeer.receiveLoop() and ReceiverService.shouldDecrypt()
This commit is contained in:
Santiago
2024-05-20 16:37:39 +02:00
committed by GitHub
parent 8c2a382788
commit 60e7a4e746
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/services/ngalert/notifier/receiver_svc.go
View File

@@ -63,7 +63,7 @@ func NewReceiverService(
}
}
func (rs *ReceiverService) shouldDecrypt(ctx context.Context, user identity.Requester, name string, reqDecrypt bool) (bool, error) {
func (rs *ReceiverService) shouldDecrypt(ctx context.Context, user identity.Requester, reqDecrypt bool) (bool, error) {
// TODO: migrate to new permission
eval := accesscontrol.EvalAny(
accesscontrol.EvalPermission(accesscontrol.ActionAlertingReceiversReadSecrets),
@@ -108,7 +108,7 @@ func (rs *ReceiverService) GetReceiver(ctx context.Context, q models.GetReceiver
receivers := cfg.AlertmanagerConfig.Receivers
for _, r := range receivers {
if r.Name == q.Name {
decrypt, err := rs.shouldDecrypt(ctx, user, q.Name, q.Decrypt)
decrypt, err := rs.shouldDecrypt(ctx, user, q.Decrypt)
if err != nil {
return definitions.GettableApiReceiver{}, err
}
@@ -157,7 +157,7 @@ func (rs *ReceiverService) GetReceivers(ctx context.Context, q models.GetReceive
continue
}
decrypt, err := rs.shouldDecrypt(ctx, user, r.Name, q.Decrypt)
decrypt, err := rs.shouldDecrypt(ctx, user, q.Decrypt)
if err != nil {
return nil, err
}

4
pkg/services/ngalert/notifier/redis_peer.go
View File

@@ -448,12 +448,12 @@ func (p *redisPeer) AddState(key string, state alertingCluster.State, _ promethe
p.states[key] = state
// As we also want to get the state from other nodes, we subscribe to the key.
sub := p.redis.Subscribe(context.Background(), p.withPrefix(key))
go p.receiveLoop(key, sub)
go p.receiveLoop(sub)
p.subs[key] = sub
return newRedisChannel(p, key, p.withPrefix(key), update)
}
func (p *redisPeer) receiveLoop(name string, channel *redis.PubSub) {
func (p *redisPeer) receiveLoop(channel *redis.PubSub) {
for {
select {
case <-p.shutdownc: