Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync upstream Prometheus at 0962d08 #828

Merged
merged 24 commits into from
Feb 19, 2025
Merged

Sync upstream Prometheus at 0962d08 #828

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
7aa1f45
fix(remote): rename some remote read related metrics for better clarity.
machine424 Dec 5, 2024
47563d9
parser: fix misleading error message in grouping processing
ywwg Jan 10, 2025
e132411
less context cancellation check for series API
yeya24 Jan 13, 2025
7be0079
Merge pull request #15806 from prometheus/owilliams/error
ywwg Jan 14, 2025
594b882
fix(remotewrite2): do not overwrite help text with unit in enqueue
krajorama Jan 14, 2025
b3a9fa3
chore: Upgrade to golangci-lint v1.63.4 (#15799)
dongjiang1989 Jan 14, 2025
c12f963
Merge pull request #15825 from prometheus/krajo/fix-metadata-enqueueing
bwplotka Jan 15, 2025
5df6ea3
promtool: Support linting of scrape interval (#15719)
aknuds1 Jan 15, 2025
92218ec
promtool: add --ignore-unknown-fields
GiedriusS Dec 20, 2024
38f8000
Merge pull request #15706 from GiedriusS/ignore_unknown_fields
bwplotka Jan 15, 2025
482a7fd
fix(remotewrite2): do not send uninitialized garbage if there's no me…
krajorama Jan 15, 2025
9385f31
scrape: Fix metadata in WAL not working for histograms and summaries.
bwplotka Jan 15, 2025
5ed0edd
Update storage/remote/queue_manager.go
krajorama Jan 16, 2025
d52e689
Merge pull request #15829 from prometheus/krajo/fix-metadata-enqueueing
bwplotka Jan 16, 2025
af928a1
Addressed Krajo's comment.
bwplotka Jan 16, 2025
de2dfe0
Merge pull request #15832 from prometheus/metadatafix
bwplotka Jan 16, 2025
a3c7f72
Merge pull request #15541 from machine424/wellwellwell
bwplotka Jan 16, 2025
3119567
scrape: Add metadata for automatic metrics.
bwplotka Jan 16, 2025
6f1ad64
Update scrape/scrape.go
bwplotka Jan 17, 2025
6a8afa6
Merge pull request #15823 from yeya24/slow-down-ctx-check
bwplotka Jan 17, 2025
0962d08
Merge pull request #15837 from prometheus/meta-report
bwplotka Jan 17, 2025
52de0ce
Merge commit '0962d08' into charleskorn/update-prometheus
charleskorn Feb 18, 2025
ed4438f
Fix breaking changes in Mimir-specific tests
charleskorn Feb 18, 2025
29bc567
Bump golangci-lint version in workflow to match upstream
charleskorn Feb 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/golangci-lint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@ jobs:
with:
args: --verbose
# Make sure to sync this with Makefile.common and scripts/golangci-lint.yml.
version: v1.62.0
version: v1.63.4
7 changes: 5 additions & 2 deletions .golangci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,25 +5,28 @@ output:
sort-results: true

linters:
# Keep this list sorted alphabetically
enable:
- depguard
- errorlint
- exptostd
- gocritic
- godot
- gofumpt
- goimports
- loggercheck
- misspell
- nilnesserr
- nolintlint
- perfsprint
- predeclared
- revive
- sloglint
- testifylint
- unconvert
- unused
- usestdlibvars
- whitespace
- loggercheck
- sloglint

issues:
max-issues-per-linter: 0
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

## unreleased

* [ENHANCEMENT] promtool: Support linting of scrape interval, through lint option `too-long-scrape-interval`. #15719

## 3.1.0 / 2025-01-02

* [SECURITY] upgrade golang.org/x/crypto to address reported CVE-2024-45337. #15691
Expand Down
2 changes: 1 addition & 1 deletion Makefile.common
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ PROMU_URL := https://github.com/prometheus/promu/releases/download/v$(PROMU_
SKIP_GOLANGCI_LINT :=
GOLANGCI_LINT :=
GOLANGCI_LINT_OPTS ?=
GOLANGCI_LINT_VERSION ?= v1.62.0
GOLANGCI_LINT_VERSION ?= v1.63.4
# golangci-lint only supports linux, darwin and windows platforms on i386/amd64/arm64.
# windows isn't included here because of the path separator being different.
ifeq ($(GOHOSTOS),$(filter $(GOHOSTOS),linux darwin))
Expand Down
Loading
Loading