Marco Pracucci
82cbf1dd0b
Merge pull request #411 from grafana/refactor-sharding-func
...
Hardcode the labels stable hash function instead of taking it as an option
2023-01-30 14:39:14 +01:00
Marco Pracucci
950c177c72
Hardcode the labels stable hash function instead of taking it as an option
...
Signed-off-by: Marco Pracucci <marco@pracucci.com>
2023-01-30 14:21:18 +01:00
George Krajcsovits
300116a20c
Merge pull request #410 from grafana/krajo/fork-sync
...
Use tgymnich/fork-sync to create PR from upstream merge
2023-01-30 10:57:16 +01:00
György Krajcsovits
9730908c2b
Use tgymnich/fork-sync to create PR from upstream merge
...
Should be able to create upstream to main merge PR.
Uses https://github.com/marketplace/actions/fork-sync for creating PR
Uses octokit , e.g. https://octokit.github.io/rest.js/v19#repos-get
Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
2023-01-30 10:31:20 +01:00
Marco Pracucci
f1986bc584
Merge pull request #406 from grafana/update-upstream
...
Update upstream Prometheus
2023-01-27 09:34:12 +01:00
Marco Pracucci
2461dee551
Merge remote-tracking branch 'remotes/prometheus/main' into update-upstream
2023-01-26 18:41:17 +01:00
Bartlomiej Plotka
6dcfb71740
Merge pull request #11897 from pracucci/propose-to-change-query-canceled-status-code
...
API: change HTTP status code from 503/422 to 499 if a request is canceled
2023-01-26 13:51:43 +00:00
Marco Pracucci
3db77b4491
API: change HTTP status code tracked in metrics form 503/422 to 499 if a request is canceled
...
Signed-off-by: Marco Pracucci <marco@pracucci.com>
2023-01-26 13:06:37 +01:00
Bryan Boreham
2b4c652e10
Merge pull request #369 from grafana/shard-func
...
* tsdb: make sharding function a parameter
Instead of relying on `labels.Hash()`, which may change, have the
caller pass in a shard function if required.
For most purposes `tsdb.Options.ShardFunc` is used, but the compactor
may be created independently so `NewLeveledCompactorWithChunkSize` also
takes a shard function parameter.
Regular Prometheus, which does not use block sharding, will have this
parameter as nil.
Rename WithCache functions as WithOptions
Where they now have 2 or more extra parameters.
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
2023-01-26 11:59:03 +00:00
Kemal Akkoyun
068b6189d8
Merge pull request #11899 from prometheus/dependabot/go_modules/github.com/aws/aws-sdk-go-1.44.187
...
build(deps): bump github.com/aws/aws-sdk-go from 1.44.186 to 1.44.187
2023-01-26 12:42:50 +01:00
Kemal Akkoyun
0945628a55
Merge pull request #11901 from prometheus/dependabot/github_actions/actions/cache-3.2.3
...
build(deps): bump actions/cache from 3.2.2 to 3.2.3
2023-01-26 12:42:04 +01:00
Björn Rabenstein
60d763282e
Merge pull request #11864 from prometheus/beorn7/histogram2
...
histograms: Return actually useful counter reset hints
2023-01-26 11:22:40 +01:00
Bartlomiej Plotka
aee77bc790
Merge pull request #11895 from kakkoyun/upgrade_ui_deps
...
Upgrade UI dependencies
2023-01-26 09:24:10 +00:00
dependabot[bot]
ad25842b0b
build(deps): bump actions/cache from 3.2.2 to 3.2.3
...
Bumps [actions/cache](https://github.com/actions/cache ) from 3.2.2 to 3.2.3.
- [Release notes](https://github.com/actions/cache/releases )
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md )
- [Commits](https://github.com/actions/cache/compare/v3.2.2...v3.2.3 )
---
updated-dependencies:
- dependency-name: actions/cache
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-01-26 09:20:31 +00:00
Kemal Akkoyun
c3b358d203
Merge pull request #11893 from kakkoyun/upgrade_several_dependencies
...
Upgrade several CI dependencies
2023-01-26 10:19:13 +01:00
dependabot[bot]
787e50550b
build(deps): bump github.com/aws/aws-sdk-go from 1.44.186 to 1.44.187
...
Bumps [github.com/aws/aws-sdk-go](https://github.com/aws/aws-sdk-go ) from 1.44.186 to 1.44.187.
- [Release notes](https://github.com/aws/aws-sdk-go/releases )
- [Commits](https://github.com/aws/aws-sdk-go/compare/v1.44.186...v1.44.187 )
---
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>
2023-01-26 09:18:37 +00:00
Kemal Akkoyun
441e1df0ee
Update dependencies for 2.42 ( #11891 )
...
* Update dependencies
Signed-off-by: Kemal Akkoyun <kakkoyun@gmail.com>
* Revert azure sdk upgrade
Signed-off-by: Kemal Akkoyun <kakkoyun@gmail.com>
Signed-off-by: Kemal Akkoyun <kakkoyun@gmail.com>
2023-01-26 09:12:01 +00:00
dependabot[bot]
104b07511d
build(deps): bump bufbuild/buf-setup-action from 1.9.0 to 1.12.0
...
Bumps [bufbuild/buf-setup-action](https://github.com/bufbuild/buf-setup-action ) from 1.9.0 to 1.12.0.
- [Release notes](https://github.com/bufbuild/buf-setup-action/releases )
- [Commits](https://github.com/bufbuild/buf-setup-action/compare/v1.9.0...v1.12.0 )
---
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>
2023-01-26 09:30:07 +01:00
dependabot[bot]
b508ae6318
Bump dessant/lock-threads from 3 to 4
...
Bumps [dessant/lock-threads](https://github.com/dessant/lock-threads ) from 3 to 4.
- [Release notes](https://github.com/dessant/lock-threads/releases )
- [Changelog](https://github.com/dessant/lock-threads/blob/master/CHANGELOG.md )
- [Commits](https://github.com/dessant/lock-threads/compare/v3...v4 )
---
updated-dependencies:
- dependency-name: dessant/lock-threads
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-01-26 09:26:37 +01:00
dependabot[bot]
02e0170432
Bump actions/cache from 3.0.11 to 3.2.2
...
Bumps [actions/cache](https://github.com/actions/cache ) from 3.0.11 to 3.2.2.
- [Release notes](https://github.com/actions/cache/releases )
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md )
- [Commits](https://github.com/actions/cache/compare/v3.0.11...v3.2.2 )
---
updated-dependencies:
- dependency-name: actions/cache
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-01-26 09:26:37 +01:00
dependabot[bot]
9f61e006ba
Bump bufbuild/buf-setup-action from 1.9.0 to 1.11.0
...
Bumps [bufbuild/buf-setup-action](https://github.com/bufbuild/buf-setup-action ) from 1.9.0 to 1.11.0.
- [Release notes](https://github.com/bufbuild/buf-setup-action/releases )
- [Commits](https://github.com/bufbuild/buf-setup-action/compare/v1.9.0...v1.11.0 )
---
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>
2023-01-26 09:26:36 +01:00
Kemal Akkoyun
bab3b4e3c3
Upgrade dependencies
...
Signed-off-by: Kemal Akkoyun <kakkoyun@gmail.com>
2023-01-26 09:19:50 +01:00
Julien Pivotto
3a43736a36
Merge pull request #11896 from mmorel-35/patch-1
...
Use secrets.GITHUB_TOKEN and clean up workflows
2023-01-26 09:15:57 +01:00
Matthieu MOREL
c1ab86757a
Update buf.yml
...
Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>
2023-01-25 20:15:42 +01:00
Matthieu MOREL
c0de8d014a
Update repo_sync.yml
...
Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>
2023-01-25 20:14:25 +01:00
Matthieu MOREL
ea1f06885f
Update prombench.yml
...
Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>
2023-01-25 20:14:02 +01:00
Matthieu MOREL
03c2fcff19
Update lock.yml
...
Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>
2023-01-25 20:13:35 +01:00
Matthieu MOREL
077fcddc96
Update fuzzing.yml
...
Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>
2023-01-25 20:13:13 +01:00
Matthieu MOREL
ca3abe1eba
Update funcbench.yml
...
Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>
2023-01-25 20:12:47 +01:00
Matthieu MOREL
1ec0786fa9
Update codeql-analysis.yml
...
Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>
2023-01-25 20:12:26 +01:00
Matthieu MOREL
fecbfa0d14
Update ci.yml
...
Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>
2023-01-25 20:12:02 +01:00
Matthieu MOREL
ff8f787f54
Update buf.yml
...
Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>
2023-01-25 20:11:41 +01:00
Matthieu MOREL
e41cbdf31f
Update buf-lint.yml
...
Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>
2023-01-25 20:09:46 +01:00
Kemal Akkoyun
ae597cac62
Upgrade several UI dependencies ( #11894 )
...
* build(deps): bump @codemirror/autocomplete in /web/ui
Bumps [@codemirror/autocomplete](https://github.com/codemirror/autocomplete ) from 6.3.0 to 6.4.0.
- [Release notes](https://github.com/codemirror/autocomplete/releases )
- [Changelog](https://github.com/codemirror/autocomplete/blob/main/CHANGELOG.md )
- [Commits](https://github.com/codemirror/autocomplete/compare/6.3.0...6.4.0 )
---
updated-dependencies:
- dependency-name: "@codemirror/autocomplete"
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
* build(deps): bump @fortawesome/fontawesome-svg-core in /web/ui
Bumps [@fortawesome/fontawesome-svg-core](https://github.com/FortAwesome/Font-Awesome ) from 6.2.0 to 6.2.1.
- [Release notes](https://github.com/FortAwesome/Font-Awesome/releases )
- [Changelog](https://github.com/FortAwesome/Font-Awesome/blob/6.x/CHANGELOG.md )
- [Commits](https://github.com/FortAwesome/Font-Awesome/compare/6.2.0...6.2.1 )
---
updated-dependencies:
- dependency-name: "@fortawesome/fontawesome-svg-core"
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-01-25 19:49:14 +01:00
beorn7
49c5b1fae4
histograms: Fix counter reset header during merging
...
See detailed discussion:
https://github.com/prometheus/prometheus/pull/11864#issuecomment-1403963451
Signed-off-by: beorn7 <beorn@grafana.com>
2023-01-25 18:23:10 +01:00
beorn7
1cfc8f65a3
histograms: Return actually useful counter reset hints
...
This is a bit more conservative than we could be. As long as a chunk
isn't the first in a block, we can be pretty sure that the previous
chunk won't disappear. However, the incremental gain of returning
NotCounterReset in these cases is probably very small and might not be
worth the code complications.
Wwith this, we now also pay attention to an explicitly set counter
reset during ingestion. While the case doesn't show up in practice
yet, there could be scenarios where the metric source knows there was
a counter reset even if it might not be visible from the values in the
histogram. It is also useful for testing.
Signed-off-by: beorn7 <beorn@grafana.com>
2023-01-25 16:57:21 +01:00
Kemal Akkoyun
ae3406c1ef
Merge pull request #11661 from prometheus/dependabot/go_modules/documentation/examples/remote_storage/github.com/prometheus/client_golang-1.14.0
...
build(deps): bump github.com/prometheus/client_golang from 1.13.1 to 1.14.0 in /documentation/examples/remote_storage
2023-01-25 16:36:16 +01:00
dependabot[bot]
e3a296dfc5
build(deps): bump github.com/prometheus/client_golang
...
Bumps [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang ) from 1.13.1 to 1.14.0.
- [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.13.1...v1.14.0 )
---
updated-dependencies:
- dependency-name: github.com/prometheus/client_golang
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-01-25 14:28:49 +00:00
Kemal Akkoyun
452d858315
Merge pull request #11795 from prometheus/dependabot/go_modules/documentation/examples/remote_storage/github.com/influxdata/influxdb-1.11.0
...
Bump github.com/influxdata/influxdb from 1.10.0 to 1.11.0 in /documentation/examples/remote_storage
2023-01-25 15:26:52 +01:00
Julien Pivotto
44ef49805c
Merge pull request #11890 from prometheus/release-2.41
...
Merge back Release 2.41
2023-01-25 11:22:46 +01:00
Shan Aminzadeh
cdfd18ce00
[lezer-promql] Fix package.json main to point to correct cjs module ( #11888 )
...
Signed-off-by: Shan Aminzadeh <shan.aminzadeh@chronosphere.io>
2023-01-25 11:00:59 +01:00
Julien Pivotto
f08730df7e
Merge pull request #11889 from prometheus/kakkoyun-release-patch
...
Add kakkoyun as volunteer as the next release shepherd
2023-01-25 10:39:11 +01:00
Kemal Akkoyun
5db15397ed
Add kakkoyun as volunteer as the next release shepherd
...
I'd be happy to help with the next release.
cc @roidelapluie
Signed-off-by: Kemal Akkoyun <kakkoyun@users.noreply.github.com>
2023-01-25 10:34:42 +01:00
Julien Pivotto
aeecf6854f
Merge pull request #11827 from roidelapluie/stabilize
...
Add 'keep_firing_for' field to alerting rules
2023-01-25 09:52:45 +01:00
George Krajcsovits
38af345dea
Merge pull request #403 from grafana/krajo/merge-upstream-main
...
merge upstream main 2023-01-25
2023-01-25 09:26:10 +01:00
György Krajcsovits
e880b19c55
Merge remote-tracking branch 'upstream/main' into krajo/merge-upstream-main
...
At 9fb8fe0d4e
2023-01-25 08:53:49 +01:00
Björn Rabenstein
9fb8fe0d4e
Merge pull request #11881 from krajorama/histograms-resethint-in-remote-write
...
Fix storage/remote/codec ignoreing histogram reset hint
2023-01-24 21:08:11 +01:00
György Krajcsovits
2d9a9cbc08
Fix storage/remote/codec ignoreing histogram reset hint
...
Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
2023-01-24 12:56:30 +01:00
Oleg Zaytsev
904bda33fd
Merge pull request #402 from grafana/expose-prefix-of-the-matchers
...
Expose `Matcher.Prefix()`
2023-01-24 10:30:01 +01:00
Julien Pivotto
e811d14963
Add comments
...
Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>
2023-01-23 13:59:43 +01:00