Arve Knudsen
760649d91f
Merge pull request #14588 from prometheus/dependabot/npm_and_yarn/web/ui/ejs-3.1.10
...
build(deps-dev): bump ejs from 3.1.8 to 3.1.10 in /web/ui
2024-08-04 18:13:55 +02:00
dependabot[bot]
983d0bd5cb
build(deps-dev): bump express from 4.18.1 to 4.19.2 in /web/ui
...
Bumps [express](https://github.com/expressjs/express ) from 4.18.1 to 4.19.2.
- [Release notes](https://github.com/expressjs/express/releases )
- [Changelog](https://github.com/expressjs/express/blob/master/History.md )
- [Commits](https://github.com/expressjs/express/compare/4.18.1...4.19.2 )
---
updated-dependencies:
- dependency-name: express
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-08-04 16:00:36 +00:00
dependabot[bot]
12dd999164
build(deps-dev): bump ejs from 3.1.8 to 3.1.10 in /web/ui
...
Bumps [ejs](https://github.com/mde/ejs ) from 3.1.8 to 3.1.10.
- [Release notes](https://github.com/mde/ejs/releases )
- [Commits](https://github.com/mde/ejs/compare/v3.1.8...v3.1.10 )
---
updated-dependencies:
- dependency-name: ejs
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-08-04 15:58:56 +00:00
dependabot[bot]
6b9c386d14
build(deps): bump follow-redirects from 1.15.2 to 1.15.6 in /web/ui
...
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects ) from 1.15.2 to 1.15.6.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases )
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.15.2...v1.15.6 )
---
updated-dependencies:
- dependency-name: follow-redirects
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-08-04 15:58:51 +00:00
Arve Knudsen
5f6221743f
Merge pull request #14583 from prometheus/dependabot/npm_and_yarn/web/ui/braces-3.0.3
...
CI / Go tests (push) Waiting to run
CI / More Go tests (push) Waiting to run
CI / Go tests with previous Go version (push) Waiting to run
CI / UI tests (push) Waiting to run
CI / Go tests on Windows (push) Waiting to run
CI / Mixins tests (push) Waiting to run
CI / Build Prometheus for common architectures (0) (push) Waiting to run
CI / Build Prometheus for common architectures (1) (push) Waiting to run
CI / Build Prometheus for common architectures (2) (push) Waiting to run
CI / Build Prometheus for all architectures (0) (push) Waiting to run
CI / Build Prometheus for all architectures (1) (push) Waiting to run
CI / Build Prometheus for all architectures (10) (push) Waiting to run
CI / Build Prometheus for all architectures (11) (push) Waiting to run
CI / Build Prometheus for all architectures (2) (push) Waiting to run
CI / Build Prometheus for all architectures (3) (push) Waiting to run
CI / Build Prometheus for all architectures (4) (push) Waiting to run
CI / Build Prometheus for all architectures (5) (push) Waiting to run
CI / Build Prometheus for all architectures (6) (push) Waiting to run
CI / Build Prometheus for all architectures (7) (push) Waiting to run
CI / Build Prometheus for all architectures (8) (push) Waiting to run
CI / Build Prometheus for all architectures (9) (push) Waiting to run
CI / Report status of build Prometheus for all architectures (push) Blocked by required conditions
CI / Check generated parser (push) Waiting to run
CI / golangci-lint (push) Waiting to run
CI / fuzzing (push) Waiting to run
CI / codeql (push) Waiting to run
CI / Publish main branch artifacts (push) Blocked by required conditions
CI / Publish release artefacts (push) Blocked by required conditions
CI / Publish UI on npm Registry (push) Blocked by required conditions
Scorecards supply-chain security / Scorecards analysis (push) Waiting to run
build(deps): bump braces from 3.0.2 to 3.0.3 in /web/ui
2024-08-03 15:35:21 +02:00
dependabot[bot]
099d209a26
build(deps): bump braces from 3.0.2 to 3.0.3 in /web/ui
...
Bumps [braces](https://github.com/micromatch/braces ) from 3.0.2 to 3.0.3.
- [Changelog](https://github.com/micromatch/braces/blob/master/CHANGELOG.md )
- [Commits](https://github.com/micromatch/braces/compare/3.0.2...3.0.3 )
---
updated-dependencies:
- dependency-name: braces
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-08-03 13:20:29 +00:00
suntala
77d111e501
Fix links to feature flags page
...
Signed-off-by: suntala <arati.rana@grafana.com>
2024-08-02 14:25:22 +02:00
dependabot[bot]
5681ec50e1
build(deps): bump @lezer/lr from 1.4.1 to 1.4.2 in /web/ui ( #14560 )
...
Bumps [@lezer/lr](https://github.com/lezer-parser/lr ) from 1.4.1 to 1.4.2.
- [Changelog](https://github.com/lezer-parser/lr/blob/main/CHANGELOG.md )
- [Commits](https://github.com/lezer-parser/lr/compare/1.4.1...1.4.2 )
---
updated-dependencies:
- dependency-name: "@lezer/lr"
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-08-02 11:47:04 +02:00
Bartlomiej Plotka
ed8acee9a1
Merge pull request #14549 from prometheus/rw20-exemplar-timestamp
...
[rw2.0] change comment that allows timestamps to be optional
2024-08-02 11:41:09 +02:00
dependabot[bot]
a5666dded5
build(deps): bump @codemirror/view from 6.28.3 to 6.29.1 in /web/ui ( #14564 )
...
Bumps [@codemirror/view](https://github.com/codemirror/view ) from 6.28.3 to 6.29.1.
- [Changelog](https://github.com/codemirror/view/blob/main/CHANGELOG.md )
- [Commits](https://github.com/codemirror/view/compare/6.28.3...6.29.1 )
---
updated-dependencies:
- dependency-name: "@codemirror/view"
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-08-02 10:06:52 +02:00
dependabot[bot]
4553d1baa6
build(deps): bump actions/setup-go from 5.0.1 to 5.0.2 in /scripts
...
Bumps [actions/setup-go](https://github.com/actions/setup-go ) from 5.0.1 to 5.0.2.
- [Release notes](https://github.com/actions/setup-go/releases )
- [Commits](cdcb360436...0a12ed9d6a
)
---
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-08-01 23:54:21 +00:00
dependabot[bot]
7d086171fc
build(deps): bump golangci/golangci-lint-action in /scripts
...
Bumps [golangci/golangci-lint-action](https://github.com/golangci/golangci-lint-action ) from 6.0.1 to 6.1.0.
- [Release notes](https://github.com/golangci/golangci-lint-action/releases )
- [Commits](a4f60bb28d...aaa42aa062
)
---
updated-dependencies:
- dependency-name: golangci/golangci-lint-action
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-08-01 23:54:16 +00:00
dependabot[bot]
f6f911db75
build(deps): bump actions/upload-artifact from 4.3.3 to 4.3.4
...
Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact ) from 4.3.3 to 4.3.4.
- [Release notes](https://github.com/actions/upload-artifact/releases )
- [Commits](65462800fd...0b2256b8c0
)
---
updated-dependencies:
- dependency-name: actions/upload-artifact
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-08-01 23:46:48 +00:00
dependabot[bot]
3cad51bcb2
build(deps): bump golangci/golangci-lint-action from 6.0.1 to 6.1.0
...
Bumps [golangci/golangci-lint-action](https://github.com/golangci/golangci-lint-action ) from 6.0.1 to 6.1.0.
- [Release notes](https://github.com/golangci/golangci-lint-action/releases )
- [Commits](a4f60bb28d...aaa42aa062
)
---
updated-dependencies:
- dependency-name: golangci/golangci-lint-action
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-08-01 23:46:44 +00:00
dependabot[bot]
918ce1f8c2
build(deps): bump github/codeql-action from 3.25.11 to 3.25.15
...
Bumps [github/codeql-action](https://github.com/github/codeql-action ) from 3.25.11 to 3.25.15.
- [Release notes](https://github.com/github/codeql-action/releases )
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md )
- [Commits](b611370bb5...afb54ba388
)
---
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>
2024-08-01 23:46:41 +00:00
dependabot[bot]
9bc42f4400
build(deps): bump bufbuild/buf-setup-action from 1.34.0 to 1.35.1
...
Bumps [bufbuild/buf-setup-action](https://github.com/bufbuild/buf-setup-action ) from 1.34.0 to 1.35.1.
- [Release notes](https://github.com/bufbuild/buf-setup-action/releases )
- [Commits](35c243d7f2...aceb106d24
)
---
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-08-01 23:46:33 +00:00
dependabot[bot]
8867959c54
build(deps): bump ossf/scorecard-action from 2.3.3 to 2.4.0
...
Bumps [ossf/scorecard-action](https://github.com/ossf/scorecard-action ) from 2.3.3 to 2.4.0.
- [Release notes](https://github.com/ossf/scorecard-action/releases )
- [Changelog](https://github.com/ossf/scorecard-action/blob/main/RELEASE.md )
- [Commits](dc50aa9510...62b2cac7ed
)
---
updated-dependencies:
- dependency-name: ossf/scorecard-action
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-08-01 23:46:29 +00:00
dependabot[bot]
5aeb5061f9
build(deps): bump actions/setup-go from 5.0.1 to 5.0.2
...
Bumps [actions/setup-go](https://github.com/actions/setup-go ) from 5.0.1 to 5.0.2.
- [Release notes](https://github.com/actions/setup-go/releases )
- [Commits](cdcb360436...0a12ed9d6a
)
---
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-08-01 23:46:27 +00:00
dependabot[bot]
8d61a3e325
build(deps): bump google.golang.org/api from 0.189.0 to 0.190.0
...
Bumps [google.golang.org/api](https://github.com/googleapis/google-api-go-client ) from 0.189.0 to 0.190.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.189.0...v0.190.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-08-01 23:20:57 +00:00
dependabot[bot]
cb6f9ff088
build(deps): bump github.com/ionos-cloud/sdk-go/v6 from 6.1.11 to 6.2.0
...
Bumps [github.com/ionos-cloud/sdk-go/v6](https://github.com/ionos-cloud/sdk-go ) from 6.1.11 to 6.2.0.
- [Release notes](https://github.com/ionos-cloud/sdk-go/releases )
- [Changelog](https://github.com/ionos-cloud/sdk-go/blob/master/docs/CHANGELOG.md )
- [Commits](https://github.com/ionos-cloud/sdk-go/compare/v6.1.11...v6.2.0 )
---
updated-dependencies:
- dependency-name: github.com/ionos-cloud/sdk-go/v6
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-08-01 23:20:40 +00:00
Callum Styan
6ca5b9cd40
regenerate pb files with new comment
...
Signed-off-by: Callum Styan <callumstyan@gmail.com>
2024-08-01 12:41:55 -07:00
Callum Styan
2bcac1b77b
change comment that allows timestamps to be optional
...
Signed-off-by: Callum Styan <callumstyan@gmail.com>
2024-08-01 12:32:49 -07:00
Owen Williams
d90c5a71d7
support quoting in grouping label lists
...
Signed-off-by: Owen Williams <owen.williams@grafana.com>
2024-08-01 10:07:12 -04:00
George Krajcsovits
00ab05c3b9
Native histograms: fix spurios counter reset when merging recoded chunk to normal chunk ( #14513 )
...
* chunkenc: allow missing empty buckets on histogram append
Allow appending to chunks when the histogram to be added is missing
some buckets, but the missing buckets are empty in the chunk.
For example bucket at index 5 is present in the chunk, but its value
is 0 and the new histogram doesn't have a bucket at index 5.
This fixes an issue of merging chunks where one chunk was recoded to
retroactively have some empty buckets in all the histograms and we are
merging in a histogram that doesn't have the empty bucket (because it
was not recoded yet).
The operation alters the histogram that is being added, however this has
already been the case when appending gauge histograms. Thus the test
TestHistogramSeriesToChunks in storage package is changed to explicitly
test what happened to the appended histogram - Compact(0) call is removed.
The new expandIntSpansAndBuckets and expandFloatSpansAndBuckets functions
are a merge of expandSpansForward and counterResetInAnyBucket and
counterResetInAnyFloatBucket.
Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
2024-08-01 09:22:32 +02:00
Augustin Husson
29b62762db
adapt the lezer grammar and codemirror autocompletion with duration and number that are equivalent ( #14417 )
...
Signed-off-by: Augustin Husson <husson.augustin@gmail.com>
2024-07-31 15:31:42 +02:00
dependabot[bot]
bffe0f80dc
build(deps): bump github.com/hetznercloud/hcloud-go/v2 ( #14535 )
...
Bumps [github.com/hetznercloud/hcloud-go/v2](https://github.com/hetznercloud/hcloud-go ) from 2.10.2 to 2.12.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.10.2...v2.12.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>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-07-31 13:29:48 +02:00
dependabot[bot]
0dc00825f5
build(deps): bump github.com/digitalocean/godo from 1.118.0 to 1.119.0 ( #14529 )
...
Bumps [github.com/digitalocean/godo](https://github.com/digitalocean/godo ) from 1.118.0 to 1.119.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.118.0...v1.119.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>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-07-31 12:41:53 +02:00
dependabot[bot]
01209f0766
build(deps): bump github.com/linode/linodego from 1.37.0 to 1.38.0 ( #14530 )
...
Bumps [github.com/linode/linodego](https://github.com/linode/linodego ) from 1.37.0 to 1.38.0.
- [Release notes](https://github.com/linode/linodego/releases )
- [Commits](https://github.com/linode/linodego/compare/v1.37.0...v1.38.0 )
---
updated-dependencies:
- dependency-name: github.com/linode/linodego
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-07-31 12:41:25 +02:00
dependabot[bot]
31a77630ce
build(deps): bump github.com/gophercloud/gophercloud ( #14534 )
...
Bumps [github.com/gophercloud/gophercloud](https://github.com/gophercloud/gophercloud ) from 1.13.0 to 1.14.0.
- [Release notes](https://github.com/gophercloud/gophercloud/releases )
- [Changelog](https://github.com/gophercloud/gophercloud/blob/v1.14.0/CHANGELOG.md )
- [Commits](https://github.com/gophercloud/gophercloud/compare/v1.13.0...v1.14.0 )
---
updated-dependencies:
- dependency-name: github.com/gophercloud/gophercloud
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-07-31 12:40:51 +02:00
dependabot[bot]
a319fd133a
build(deps): bump google.golang.org/api from 0.188.0 to 0.189.0 ( #14536 )
...
Bumps [google.golang.org/api](https://github.com/googleapis/google-api-go-client ) from 0.188.0 to 0.189.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.188.0...v0.189.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>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-07-31 12:40:09 +02:00
Bryan Boreham
f9d9b9ddbb
Merge pull request #13458 from mmorel-35/ossf-security-insight
...
chore: provide OSSF security insight
2024-07-31 11:10:38 +01:00
George Krajcsovits
d0d41cfebd
Merge pull request #14538 from fpetkovski/stats-hist-reset
...
Use CopyTo when resetting histogram in stats iterator
2024-07-31 11:34:54 +02:00
Filip Petkovski
3e6155e596
Use CopyTo when resetting histogram in stats iterator
...
The histogram stats iterator does not fully clear the histogram object
and is not resilient to new fields being added to the histogram type.
To resolve the issue, the commit uses the CopyTo methods which should
be future proof to new fields being added.
Signed-off-by: Filip Petkovski <filip.petkovsky@gmail.com>
2024-07-31 11:18:47 +02:00
Charles Korn
7fab72a280
promqltest: add support for setting counter reset hint on histogram samples ( #14537 )
...
* promqltest: add support for setting counter reset hint on histogram samples
Signed-off-by: Charles Korn <charles.korn@grafana.com>
2024-07-31 09:53:05 +02:00
Bartlomiej Plotka
6816149852
Merge pull request #14525 from colega/merge-mmmaxtime-into-shardhash
...
Store `mmMaxTime` in same field as `seriesShard`
2024-07-31 08:39:38 +02:00
Matthieu MOREL
2880ee8e46
chore: provide OSSF security insight
...
Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>
2024-07-31 06:36:02 +00:00
Callum Styan
1561815732
remote write: increase time threshold for resharding ( #14450 )
...
Don't reshard if we haven't successfully sent a sample in the last
shardUpdateDuration seconds.
Signed-off-by: Callum Styan <callumstyan@gmail.com>
Co-authored-by: kushagra Shukla <kushalshukla110@gmail.com>
2024-07-30 14:08:28 -07:00
Max Amin
84b819a69f
feat: add Google cloud roundtripper for remote write ( #14346 )
...
* feat: Google Auth for remote write
Signed-off-by: Max Amin <maxamin@google.com>
---------
Signed-off-by: Max Amin <maxamin@google.com>
2024-07-30 16:25:19 +01:00
Bryan Boreham
79a0ba9d64
Merge pull request #13503 from tylitianrui/chore/remove_redundance
...
remove redundant code
2024-07-30 12:44:03 +01:00
dependabot[bot]
6cef8698c2
build(deps-dev): bump @lezer/generator from 1.7.0 to 1.7.1 in /web/ui ( #14382 )
...
Bumps [@lezer/generator](https://github.com/lezer-parser/generator ) from 1.7.0 to 1.7.1.
- [Changelog](https://github.com/lezer-parser/generator/blob/main/CHANGELOG.md )
- [Commits](https://github.com/lezer-parser/generator/compare/1.7.0...1.7.1 )
---
updated-dependencies:
- dependency-name: "@lezer/generator"
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-07-30 13:30:49 +02:00
Oleg Zaytsev
0300ad58a9
Revert the option regardless of error
...
Signed-off-by: Oleg Zaytsev <mail@olegzaytsev.com>
2024-07-30 11:31:31 +02:00
Bryan Boreham
2898d5d715
Add #14515 to CHANGELOG
...
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
2024-07-30 10:15:23 +01:00
Bryan Boreham
03963b9ba0
Merge pull request #14515 from prometheus/revert-13777-remoteread2 ( #14524 )
...
Revert "Chunked remote read: close the querier earlier"
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
2024-07-30 10:11:16 +01:00
Oleg Zaytsev
d8e1b6bdfd
Store mmMaxTime in same field as seriesShard
...
We don't use seriesShard during DB initialization, so we can use the
same 8 bytes to store mmMaxTime, and save those during the rest of the
lifetime of the database.
This doesn't affect CPU performance.
Signed-off-by: Oleg Zaytsev <mail@olegzaytsev.com>
2024-07-30 10:20:29 +02:00
Oleg Zaytsev
b7f2f3c3ac
Add BenchmarkLoadRealWLs
...
This benchmark runs on real WLs rather than fake generated ones.
Signed-off-by: Oleg Zaytsev <mail@olegzaytsev.com>
2024-07-30 10:19:56 +02:00
George Krajcsovits
395f7088c3
Merge pull request #14514 from fpetkovski/counter-reset-nan
...
Ignore stale histograms for counter reset detection
2024-07-30 08:43:06 +02:00
Bryan Boreham
3ee42e197a
Merge pull request #14499 from prometheus/rw1.0-clarify-deprecation
...
clarify that 1.0 will eventually be deprecated, it is not yet deprecated
2024-07-29 18:47:11 +01:00
Bryan Boreham
a7c8ff00c6
Merge pull request #14515 from prometheus/revert-13777-remoteread2
...
Revert "Chunked remote read: close the querier earlier"
2024-07-29 18:39:19 +01:00
Bryan Boreham
d186caead5
Merge pull request #14496 from bboreham/fix-nil-primary ( #14509 )
...
[BUGFIX] Storage: errors from a single secondary querier should be warnings.
This is a backport of #14496 to release-2.54 branch.
#13434 introduced an unwanted change in behaviour: if there was no primary querier and a single secondary querier, the secondary would be treated like a primary. This PR restores the previous behaviour, that all secondary queriers report errors as warnings.
In order to test this behaviour, I changed `TestMergeQuerierWithSecondaries_ErrorHandling` so it now calls `NewMergeQuerier` rather than creating the internal data structure directly.
This in turn required all the data types to change, so I merged `mockGenericQuerier` into `mockQuerier`.
Also replaced `unwrapMockGenericQuerier` with a visitor pattern.
While I was there, I addressed the comment from https://github.com/prometheus/prometheus/pull/13434#pullrequestreview-2191058921 to short-circuit the merge of single querier with any number of no-op or nil queriers.
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
2024-07-29 14:41:10 +01:00
Filip Petkovski
2cd97c61e0
Add more test cases
...
Signed-off-by: Filip Petkovski <filip.petkovsky@gmail.com>
2024-07-29 14:53:32 +02:00