Skip to content

Commit cdd1d70

Browse files
committed
Upgrade to cortex v1.21.0
Signed-off-by: Friedrich Gonzalez <1517449+friedrichg@users.noreply.github.com>
1 parent 6738d1a commit cdd1d70

File tree

1,807 files changed

+153416
-127409
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,807 files changed

+153416
-127409
lines changed

.github/workflows/validate_pr.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,20 @@ jobs:
1212
- uses: actions/checkout@v4
1313
- uses: actions/setup-go@v5
1414
with:
15-
go-version: 1.23
15+
go-version: 1.25
1616
cache: false
1717
- name: golangci-lint
1818
uses: golangci/golangci-lint-action@v6
1919
with:
20-
version: v1.64
20+
version: v1.64.8
2121
unit_tests:
2222
name: Unit-Tests
2323
runs-on: ubuntu-latest
2424
steps:
2525
- uses: actions/checkout@v4
2626
- uses: actions/setup-go@v5
2727
with:
28-
go-version: 1.23
28+
go-version: 1.25
2929
- name: Unit Tests
3030
run: make test
3131
build:
@@ -35,6 +35,6 @@ jobs:
3535
- uses: actions/checkout@v4
3636
- uses: actions/setup-go@v5
3737
with:
38-
go-version: 1.23
38+
go-version: 1.25
3939
- name: Build All
4040
run: make all

go.mod

Lines changed: 119 additions & 111 deletions
Large diffs are not rendered by default.

go.sum

Lines changed: 302 additions & 268 deletions
Large diffs are not rendered by default.

pkg/rules/rules.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import (
44
"fmt"
55
"strings"
66

7+
"github.com/prometheus/common/model"
78
"github.com/prometheus/prometheus/model/rulefmt"
89
"github.com/prometheus/prometheus/promql/parser"
910
log "github.com/sirupsen/logrus"
@@ -234,7 +235,7 @@ func (r RuleNamespace) Validate() []error {
234235
func ValidateRuleGroup(g rwrulefmt.RuleGroup) []error {
235236
var errs []error
236237
for _, r := range g.Rules {
237-
for _, we := range r.Validate(rulefmt.RuleNode{}) {
238+
for _, we := range r.Validate(rulefmt.RuleNode{}, model.LegacyValidation) {
238239
errs = append(errs, fmt.Errorf("group %q, rule %q: %s", g.Name, getRuleName(r), we.Error()))
239240
}
240241
}

0 commit comments

Comments
 (0)