mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-12-26 06:04:05 -08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity
8815 commits 243 branches 444 tags 649 MiB
Commit graph

8815 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Julius Volz 0fef342816
Add initial CODEOWNERS GitHub config file (#8552) 
* Add initial CODEOWNERS GitHub config file

See https://docs.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners

Signed-off-by: Julius Volz <julius.volz@gmail.com>

* Add Tom as a remote storage maintainer

Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2021-03-01 23:16:32 +01:00
Julien Pivotto 646556a263
Merge pull request #8546 from roidelapluie/follow-redirect 
Support follow_redirect
 2021-03-01 17:22:44 +01:00
jessicagreben 591e719dc1 fix failing blockwriter tests 
Signed-off-by: jessicagreben <jessicagrebens@gmail.com>
 2021-03-01 06:16:05 -08:00
jessicagreben 9fc53b7edf fix appender.Add -> appender.Append 
Signed-off-by: jessicagreben <jessicagrebens@gmail.com>
 2021-03-01 05:49:49 -08:00
Julien Pivotto 93c6139bc1 Support follow_redirect 
This PR introduces support for follow_redirect, to enable users to
disable following HTTP redirects.

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2021-02-26 22:50:56 +01:00
Julien Pivotto 9c4bc38c94
Merge pull request #8516 from Harkishen-Singh/headers-remote-read-on-round-tripper 
Custom headers on remote-read and refactor implementation to roundtripper
 2021-02-26 17:55:07 +01:00
Tom Wilkie ce97cdd477
Move remote read handler to remote package. (#8536) 
* Move remote read handler to remote package.

This follows the pattern I started with the remote write handler.  The api/v1 package is getting pretty cluttered.  Moving code to other packages helps reduce this size and also makes it reusable - eg Cortex doesn't do streaming remote writes yet, and will very soon.

Signed-off-by: Tom Wilkie <tom.wilkie@gmail.com>

* Deal with a nil remoteReadHandler for tests.

Signed-off-by: Tom Wilkie <tom.wilkie@gmail.com>

* Remove the global metrics.

Signed-off-by: Tom Wilkie <tom.wilkie@gmail.com>

* Fix test.

Signed-off-by: Tom Wilkie <tom.wilkie@gmail.com>

* Review feedback.

Signed-off-by: Tom Wilkie <tom.wilkie@gmail.com>
 2021-02-26 16:43:19 +00:00
Julien Pivotto 17688550d7
Merge pull request #8545 from prometheus/bwplotka-patch-1 
Volunteering Myself & Chris for next releases.
 2021-02-26 17:18:27 +01:00
Bartlomiej Plotka 8f748b2e24
Volunteering Myself & Chris for next releases. 2021-02-26 16:06:19 +00:00
Harkishen-Singh 79ba53a6c4 Custom headers on remote-read and refactor implementation to roundtripper. 
Signed-off-by: Harkishen-Singh <harkishensingh@hotmail.com>
 2021-02-26 17:20:29 +05:30
Arthur Silva Sens 537c0aff49
Prometheus and Promtool binaries now print help and usage to stdout (#8542) 
Signed-off-by: ArthurSens <arthursens2005@gmail.com>
 2021-02-25 19:52:34 +01:00
Julien Pivotto 0e24f246cc
Merge pull request #8540 from roidelapluie/fix-sync-repo 
sync_repo_files: Normalize usage of git_user
 2021-02-25 11:21:45 +01:00
Bartlomiej Plotka 8bf7bc68f1
Fixed TestChunkDiskMapper_WriteChunk_Chunk_IterateChunks for go1.16 (#8538) 
Fixes https://github.com/prometheus/prometheus/issues/8403

Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com>
 2021-02-25 14:38:12 +05:30
Julien Pivotto c0173072e2 sync_repo_files: Normalize usage of git_user 
Fix ./scripts/sync_repo_files.sh: line 141: GITHUB_USER: unbound variable

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2021-02-24 21:10:21 +01:00
Simon Pasquier fe23360d0f
web/ui/react-app: update dependencies (#8529) 
Fix lodash security issue.

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2021-02-24 21:01:28 +01:00
jessicagreben 78e84aed89 resolve merge conflict 
Signed-off-by: jessicagreben <jessicagrebens@gmail.com>
 2021-02-24 09:47:29 -08:00
jessicagreben f2db9dc722 add multi rule integration tests 
Signed-off-by: jessicagreben <jessicagrebens@gmail.com>
 2021-02-24 09:42:31 -08:00
schou 3bafe17870 add negative offset to printer 
Signed-off-by: schou <pschou@users.noreply.github.com>
 2021-02-23 21:16:28 -05:00
pschou f80b52be69
Merge branch 'main' into dev_neg_offset 2021-02-23 20:52:57 -05:00
schou efbf3af05d reduce addOffst to 2 parameters 
Signed-off-by: schou <pschou@users.noreply.github.com>
 2021-02-23 20:46:52 -05:00
schou 75d932a172 var init for bool 
Signed-off-by: schou <pschou@users.noreply.github.com>
 2021-02-23 20:26:35 -05:00
schou 22bfc11738 aggregate booleans for ease of reading 
Signed-off-by: schou <pschou@users.noreply.github.com>
 2021-02-23 20:26:35 -05:00
schou 71712183ac minor wording updates 
Signed-off-by: schou <pschou@users.noreply.github.com>
 2021-02-23 20:26:35 -05:00
schou 9621f6d549 wording for shift correctness 
Signed-off-by: schou <pschou@users.noreply.github.com>
 2021-02-23 20:25:56 -05:00
schou 22cd48868a adding feature flag, promql-negative-offset 
Signed-off-by: schou <pschou@users.noreply.github.com>
 2021-02-23 20:25:56 -05:00