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

5295 commits

This branch
This branch
All branches
Author SHA1 Message Date
stuart nelson 6a69471bc2
[promtool] Support writing output as json (#4848) 
* Support writing output as json

Oftentimes I'll want to execute something based on
the output from promtool, and supporting json
makes it easy to pull out values with a supporting
tool such as jq.

Signed-off-by: stuart nelson <stuartnelson3@gmail.com>
 2018-11-14 18:40:07 +01:00
Frederic Branczyk b82f930238
Merge pull request #4865 from squat/buffersignals 
cmd/prometheus: buffer signal chans
 2018-11-14 16:32:23 +01:00
Goutham Veeramachaneni d4b348a7b1
Merge pull request #4866 from gouthamve/api-compat 
web(api): Make query and range api errors match
 2018-11-14 13:26:07 +01:00
Goutham Veeramachaneni 7acedbce64
web(api): Make query and range api errors match 
Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>
 2018-11-14 15:25:54 +05:30
Goutham Veeramachaneni 1f053f897b
Merge pull request #4628 from bboreham/fix-storage-error 
Make ErrStorage a concrete type not an interface
 2018-11-14 10:39:16 +01:00
Lucas Serven 70c8b2c63c
cmd/prometheus: buffer signal chans 
According to the GoDoc for os.Signal [0]:

> Package signal will not block sending to c: the caller must ensure that
> c has sufficient buffer space to keep up with the expected signal rate.
> For a channel used for notification of just one signal value, a buffer
> of size 1 is sufficient.

[0] https://golang.org/pkg/os/signal/#Notify

Signed-off-by: Lucas Serven <lserven@gmail.com>
 2018-11-14 10:33:28 +01:00
Simon Pasquier 181f07ef26
web: avoid proxy to connect to the local gRPC server (#4572) 
By default the gRPC client of the REST API gateway relies on the
HTTP_PROXY variable to connect to the local gRPC server which isn't
desired as the server runs in the same process. This change uses a
custom dialer that connects directly to the server's address.

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-11-13 14:42:23 +01:00
fengyuceNv 94fff219ab improve remote storage enqueue performance (#4772) 
Signed-off-by: fyc <fyc22788@ly.com>
 2018-11-13 12:19:05 +00:00
Brian Brazil 8edaa8ad4d
Fix goroutine leak in lexer/parser. (#4858) 
When there was an error in the parser, the
lexer goroutine was left running.

Also make runtime panic test actually test things.

Signed-off-by: Brian Brazil <brian.brazil@robustperception.io>
 2018-11-12 18:47:13 +00:00
Ben Kochie b1e779d0ed
Use release binary of promu (#4843) 
Download and extract a release binary of promu, rather than pull from
master.

Signed-off-by: Ben Kochie <superq@gmail.com>
 2018-11-10 16:28:59 +01:00
Simon Pasquier 5230e2730a
*: check that assets are up-to-date (#4731) 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-11-09 11:31:36 +01:00
Simon Pasquier 7465118a2c
Fix errors in the vendor/ directory (#4781) 
* vendor: fix revision for google.golang.org/grpc packages

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

* vendor: fix revision for google.golang.org/genproto/googleapis/rpc/status

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

* vendor: fix revision for github.com/petermattis/goid

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

* vendor: fix revision for github.com/davecgh/go-spew/spew

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

* vendor: fix revision for github.com/ghodss/yaml

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

* vendor: fix revision for github.com/golang/glog

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

* vendor: fix revision for github.com/google/gofuzz

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

* vendor: fix revision for github.com/pmezard/go-difflib/difflib

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

* vendor: fix revision for github.com/sasha-s/go-deadlock

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

* vendor: fix revision for gopkg.in/inf.v0

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

* vendor: remove unused packages from vendor.json

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

* vendor: commit vendor/ after running govendor sync

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-11-09 10:17:47 +01:00
Frederic Branczyk 12ab9bf792
Merge pull request #4829 from brancz/release-doc 
Add RELEASE.md
 2018-11-08 09:43:14 +01:00
Frederic Branczyk bda9781ccd
Merge pull request #3839 from brancz/remove-old-alert-record 
promql: Remove old and unused alerting/reconding syntax
 2018-11-06 15:53:27 +01:00
Frederic Branczyk 3274a74595
Add RELEASE.md 
Signed-off-by: Frederic Branczyk <fbranczyk@gmail.com>
 2018-11-06 15:47:26 +01:00
Frederic Branczyk 3287b9a4b8
Merge pull request #4579 from bwplotka/ensure-genproto-works 
proto: Allow reproducible proto generation.
 2018-11-06 15:46:56 +01:00
Bryan Boreham cf37e1feb4 Add __meta_kubernetes_pod_phase label in discovery (#4824) 
This lets you add a relabel rule to drop scrapes for pods which are
not running.

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
 2018-11-06 14:40:24 +00:00
Silvio Gissi 6100f160ad EC2 Platform meta label (#4663) 
Set __meta_ec2_platform label with the instance platform string. Set to 'windows' on Windows servers and absent otherwise.


Signed-off-by: Silvio Gissi <silvio@gissilabs.com>
 2018-11-06 14:39:48 +00:00
Mucahit Kurt 4a6c329d71 add alert template expanding failure metric (#4747) 
Signed-off-by: Mucahit Kurt <mucahitkurt@gmail.com>
 2018-11-06 14:39:06 +00:00
Frederic Branczyk c2f32c99cf
Merge pull request #4826 from brancz/cut-2.5.0 
*: Cut v2.5.0
 2018-11-06 11:34:27 +01:00
Frederic Branczyk 98e4d8f6e4
*: Cut v2.5.0 
Signed-off-by: Frederic Branczyk <fbranczyk@gmail.com>
 2018-11-06 09:20:09 +01:00
Frederic Branczyk 4d4b5c9d12
Merge pull request #4809 from brancz/cut-2.5.0-rc.2 
*: Cut v2.5.0-rc.2
 2018-10-31 11:14:47 +01:00
Frederic Branczyk b76dd3513b
*: Cut v2.5.0-rc.2 
Signed-off-by: Frederic Branczyk <fbranczyk@gmail.com>
 2018-10-31 09:52:34 +01:00
Frederic Branczyk dbe8acce94
Merge pull request #4806 from simonpasquier/fix-targets-page 
web: display job label in targets page
 2018-10-31 08:34:09 +01:00
Simon Pasquier 147f2061d5 web: display job label in targets page 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-10-30 16:20:43 +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