diff --git a/CHANGELOG.md b/CHANGELOG.md index 754386bd0..0bc3abd71 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,7 @@ This release changes the default for GOGC, the Go runtime control for the trade- * [CHANGE] Rules: Execute 1 query instead of N (where N is the number of alerts within alert rule) when restoring alerts. #13980 #14048 * [CHANGE] Runtime: Change GOGC threshold from 100 to 50 #14176 -* [FEATURE] Rules: Add new option `query_offset` for each rule group via rule group configuration file and `rule_query_offset` as part of the global configuration to have more resilience for remote write delays. #14061 #14216 +* [FEATURE] Rules: Add new option `query_offset` for each rule group via rule group configuration file and `rule_query_offset` as part of the global configuration to have more resilience for remote write delays. #14061 #14216 #14273 * [ENHANCEMENT] Rules: Add `rule_group_last_restore_duration_seconds` metric to measure the time it takes to restore a rule group. #13974 * [ENHANCEMENT] OTLP: Improve remote write format translation performance by using label set hashes for metric identifiers instead of string based ones. #14006 #13991 * [ENHANCEMENT] TSDB: Optimize querying with regexp matchers. #13620 diff --git a/rules/group.go b/rules/group.go index 9ae89789d..c0ad18c18 100644 --- a/rules/group.go +++ b/rules/group.go @@ -793,6 +793,10 @@ func (g *Group) Equals(ng *Group) bool { return false } + if ((g.queryOffset == nil) != (ng.queryOffset == nil)) || (g.queryOffset != nil && ng.queryOffset != nil && *g.queryOffset != *ng.queryOffset) { + return false + } + if len(g.rules) != len(ng.rules) { return false } diff --git a/rules/group_test.go b/rules/group_test.go new file mode 100644 index 000000000..ff1ef3d6c --- /dev/null +++ b/rules/group_test.go @@ -0,0 +1,98 @@ +// Copyright 2013 The Prometheus Authors +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package rules + +import ( + "testing" + "time" + + "github.com/stretchr/testify/require" +) + +func TestGroup_Equals(t *testing.T) { + tests := map[string]struct { + first *Group + second *Group + expected bool + }{ + "no query offset set on both groups": { + first: &Group{ + name: "group-1", + file: "file-1", + interval: time.Minute, + }, + second: &Group{ + name: "group-1", + file: "file-1", + interval: time.Minute, + }, + expected: true, + }, + "query offset set only on the first group": { + first: &Group{ + name: "group-1", + file: "file-1", + interval: time.Minute, + queryOffset: pointerOf[time.Duration](time.Minute), + }, + second: &Group{ + name: "group-1", + file: "file-1", + interval: time.Minute, + }, + expected: false, + }, + "query offset set on both groups to the same value": { + first: &Group{ + name: "group-1", + file: "file-1", + interval: time.Minute, + queryOffset: pointerOf[time.Duration](time.Minute), + }, + second: &Group{ + name: "group-1", + file: "file-1", + interval: time.Minute, + queryOffset: pointerOf[time.Duration](time.Minute), + }, + expected: true, + }, + "query offset set on both groups to different value": { + first: &Group{ + name: "group-1", + file: "file-1", + interval: time.Minute, + queryOffset: pointerOf[time.Duration](time.Minute), + }, + second: &Group{ + name: "group-1", + file: "file-1", + interval: time.Minute, + queryOffset: pointerOf[time.Duration](2 * time.Minute), + }, + expected: false, + }, + } + + for testName, testData := range tests { + t.Run(testName, func(t *testing.T) { + require.Equal(t, testData.expected, testData.first.Equals(testData.second)) + require.Equal(t, testData.expected, testData.second.Equals(testData.first)) + }) + } +} + +func pointerOf[T any](value T) *T { + return &value +}