Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions .github/workflows/integration_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: 1.22
go-version: 1.23
- name: Start Cortex
run: |
docker run -d --name cortex \
-p 9009:9009 \
-v ${{ github.workspace }}/integration/cortex-config.yaml:/etc/cortex/config.yaml \
cortexproject/cortex:v1.18.1 \
cortexproject/cortex:v1.19.1 \
-config.file=/etc/cortex/config.yaml \
-target=all,alertmanager
- name: Wait for Cortex
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/validate_pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,20 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: 1.22
go-version: 1.23
cache: false
- name: golangci-lint
uses: golangci/golangci-lint-action@v4
uses: golangci/golangci-lint-action@v6
with:
version: v1.54
version: v1.64
unit_tests:
name: Unit-Tests
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: 1.22
go-version: 1.23
- name: Unit Tests
run: make test
build:
Expand All @@ -37,6 +37,6 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: 1.22
go-version: 1.23
- name: Build All
run: make all
6 changes: 4 additions & 2 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ run:
- require_docker

output:
format: line-number
formats:
- format: line-number

linters:
enable:
Expand All @@ -17,6 +18,7 @@ linters:

linters-settings:
errcheck:
exclude: .errcheck-exclude
exclude-functions:
- (github.com/go-kit/log.Logger).Log
goimports:
local-prefixes: "github.com/cortexproject/cortex-tools"
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@

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

## v0.19.0
* [CHANGE] Upgrade cortex to v1.19.1
* [CHANGE] Upgrade Go to 1.23
* [CHANGE] Upgrade golangci-lint to v1.64

## v0.18.0
* [CHANGE] Upgrade cortex to v1.18.1
* [FEATURE] Add kubeconfig-style configuration file support #50
Expand Down
35 changes: 35 additions & 0 deletions changelogs/v0.19.0.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
# v0.19.0 Release

## Changes

* [CHANGE] Upgrade cortex to v1.19.1
* [CHANGE] Upgrade Go to 1.23
* [CHANGE] Upgrade golangci-lint to v1.64

## Installation

## cortextool

```console
# download the binary (adapt os and arch as needed)
$ curl -fSL -o "cortextool" "https://github.com/cortexproject/cortex-tools/releases/download/v0.19.0/cortextool_0.19.0_linux_x86_64"

# make it executable
$ chmod a+x "cortextool"

# have fun :)
$ ./cortextool --help
```

## benchtool

```console
# download the binary (adapt os and arch as needed)
$ curl -fSL -o "benchtool" "https://github.com/cortexproject/cortex-tools/releases/download/v0.19.0/benchtool_0.19.0_linux_x86_64"

# make it executable
$ chmod a+x "benchtool"

# have fun :)
$ ./benchtool --help
```
8 changes: 4 additions & 4 deletions cmd/sim/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,8 @@ func run(k int, sizer func(float64) int) {

fmt.Printf("%d, %d, %d, %d, %f, %f\n",
k,
int(min(nodeSeries)),
int(max(nodeSeries)),
int(minFloat(nodeSeries)),
int(maxFloat(nodeSeries)),
int(stat.Mean(nodeSeries, nil)),
stat.StdDev(nodeSeries, nil),
float64(maxAffectedTenants)/float64(numTenants))
Expand Down Expand Up @@ -168,7 +168,7 @@ func shuffleShard(entropy *rand.Rand, shardSize, numReplicas int) []int {
return ids
}

func min(fs []float64) float64 {
func minFloat(fs []float64) float64 {
result := math.MaxFloat64
for _, f := range fs {
if f < result {
Expand All @@ -178,7 +178,7 @@ func min(fs []float64) float64 {
return result
}

func max(fs []float64) float64 {
func maxFloat(fs []float64) float64 {
result := 0.0
for _, f := range fs {
if f > result {
Expand Down
Loading
Loading