Commit graph

8503 commits

Author SHA1 Message Date
Julien Pivotto bda05a23ad
Merge pull request #8610 from roidelapluie/release2252
Release 2.25.2
2021-03-16 19:03:38 +01:00
Julien Pivotto f9692a6846 Release 2.25.2
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2021-03-16 16:44:35 +01:00
David Leadbeater 168d8d4f5f Ensure that timestamp comparison uses wall clock time (backport #8601)
It's not possible to assume subtraction and addition of a time.Time will
result in consistent values.

Signed-off-by: David Leadbeater <dgl@dgl.cx>
2021-03-16 16:44:10 +01:00
Julien Pivotto 34ca0bb20a
Merge pull request #8597 from roidelapluie/release2251
Release 2.25.1
2021-03-14 13:23:33 +01:00
Julien Pivotto d9c8a0504e Release Prometheus 2.25.1
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2021-03-14 10:50:51 +01:00
Julius Volz df7541b899 Fix sample deduplication in chainSampleIterator (backport #8591)
Fixes https://github.com/prometheus/prometheus/issues/8558

Signed-off-by: Julius Volz <julius.volz@gmail.com>
2021-03-13 18:33:09 +01:00
Julien Pivotto 97fb4a34ae Fix subqueries with default resolution in promql unit tests (backport #8569)
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2021-03-13 18:32:48 +01:00
Łukasz Mierzwa 30b0cfecda use golang/snappy v0.0.3 (backport #8593)
v0.0.2 crashes on arm64 (at least on M1 mac), v0.0.3 contains a fix for that.
See 674baa8c7f

Signed-off-by: Łukasz Mierzwa <l.mierzwa@gmail.com>
2021-03-13 18:32:33 +01:00
Julien Pivotto a6be548dbc
Merge pull request #8506 from roidelapluie/release-225-final
Release 2.25.0
2021-02-17 15:12:58 +01:00
Julien Pivotto c2410d4147 docs: fix typo in disabled feature link
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2021-02-17 12:49:09 +01:00
Julien Pivotto f3e7921595 Release 2.25.0
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2021-02-17 12:04:12 +01:00
Julien Pivotto f0ae5f1584
Merge pull request #8505 from roidelapluie/go115-relase-225
Pin go version for windows to go1.15
2021-02-17 11:59:49 +01:00
Julien Pivotto f1208bb7ea
Merge pull request #8496 from codesome/fix-8476
Increase block writer size for backfilling
2021-02-17 11:56:40 +01:00
Julien Pivotto bdf7759eeb Pin go version for windows to go1.15
Tests are failing with go 1.16 at the moment, and by default we test
with latest go version.

https://github.com/prometheus/prometheus/issues/8403

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2021-02-17 11:50:19 +01:00
Ganesh Vernekar c4536fa28c
Increase block writer size for backfilling
Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>
2021-02-17 15:45:41 +05:30
Julien Pivotto 6393b48929
Merge pull request #8493 from prometheus/beorn7/doc
Recommend to get promtool from a binary distribution.
2021-02-15 22:21:09 +01:00
beorn7 00cf59829d Recommend to get promtool from a binary distribution.
Rather than compile it yourself, which doesn't work as shown anymore
because of Go Modules.

Signed-off-by: beorn7 <beorn@grafana.com>
2021-02-15 22:18:21 +01:00
Julien Pivotto 10156762eb
Merge pull request #8484 from roidelapluie/add-note-am-api-v2
Add a note about deprecating alertmanager in the next release.
2021-02-15 16:38:38 +01:00
Julien Pivotto 276c1b21d8 Add a note about deprecating alertmanager in the next release.
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2021-02-13 22:49:17 +01:00
Julien Pivotto 526095f9fa
Merge pull request #8479 from roidelapluie/initiate-release-225
release 2.25.0-rc.0
2021-02-12 19:57:55 +01:00
Julien Pivotto 2a9e05b777 Release 2.25.0-rc.0
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2021-02-12 16:12:33 +01:00
Julien Pivotto 49a8ce5239 Revert "Consider status code 429 as recoverable errors to avoid resharding (#8237)"
This reverts commit cd412470d7.

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2021-02-12 09:44:06 +01:00
Julien Pivotto 8f6c5e8cb0
Merge pull request #8471 from prometheus/superq/yarn_yarn_yarn
Update web UI package.json
2021-02-12 09:41:02 +01:00
Ben Kochie f8779137d0
Update web UI package.json
Update several NPM version pinnings.

Signed-off-by: Ben Kochie <superq@gmail.com>
2021-02-11 15:51:56 +01:00
Julien Pivotto cdc71a1c2a
Merge pull request #8460 from roidelapluie/update-vendor-for-2-25
Update vendoring for 2.25 release
2021-02-11 15:50:21 +01:00
Julien Pivotto 90a8cb263e Update dependencies
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2021-02-11 11:53:33 +01:00
Julien Pivotto b5edda7cc5 Disable fuzzing
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2021-02-11 11:53:33 +01:00
Ben Kochie 000d7edec9 Remove inline Go vendor dir
Remove the inline Go vendoring per Prometheus 2020 Dev Summit[0].

[0]: https://docs.google.com/document/d/1yuaPKLDvhJNXMF1ubsOOm5kE2_6dvCxHowBQIDs0KdU/edit

Signed-off-by: Ben Kochie <superq@gmail.com>
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2021-02-11 11:53:22 +01:00
Harkishen Singh cd412470d7
Consider status code 429 as recoverable errors to avoid resharding (#8237)
* Consider status code 429 as recoverable errors to avoid resharding.
* Adds support for Retry-After in backoff logic in remote storage.

Signed-off-by: Harkishen-Singh <harkishensingh@hotmail.com>
2021-02-10 15:25:37 -07:00
Julien Pivotto b61d7b3b69
Update javascript dependencies (#8465)
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2021-02-10 18:00:20 +01:00
Taishi Matsumoto 89e9632a34
Increase golint timeout 1m -> 2m (#8469)
* Increase golint timeout 1m -> 2m

Signed-off-by: w1mvy <w1mvypine@gmail.com>
2021-02-10 14:02:26 +01:00
Julien Pivotto 6bc6780533
Merge pull request #8466 from liguozhong/remote_storage_write
[fix] remote_storage :  rename storage/remote/{write_hander.go => write_handler.go}
2021-02-10 09:06:45 +01:00
fuling 47d7e3781f [fix] remote_storage : change "write_hander.go" to "write_handler.go"
Signed-off-by: fuling <fuling.lgz@alibaba-inc.com>
2021-02-10 14:25:04 +08:00
Julien Pivotto e29b47b39e
Merge pull request #8440 from mishamo/master
Add optional name property to testgroup for better test failure output
2021-02-09 21:23:24 +01:00
Mauro Stettler 7715fe3219
Add matchers to LabelValues() call (#8400)
* Accept matchers in querier LabelValues()

Signed-off-by: Mauro Stettler <mauro.stettler@gmail.com>

* create matcher to only select metrics which have searched label

Signed-off-by: Mauro Stettler <mauro.stettler@gmail.com>

* test case for merge querier with matchers

Signed-off-by: Mauro Stettler <mauro.stettler@gmail.com>

* test LabelValues with matchers on head

Signed-off-by: Mauro Stettler <mauro.stettler@gmail.com>

* add test for LabelValues on block

Signed-off-by: Mauro Stettler <mauro.stettler@gmail.com>

* formatting fix

Signed-off-by: Mauro Stettler <mauro.stettler@gmail.com>

* Add comments

Signed-off-by: Mauro Stettler <mauro.stettler@gmail.com>

* add missing lock release

Signed-off-by: Mauro Stettler <mauro.stettler@gmail.com>

* remove unused parameter

Signed-off-by: Mauro Stettler <mauro.stettler@gmail.com>

* Benchmarks for LabelValues() methods on block/head

Signed-off-by: Mauro Stettler <mauro.stettler@gmail.com>

* Better comment

Co-authored-by: Julien Pivotto <roidelapluie@gmail.com>
Signed-off-by: Mauro Stettler <mauro.stettler@gmail.com>

* update comment

Signed-off-by: Mauro Stettler <mauro.stettler@gmail.com>

* minor refactor make code cleaner

Signed-off-by: Mauro Stettler <mauro.stettler@gmail.com>

* better comments

Signed-off-by: Mauro Stettler <mauro.stettler@gmail.com>

* fix expected errors in test

Signed-off-by: Mauro Stettler <mauro.stettler@gmail.com>

* Deleting parameter which can only be empty

Co-authored-by: Ganesh Vernekar <15064823+codesome@users.noreply.github.com>
Signed-off-by: Mauro Stettler <mauro.stettler@gmail.com>

* fix comments

Signed-off-by: Mauro Stettler <mauro.stettler@gmail.com>

* remove unnecessary lock

Signed-off-by: Mauro Stettler <mauro.stettler@gmail.com>

* only lookup label value if label name was looked up

Signed-off-by: Mauro Stettler <mauro.stettler@gmail.com>

* Return error when there is one

Co-authored-by: Ganesh Vernekar <15064823+codesome@users.noreply.github.com>
Signed-off-by: Mauro Stettler <mauro.stettler@gmail.com>

* Call .Get() on decoder before checking errors

Signed-off-by: Mauro Stettler <mauro.stettler@gmail.com>

* only lock head.symMtx when necessary

Signed-off-by: Mauro Stettler <mauro.stettler@gmail.com>

* remove unnecessary delete()

Signed-off-by: Mauro Stettler <mauro.stettler@gmail.com>

* re-use code instead of duplicating it

Signed-off-by: Mauro Stettler <mauro.stettler@gmail.com>

* Consistently return error from LabelValueFor()

Signed-off-by: Mauro Stettler <mauro.stettler@gmail.com>

* move helper func from util.go to querier.go

Signed-off-by: Mauro Stettler <mauro.stettler@gmail.com>

* Fix test expectation

Signed-off-by: Mauro Stettler <mauro.stettler@gmail.com>

Co-authored-by: Ganesh Vernekar <15064823+codesome@users.noreply.github.com>

* ensure result de-duplication and sorting works

Signed-off-by: Mauro Stettler <mauro.stettler@gmail.com>

* return named error from LabelValueFor()

Signed-off-by: Mauro Stettler <mauro.stettler@gmail.com>

Co-authored-by: Julien Pivotto <roidelapluie@gmail.com>
Co-authored-by: Ganesh Vernekar <15064823+codesome@users.noreply.github.com>
2021-02-09 23:08:35 +05:30
Ganesh Vernekar 86c71856e8
Add start() and end() pre-processors for @ modifier (#8425)
* Add start() and end() pre-processors for @ modifier

Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>

* Fix reviews

Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>

* Fix review comments

Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>

* Fix review comments

Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>
2021-02-09 21:33:16 +05:30
misha 1c3e7b4241 Use strings.Builder for neater error formatting
Signed-off-by: misha <DL-OTTCloudPlatform-Nova@bskyb.internal>
2021-02-09 15:00:26 +00:00
Dustin Hooten b9f0baf6ff
Combine NewHead() args into a HeadOptions struct (#8452)
* Combine NewHead() args into a HeadOptions struct

Signed-off-by: Dustin Hooten <dustinhooten@gmail.com>

* remove overrides params

Signed-off-by: Dustin Hooten <dustinhooten@gmail.com>

* address pr feedback

Signed-off-by: Dustin Hooten <dustinhooten@gmail.com>
2021-02-09 19:42:48 +05:30
Julien Pivotto f2c5c230f1
Merge pull request #8459 from prometheus/fix-labelname-style-bug
Fix label name leak into class name
2021-02-08 23:56:29 +01:00
Julien Pivotto 860f08532a
Merge pull request #8424 from prometheus/prom/remote-writer-api
[FEATURE] Accept remote_write requests in the Prometheus server
2021-02-08 23:39:34 +01:00
Julius Volz b6544c9048 Fix label name leak into class name
Similar to https://github.com/prometheus/prometheus/pull/7902, this could lead
to style bugs for label names that correspond to styled CSS class names.

Signed-off-by: Julius Volz <julius.volz@gmail.com>
2021-02-08 22:24:49 +01:00
Łukasz Mierzwa 885674c5c0
[UI] Fix duplicated keys on /targets page (#8456)
* [UI] Add a test for duplicated keys in EndpointLink component

I've noticed that I'm getting warnings about multiple children with the same key on /targets page.
This adds a test that fails when that happens.

Signed-off-by: Łukasz Mierzwa <l.mierzwa@gmail.com>

* [UI] Fix duplicated keys on /targets page

Since any URI we render on /targets page can have multi-value params we should use both name and value as components keys.

Signed-off-by: Łukasz Mierzwa <l.mierzwa@gmail.com>
2021-02-08 22:17:04 +01:00
Tom Wilkie d479151f1f Various enhancements and refactorings for remote write receiver:
- Remove unrelated changes
- Refactor code out of the API module - that is already getting pretty crowded.
- Don't track reference for AddFast in remote write.  This has the potential to consume unlimited server-side memory if a malicious client pushes a different label set for every series.  For now, its easier and safer to always use the 'slow' path.
- Return 400 on out of order samples.
- Use remote.DecodeWriteRequest in the remote write adapters.
- Put this behing the 'remote-write-server' feature flag
- Add some (very) basic docs.
- Used named return & add test for commit error propagation

Signed-off-by: Tom Wilkie <tom.wilkie@gmail.com>
2021-02-08 20:41:23 +00:00
Julien Pivotto 24ba63f9f9
Merge pull request #8446 from simonpasquier/bump-gogo-dep
Update github.com/gogo/protobuf to v1.3.2
2021-02-08 20:13:56 +01:00
Simon Pasquier cf269b7ddd Update github.com/gogo/protobuf to v1.3.2
Fix for CVE-2021-3121

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
2021-02-08 17:30:46 +01:00
Julien Pivotto dfaa194320
Merge pull request #8451 from roidelapluie/fuzzing-badge
Add fuzzing badge in readme
2021-02-08 13:24:52 +01:00
Julien Pivotto e0f1506254
Merge pull request #8455 from mikeee/fix-ci
Fix CI (Windows Testing)
2021-02-08 10:06:52 +01:00
mikeee 9fbce46566
Trigger CI
Signed-off-by: mikeee <hey@mike.ee>
2021-02-08 00:47:22 +00:00
mikeee 52109966af
Change the CI workflow to powershell and fixes the missing env var issue
Signed-off-by: mikeee <hey@mike.ee>
2021-02-08 00:44:58 +00:00
mikeee 9ca24f9d24
Revert to get the latest version of Go
Signed-off-by: mikeee <hey@mike.ee>
2021-02-08 00:40:34 +00:00