Alerting: Add RuleGroup field to ListAlertInstancesQuery struct (#94615)

alexander-akhmetov · web-flow · commit 0b804e720fcc · 2024-10-18T09:44:16.000+02:00
Alerting: add RuleGroup field to ListAlertInstancesQuery struct
diff --git a/pkg/services/ngalert/models/instance.go b/pkg/services/ngalert/models/instance.go
@@ -55,6 +55,7 @@ func (i InstanceStateType) IsValid() bool {
 type ListAlertInstancesQuery struct {
 	RuleUID   string
 	RuleOrgID int64 `json:"-"`
+	RuleGroup string
 }
 
 // ValidateAlertInstance validates that the alert instance contains an alert rule id,
diff --git a/pkg/services/ngalert/store/instance_database.go b/pkg/services/ngalert/store/instance_database.go
@@ -33,6 +33,9 @@ func (st DBstore) ListAlertInstances(ctx context.Context, cmd *models.ListAlertI
 		if cmd.RuleUID != "" {
 			addToQuery(` AND rule_uid = ?`, cmd.RuleUID)
 		}
+		if cmd.RuleGroup != "" {
+			return errors.New("filtering by RuleGroup is not supported")
+		}
 
 		if st.FeatureToggles.IsEnabled(ctx, featuremgmt.FlagAlertingNoNormalState) {
 			s.WriteString(fmt.Sprintf(" AND NOT (current_state = '%s' AND current_reason = '')", models.InstanceStateNormal))

Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,7 @@ func (i InstanceStateType) IsValid() bool {`
`55`	`55`	`type ListAlertInstancesQuery struct {`
`56`	`56`	`RuleUID string`
`57`	`57`	RuleOrgID int64 `json:"-"`
	`58`	`+ RuleGroup string`
`58`	`59`	`}`
`59`	`60`
`60`	`61`	`// ValidateAlertInstance validates that the alert instance contains an alert rule id,`
Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,9 @@ func (st DBstore) ListAlertInstances(ctx context.Context, cmd *models.ListAlertI`
`33`	`33`	`if cmd.RuleUID != "" {`
`34`	`34`	addToQuery(` AND rule_uid = ?`, cmd.RuleUID)
`35`	`35`	`}`
	`36`	`+ if cmd.RuleGroup != "" {`
	`37`	`+ return errors.New("filtering by RuleGroup is not supported")`
	`38`	`+ }`
`36`	`39`
`37`	`40`	`if st.FeatureToggles.IsEnabled(ctx, featuremgmt.FlagAlertingNoNormalState) {`
`38`	`41`	`s.WriteString(fmt.Sprintf(" AND NOT (current_state = '%s' AND current_reason = '')", models.InstanceStateNormal))`