mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-12-28 23:19:41 -08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity
5329 commits 243 branches 444 tags 649 MiB
Commit graph

5329 commits

This branch
This branch
All branches
Author SHA1 Message Date
Simon Pasquier ae47fc2aca vendor: fix revision for gopkg.in/inf.v0 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-10-29 17:25:42 +01:00
Simon Pasquier 2fc8b37807 vendor: fix revision for github.com/sasha-s/go-deadlock 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-10-29 17:25:42 +01:00
Simon Pasquier b718d25fee vendor: fix revision for github.com/pmezard/go-difflib/difflib 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-10-29 17:25:42 +01:00
Simon Pasquier 79b5203a78 vendor: fix revision for github.com/google/gofuzz 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-10-29 17:25:42 +01:00
Simon Pasquier 9a88ec93af vendor: fix revision for github.com/golang/glog 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-10-29 17:25:42 +01:00
Simon Pasquier ddcf94881e vendor: fix revision for github.com/ghodss/yaml 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-10-29 17:25:42 +01:00
Simon Pasquier 8c754c88fd vendor: fix revision for github.com/davecgh/go-spew/spew 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-10-29 17:25:42 +01:00
Simon Pasquier 9ee6aa6fc4 vendor: fix revision for github.com/petermattis/goid 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-10-29 17:25:42 +01:00
Simon Pasquier c21f9c0200 vendor: fix revision for google.golang.org/genproto/googleapis/rpc/status 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-10-29 17:25:42 +01:00
Simon Pasquier 79a4269f73 vendor: fix revision for google.golang.org/grpc packages 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-10-29 17:25:42 +01:00
Frederic Branczyk f34b2602e1
Merge pull request #4794 from brancz/cut-2.5.0-rc.1 
*: Cut v2.5.0-rc.1
 2018-10-29 17:20:23 +01:00
Frederic Branczyk d04148ab86
*: Cut v2.5.0-rc.1 
Signed-off-by: Frederic Branczyk <fbranczyk@gmail.com>
 2018-10-29 16:21:10 +01:00
nilsocket fe0f0da6b3 docs: add missing word (time) (#4797) 
Signed-off-by: nilsocket <nilsocket@gmail.com>
 2018-10-28 07:36:09 +00:00
Frederic Branczyk 4800401eec
Merge pull request #4785 from ti-mo/master 
Add documentation for new marathon-sd functionality
 2018-10-26 17:30:23 +02:00
Frederic Branczyk ad5139fcba
Merge pull request #4783 from simonpasquier/fix-targets-api 
web/api/v1: fix targets endpoint
 2018-10-26 15:37:12 +02:00
Wei Guo 742583e836 Support to query elements by a specific time (#4764) 
* support to query elements by a specific time

Signed-off-by: Wei Guo <me@imkira.com>
 2018-10-26 14:16:40 +02:00
Timo Beckers 36143be234
docs - refer to documentation/examples/prometheus-marathon.yml 
Signed-off-by: Timo Beckers <timo@incline.eu>
 2018-10-25 18:02:59 +02:00
Timo Beckers b12ed54f95
documentation - add marathon-sd example configuration 
Signed-off-by: Timo Beckers <timo@incline.eu>
 2018-10-25 18:02:59 +02:00
Simon Pasquier a308a186e4 web/api/v1: fix targets endpoint 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-10-25 11:10:26 +02:00
Frederic Branczyk 270c8760a3
Merge pull request #4775 from brancz/cut-2.5.0-rc.0 
Cut 2.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