From a7fe77cdbf0d35e278af49e9814ffa332916a558 Mon Sep 17 00:00:00 2001 From: Tito Lins Date: Wed, 7 May 2025 09:30:34 +0200 Subject: [PATCH] grafana-ruler: add new alert query fields (#104933) --- pkg/services/ngalert/models/alert_query.go | 6 ++++++ pkg/services/ngalert/models/alert_rule.go | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/pkg/services/ngalert/models/alert_query.go b/pkg/services/ngalert/models/alert_query.go index e38c1610584..9d25d8cfa71 100644 --- a/pkg/services/ngalert/models/alert_query.go +++ b/pkg/services/ngalert/models/alert_query.go @@ -96,6 +96,12 @@ type AlertQuery struct { // JSON is the raw JSON query and includes the above properties as well as custom properties. Model json.RawMessage `json:"model"` + // DatasourceType is the type of the data source. + DatasourceType string `json:"-"` + + // IsMTQuery ... + IsMTQuery bool `json:"-"` + modelProps map[string]any } diff --git a/pkg/services/ngalert/models/alert_rule.go b/pkg/services/ngalert/models/alert_rule.go index 3f95cfd8b62..e283c55b4bf 100644 --- a/pkg/services/ngalert/models/alert_rule.go +++ b/pkg/services/ngalert/models/alert_rule.go @@ -469,7 +469,7 @@ func (alertRule *AlertRule) Diff(rule *AlertRule, ignore ...string) cmputil.Diff ops = append( ops, cmp.Reporter(&reporter), - cmpopts.IgnoreFields(AlertQuery{}, "modelProps"), + cmpopts.IgnoreFields(AlertQuery{}, "modelProps", "DatasourceType", "IsMTQuery"), jsonCmp, cmpopts.EquateEmpty(), )