refactor(jira): use grouplabels to calculate hash instead of ExtractGroupKey function

Signed-off-by: Holger Waschke <[email protected]>

Author: holger-waschke

notify/jira/jira.go

@@ -66,12 +66,15 @@ func New(c *config.JiraConfig, t *template.Template, l *slog.Logger, httpOpts ..
 
 // Notify implements the Notifier interface.
 func (n *Notifier) Notify(ctx context.Context, as ...*types.Alert) (bool, error) {
-	key, err := notify.ExtractGroupKey(ctx)
-	if err != nil {
-		return false, err
+	groupLabels, ok := notify.GroupLabels(ctx)
+	if !ok {
+		return false, fmt.Errorf("group labels missing")
 	}
+	groupID := notify.HashGroupLabels(groupLabels)
+
+	logger := n.logger.With("group_key", groupLabels.String())
 
-	logger := n.logger.With("group_key", key.String())
+	n.logger.Debug("computed JIRA group hash", "group_labels", groupLabels, "group_id", groupID)
 
 	var (
 		alerts = types.Alerts(as...)
@@ -87,7 +90,7 @@ func (n *Notifier) Notify(ctx context.Context, as ...*types.Alert) (bool, error)
 		method = http.MethodPost
 	)
 
-	existingIssue, shouldRetry, err := n.searchExistingIssue(ctx, logger, key.Hash(), alerts.HasFiring(), tmplTextFunc)
+	existingIssue, shouldRetry, err := n.searchExistingIssue(ctx, logger, groupID, alerts.HasFiring(), tmplTextFunc)
 	if err != nil {
 		return shouldRetry, fmt.Errorf("failed to look up existing issues: %w", err)
 	}
@@ -106,7 +109,7 @@ func (n *Notifier) Notify(ctx context.Context, as ...*types.Alert) (bool, error)
 		logger.Debug("updating existing issue", "issue_key", existingIssue.Key)
 	}
 
-	requestBody, err := n.prepareIssueRequestBody(ctx, logger, key.Hash(), tmplTextFunc)
+	requestBody, err := n.prepareIssueRequestBody(ctx, logger, groupID, tmplTextFunc)
 	if err != nil {
 		return false, err
 	}

notify/jira/jira_test.go

@@ -472,7 +472,7 @@ func TestJiraNotify(t *testing.T) {
 					Summary:     "[FIRING:1] test (vm1 critical)",
 					Description: "\n\n# Alerts Firing:\n\nLabels:\n  - alertname = test\n  - instance = vm1\n  - severity = critical\n\nAnnotations:\n\nSource: \n\n\n\n\n",
 					Issuetype:   &idNameValue{Name: "Incident"},
-					Labels:      []string{"ALERT{6b86b273ff34fce19d6b804eff5a3f5747ada4eaa22f1d49c01e52ddb7875b4b}", "alertmanager", "test"},
+					Labels:      []string{"ALERT{2619b3472463c746278b332eae12b978ff97478bd1cdaa911b06cd2c134e0382}", "alertmanager", "test"},
 					Project:     &issueProject{Key: "OPS"},
 					Priority:    &idNameValue{Name: "High"},
 				},
@@ -516,7 +516,7 @@ func TestJiraNotify(t *testing.T) {
 					Summary:     "[FIRING:1] test (vm1 MINOR MONITORING critical)",
 					Description: "\n\n# Alerts Firing:\n\nLabels:\n  - alertname = test\n  - instance = vm1\n  - issue_type = MINOR\n  - project = MONITORING\n  - severity = critical\n\nAnnotations:\n\nSource: \n\n\n\n\n",
 					Issuetype:   &idNameValue{Name: "MINOR"},
-					Labels:      []string{"ALERT{6b86b273ff34fce19d6b804eff5a3f5747ada4eaa22f1d49c01e52ddb7875b4b}", "alertmanager", "test"},
+					Labels:      []string{"ALERT{2619b3472463c746278b332eae12b978ff97478bd1cdaa911b06cd2c134e0382}", "alertmanager", "test"},
 					Project:     &issueProject{Key: "MONITORING"},
 					Priority:    &idNameValue{Name: "High"},
 				},
@@ -568,7 +568,7 @@ func TestJiraNotify(t *testing.T) {
 					Summary:     strings.Repeat("A", maxSummaryLenRunes-1) + "…",
 					Description: "\n\n# Alerts Firing:\n\nLabels:\n  - alertname = test\n  - instance = vm1\n\nAnnotations:\n\nSource: \n\n\n\n\n",
 					Issuetype:   &idNameValue{Name: "Incident"},
-					Labels:      []string{"ALERT{6b86b273ff34fce19d6b804eff5a3f5747ada4eaa22f1d49c01e52ddb7875b4b}", "alertmanager", "test"},
+					Labels:      []string{"ALERT{2619b3472463c746278b332eae12b978ff97478bd1cdaa911b06cd2c134e0382}", "alertmanager", "test"},
 					Project:     &issueProject{Key: "OPS"},
 				},
 			},
@@ -631,7 +631,7 @@ func TestJiraNotify(t *testing.T) {
 					Summary:     "[FIRING:1] test (vm1)",
 					Description: "\n\n# Alerts Firing:\n\nLabels:\n  - alertname = test\n  - instance = vm1\n\nAnnotations:\n\nSource: \n\n\n\n\n",
 					Issuetype:   &idNameValue{Name: "Incident"},
-					Labels:      []string{"ALERT{6b86b273ff34fce19d6b804eff5a3f5747ada4eaa22f1d49c01e52ddb7875b4b}", "alertmanager", "test"},
+					Labels:      []string{"ALERT{2619b3472463c746278b332eae12b978ff97478bd1cdaa911b06cd2c134e0382}", "alertmanager", "test"},
 					Project:     &issueProject{Key: "OPS"},
 					Priority:    &idNameValue{Name: "High"},
 				},
@@ -686,7 +686,7 @@ func TestJiraNotify(t *testing.T) {
 					Summary:     "[RESOLVED] test (vm1)",
 					Description: "\n\n\n# Alerts Resolved:\n\nLabels:\n  - alertname = test\n  - instance = vm1\n\nAnnotations:\n\nSource: \n\n\n\n",
 					Issuetype:   &idNameValue{Name: "Incident"},
-					Labels:      []string{"ALERT{6b86b273ff34fce19d6b804eff5a3f5747ada4eaa22f1d49c01e52ddb7875b4b}", "alertmanager", "test"},
+					Labels:      []string{"ALERT{2619b3472463c746278b332eae12b978ff97478bd1cdaa911b06cd2c134e0382}", "alertmanager", "test"},
 					Project:     &issueProject{Key: "OPS"},
 				},
 			},
@@ -740,7 +740,7 @@ func TestJiraNotify(t *testing.T) {
 					Summary:     "[FIRING:1] test (vm1)",
 					Description: "\n\n# Alerts Firing:\n\nLabels:\n  - alertname = test\n  - instance = vm1\n\nAnnotations:\n\nSource: \n\n\n\n\n",
 					Issuetype:   &idNameValue{Name: "Incident"},
-					Labels:      []string{"ALERT{6b86b273ff34fce19d6b804eff5a3f5747ada4eaa22f1d49c01e52ddb7875b4b}", "alertmanager", "test"},
+					Labels:      []string{"ALERT{2619b3472463c746278b332eae12b978ff97478bd1cdaa911b06cd2c134e0382}", "alertmanager", "test"},
 					Project:     &issueProject{Key: "OPS"},
 				},
 			},

notify/util.go

@@ -16,6 +16,7 @@ package notify
 import (
 	"context"
 	"crypto/sha256"
+	"encoding/hex"
 	"errors"
 	"fmt"
 	"io"
@@ -25,6 +26,7 @@ import (
 	"slices"
 	"strings"
 
+	"github.com/prometheus/common/model"
 	"github.com/prometheus/common/version"
 
 	"github.com/prometheus/alertmanager/template"
@@ -297,3 +299,10 @@ func GetFailureReasonFromStatusCode(statusCode int) Reason {
 
 	return DefaultReason
 }
+
+// HashGroupLabels returns the sha256 hash for a group's labels as integrations
+// may have maximum length requirements on deduplication keys.
+func HashGroupLabels(labels model.LabelSet) string {
+	sum := sha256.Sum256([]byte(labels.String()))
+	return hex.EncodeToString(sum[:])
+}