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: use raw query data in provisioning to bypass interpolation of macros (#54293)

Browse Source
This commit is contained in:
Jean-Philippe Quéméner
2022-08-26 23:54:30 +02:00
committed by GitHub
parent 49b1182f34
commit a932428057
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/services/provisioning/alerting/rules_types.go
View File

@@ -151,7 +151,12 @@ func (queryV1 *QueryV1) mapToModel() (models.AlertQuery, error) {
// in json.RawMessage. We do this as we cannot use
// json.RawMessage with a yaml files and have to use
// JSONValue that supports both, json and yaml.
encoded, err := json.Marshal(queryV1.Model.Value())
//
// We have to use the Raw field here, as Value would
// try to interpolate macros like `$__timeFilter`, resulting
// in missing macros in the SQL queries as they would be
// replaced by an empty string.
encoded, err := json.Marshal(queryV1.Model.Raw)
if err != nil {
return models.AlertQuery{}, err
}