Commit graph

8890 commits

Author SHA1 Message Date
Julien Pivotto 2713bddc2c
Merge pull request #8599 from prometheus/release-2.25
Merge back release 2.25
2021-03-15 20:41:51 +01:00
Julien Pivotto 3c7d90c520
Merge pull request #8603 from pracucci/add-tracing-span-to-eval
Added tracing span to evaluator.eval()
2021-03-15 17:19:36 +01:00
Julien Pivotto 228d23f377
Merge pull request #8590 from roidelapluie/scaleway-more-labels
Scaleway SD: Add more labels to the instance role
2021-03-15 17:19:24 +01:00
Marco Pracucci 7bbab380b6
Added tracing span to evaluator.eval()
Signed-off-by: Marco Pracucci <marco@pracucci.com>
2021-03-15 15:05:47 +01:00
David Leadbeater 21a282fabe Ensure that timestamp comparison uses wall clock time
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-15 13:05:17 +00:00
Julien Pivotto 76750d2a96
Merge pull request #8585 from pracucci/optimize-buffered-iterator
Optimized vectorSelectorSingle()
2021-03-15 11:50:46 +01:00
Marco Pracucci 6f050f66c7
Update storage/memoized_iterator.go
Signed-off-by: Marco Pracucci <marco@pracucci.com>

Co-authored-by: Julien Pivotto <roidelapluie@gmail.com>
2021-03-15 09:27:20 +01:00
jessicagreben 7c26642460 add block alignment and write in 2 hr blocks
Signed-off-by: jessicagreben <jessicagrebens@gmail.com>
2021-03-14 10:10:55 -07: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 e9de5b9192
Merge pull request #8591 from prometheus/fix/chainsampleiterator-deduping-8558
Fix sample deduplication in chainSampleIterator
2021-03-13 18:26:59 +01:00
Julien Pivotto 4577a295c5
Merge pull request #8593 from prymitive/snappy-v0.3
use golang/snappy v0.0.3
2021-03-13 00:44:34 +01:00
Julien Pivotto bab0fb81ef Rename to or ID
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2021-03-12 23:53:08 +01:00
Łukasz Mierzwa d941634926 use golang/snappy v0.0.3
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-12 19:34:22 +00:00
Julius Volz cf4250cff3 Fix sample deduplication in chainSampleIterator
Fixes https://github.com/prometheus/prometheus/issues/8558

Signed-off-by: Julius Volz <julius.volz@gmail.com>
2021-03-12 12:34:23 +01:00
Julien Pivotto d1c8550894 Scaleway SD: Add more labels to the instance role
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2021-03-12 01:04:15 +01:00
Julien Pivotto 82ffdae1f3
Merge pull request #8588 from roidelapluie/instance-test
Scaleway SD: Add instance test
2021-03-12 00:09:54 +01:00
Julien Pivotto 990d01631f Scaleway SD: Add instance test
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2021-03-11 22:18:07 +01:00
Julien Pivotto fcfc0e8888
Merge pull request #8587 from knrybarczyk/doc/fix-install-from-source-in-readme
Fix the installation from source instruction in README
2021-03-11 16:35:19 +01:00
krrybarc bc53e7b98c Fix the installation from source instruction in README
Signed-off-by: krrybarc <981627+knrybarczyk@users.noreply.github.com>
2021-03-11 16:24:15 +01:00
Matthias Loibl 369aae93a8
web/ui: Hitting enter on range input creates a new query (#8581)
Signed-off-by: Matthias Loibl <mail@matthiasloibl.com>
2021-03-11 14:37:26 +01:00
Marco Pracucci b92c03023d
Optimized vector selector
Signed-off-by: Marco Pracucci <marco@pracucci.com>
2021-03-11 14:32:56 +01:00
Julien Pivotto 3e17eaada5
Merge pull request #8574 from roidelapluie/dgl-promtool-maintainer
Add @dgl as maintainer of promtool
2021-03-11 13:10:05 +01:00
Julien Pivotto 63ea88af82
Merge pull request #8575 from pfreixes/add-scrapes-parameter
Add num scrapes as tsdb write benchmark command flag
2021-03-11 13:09:50 +01:00
Rémy Léone f690b811c5
add support for scaleway service discovery (#8555)
Co-authored-by: Patrik <patrik@ptrk.io>
Co-authored-by: Julien Pivotto <roidelapluie@inuits.eu>

Signed-off-by: Rémy Léone <rleone@scaleway.com>
2021-03-10 15:10:17 +01:00
Pau Freixes b1ac4a45e6 Add num scrapes as tsdb write benchmark command flag
By default same value that was hardcoded is used, but with the
new flag added the number of scrapes can be increased to any value.

Signed-off-by: Pau Freixes <pfreixes@gmail.com>
2021-03-10 11:17:07 +01:00
Julien Pivotto ad5ed416ba
Merge pull request #8487 from pschou/dev_neg_offset
allow negative offset
2021-03-08 22:18:45 +01:00
Julien Pivotto f2fc05fd5f
Merge pull request #8569 from roidelapluie/fix-default-resolution
Fix subqueries with default resolution in promql unit tests
2021-03-08 20:44:09 +01:00
Julien Pivotto 515edbba94 Add @dgl as maintainer of promtool
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2021-03-08 20:38:57 +01:00
Julien Pivotto d17bd9fdd4
Merge pull request #8573 from simonpasquier/remove-myself-as-promtool-maintainer
MAINTAINERS.md: remove myself from promtool maintainers
2021-03-08 20:36:58 +01:00
Robert Fratto 5b78aa0649
Contribute grafana/agent sigv4 code (#8509)
* Contribute grafana/agent sigv4 code
* address review feedback
  - move validation logic for RemoteWrite into unmarshal
  - copy configuration fields from ec2 SD config
  - remove enabled field, use pointer for enabling sigv4
* Update config/config.go
* Don't provide credentials if secret key / access key left blank
* Add SigV4 headers to the list of unchangeable headers.
* sigv4: don't include all headers in signature
* only test for equality in the authorization header, not the signed date
* address review feedback
  1. s/httpClientConfigEnabled/httpClientConfigAuthEnabled
  2. bearer_token tuples to "authorization"
  3. Un-export NewSigV4RoundTripper
* add x-amz-content-sha256 to list of unchangeable headers
* Document sigv4 configuration
* add suggestion for using default AWS SDK credentials

Signed-off-by: Robert Fratto <robertfratto@gmail.com>
Co-authored-by: Julien Pivotto <roidelapluie@gmail.com>
2021-03-08 12:20:09 -07:00
alex-petrov-vt 4f03df8c55
Fix inconsistent display of word 'ago' on rules page (#8566)
* Fix inconsistent display of word 'ago' in last evaluation column on rules page

Signed-off-by: Alex Petrov <alex.petrov.vt@gmail.com>

* Extract adding word 'ago' to relativeDuration util function

Signed-off-by: Alex Petrov <alex.petrov.vt@gmail.com>
2021-03-08 19:10:09 +01:00
Simon Pasquier c556ccb8dc MAINTAINERS.md: remove myself from promtool maintainers
Unfortunately I don't have enough time to take care of promtool
currently.

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
2021-03-08 15:04:51 +01:00
Julien Pivotto 5742a18590 Fix subqueries with default resolution in promql unit tests
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2021-03-07 09:20:04 +01:00
Julien Pivotto 8d2a8f4939
Merge pull request #8563 from ldhnam/update-contributing
Update master branch to main in CONTRIBUTING.md
2021-03-05 09:59:10 +01:00
ldhnam 45e9037467 Update master branch to main
Signed-off-by: Nam Le <namhoai95@gmail.com>
Signed-off-by: ldhnam <namhoai95@gmail.com>
2021-03-05 15:55:42 +07:00
Julien Pivotto 266e5e6c6c
Merge pull request #8544 from roidelapluie/move-to-go1.16
Upgrade to golang 1.16
2021-03-05 07:45:14 +01:00
Julien Pivotto 75e505babb Upgrade to golang 1.16
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2021-03-05 00:59:25 +01:00
Ganesh Vernekar e92bf2ebaa
Add codesome (tsdb, promql) and roidelapluie (promql) in CODEOWNERS file (#8560)
* Add codesome in CODEOWNERS file for tsdb and promql

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

* Add Julien to promql

Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>
2021-03-04 18:21:35 +05:30
Rémy Léone 6962e44618
Discovery docs: add a pull requests examples section (#8556)
* add a pull requests examples section

Signed-off-by: Rémy Léone <rleone@scaleway.com>
2021-03-04 10:11:08 +01:00
schou 65658091ed moved details of feature to disabled features.md
Signed-off-by: schou <pschou@users.noreply.github.com>
2021-03-03 21:42:17 -05:00
schou 946dba6a7f small suggested changes
Signed-off-by: schou <pschou@users.noreply.github.com>
2021-03-03 21:35:51 -05:00
Julien Pivotto dd5a46aa47
Merge pull request #8523 from roidelapluie/edge-case-test-relabeling
Add hashmod relabeling test with hasmod and a newline
2021-03-03 22:09:08 +01:00
pschou c15f15d6fd revert disabled_features.md to previous wording.
Signed-off-by: schou <pschou@users.noreply.github.com>
2021-03-02 22:01:02 -05:00
Julien Pivotto 22cfa10685 Add hashmod relabeling test with hasmod and a newline
Currently hashmod hashes all the labels, even if there is a newline. To
ensure it still works in the future, let's add a test.

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2021-03-02 23:01:22 +01:00
Julien Pivotto 77e648534e
Merge pull request #8553 from prometheus/brancz-codeowner
Add @brancz as CODEOWNER of kubernetes discovery
2021-03-02 10:21:23 +01:00
Frederic Branczyk 2f9af2c5a1
Add @brancz as CODEOWNER of kubernetes discovery
Signed-off-by: Frederic Branczyk <fbranczyk@gmail.com>
2021-03-02 09:47:38 +01:00