RepoMirrors
/
prometheus
mirror of https://github.com/prometheus/prometheus
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
8,127 Commits 245 Branches 436 Tags 657 MiB
Commit Graph

111 Commits

Author SHA1 Message Date
kangwoo 7c0d5ae4e7
Add Eureka Service Discovery (#3369) 
Signed-off-by: kangwoo <kangwoo@gmail.com>
 2020-08-26 17:36:59 +02:00
showuon ca6f2bde94
add relabeling link to be consistent with other section (#7851) 
Signed-off-by: Luke Chen <showuon@gmail.com>
 2020-08-26 08:39:31 +01:00
Julien Pivotto 27a1a281fd
Improve hetzner documentation (#7849) 
* Improve hetzner documentation

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2020-08-25 20:51:54 +02:00
Lukas Kämmerling b6955bf1ca
Add hetzner service discovery (#7822) 
Signed-off-by: Lukas Kämmerling <lukas.kaemmerling@hetzner-cloud.de>
 2020-08-21 15:49:19 +02:00
Julien Pivotto d867491364
Human-friendly durations in PromQL (#7713) 
* Add support for user-friendly durations

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2020-08-04 21:12:41 +02:00
Lars Nielsen 019d031f3e
Updated documentation (#5390) 
Updated documentation to include YAML example for file_sd_config

Signed-off-by: Lars Nielsen <nellemandela@gmail.com>
 2020-08-03 15:36:33 +01:00
Julien Pivotto f482c7bdd7
Add per scrape-config targets limit (#7554) 
* Add per scrape-config targets limit

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2020-07-30 14:20:24 +02:00
Julien Pivotto 924e7239b7
Docker Swarm SD: Support tasks and service without published ports (#7686) 
* Support tasks and service without published ports

Mimics k8s discovery behaviour.

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2020-07-29 20:56:30 +02:00
Julien Pivotto 88bdb13c55
DNS SD: add srv record target and port meta labels (#7678) 
* DNS SD: add srv record target and port meta labels

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2020-07-28 22:09:01 +02:00
Julien Pivotto 9c599f1ee2
Add new SD's to alertmanager config (#7584) 
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2020-07-15 20:51:14 +02:00
Julien Pivotto be96951c56
Add Docker Swarm configuration example (#7542) 
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2020-07-09 20:05:21 +02:00
John Bampton 98a69b77d1
Fix spelling (#7512) 
Signed-off-by: John Bampton <jbampton@users.noreply.github.com>
 2020-07-04 14:54:26 +02:00
Julien Pivotto 74a6959d46
Docs: fix types (#7508) 
I have batched a bunch of fixes around types in the documentation.

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2020-07-02 23:27:14 +02:00
Steffen Neubauer 9c9b872087
OpenStack SD: Add availability config option, to choose endpoint type (#7494) 
* OpenStack SD: Add availability config option, to choose endpoint type

In some environments Prometheus must query OpenStack via an alternative
endpoint type (gophercloud calls this `availability`.

This commit implements this option.

Co-Authored-By: Dennis Kuhn <d.kuhn@syseleven.de>
Signed-off-by: Steffen Neubauer <s.neubauer@syseleven.de>
 2020-07-02 15:17:56 +01:00
Julien Pivotto 800c0aefcf
Fix types in k8s+dns docs (#7474) 
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2020-06-28 09:13:23 +02:00
Julien Pivotto 59de58d380
Docker Swarm service discovery (#7420) 
* Docker Swarm service discovery

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2020-06-26 12:25:58 +02:00
Julien Pivotto 0444a419d7
Consul: document health meta label (#7466) 
implemented in #5313

fixes #770

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2020-06-26 12:14:51 +02:00
Julien Pivotto c61141ce51
Add DigitalOcean service discovery (#7407) 
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2020-06-18 17:04:41 +02:00
Julien Pivotto 7b24bb3116
Docs: normalize bearer_token_file type (#7408) 
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2020-06-16 23:09:05 +02:00
Alex Vandiver 3c753aba5f
Add missing newline before inline-code block (#7401) 
Sections with three backticks require a blank line before them.

Signed-off-by: Alex Vandiver <alex@chmrr.net>
 2020-06-16 07:13:27 +02:00
Martin Lee b5d61fb66c
Add AMI to labels scraped during service discovery. (#7386) 
Signed-off-by: Martin Lee <martin@martinlee.org>
 2020-06-11 18:25:58 +01:00
Julien Pivotto ef4d8a38ca
Change metrics relabel terminology (#7362) 
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2020-06-09 05:40:45 +01:00
Julien Pivotto 2209fa98b4
Fix consul_sd_config to follow types convention (#7316) 
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2020-05-29 21:20:37 +02:00
Jop Zinkweg 1f69c38ba4
Add discovery support for triton compute nodes (#7250) 
Added optional configuration item role, defaults to 'container' (backwards-compatible).
Setting role to 'cn' will discover compute nodes instead.

Human-friendly compute node hostname discovery depends on cmon 1.7.0:
c1a2aeca36

Adjust testcases to use discovery config per case as two different types are now supported.

Updated documentation:
* new role setting
* clarify what the name 'container' covers as triton uses different names in different locations

Signed-off-by: jzinkweg <jzinkweg@gmail.com>
 2020-05-22 16:19:21 +01:00
Callum Styan 386aea7774
Add missing remote write/read config name to docs. (#7105) 
Signed-off-by: Callum Styan <callumstyan@gmail.com>
 2020-04-14 09:27:33 -07:00
Frederic Hemberger fe47c9c86e
[Docs] consul_sd_config: Add default value for `allow_stale` (#7075) 
Ref: https://github.com/prometheus/prometheus/blob/master/discovery/consul/consul.go#L97
Signed-off-by: Frederic Hemberger <mail@frederic-hemberger.de>
 2020-03-31 18:55:25 +01:00
Deepjyoti Mondal c38ca2ca95
Fix #6999 : Add architecture meta label for EC2 (#7000) 
This PR adds architecture meta labels for EC2 instances

Signed-off-by: Deepjyoti Mondal <djmdeveloper060796@gmail.com>
 2020-03-28 20:41:37 +00:00
coding3min 4dfbf328f2
[OpenStack SD] Add HypervisorID meta labels about id (#6962) 
Add extra meta labels which will be useful in the case
Prometheus discovery hypervisor .

Signed-off-by: pzqu <pzqu@qq.com>

Co-authored-by: pzqu <pzqu@example.com>
 2020-03-11 08:38:14 +00:00
Alex Gaganov df92a00838
Expose EC2 instance lifecycle as label (#6914) 
Signed-off-by: Alex Gaganov <alex.gaganov@fiverr.com>
 2020-03-03 08:03:16 +00:00
李国忠 029b45aa30
add service type metadata to kubernetes_sd_config service role #6496 (#6684) 
* [service discovery] add service type metadata to kubernetes_sd_config service role

Signed-off-by: fuling <fuling.lgz@alibaba-inc.com>

* [fix] ServiceType -> string

Signed-off-by: fuling <fuling.lgz@alibaba-inc.com>

* [fix] fix testcase

Signed-off-by: fuling <fuling.lgz@alibaba-inc.com>

* [style]

Signed-off-by: fuling <fuling.lgz@alibaba-inc.com>

* [doc] add service type

Signed-off-by: fuling <fuling.lgz@alibaba-inc.com>

* [doc] sort

Signed-off-by: fuling <fuling.lgz@alibaba-inc.com>
 2020-02-25 09:22:14 +01:00
Aleksandra Gacek 8e53c19f9c discovery/kubernetes: expose label_selector and field_selector 
Close #6807

Co-authored-by @shuttie
Signed-off-by: Aleksandra Gacek <algacek@google.com>
 2020-02-15 14:57:56 +01:00
Grebennikov Roman b4445ff03f discovery/kubernetes: expose label_selector and field_selector 
Closes #6096

Signed-off-by: Grebennikov Roman <grv@dfdx.me>
 2020-02-15 14:57:38 +01:00
Julien Pivotto 9d9bc524e5 Add query log (#6520) 
* Add query log, make stats logged in JSON like in the API

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2020-01-08 13:28:43 +00:00
li mengyang 1c6d2194c4 fix spelling mistakes in docs (#5952) 
Signed-off-by: hwdef <hwdef97@gmail.com>
 2019-08-27 11:33:40 -06:00
Chris Marchbanks a6a55c433c Improve desired shards calculation (#5763) 
The desired shards calculation now properly keeps track of the rate of
pending samples, and uses the previously unused integralAccumulator to
adjust for missing information in the desired shards calculation.

Also, configure more capacity for each shard.  The default 10 capacity
causes shards to block on each other while
sending remote requests. Default to a 500 sample capacity and explain in
the documentation that having more capacity will help throughput.

Signed-off-by: Chris Marchbanks <csmarchbanks@gmail.com>
 2019-08-13 10:10:21 +01:00
Dan P a9dea68ee6 removed document reference to meta label that doesnt exist in the kubernetes_sd (#5821) 
Signed-off-by: Dan Potepa <dan@danpotepa.co.uk>
 2019-08-01 12:34:23 +01:00
beorn7 5973acd65d Clarifying honor_labels documentation 
Previously, the wording could be misunderstood as setting honor_labels
to "false" for federation.

This also adds scraping the Pushgateway as a typical use case for
honor_labels=true.

Signed-off-by: beorn7 <beorn@grafana.com>
 2019-07-02 13:23:20 +02:00
Svend Sorensen 8d54650d06 Document behavior of empty ec2_sd_config region (#5711) 
Document the behavior of an empty `ec2_sd_config` `region` setting. If this is
omitted or blank, the region is discovered from the instance metadata, if available.
If it is blank and instance region metadata is not available, an error will
result ("EC2 SD configuration requires a region").

Signed-off-by: Svend Sorensen <svend@svends.net>
 2019-06-27 18:35:54 +01:00
Max Leonard Inden 41c22effbe
config&notifier: Add option to use Alertmanager API v2 
With v0.16.0 Alertmanager introduced a new API (v2). This patch adds a
configuration option for Prometheus to send alerts to the v2 endpoint
instead of the defautl v1 endpoint.

Signed-off-by: Max Leonard Inden <IndenML@gmail.com>
 2019-06-21 16:33:53 +02:00
Björn Rabenstein f3f016d464
Merge pull request #5604 from cstyan/default-capacity-docs 
Update queue config documentation
 2019-06-17 13:05:14 +02:00
Callum Styan e9129abeff Remove max_retries from queue_config since it's not used in remote write 
anymore.

Signed-off-by: Callum Styan <callumstyan@gmail.com>
 2019-06-10 12:43:08 -07:00
sh0rez 8ba23fb336
fix(style): container_is_init to container_init 
Removes 'is' keyword to comply style guide

Signed-off-by: sh0rez <me@shorez.de>
 2019-05-29 16:16:19 +02:00
sh0rez 88b79bae64
chore(style): Comply with style guide, order list 
Signed-off-by: sh0rez <me@shorez.de>
 2019-05-29 11:22:10 +02:00
Callum Styan babb8a0572 Update queue config documentation to reflect default value change for capacity. 
Signed-off-by: Callum Styan <callumstyan@gmail.com>
 2019-05-28 14:12:57 -07:00
sh0rez 1b144e499f
doc(discovery/kubernetes): container_is_init meta label 
Signed-off-by: sh0rez <me@shorez.de>
 2019-05-28 16:52:13 +02:00
Frederic Branczyk 04f22700b7
Merge pull request #5571 from simonpasquier/extend-k8s-endpoint-metadata 
discovery/kubernetes: add node name and hostname to endpoints
 2019-05-16 20:19:29 +02:00
Samuel Alfageme 425b07f3c4 Updated the 'consistency-modes' consul.io/api link to point to its new location (#5572) 
Ref: 626392eb62

Signed-off-by: Samuel Alfageme <samuel@alfage.me>
 2019-05-16 15:52:35 +01:00
Simon Pasquier 3441ecdea1 discovery/kubernetes: add node name and hostname to endpoints 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-05-16 10:49:13 +02:00
EarthmanT 35be8c9e25 Add azure public ip label (#5475) 
* Update Azure SD Config with Public IP label

Signed-off-by: earthmant <trammell@cloudify.co>
 2019-04-17 16:05:44 +01:00
Simon Pasquier dafd1632a2 discovery/kubernetes: add present labels for labels/annotations (#5443) 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-04-10 13:21:42 +01:00