mirrors/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2026-05-14 17:16:54 +02:00
Code Issues Projects Releases Wiki Activity
5,272 Commits 361 Branches 529 Tags
Commit Graph

5272 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fabian Reinartz
14b33d0d66
Merge pull request #4840 from prometheus/mdapi 
Correctly skip mismatching targets
 2018-11-12 12:07:51 +01:00
Fabian Reinartz
99021c515b Correctly skip mismatching targets 
Signed-off-by: Fabian Reinartz <freinartz@google.com>
 2018-11-09 05:27:27 -05:00
Frederic Branczyk
67dc912ac8
Merge pull request #4828 from brancz/cherrypick-4826 
Cherrypick 4826
v2.5.0 		2018-11-06 12:38:56 +01:00
Frederic Branczyk
742b071dd1
*: Cut v2.5.0 
Signed-off-by: Frederic Branczyk <fbranczyk@gmail.com>
 2018-11-06 11:36:04 +01:00
Frederic Branczyk
bb81bac12d
Merge pull request #4810 from brancz/cherrypick-4806-4809 
Cherrypick 4806 4809
v2.5.0-rc.2 		2018-10-31 12:33:31 +01:00
Frederic Branczyk
6662b4fd9f
*: Cut v2.5.0-rc.2 
Signed-off-by: Frederic Branczyk <fbranczyk@gmail.com>
 2018-10-31 11:28:06 +01:00
Simon Pasquier
de459cb3f3
web: display job label in targets page 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-10-31 11:27:58 +01:00
Frederic Branczyk
68ea9840eb
Merge pull request #4800 from brancz/cherrypick-4794 
cherrypick 4794
v2.5.0-rc.1 		2018-10-30 10:05:32 +01:00
Frederic Branczyk
4d37b1688a
*: Cut v2.5.0-rc.1 
Signed-off-by: Frederic Branczyk <fbranczyk@gmail.com>
 2018-10-29 17:21:50 +01:00
Frederic Branczyk
ebc5ce9f81
Merge pull request #4793 from brancz/cherrypick-4785 
Cherrypick 4785
 2018-10-29 11:24:42 +01:00
Timo Beckers
65adbe7d8f
documentation - add marathon-sd example configuration 
Signed-off-by: Timo Beckers <timo@incline.eu>
 2018-10-26 17:40:05 +02:00
Timo Beckers
d0af3a8e01
docs - refer to documentation/examples/prometheus-marathon.yml 
Signed-off-by: Timo Beckers <timo@incline.eu>
 2018-10-26 17:39:47 +02:00
Frederic Branczyk
f5d699dabe
Merge pull request #4791 from brancz/cherrypick-4783 
cherrypick-4783
 2018-10-26 17:16:33 +02:00
Simon Pasquier
c7a48a4a93
web/api/v1: fix targets endpoint 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-10-26 15:46:14 +02:00
Frederic Branczyk
270c8760a3
Merge pull request #4775 from brancz/cut-2.5.0-rc.0 
Cut 2.5.0-rc.0
v2.5.0-rc.0 		2018-10-24 14:19:20 +02:00
Frederic Branczyk
4fc98efcde
CHANGELOG.md: Add entry for 2.5.0-rc.0 
Signed-off-by: Frederic Branczyk <fbranczyk@gmail.com>
 2018-10-24 12:36:32 +02:00
Goutham Veeramachaneni
f988af7235 Revert #4586 (#4766) 
This breaks people if they are depending on the contents of
__address__ label.

Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>
 2018-10-24 10:16:36 +02:00
Frederic Branczyk
86a34c2e4c
VERSION: Bump version to 2.5.0-rc.0 
Signed-off-by: Frederic Branczyk <fbranczyk@gmail.com>
 2018-10-23 16:46:28 +02:00
Chris Marchbanks
ab3cdb9500 Allow promql benchmarks to query more samples (#4770) 
Signed-off-by: Chris Marchbanks <csmarchbanks@gmail.com>
 2018-10-22 18:02:22 +01:00
Brian Pandola
3241c527d0 Fix typo (#4760) 
Signed-off-by: Brian Pandola <bpandola@hsdp.io>
 2018-10-18 21:19:21 +01:00
Simon Pasquier
a30348f1a4 discovery: add config label to discovered targets metric (#4753) 
* discovery: add labels to discovered targets metric

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-10-18 16:46:59 +01:00
Brian Brazil
105ed5c112
Merge pull request #4700 from prometheus/openmetrics 
Openmetrics Parser
 2018-10-18 15:17:27 +01:00
Brian Brazil
3fdb92010e Expand OM to OpenMetrics 
Signed-off-by: Brian Brazil <brian.brazil@robustperception.io>
 2018-10-18 14:16:41 +01:00
Brian Brazil
9c03e11c2c Hook OpenMetrics parser into scraping. 
Extend metadata api to support units.

Signed-off-by: Brian Brazil <brian.brazil@robustperception.io>
 2018-10-18 13:58:00 +01:00
Brian Brazil
c271ef456a Add an OpenMetrics parser. 
This is based on the existing parser, and has slightly better
performance (few %) than it.

Signed-off-by: Brian Brazil <brian.brazil@robustperception.io>
 2018-10-18 13:58:00 +01:00
Brian Brazil
ffe7efb411 Prepare for multiple text formats 
Pass content type down to text parser.

Add layer of indirection in front of text parser,
and rename to avoid future clashes.

Signed-off-by: Brian Brazil <brian.brazil@robustperception.io>
 2018-10-18 13:58:00 +01:00
Simon Pasquier
5824d6902d
openstack: fix client when using env variables (#4734) 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-10-17 16:04:07 +02:00
Kien Nguyen-Tuan
9c5370fdfe Support discover instances from all projects (#4682) 
By default, OpenStack SD only queries for instances
from specified project. To discover instances from other
projects, users have to add more openstack_sd_configs for
each project.

This patch adds `all_tenants` <bool> options to
openstack_sd_configs. For example:

- job_name: 'openstack_all_instances'
  openstack_sd_configs:
    - role: instance
      region: RegionOne
      identity_endpoint: http://<identity_server>/identity/v3
      username: <username>
      password: <super_secret_password>
      domain_name: Default
      all_tenants: true

Co-authored-by: Kien Nguyen <kiennt2609@gmail.com>
Signed-off-by: dmatosl <danielmatos.lima@gmail.com>
 2018-10-17 13:01:33 +01:00
Ariya Hidayat
a0ba9b7f3e Avoid browser's spell-checking the Expression field (#4728) 
Signed-off-by: Ariya Hidayat <ariya.hidayat@gmail.com>
 2018-10-17 10:54:16 +02:00
Kangseok Thomas Lee
bec1a2f038 Reordering fields of String datetype (#4751) 
Other types has timestamp as first field, but only String type has value as first field.

Signed-off-by: gangseok.lee <gangseok.lee@samsung.com>
 2018-10-17 08:52:23 +01:00
Simon Pasquier
c4a6acfb1e
*: move to go 1.11 (#4626) 
* *: move to go 1.11

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

* Reduce number of places where we specify the Go version

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-10-16 09:41:45 +02:00
Vandewilly
1098ed89d8 Drop 'else' condition when 'if' ends with a return (#4743) 
This commit drops the else condition when the if block ends with a
return statement.

Signed-off-by: Vandewilly Silva <vandewilly.oli.silva@hpe.com>
 2018-10-15 23:51:55 +01:00
Glenn McDonald
69656c295d Switching from rawgit to jsdelivr (#4733) (#4737) 
Signed-off-by: Glenn McDonald <2371316+glenn-m@users.noreply.github.com>
 2018-10-13 13:20:29 +01:00
Goutham Veeramachaneni
ffb7f829ec
Merge pull request #4730 from prometheus/release-2.4 
Release 2.4
 2018-10-12 14:15:42 -07:00
Will Hegedus
193ebe7e34 Updates to /targets and /rules (scrape duration, last evaluation time) (#4722) 
* Add evaluationTimestamp (Last Evaluation) column to display on /rules
Signed-off-by: Will Hegedus <wbhegedus@liberty.edu>

* Add lastScrapeDuration ("Scrape Duration") to display on /targets
Signed-off-by: Will Hegedus <wbhegedus@liberty.edu>

* Updates based on Julius' feedback

Signed-off-by: Will Hegedus <wbhegedus@liberty.edu>

* Update to set timestamp to when eval started (after eval completes)

Signed-off-by: Will Hegedus <wbhegedus@liberty.edu>

* Update /rules to display time since last evaluation

Signed-off-by: Will Hegedus <wbhegedus@liberty.edu>

* Re-order Last Eval/Eval Time to be consistent with targets page

Signed-off-by: Will Hegedus <wbhegedus@liberty.edu>
 2018-10-12 18:26:59 +02:00
Goutham Veeramachaneni
1625c9c6e4
Format changelog properly (#4721) 
Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>
 2018-10-11 09:10:37 -07:00
Simon Pasquier
3e6b9d43c3
Merge pull request #4720 from teresy/redundant-nil-check-slice 
Remove redundant nil check
 2018-10-11 10:24:55 +02:00
Tariq Ibrahim
d371697841 Adding new metric type to track in-flight queries via the remote read API endpoint. (#4699) 
* Adding new metric type to track in-flight queries via the remote read API endpoint.

Signed-off-by: tariqibrahim <tariq.ibrahim@microsoft.com>

* fix review comments

Signed-off-by: tariqibrahim <tariq.ibrahim@microsoft.com>

* fix comments

Signed-off-by: tariqibrahim <tariq.ibrahim@microsoft.com>
 2018-10-10 16:09:08 -07:00
Tariq Ibrahim
3f7ed7de49 Adding new metric type to track in-flight remote read queries. (#4677) 
Signed-off-by: tariqibrahim <tariq.ibrahim@microsoft.com>
 2018-10-10 14:48:32 -07:00
Rijnard van Tonder
9d102e3bff The nil check before the range loop is redundant 
Signed-off-by: Rijnard van Tonder <hi.teresy@gmail.com>
 2018-10-10 16:11:45 -04:00
Brian Brazil
468e49417c Update remote_write queue docs to present defaults. (#4715) 
Signed-off-by: Brian Brazil <brian.brazil@robustperception.io>
 2018-10-10 18:51:27 +01:00
Richard Kiene
b537f6047a Add ability to filter triton_sd targets by pre-defined groups (#4701) 
Additionally, add triton groups metadata to the discovery reponse
and correct a documentation error regarding the triton server id
metadata.

Signed-off-by: Richard Kiene <richard.kiene@joyent.com>
 2018-10-10 10:03:34 +01:00
Benji Visser
eb4cc37e50 Update moment.js and moment-timezone.js (#4679) 
* upgrading moment-timezome (0.5.13 -> 0.5.17)
* upgrading dependency moment (2.16.0 -> 2.22.2)

Signed-off-by: noqcks <benny@noqcks.io>
 2018-10-10 09:48:06 +01:00
Simon Pasquier
a2a78d0a09 discovery/openstack: discover all interfaces (#4649) 
* discovery/openstack: discover all interfaces
* Add address pool label

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-10-09 16:17:08 +01:00
Simon Pasquier
33c97d73e4
Merge pull request #4713 from simonpasquier/circleci-2.1 
circleci: switch to 2.1 config
 2018-10-09 16:07:38 +02:00
Simon Pasquier
a41aec1d67 circleci: switch to 2.1 config 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-10-09 14:24:36 +02:00
Krasi Georgiev
73fba6d0e4
update tsdb (#4692) 
removed unused code
metrics for WAL operations
minor variable renamings to improve readability
now using the common.Makefile
fixed the total NumTombstones count Stats

Signed-off-by: Krasi Georgiev <kgeorgie@redhat.com>
 2018-10-08 18:26:53 +03:00
Julien Pivotto
17fea5478a Improve rule views by wrapping lines (#4702) 
With the addition of the errors in the views list, it is now difficult
to have a view on all the rules in a screen witdh.

This commit adds wrapping to improve the overall display of the rules
page.

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2018-10-07 15:31:16 +01:00
Simon Pasquier
e1e2821cca
Merge pull request #4654 from simonpasquier/openstack-tls 
discovery/openstack: support tls_config
 2018-10-05 18:11:55 +02:00
Björn Rabenstein
8dbd84bb9f
Merge pull request #4698 from prometheus/beorn7/vendoring 
Update prometheus/client_golang vendoring
 2018-10-05 14:10:44 +02:00