mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-09-22 16:57:32 -07:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity
8594 commits 211 branches 425 tags 637 MiB
Commit graph

337 commits

Author SHA1 Message Date
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
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
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
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
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
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 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
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
pschou f80b52be69
Merge branch 'main' into dev_neg_offset 2021-02-23 20:52:57 -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
schou 8aa9cc3978 add blob to basics documentation about negative shift 
Signed-off-by: schou <pschou@users.noreply.github.com>
 2021-02-23 20:25:56 -05:00
Julien Pivotto 432d5ebc6c Rename default branch to main 
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2021-02-22 20:28:02 +01:00
pschou aff3c702ab
promql: Add sgn, clamp and last_over_time functions (#8457) 
* Add sgn, clamp and last_over_time functions

Signed-off-by: schou <pschou@users.noreply.github.com>
 2021-02-20 16:34:52 +01:00
Julien Pivotto 8787f0aed7 Update common to support credentials type 
Most of the backwards compat tests is done in common.

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2021-02-18 23:28:22 +01:00
Julien Pivotto 2d172d0896
Merge pull request #8508 from prometheus/release-2.25 
Merge back release 2.25
 2021-02-17 16:26:34 +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 5f92a82ca7
Merge pull request #8477 from Harkishen-Singh/configure-rate-limit-via-config 
Configure retry on Rate-Limiting from remote-write config
 2021-02-16 20:11:52 +01:00
Matteo Valentini 5628ed3c34 Update docs/configuration/configuration.md 
Co-authored-by: Julien Pivotto <roidelapluie@gmail.com>
Signed-off-by: Matteo Valentini <matteo.valentini@nethesis.it>
 2021-02-16 11:23:55 +01:00
Matteo Valentini 44b78ef318 Add image name meta label to DO service discovery 
The label `__meta_digitalocean_image` expose the `slug` of the image and
the `slug` is only present in the public images.
To refer a user-generated image (`snapshot` or `custom`) we can use
the image's display name.

See: https://developers.digitalocean.com/documentation/v2/#images

Signed-off-by: Matteo Valentini <matteo.valentini@nethesis.it>
 2021-02-16 11:05:14 +01:00
Harkishen-Singh 77c20fd2f8 Adds support to configure retry on Rate-Limiting from remote-write config. 
Signed-off-by: Harkishen-Singh <harkishensingh@hotmail.com>
 2021-02-16 14:52:49 +05:30
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
beorn7 ae900a117f 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 21:59:32 +01: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
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
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
Nándor István Krácser 509000269a
remote_write: allow passing along custom HTTP headers (#8416) 
* remote_write: allow passing along custom HTTP headers

Signed-off-by: Nandor Kracser <bonifaido@gmail.com>

* add warning

Signed-off-by: Nandor Kracser <bonifaido@gmail.com>

* remote_write: add header valadtion

Signed-off-by: Nandor Kracser <bonifaido@gmail.com>

* extend tests for bad remote write headers

Signed-off-by: Nandor Kracser <bonifaido@gmail.com>

* remote_write: add note about the authorization header

Signed-off-by: Nandor Kracser <bonifaido@gmail.com>
 2021-02-04 14:18:13 -07:00
Ganesh Vernekar 9199fcb8d1
'@ <timestamp>' modifier (#8121) 
This commit adds `@ <timestamp>` modifier as per this design doc: https://docs.google.com/document/d/1uSbD3T2beM-iX4-Hp7V074bzBRiRNlqUdcWP6JTDQSs/edit.

An example query:

```
rate(process_cpu_seconds_total[1m]) 
  and
topk(7, rate(process_cpu_seconds_total[1h] @ 1234))
```

which ranks based on last 1h rate and w.r.t. unix timestamp 1234 but actually plots the 1m rate.

Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>
 2021-01-20 16:27:39 +05:30
Julien Pivotto b7fe028740
Merge pull request #8373 from hs0210/work 
Fix a typo in docs/configuration/configuration.md
 2021-01-18 08:24:05 +01:00
Hu Shuai 2d8738c947 Fix a typo in docs/configuration/configuration.md 
Signed-off-by: Hu Shuai <hus.fnst@cn.fujitsu.com>
 2021-01-18 10:14:47 +08:00
Julien Pivotto 5bd7145e55
Merge pull request #8327 from roidelapluie/tlsexemple 
https: Add example configuration file
 2021-01-15 09:50:52 +01:00
Julien Pivotto 08c259cda6 https: Add example configuration file 
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2021-01-15 01:37:50 +01:00
Julien Pivotto 438ab463ad Fix link in documentation 
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2021-01-04 01:12:47 +01:00
Julien Pivotto c04284ff90 Add https and authentication to the navbar 
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2021-01-04 01:12:47 +01:00
Julien Pivotto 5b4f46a348 Add TLS and basic authentication 
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2020-12-28 21:33:44 +01:00
Ben Ye caa173d2aa
Support matchers for Labels API (#8301) 
Signed-off-by: Ben Ye <yb532204897@gmail.com>
Co-authored-by: Erik Klockare <eklockare@gmail.com>
 2020-12-22 11:02:19 +00:00
Atibhi Agrawal c08009139a
Add docs for backfill (#8230) 
* Add docs for backfill

Signed-off-by: aSquare14 <atibhi.a@gmail.com>
 2020-12-10 16:29:44 +01:00
Julien Pivotto 87e142c02f
remote_write documentation: fix blank lines (#8264) 
The blank line is not efficiently placed in the remote_write config,
affecting readability.

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2020-12-08 14:27:50 +01:00
Thibault Jamet f055690b34
Clarify: all rules in a group are concomitant (#8248) 
Improve the documentation to clarify the differences beetween rules in a
group and outside a group.

Signed-off-by: Thibault Jamet <tjamet@users.noreply.github.com>
 2020-12-03 10:32:10 +00:00
Mike DeSimone 759150878c
fix trivial typos (#8238) 
Signed-off-by: Mike DeSimone <michael.2.desimone@gmail.com>
 2020-11-29 01:23:10 +00:00
George Brighton 76cd5f4c7f
Fix typo in EC2 SD docs (#8210) 
Signed-off-by: George Brighton <george@gebn.co.uk>
 2020-11-20 19:22:03 +00:00
Muhammad Falak R Wani 587fd740be
discovery: ec2: expose IPv6 as label (#7086) 
* discovery: ec2: expose IPv6 as label

Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>
 2020-11-20 17:13:52 +00:00
Justin Toh 5f103aaecc
docs: Fix "time duration" link (#8209) 
Signed-off-by: Justin Toh <tohjustin@hotmail.com>
 2020-11-20 12:25:45 +00:00
gotjosh 4eca4dffb8
Allow metric metadata to be propagated via Remote Write. (#6815) 
* Introduce a metadata watcher

Similarly to the WAL watcher, its purpose is to observe the scrape manager and pull metadata. Then, send it to a remote storage.

Signed-off-by: gotjosh <josue@grafana.com>

* Additional fixes after rebasing.

Signed-off-by: Callum Styan <callumstyan@gmail.com>

* Rework samples/metadata metrics.

Signed-off-by: Callum Styan <callumstyan@gmail.com>

* Use more descriptive variable names in MetadataWatcher collect.

Signed-off-by: Callum Styan <callumstyan@gmail.com>

* Fix issues caused during rebasing.

Signed-off-by: Callum Styan <callumstyan@gmail.com>

* Fix missing metric add and unneeded config code.

Signed-off-by: Callum Styan <callumstyan@gmail.com>

* Address some review comments.

Signed-off-by: Callum Styan <callumstyan@gmail.com>

* Fix metrics and docs

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

* Replace assert with require

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

* Bring back max_samples_per_send metric

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

* Fix tests

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

Co-authored-by: Callum Styan <callumstyan@gmail.com>
Co-authored-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>
 2020-11-19 20:53:03 +05:30
Peter Wu 1797192f02
Fix the alerting rules name description (#7083) (#8197) 
commit 9875afc491 changed the type from
metric names to label values, we might as well adjust the description.
The alternative is to revert that commit and restrict names of alerting
rules again even if that was not really enforced.

Signed-off-by: Peter Wu <pwu@cloudflare.com>
 2020-11-18 19:29:01 +00:00
Julien Pivotto 3509647462
Docker swarm: add filtering of services (#8074) 
* Docker swarm: add filtering of services

Add filters on all docker swarm roles (nodes, tasks and services).

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2020-11-09 12:41:02 +01:00