Commit graph

13243 commits

Author SHA1 Message Date
Ben Kochie 35444b9de3
Merge pull request #14227 from prometheus/superq/more_dependabot_prs
Increase the depndabot open PR limit
2024-06-05 17:13:10 +02:00
dependabot[bot] e04cf1e770
build(deps): bump golang.org/x/net from 0.25.0 to 0.26.0
Bumps [golang.org/x/net](https://github.com/golang/net) from 0.25.0 to 0.26.0.
- [Commits](https://github.com/golang/net/compare/v0.25.0...v0.26.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2024-06-05 15:08:33 +00:00
George Krajcsovits 3262fefe46
Merge pull request #14212 from prometheus/bump-go-version-to-1.22
Update GO dependencies for 2.53
2024-06-05 17:06:50 +02:00
György Krajcsovits b18e2d3ef6 Format linter pragma correctly
Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
2024-06-05 16:50:09 +02:00
György Krajcsovits 180059e6fa Update scaleway-sdk-go and silence deprecation warnings
This reverts commit 777daea86e.
2024-06-05 16:37:58 +02:00
SuperQ 38baaebb01
Increase the depndabot open PR limit
The default limit of 5 is a bit small given the number of dependencies
we have for Go and JS. Increase to 20 to allow more updates to be
pushed.

Signed-off-by: SuperQ <superq@gmail.com>
2024-06-05 16:18:59 +02:00
SuperQ 68ba6c1ae5
Add configuration option for GOGC
Add the ability to adjust the `GOGC` variable from the Prometheus
configuration file.
* Create a new top-level `runtime` section in the config.
* Adjust from the Go default of 100 to 50 to reduce wasted memory.
* Use the `GOGC` env value if no configuraiton is used.

Signed-off-by: SuperQ <superq@gmail.com>
2024-06-05 15:23:16 +02:00
György Krajcsovits 777daea86e Revert change to scaleway-sdk-go
The change brings in non trivial deprecations.
Multiple public IPs can be returned by the API now instead of one.
Need to decide what to do in that case as we used a single
meta label for that __meta_scaleway_instance_public_ipv4.

Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
2024-06-05 14:39:24 +02:00
György Krajcsovits 772b211e33 Revert update of opentelemetry collector components
These bring in a hard dependecy on toolchain we don't want via
https://github.com/open-telemetry/opentelemetry-collector/pull/10165

The dependency should be going away
https://github.com/open-telemetry/opentelemetry-collector/pull/10165#pullrequestreview-2060814562

Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
2024-06-05 14:12:38 +02:00
Ben Ye 8a08f452b6
tsdb: Allow passing a custom compactor to override the default one (#14113)
* expose hook in tsdb to allow customizing compactor

Signed-off-by: Ben Ye <benye@amazon.com>

* address comment

Signed-off-by: Ben Ye <benye@amazon.com>

---------

Signed-off-by: Ben Ye <benye@amazon.com>
2024-06-04 19:11:36 -04:00
György Krajcsovits 0ee4cf8d94 Update Go dependencies for 2.53
Ran "make update-all-go-deps" , but do not bump go version and remove
toolchain clause from go.mod


Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
2024-06-04 18:02:21 +02:00
Björn Rabenstein 8c8ddd01d5
Merge pull request #14211 from prometheus/beorn7/ci
CI: Use default behavior of update-container-description-action
2024-06-04 17:51:26 +02:00
George Krajcsovits d66d950714
Merge pull request #14190 from prometheus/dependabot/go_modules/github.com/docker/docker-26.1.3incompatible
build(deps): bump github.com/docker/docker from 26.0.1+incompatible to 26.1.3+incompatible
2024-06-04 17:25:37 +02:00
George Krajcsovits 1630784c72
Merge pull request #14182 from prometheus/dependabot/github_actions/github/codeql-action-3.25.7
build(deps): bump github/codeql-action from 3.22.12 to 3.25.7
2024-06-04 17:19:39 +02:00
dependabot[bot] e6a4c940f0
build(deps): bump github.com/docker/docker
Bumps [github.com/docker/docker](https://github.com/docker/docker) from 26.0.1+incompatible to 26.1.3+incompatible.
- [Release notes](https://github.com/docker/docker/releases)
- [Commits](https://github.com/docker/docker/compare/v26.0.1...v26.1.3)

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

Signed-off-by: dependabot[bot] <support@github.com>
2024-06-04 15:07:08 +00:00
Arve Knudsen ad74e2ce6a
Merge pull request #14189 from prometheus/dependabot/go_modules/go-opentelemetry-io-0de1682db1
build(deps): bump the go-opentelemetry-io group across 1 directory with 9 updates
2024-06-04 17:05:54 +02:00
dependabot[bot] 7007af1500
build(deps): bump github/codeql-action from 3.22.12 to 3.25.7
Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.22.12 to 3.25.7.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](012739e508...f079b84933)

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

Signed-off-by: dependabot[bot] <support@github.com>
2024-06-04 14:46:30 +00:00
dependabot[bot] 0e7070263b build(deps): bump the go-opentelemetry-io group across 1 directory with 9 updates
Bumps the go-opentelemetry-io group with 6 updates in the / directory:

| Package | From | To |
| --- | --- | --- |
| [go.opentelemetry.io/collector/pdata](https://github.com/open-telemetry/opentelemetry-collector) | `1.5.0` | `1.8.0` |
| [go.opentelemetry.io/collector/semconv](https://github.com/open-telemetry/opentelemetry-collector) | `0.98.0` | `0.101.0` |
| [go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp](https://github.com/open-telemetry/opentelemetry-go-contrib) | `0.50.0` | `0.52.0` |
| [go.opentelemetry.io/otel/exporters/otlp/otlptrace](https://github.com/open-telemetry/opentelemetry-go) | `1.25.0` | `1.27.0` |
| [go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc](https://github.com/open-telemetry/opentelemetry-go) | `1.25.0` | `1.27.0` |
| [go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp](https://github.com/open-telemetry/opentelemetry-go) | `1.25.0` | `1.27.0` |

Updates `go.opentelemetry.io/collector/pdata` from 1.5.0 to 1.8.0
- [Release notes](https://github.com/open-telemetry/opentelemetry-collector/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-collector/blob/main/CHANGELOG-API.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-collector/compare/pdata/v1.5.0...pdata/v1.8.0)

Updates `go.opentelemetry.io/collector/semconv` from 0.98.0 to 0.101.0
- [Release notes](https://github.com/open-telemetry/opentelemetry-collector/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-collector/blob/main/CHANGELOG-API.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-collector/compare/v0.98.0...v0.101.0)

Updates `go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp` from 0.50.0 to 0.52.0
- [Release notes](https://github.com/open-telemetry/opentelemetry-go-contrib/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-go-contrib/blob/main/CHANGELOG.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-go-contrib/compare/zpages/v0.50.0...zpages/v0.52.0)

Updates `go.opentelemetry.io/otel` from 1.25.0 to 1.27.0
- [Release notes](https://github.com/open-telemetry/opentelemetry-go/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-go/blob/main/CHANGELOG.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-go/compare/v1.25.0...v1.27.0)

Updates `go.opentelemetry.io/otel/exporters/otlp/otlptrace` from 1.25.0 to 1.27.0
- [Release notes](https://github.com/open-telemetry/opentelemetry-go/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-go/blob/main/CHANGELOG.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-go/compare/v1.25.0...v1.27.0)

Updates `go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc` from 1.25.0 to 1.27.0
- [Release notes](https://github.com/open-telemetry/opentelemetry-go/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-go/blob/main/CHANGELOG.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-go/compare/v1.25.0...v1.27.0)

Updates `go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp` from 1.25.0 to 1.27.0
- [Release notes](https://github.com/open-telemetry/opentelemetry-go/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-go/blob/main/CHANGELOG.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-go/compare/v1.25.0...v1.27.0)

Updates `go.opentelemetry.io/otel/sdk` from 1.25.0 to 1.27.0
- [Release notes](https://github.com/open-telemetry/opentelemetry-go/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-go/blob/main/CHANGELOG.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-go/compare/v1.25.0...v1.27.0)

Updates `go.opentelemetry.io/otel/trace` from 1.25.0 to 1.27.0
- [Release notes](https://github.com/open-telemetry/opentelemetry-go/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-go/blob/main/CHANGELOG.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-go/compare/v1.25.0...v1.27.0)

---
updated-dependencies:
- dependency-name: go.opentelemetry.io/collector/pdata
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: go-opentelemetry-io
- dependency-name: go.opentelemetry.io/collector/semconv
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: go-opentelemetry-io
- dependency-name: go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: go-opentelemetry-io
- dependency-name: go.opentelemetry.io/otel
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: go-opentelemetry-io
- dependency-name: go.opentelemetry.io/otel/exporters/otlp/otlptrace
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: go-opentelemetry-io
- dependency-name: go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: go-opentelemetry-io
- dependency-name: go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: go-opentelemetry-io
- dependency-name: go.opentelemetry.io/otel/sdk
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: go-opentelemetry-io
- dependency-name: go.opentelemetry.io/otel/trace
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: go-opentelemetry-io
...

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
2024-06-04 16:41:17 +02:00
beorn7 4a4965edb3 CI: Use default behavior of update-container-description-action
Previously, we always used README.md as the readme to push as
container description. By not explicitly specifying this file name, we
use the default behavior of the action, which is to push
README-containers.md if it exist, and push README.md otherwise.

In short, nothing will directly change with this commit, but now
repositories can provide a README-containers.md if they want to push a
different README as the container description.

Signed-off-by: beorn7 <beorn@grafana.com>
2024-06-04 16:25:24 +02:00
George Krajcsovits 9c557d7ae2
Merge pull request #14180 from prometheus/dependabot/github_actions/bufbuild/buf-setup-action-1.32.2
build(deps): bump bufbuild/buf-setup-action from 1.30.0 to 1.32.2
2024-06-04 16:24:20 +02:00
George Krajcsovits 8e62826cff
Merge pull request #14177 from prometheus/dependabot/go_modules/documentation/examples/remote_storage/github.com/prometheus/prometheus-0.52.1
build(deps): bump github.com/prometheus/prometheus from 0.51.2 to 0.52.1 in /documentation/examples/remote_storage
2024-06-04 16:21:32 +02:00
George Krajcsovits d4ed9004b3
Merge pull request #14183 from prometheus/dependabot/github_actions/actions/setup-go-5.0.1
build(deps): bump actions/setup-go from 5.0.0 to 5.0.1
2024-06-04 16:15:54 +02:00
George Krajcsovits 461c10fc9f
Merge pull request #14191 from prometheus/dependabot/github_actions/scripts/actions/setup-go-5.0.1
build(deps): bump actions/setup-go from 5.0.0 to 5.0.1 in /scripts
2024-06-04 16:00:53 +02:00
dependabot[bot] 0627745be0
build(deps): bump github.com/prometheus/prometheus
Bumps [github.com/prometheus/prometheus](https://github.com/prometheus/prometheus) from 0.51.2 to 0.52.1.
- [Release notes](https://github.com/prometheus/prometheus/releases)
- [Changelog](https://github.com/prometheus/prometheus/blob/main/CHANGELOG.md)
- [Commits](https://github.com/prometheus/prometheus/compare/v0.51.2...v0.52.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
2024-06-04 13:56:10 +00:00
George Krajcsovits 02a4a45d13
Merge pull request #14178 from prometheus/dependabot/go_modules/documentation/examples/remote_storage/github.com/prometheus/client_golang-1.19.1
build(deps): bump github.com/prometheus/client_golang from 1.19.0 to 1.19.1 in /documentation/examples/remote_storage
2024-06-04 15:55:08 +02:00
Bryan Boreham 4ce26288e0 [ENHANCEMENT] HTTP API: Add url to errors logged while sending response
Give more clues when troubleshooting.

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
2024-06-04 13:54:17 +01:00
Bryan Boreham d635bcaa84
Merge pull request #13587 from tylitianrui/chore/typo_20240215
chore:fix typo
2024-06-04 14:43:18 +03:00
Marco Pracucci d966ae6400
Optimize containsInOrder() inlining it
Signed-off-by: Marco Pracucci <marco@pracucci.com>
2024-06-04 10:34:15 +02:00
Marco Pracucci a0807733be
Improved tests
Signed-off-by: Marco Pracucci <marco@pracucci.com>
2024-06-04 10:34:15 +02:00
Marco Pracucci 78fdd2188d
Improve contains check done by FastRegexMatcher
Signed-off-by: Marco Pracucci <marco@pracucci.com>
2024-06-04 10:34:15 +02:00
Bryan Boreham 42b546a43d
tsdb: add details to duplicate sample error (#13277)
Now the error will include the timestamp and the existing and new values.
When you are trying to track down the source of this error, it can be
useful to see that the values are close, or alternating, or something
else.

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
2024-06-04 08:54:09 +01:00
Arve Knudsen 31a74dcf5a
Merge pull request #14199 from aknuds1/arve/fix-test
tsdb/index: Fix number of series in TestReader_PostingsForLabelMatchingHonorsContextCancel
2024-06-03 19:33:18 +02:00
Arve Knudsen b8b9015e38 tsdb/index: Fix TestReader_PostingsForLabelMatchingHonorsContextCancel
Fix number of series in
TestReader_PostingsForLabelMatchingHonorsContextCancel (off by one).

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
2024-06-03 17:29:06 +02:00
Arthur Silva Sens efbd6e41c5
Merge pull request #14171 from prometheus/resolveconflicts-2.52.1
Merge release-2.52 back to main
2024-06-03 10:35:59 -03:00
dependabot[bot] bd9d35cc66
build(deps): bump bufbuild/buf-setup-action from 1.30.0 to 1.32.2
Bumps [bufbuild/buf-setup-action](https://github.com/bufbuild/buf-setup-action) from 1.30.0 to 1.32.2.
- [Release notes](https://github.com/bufbuild/buf-setup-action/releases)
- [Commits](517ee23296...dde0b9351d)

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

Signed-off-by: dependabot[bot] <support@github.com>
2024-06-03 11:57:51 +00:00
dependabot[bot] ef84c19e36
build(deps): bump actions/setup-go from 5.0.0 to 5.0.1
Bumps [actions/setup-go](https://github.com/actions/setup-go) from 5.0.0 to 5.0.1.
- [Release notes](https://github.com/actions/setup-go/releases)
- [Commits](0c52d547c9...cdcb360436)

---
updated-dependencies:
- dependency-name: actions/setup-go
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-06-03 11:57:20 +00:00
Julien 5b32f1fec1
Merge pull request #14188 from prometheus/dependabot/go_modules/github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v5-5.7.0
build(deps): bump github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v5 from 5.6.0 to 5.7.0
2024-06-03 13:57:12 +02:00
Julien 27f2dded14
Merge pull request #14186 from prometheus/dependabot/go_modules/github.com/hetznercloud/hcloud-go/v2-2.9.0
build(deps): bump github.com/hetznercloud/hcloud-go/v2 from 2.7.2 to 2.9.0
2024-06-03 13:56:50 +02:00
Julien 2de6c5be09
Merge pull request #14181 from prometheus/dependabot/github_actions/ossf/scorecard-action-2.3.3
build(deps): bump ossf/scorecard-action from 2.3.1 to 2.3.3
2024-06-03 13:56:25 +02:00
Julien 0520e8652f
Merge pull request #14179 from prometheus/dependabot/github_actions/actions/checkout-4.1.6
build(deps): bump actions/checkout from 4.1.4 to 4.1.6
2024-06-03 13:56:09 +02:00
dependabot[bot] 2061cd3670
build(deps): bump actions/setup-go from 5.0.0 to 5.0.1 in /scripts
Bumps [actions/setup-go](https://github.com/actions/setup-go) from 5.0.0 to 5.0.1.
- [Release notes](https://github.com/actions/setup-go/releases)
- [Commits](0c52d547c9...cdcb360436)

---
updated-dependencies:
- dependency-name: actions/setup-go
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-06-01 23:44:11 +00:00
dependabot[bot] e95c5f3094
build(deps): bump github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v5
Bumps [github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v5](https://github.com/Azure/azure-sdk-for-go) from 5.6.0 to 5.7.0.
- [Release notes](https://github.com/Azure/azure-sdk-for-go/releases)
- [Changelog](https://github.com/Azure/azure-sdk-for-go/blob/main/documentation/release.md)
- [Commits](https://github.com/Azure/azure-sdk-for-go/compare/sdk/resourcemanager/compute/armcompute/v5.6.0...sdk/resourcemanager/compute/armcompute/v5.7.0)

---
updated-dependencies:
- dependency-name: github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v5
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-06-01 23:36:23 +00:00
dependabot[bot] 4f6ef4549b
build(deps): bump github.com/hetznercloud/hcloud-go/v2
Bumps [github.com/hetznercloud/hcloud-go/v2](https://github.com/hetznercloud/hcloud-go) from 2.7.2 to 2.9.0.
- [Release notes](https://github.com/hetznercloud/hcloud-go/releases)
- [Changelog](https://github.com/hetznercloud/hcloud-go/blob/main/CHANGELOG.md)
- [Commits](https://github.com/hetznercloud/hcloud-go/compare/v2.7.2...v2.9.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>
2024-06-01 23:35:56 +00:00
dependabot[bot] b36d145a9d
build(deps): bump ossf/scorecard-action from 2.3.1 to 2.3.3
Bumps [ossf/scorecard-action](https://github.com/ossf/scorecard-action) from 2.3.1 to 2.3.3.
- [Release notes](https://github.com/ossf/scorecard-action/releases)
- [Changelog](https://github.com/ossf/scorecard-action/blob/main/RELEASE.md)
- [Commits](0864cf1902...dc50aa9510)

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

Signed-off-by: dependabot[bot] <support@github.com>
2024-06-01 23:15:46 +00:00
dependabot[bot] 61724e5643
build(deps): bump actions/checkout from 4.1.4 to 4.1.6
Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.4 to 4.1.6.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v4.1.4...a5ac7e51b41094c92402da3b24376905380afc29)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-06-01 23:15:35 +00:00
dependabot[bot] 4b5f4f03a1
build(deps): bump github.com/prometheus/client_golang
Bumps [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang) from 1.19.0 to 1.19.1.
- [Release notes](https://github.com/prometheus/client_golang/releases)
- [Changelog](https://github.com/prometheus/client_golang/blob/main/CHANGELOG.md)
- [Commits](https://github.com/prometheus/client_golang/compare/v1.19.0...v1.19.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
2024-06-01 23:07:22 +00:00
Bryan Boreham bfdca40fd2
Merge pull request #14083 from charleskorn/sort-matrix-series
promql: ensure series in matrix values returned for instant queries are sorted
2024-05-31 19:25:20 +03:00
Arthur Silva Sens d73537ccc0
Merge branch 'main' into resolveconflicts-2.52.1 2024-05-31 09:36:17 -03:00
Charles Korn 24ef000025
Merge branch 'main' into sort-matrix-series
# Conflicts:
#	promql/engine_test.go
2024-05-31 12:44:27 +10:00
Ganesh Vernekar e47474d755
Merge pull request #14080 from bboreham/faster-exemplars
[ENHANCEMENT] TSDB: Faster exemplars
2024-05-30 18:02:55 -04:00