Alerting: Use hash of opts in singleflight (grafana#58474)

percona · Nov 8, 2022 · ad9ac85 · ad9ac85
1 parent 72275e9
commit ad9ac85
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/pkg/services/ngalert/image/service.go b/pkg/services/ngalert/image/service.go
@@ -2,6 +2,7 @@ package image
 
 import (
 	"context"
+	"encoding/base64"
 	"errors"
 	"fmt"
 	"time"
@@ -135,8 +136,8 @@ func (s *ScreenshotImageService) NewImage(ctx context.Context, r *models.AlertRu
 		Timeout:      screenshotTimeout,
 	}
 
-	k := fmt.Sprintf("%s-%d-%s", opts.DashboardUID, opts.PanelID, opts.Theme)
-	result, err, _ := s.singleflight.Do(k, func() (interface{}, error) {
+	optsHash := base64.StdEncoding.EncodeToString(opts.Hash())
+	result, err, _ := s.singleflight.Do(optsHash, func() (interface{}, error) {
 		screenshot, err := s.limiter.Do(ctx, opts, s.screenshots.Take)
 		if err != nil {
 			if errors.Is(err, dashboards.ErrDashboardNotFound) {