Commit graph

12956 commits

Author SHA1 Message Date
Bryan Boreham d697719db6 [BUGFIX] Scraping: allow multiple samples on same series (#14685)
So long as they specify timestamps. We don't check that the timestamps
are different.

Extend test, and use client_golang/prometheus/testutil to simplify metric check.

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
2024-08-27 10:16:37 +01:00
Bryan Boreham 6e971a7dc9
Merge pull request #14645 from prometheus/prep-2.53.2
Some checks failed
CI / Go tests (push) Has been cancelled
CI / More Go tests (push) Has been cancelled
CI / Go tests with previous Go version (push) Has been cancelled
CI / UI tests (push) Has been cancelled
CI / Go tests on Windows (push) Has been cancelled
CI / Mixins tests (push) Has been cancelled
CI / Build Prometheus for common architectures (0) (push) Has been cancelled
CI / Build Prometheus for common architectures (1) (push) Has been cancelled
CI / Build Prometheus for common architectures (2) (push) Has been cancelled
CI / Build Prometheus for all architectures (0) (push) Has been cancelled
CI / Build Prometheus for all architectures (1) (push) Has been cancelled
CI / Build Prometheus for all architectures (10) (push) Has been cancelled
CI / Build Prometheus for all architectures (11) (push) Has been cancelled
CI / Build Prometheus for all architectures (2) (push) Has been cancelled
CI / Build Prometheus for all architectures (3) (push) Has been cancelled
CI / Build Prometheus for all architectures (4) (push) Has been cancelled
CI / Build Prometheus for all architectures (5) (push) Has been cancelled
CI / Build Prometheus for all architectures (6) (push) Has been cancelled
CI / Build Prometheus for all architectures (7) (push) Has been cancelled
CI / Build Prometheus for all architectures (8) (push) Has been cancelled
CI / Build Prometheus for all architectures (9) (push) Has been cancelled
CI / Check generated parser (push) Has been cancelled
CI / golangci-lint (push) Has been cancelled
CI / fuzzing (push) Has been cancelled
CI / codeql (push) Has been cancelled
CI / Publish main branch artifacts (push) Has been cancelled
CI / Publish release artefacts (push) Has been cancelled
CI / Publish UI on npm Registry (push) Has been cancelled
Cut release 2.53.2
2024-08-09 14:46:33 +01:00
Bryan Boreham f7d316a3d0 Cut release 2.53.2
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
2024-08-09 12:32:34 +01:00
Bryan Boreham 72d84f511f
Merge pull request #14515 from prometheus/revert-13777-remoteread2 (#14523)
Revert "Chunked remote read: close the querier earlier"

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
2024-07-31 12:16:11 +01:00
Bryan Boreham 14cfec3f60
Prepare release 2.53.1 (#14452)
Co-authored-by: George Krajcsovits <krajorama@users.noreply.github.com>
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
2024-07-10 11:14:07 +01:00
Bryan Boreham 7083ae8267
[release 2.53] Revert 13583 to stop dropping samples in remote-write catch-up (#14446)
* Revert "fix bug that would cause us to endlessly fall behind (#13583)"
This reverts commit 0c71230784.
(leaving the new test in place)

* TSDB: enhance TestRun_AvoidNotifyWhenBehind
With code suggested by @cstyan in #14439.

* WAL watcher: add back log line showing current segment

---------

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
2024-07-10 10:00:31 +01:00
George Krajcsovits 4c35b9250a
Merge pull request #14303 from prometheus/prepare-2.53.0-release
Prepare 2.53.0 release
2024-06-18 15:08:14 +02:00
George Krajcsovits 29d3e48267
Update CHANGELOG.md
Co-authored-by: Julien <291750+roidelapluie@users.noreply.github.com>
Signed-off-by: George Krajcsovits <krajorama@users.noreply.github.com>
2024-06-18 13:45:53 +02:00
György Krajcsovits e121d07388 Prepare release 2.53.0
Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
2024-06-16 10:24:09 +02:00
George Krajcsovits 604287400c
Merge pull request #14284 from prometheus/prepare-2.53.rc.1
Prepare 2.53.rc.1
2024-06-11 14:01:40 +02:00
György Krajcsovits dd8676218b Prepare 2.53.0-rc.1 release
Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
2024-06-11 12:56:32 +02:00
György Krajcsovits 4cfec57606 Revert "Update changelog due to pr 14273"
This reverts commit dd44001465.

Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
2024-06-11 12:55:02 +02:00
Ben Kochie 4c4c2be6dd
Merge pull request #14288 from prometheus/superq/pick_14285
Tune default GOGC
2024-06-11 11:58:10 +02:00
SuperQ 38bf349ff7
Update changelog for GOGC tuning
Include #14285 in changelog.

Signed-off-by: SuperQ <superq@gmail.com>
2024-06-11 11:37:32 +02:00
SuperQ 6ccee2c4a5
Tune default GOGC
Adjust the default GOGC value to 75. This is less of a memory savings,
but has less impact on CPU use.

Signed-off-by: SuperQ <superq@gmail.com>
2024-06-11 11:17:33 +02:00
George Krajcsovits dea904150b
Merge pull request #14276 from prometheus/pick-pr14273-to-2.53
Fix Group.Equals() to take in account the new queryOffset too (#14273)
2024-06-07 10:40:31 +02:00
György Krajcsovits dd44001465 Update changelog due to pr 14273
Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
2024-06-07 10:21:27 +02:00
Marco Pracucci 1d2f2cb43d Fix Group.Equals() to take in account the new queryOffset too (#14273)
Signed-off-by: Marco Pracucci <marco@pracucci.com>
2024-06-07 10:20:00 +02:00
George Krajcsovits 80d39c8189
Merge pull request #14255 from prometheus/prepare-v2.53-rc.0
Version bump to v2.53.0-rc.0
2024-06-07 08:35:10 +02:00
György Krajcsovits 3feefd903b Update changelog from review comments
Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
2024-06-06 17:54:04 +02:00
György Krajcsovits c8de725aba Fix typo in changelog
Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
2024-06-06 12:31:03 +02:00
György Krajcsovits 73f74d301e Clarify action to take with regards to the changelog
Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
2024-06-06 12:29:49 +02:00
György Krajcsovits b59034ec31 Ammend changelog with missing user impact entries
Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
2024-06-06 12:29:34 +02:00
György Krajcsovits 8397c7bc48 Version bump to v2.53.0-rc.0
Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
2024-06-06 09:56:36 +02:00
Ben Kochie f5eff89811
Merge pull request #14240 from prometheus/dependabot/go_modules/google.golang.org/api-0.183.0
Signed-off-by: Ben Kochie <superq@gmail.com>
2024-06-05 20:28:39 +02:00
dependabot[bot] 5cc0e641cf
build(deps): bump google.golang.org/api from 0.182.0 to 0.183.0
Bumps [google.golang.org/api](https://github.com/googleapis/google-api-go-client) from 0.182.0 to 0.183.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](https://github.com/googleapis/google-api-go-client/compare/v0.182.0...v0.183.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>
2024-06-05 17:46:34 +00:00
Ben Kochie 84ad107195
Merge pull request #14236 from prometheus/dependabot/go_modules/golang.org/x/tools-0.22.0
build(deps): bump golang.org/x/tools from 0.21.0 to 0.22.0
2024-06-05 19:45:32 +02:00
Björn Rabenstein a078cf8a4a
Merge pull request #14221 from prometheus/beorn7/ci
CI: Actually enable the default fallback behavior of docker-pushrm
2024-06-05 19:02:50 +02:00
Ben Kochie 8a3cca96f6
Merge pull request #14238 from prometheus/dependabot/go_modules/github.com/digitalocean/godo-1.117.0
build(deps): bump github.com/digitalocean/godo from 1.116.0 to 1.117.0
2024-06-05 18:16:31 +02:00
Ben Kochie d7ee54b7b5
Merge pull request #14242 from prometheus/dependabot/go_modules/github.com/aws/aws-sdk-go-1.53.16
build(deps): bump github.com/aws/aws-sdk-go from 1.53.15 to 1.53.16
2024-06-05 18:12:57 +02:00
beorn7 15b0cb4b14 CI: Actually enable the default fallback behavior of docker-pushrm
The Github action explicitly sets `README.md` as the default file to
push, see
https://github.com/christian-korneck/update-container-description-action/blob/master/action.yml#L17

This disables the fallback to `README-containers.md`, as implemented
in the actual tool that the Github action uses, i.e.
https://github.com/christian-korneck/docker-pushrm

However, by setting the file name explicitly to an empty string, we
can trigger the default fallback behavior of dockre-pushrm after all.

Signed-off-by: beorn7 <beorn@grafana.com>
2024-06-05 17:45:45 +02:00
Ben Kochie 4e664035e8
Merge pull request #14176 from prometheus/superq/gogc
Add configuration option for GOGC, default to 50
2024-06-05 17:43:40 +02:00
dependabot[bot] 0309e346eb
build(deps): bump golang.org/x/tools from 0.21.0 to 0.22.0
Bumps [golang.org/x/tools](https://github.com/golang/tools) from 0.21.0 to 0.22.0.
- [Release notes](https://github.com/golang/tools/releases)
- [Commits](https://github.com/golang/tools/compare/v0.21.0...v0.22.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2024-06-05 15:39:51 +00:00
Ben Kochie 49cab2e317
Merge pull request #14224 from prometheus/dependabot/go_modules/golang.org/x/net-0.26.0
build(deps): bump golang.org/x/net from 0.25.0 to 0.26.0
2024-06-05 17:38:37 +02:00
gotjosh b615c43d5b
RuleQueryOffset: Add omitempty for the global configuration (#14216)
A small oversight of when I introduced https://github.com/prometheus/prometheus/pull/14061, I could add a test to cover it but it seems like an overkill given other similar attributes don't have it either. Let me know if you think it's worth it.

Signed-off-by: gotjosh <josue.abreu@gmail.com>
2024-06-05 16:35:52 +01:00
dependabot[bot] d9d3f4fd60
build(deps): bump github.com/aws/aws-sdk-go from 1.53.15 to 1.53.16
Bumps [github.com/aws/aws-sdk-go](https://github.com/aws/aws-sdk-go) from 1.53.15 to 1.53.16.
- [Release notes](https://github.com/aws/aws-sdk-go/releases)
- [Commits](https://github.com/aws/aws-sdk-go/compare/v1.53.15...v1.53.16)

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

Signed-off-by: dependabot[bot] <support@github.com>
2024-06-05 15:15:28 +00:00
dependabot[bot] 8c792ce59b
build(deps): bump github.com/digitalocean/godo from 1.116.0 to 1.117.0
Bumps [github.com/digitalocean/godo](https://github.com/digitalocean/godo) from 1.116.0 to 1.117.0.
- [Release notes](https://github.com/digitalocean/godo/releases)
- [Changelog](https://github.com/digitalocean/godo/blob/main/CHANGELOG.md)
- [Commits](https://github.com/digitalocean/godo/compare/v1.116.0...v1.117.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>
2024-06-05 15:14:55 +00:00
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