8000 Sync upstream up to da7afdc81 (2025-04-22) by zenador · Pull Request #867 · grafana/mimir-prometheus · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Sync upstream up to da7afdc81 (2025-04-22) #867

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.

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

Merged
merged 58 commits into from
Apr 23, 2025
Merged

Sync upstream up to da7afdc81 (2025-04-22) #867

merged 58 commits into from
Apr 23, 2025

Conversation

zenador
Copy link
Contributor
@zenador zenador commented Apr 22, 2025

This brings changes from prometheus/prometheus up to 2025-04-22 commit prometheus/prometheus@da7afdc

Diff: prometheus/prometheus@bce72b9...da7afdc

Minor merge conflicts from prometheus/prometheus#16333 , fairly straightforward to resolve.

Bug fixes

Optimisations

Refactoring and code cleanup

Non-production changes (eg. tests, docs)

Minor behaviour changes

Dependency upgrades

Changes not relevant to Mimir (eg. UI changes)

vvyushmanov and others added 30 commits February 20, 2024 14:12
Signed-off-by: Vadim Yushmanov <v_yushmanov@mail.ru>
This test consistently fails missing ~10 series.
If it doesn't fail on your machine, just increase totalSeries, that's
how race conditions work.

Signed-off-by: Oleg Zaytsev <mail@olegzaytsev.com>
This fixes TestHead_RaceBetweenSeriesCreationAndGC.

Signed-off-by: Oleg Zaytsev <mail@olegzaytsev.com>
Signed-off-by: Neeraj Gartia <neerajgartia211002@gmail.com>
Signed-off-by: Oleg Zaytsev <mail@olegzaytsev.com>
Bumps [github.com/hetznercloud/hcloud-go/v2](https://github.com/hetznercloud/hcloud-go) from 2.20.1 to 2.21.0.
- [Release notes](https://github.com/hetznercloud/hcloud-go/releases)
- [Changelog](https://github.com/hetznercloud/hcloud-go/blob/main/CHANGELOG.md)
- [Commits](hetznercloud/hcloud-go@v2.20.1...v2.21.0)

---
updated-dependencies:
- dependency-name: github.com/hetznercloud/hcloud-go/v2
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [github.com/bufbuild/buf](https://github.com/bufbuild/buf) from 1.50.1 to 1.51.0.
- [Release notes](https://github.com/bufbuild/buf/releases)
- [Changelog](https://github.com/bufbuild/buf/blob/main/CHANGELOG.md)
- [Commits](bufbuild/buf@v1.50.1...v1.51.0)

---
updated-dependencies:
- dependency-name: github.com/bufbuild/buf
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.28.12 to 3.28.13.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](github/codeql-action@5f8171a...1b549b9)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Updated the parser to allow calculations in PromQL durations.

This enables durations in the form of:

  rate(http_requests_total[10m+2s])

The computation of the calculations is done directly at the parse level and does not hit the PromQL Engine.
The lexer has also been updated and improved, in particular for subqueries.

Buxfix: rate(http_requests_total[0]) is no longer allowed.

Signed-off-by: Julien Pivotto <291750+roidelapluie@users.noreply.github.com>
Signed-off-by: Julien Pivotto <291750+roidelapluie@users.noreply.github.com>
Signed-off-by: Julien Pivotto <291750+roidelapluie@users.noreply.github.com>
Signed-off-by: Julien Pivotto <291750+roidelapluie@users.noreply.github.com>
Signed-off-by: Julien Pivotto <291750+roidelapluie@users.noreply.github.com>
Signed-off-by: Julien Pivotto <291750+roidelapluie@users.noreply.github.com>
Documentation: Add description for OAuth2 password grant type setup
We implemented proper type handling (gauge vs. counter histogram) a
while ago. The note about it is obsolete.

Signed-off-by: beorn7 <beorn@grafana.com>
docs: Remove recording rule note for native histograms
Signed-off-by: Jeanette Tan <jeanette.tan@grafana.com>
Signed-off-by: Jeanette Tan <jeanette.tan@grafana.com>
Signed-off-by: Jeanette Tan <jeanette.tan@grafana.com>
[BUG] PromQL: Return early when `endtime` < `startime`
Signed-off-by: Jeanette Tan <jeanette.tan@grafana.com>
* discovery: a change to a service with the same name but from another namespace won't enqueue the endpointSlice

Signed-off-by: Ryan Wu <rongjun0821@gmail.com>

* Update discovery/kubernetes/endpointslice.go

Co-authored-by: Ayoub Mrini <ayoubmrini424@gmail.com>
Signed-off-by: Ryan Wu <rongjun0821@gmail.com>

* Update endpointslice.go

Signed-off-by: Ryan Wu <rongjun0821@gmail.com>

---------

Signed-off-by: Ryan Wu <rongjun0821@gmail.com>
Co-authored-by: Ayoub Mrini <ayoubmrini424@gmail.com>
Signed-off-by: machine424 <ayoubmrini424@gmail.com>
These are supported in the main prometheus binary but the feature flags
weren't supported in promtool.

Fixes #16412.

Signed-off-by: David Leadbeater <dgl@dgl.cx>
…ithub/codeql-action-3.28.13

chore(deps): bump github/codeql-action from 3.28.12 to 3.28.13
…nal/tools/github.com/bufbuild/buf-1.51.0

chore(deps): bump github.com/bufbuild/buf from 1.50.1 to 1.51.0 in /internal/tools
…eplay to

not wait for an extra GC cycle until the built-in cleanup mechanism
kicks in

See prometheus/prometheus#15778

Signed-off-by: machine424 <ayoubmrini424@gmail.com>
Bumps [github.com/docker/docker](https://github.com/docker/docker) from 28.0.2+incompatible to 28.0.4+incompatible.
- [Release notes](https://github.com/docker/docker/releases)
- [Commits](moby/moby@v28.0.2...v28.0.4)

---
updated-dependencies:
- dependency-name: github.com/docker/docker
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Jan-Otto Kröpke <mail@jkroepke.de>
github-actions bot and others added 20 commits April 17, 2025 17:11
…e.golang.org/protobuf-1.36.6

chore(deps): bump google.golang.org/protobuf from 1.36.5 to 1.36.6
…b.com/ionos-cloud/sdk-go/v6-6.3.3

chore(deps): bump github.com/ionos-cloud/sdk-go/v6 from 6.3.2 to 6.3.3
…b.com/scaleway/scaleway-sdk-go-1.0.0-beta.33

chore(deps): bump github.com/scaleway/scaleway-sdk-go from 1.0.0-beta.32 to 1.0.0-beta.33
…b.com/docker/docker-28.0.4incompatible

chore(deps): bump github.com/docker/docker from 28.0.2+incompatible to 28.0.4+incompatible
Bumps [github.com/digitalocean/godo](https://github.com/digitalocean/godo) from 1.141.0 to 1.142.0.
- [Release notes](https://github.com/digitalocean/godo/releases)
- [Changelog](https://github.com/digitalocean/godo/blob/main/CHANGELOG.md)
- [Commits](digitalocean/godo@v1.141.0...v1.142.0)

---
updated-dependencies:
- dependency-name: github.com/digitalocean/godo
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
…with 5 updates (#16372)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…b.com/digitalocean/godo-1.142.0

chore(deps): bump github.com/digitalocean/godo from 1.141.0 to 1.142.0
…ontrib/processor/deltatocumulativeprocessor

Bumps [github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatocumulativeprocessor](https://github.com/open-telemetry/opentelemetry-collector-contrib) from 0.122.0 to 0.123.0.
- [Release notes](https://github.com/open-telemetry/opentelemetry-collector-contrib/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CHANGELOG-API.md)
- [Commits](open-telemetry/opentelemetry-collector-contrib@v0.122.0...v0.123.0)

---
updated-dependencies:
- dependency-name: github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatocumulativeprocessor
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off
8000
-by: dependabot[bot] <support@github.com>
Bumps [github.com/hashicorp/consul/api](https://github.com/hashicorp/consul) from 1.31.2 to 1.32.0.
- [Release notes](https://github.com/hashicorp/consul/releases)
- [Changelog](https://github.com/hashicorp/consul/blob/main/CHANGELOG.md)
- [Commits](hashicorp/consul@api/v1.31.2...api/v1.32.0)

---
updated-dependencies:
- dependency-name: github.com/hashicorp/consul/api
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
…b.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatocumulativeprocessor-0.123.0

chore(deps): bump github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatocumulativeprocessor from 0.122.0 to 0.123.0
…b.com/hashicorp/consul/api-1.32.0

chore(deps): bump github.com/hashicorp/consul/api from 1.31.2 to 1.32.0
Bumps [google.golang.org/api](https://github.com/googleapis/google-api-go-client) from 0.227.0 to 0.228.0.
- [Release notes](https://github.com/googleapis/google-api-go-client/releases)
- [Changelog](https://github.com/googleapis/google-api-go-client/blob/main/CHANGES.md)
- [Commits](googleapis/google-api-go-client@v0.227.0...v0.228.0)

---
updated-dependencies:
- dependency-name: google.golang.org/api
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [golang.org/x/net](https://github.com/golang/net) from 0.37.0 to 0.38.0.
- [Commits](golang/net@v0.37.0...v0.38.0)

---
updated-dependencies:
- dependency-name: golang.org/x/net
  dependency-version: 0.38.0
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
…nal/tools/golang.org/x/net-0.38.0

chore(deps): bump golang.org/x/net from 0.37.0 to 0.38.0 in /internal/tools
…e.golang.org/api-0.228.0

chore(deps): bump google.golang.org/api from 0.227.0 to 0.228.0
Signed-off-by: Jan-Otto Kröpke <mail@jkroepke.de>
* DRY stddev and stdvar

---------

Signed-off-by: Neeraj Gartia <neerajgartia211002@gmail.com>
PromQL: allow arithmetic operations in durations in PromQL parser
remote: Allow unwrapping of errors when reading from remote client
MAINTAINERS: add Jan-Otto Kröpke as an discovery/azure maintainer
@CLAassistant
Copy link
CLAassistant commented Apr 22, 2025

CLA assistant check
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
7 out of 12 committers have signed the CLA.

✅ colega
✅ roidelapluie
✅ krajorama
✅ zenador
✅ jkroepke
✅ beorn7
✅ bboreham
❌ vvyushmanov
❌ ryanwuer
❌ dgl
❌ machine424
❌ NeerajGartia21
You have signed the CLA already but the status is still pending? Let us recheck it.

@zenador zenador force-pushed the zenador/sync-prom branch from 44cad52 to 4e0386e Compare April 22, 2025 16:24
@zenador zenador force-pushed the zenador/sync-prom branch from 4e0386e to 9d50563 Compare April 22, 2025 16:42
@krajorama krajorama self-requested a review April 23, 2025 07:24
Copy link
Contributor
@krajorama krajorama left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, I looked at the code only, did not analyze the dependency updates deeply

@zenador zenador merged commit 007de9b into main Apr 23, 2025
7 of 8 checks passed
@zenador zenador deleted the zenador/sync-prom branch April 23, 2025 08:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

0