Skip to content

Commit 319541d

Browse files
CopilotCharlieTLe
Copilot
and
CharlieTLe
committed
Upgrade cortex dependency from v1.18.1 to v1.20.1
- Update go.mod to reference cortex v1.20.1 and go 1.24.0 - Add changelog entries and files for v0.18.1, v0.19.1, v0.20.1 - Fix API changes: rulefmt.RuleNode -> rulefmt.Rule (string fields) - Fix tsdb.NewBlockWriter to use *slog.Logger - Fix dns.Provider.Resolve to include flushOld parameter - Fix bucket.NewClient signature change - Fix objstore.Bucket.Upload signature change - Fix remote.ReadClient.Read API change (returns SeriesSet) - Fix labels.Labels type changes (no longer a slice) - Update ulid to v2 in blockscopy - Update replace directives to match cortex v1.20.1 - Update vendor directory - Update test files for new Rule type API Co-authored-by: CharlieTLe <3375195+CharlieTLe@users.noreply.github.com>
1 parent af7e71a commit 319541d

3,829 files changed

Lines changed: 746543 additions & 230268 deletions

File tree

Some content is hidden

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

‎CHANGELOG.md‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,15 @@
22

33
Order should be `CHANGE`, `FEATURE`, `ENHANCEMENT`, and `BUGFIX`
44

5+
## v0.20.1
6+
* [CHANGE] Upgrade cortex to v1.20.1
7+
8+
## v0.19.1
9+
* [CHANGE] Upgrade cortex to v1.19.1
10+
11+
## v0.18.1
12+
* [CHANGE] Upgrade cortex to v1.18.1
13+
514
## v0.17.0
615
* [CHANGE] Upgrade cortex to v1.17.0
716

‎changelogs/v0.18.1.md‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
# v0.18.1 Release
2+
3+
## Changes
4+
5+
* [CHANGE] Upgrade cortex to v1.18.1
6+
7+
## Installation
8+
9+
## cortextool
10+
11+
```console
12+
# download the binary (adapt os and arch as needed)
13+
$ curl -fSL -o "cortextool" "https://github.com/cortexproject/cortex-tools/releases/download/v0.18.1/cortextool_0.18.1_linux_x86_64"
14+
15+
# make it executable
16+
$ chmod a+x "cortextool"
17+
18+
# have fun :)
19+
$ ./cortextool --help
20+
```
21+
22+
## benchtool
23+
24+
```console
25+
# download the binary (adapt os and arch as needed)
26+
$ curl -fSL -o "benchtool" "https://github.com/cortexproject/cortex-tools/releases/download/v0.18.1/benchtool_0.18.1_linux_x86_64"
27+
28+
# make it executable
29+
$ chmod a+x "benchtool"
30+
31+
# have fun :)
32+
$ ./benchtool --help
33+
```

‎changelogs/v0.19.1.md‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
# v0.19.1 Release
2+
3+
## Changes
4+
5+
* [CHANGE] Upgrade cortex to v1.19.1
6+
7+
## Installation
8+
9+
## cortextool
10+
11+
```console
12+
# download the binary (adapt os and arch as needed)
13+
$ curl -fSL -o "cortextool" "https://github.com/cortexproject/cortex-tools/releases/download/v0.19.1/cortextool_0.19.1_linux_x86_64"
14+
15+
# make it executable
16+
$ chmod a+x "cortextool"
17+
18+
# have fun :)
19+
$ ./cortextool --help
20+
```
21+
22+
## benchtool
23+
24+
```console
25+
# download the binary (adapt os and arch as needed)
26+
$ curl -fSL -o "benchtool" "https://github.com/cortexproject/cortex-tools/releases/download/v0.19.1/benchtool_0.19.1_linux_x86_64"
27+
28+
# make it executable
29+
$ chmod a+x "benchtool"
30+
31+
# have fun :)
32+
$ ./benchtool --help
33+
```

‎changelogs/v0.20.1.md‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
# v0.20.1 Release
2+
3+
## Changes
4+
5+
* [CHANGE] Upgrade cortex to v1.20.1
6+
7+
## Installation
8+
9+
## cortextool
10+
11+
```console
12+
# download the binary (adapt os and arch as needed)
13+
$ curl -fSL -o "cortextool" "https://github.com/cortexproject/cortex-tools/releases/download/v0.20.1/cortextool_0.20.1_linux_x86_64"
14+
15+
# make it executable
16+
$ chmod a+x "cortextool"
17+
18+
# have fun :)
19+
$ ./cortextool --help
20+
```
21+
22+
## benchtool
23+
24+
```console
25+
# download the binary (adapt os and arch as needed)
26+
$ curl -fSL -o "benchtool" "https://github.com/cortexproject/cortex-tools/releases/download/v0.20.1/benchtool_0.20.1_linux_x86_64"
27+
28+
# make it executable
29+
$ chmod a+x "benchtool"
30+
31+
# have fun :)
32+
$ ./benchtool --help
33+
```

‎cmd/blockscopy/main.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
"github.com/go-kit/log"
2020
"github.com/go-kit/log/level"
2121
"github.com/grafana/dskit/concurrency"
22-
"github.com/oklog/ulid"
22+
"github.com/oklog/ulid/v2"
2323
"github.com/pkg/errors"
2424
"github.com/prometheus/client_golang/prometheus"
2525
"github.com/prometheus/client_golang/prometheus/promauto"

0 commit comments

Comments
 (0)