mirrors/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-10-31 00:11:23 +01:00
Code Issues Projects Releases Wiki Activity
10,841 Commits 284 Branches 495 Tags
Commit Graph

245 Commits

Author SHA1 Message Date
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
Kien Nguyen-Tuan
813b58367a [OpenStack SD] Add ProjectID and UserID meta labels (#5431) 
Add extra meta labels which will be useful in the case
Prometheus discovery instances from all projects.

Signed-off-by: Kien Nguyen <kiennt2609@gmail.com>
 2019-04-04 10:02:31 +01:00
Julien Pivotto
4397916cb2 Add honor_timestamps (#5304) 
Fixes #5302

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2019-03-15 10:04:15 +00:00
Callum Styan
83c46fd549 update Consul vendor code so that catalog.ServiceMultipleTags can be (#5151) 
Signed-off-by: Callum Styan <callumstyan@gmail.com>
 2019-03-12 10:31:27 +00:00
tuanvcw
9de0ab3c8a Update remaining deprecated links in docs (#5271) 
Signed-off-by: Vu Cong Tuan <tuanvc@vn.fujitsu.com>
 2019-02-26 10:16:38 +00:00
LongKB
e4a741cb7d Replacing 'HTTP' by 'HTTPS' for securing links (#5252) 
Currently, when we access the modified pages with **HTTP**, it is
redirected to **HTTPS** automatically. So this commit aims to
replace **HTTP** to **HTTPs** for security.

Co-Authored-By: Nguyen Phuong An <AnNP@vn.fujitsu.com>
Signed-off-by: Kim Bao Long <longkb@vn.fujitsu.com>
 2019-02-22 14:33:02 +01:00
LongKB
23480bef43 Remove the duplicated words (#5251) 
Although it is spelling mistakes, it might make an affects while reading.

Co-Authored-By: Nguyen Phuong An <AnNP@vn.fujitsu.com>
Signed-off-by: Kim Bao Long <longkb@vn.fujitsu.com>
 2019-02-22 14:32:34 +01:00
Simon Pasquier
c8a1a5a93c
discovery/kubernetes: fix support for password_file and bearer_token_file (#5211) 
* discovery/kubernetes: fix support for password_file

Signed-off-by: Simon Pasquier <spasquie@redhat.com>

* Create and pass custom RoundTripper to Kubernetes client

Signed-off-by: Simon Pasquier <spasquie@redhat.com>

* Use inline HTTPClientConfig

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-02-20 11:22:34 +01:00
Kevin Bulebush
718344434c openstack_sd: Supporting application credential for authentication. (#4968) 
* openstack_sd: Support application credentials for authentication.
Updated gophercloud

Signed-off-by: Kevin Bulebush <kmbulebu@gmail.com>
 2019-01-09 15:18:58 +00:00
Fabian Reinartz
93d13c59d0 Sort 
Signed-off-by: Fabian Reinartz <freinartz@google.com>
 2019-01-03 13:10:57 +01:00
Fabian Reinartz
7a41038695 Add Azure tenant and subscription ID labels 
Signed-off-by: Fabian Reinartz <freinartz@google.com>
 2019-01-03 13:09:13 +01:00
Julien Pivotto
2e725a195a Niptick about relabel config (#4994) 
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2018-12-21 10:42:18 +00:00
Marcel D. Juhnke
c7d83b2b6a discovery: add support for Managed Identity authentication in Azure SD (#4590) 
Signed-off-by: Marcel Juhnke <marrat@marrat.de>
 2018-12-19 10:03:33 +00:00
Tariq Ibrahim
de6f3b6af7 expose kubernetes service cluster ip (#4940) 
Signed-off-by: tariqibrahim <tariq.ibrahim@microsoft.com>
Signed-off-by: tariqibrahim <tariq181290@gmail.com>
 2018-12-18 15:17:34 +00:00
Samuel Alfageme
240321acee Add taggedAddress to the labels in ConsulSD (#5001) 
Useful when multiple (tagged) addresses for a node are exposed on the catalog API
Ref. https://www.consul.io/api/catalog.html#taggedaddresses

Signed-off-by: Samuel Alfageme <samuel@alfage.me>
 2018-12-18 11:51:05 +01:00
Tariq Ibrahim
e3bdc463fa Revert "add logic to check if an azure VM is deallocated or not (#4908)" (#4980) 
This reverts commit 61cf4365

Signed-off-by: tariqibrahim <tariq.ibrahim@microsoft.com>
 2018-12-12 09:27:12 +01:00
Ryota Arai
135d580ab2 Introduce min_shards for remote write to set minimum number of shards. (#4924) 
Signed-off-by: Ryota Arai <ryota.arai@gmail.com>
 2018-12-04 17:32:14 +00:00