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

5131 Commits

Author SHA1 Message Date
Javier Kohen 1c89984778 Expose EC2 instance owner as a discovery label. 
This exposes the OwnerID field of the DescribeInstances respons as .

Signed-off-by: Javier Kohen <jkohen@google.com>
 2018-08-17 11:30:18 -04:00
Javier Kohen 403ac08ece Expose __meta_gce_instance_id as an integer (instead of raw bytes). 
Signed-off-by: Javier Kohen <jkohen@google.com>
 2018-08-10 16:21:46 -04:00
Javier Kohen 2d4bcb3ee1 Document the new __meta_gce_instance_id discovery label. 
Signed-off-by: Javier Kohen <jkohen@google.com>
 2018-08-10 11:59:22 -04:00
Javier Kohen 7e9549b398 Added __meta_gce_instance_id discovery label 
Populated from instance.ID. I will follow up with a change to the documentation.

Signed-off-by: Javier Kohen <jkohen@google.com>
 2018-08-10 11:57:55 -04:00
Simon Pasquier d6c590018b
Merge pull request #4472 from simonpasquier/better-gofmt-msg 
Makefile: improve 'make style' reporting
 2018-08-08 09:32:17 +02:00
Simon Pasquier 08c2f50382
Merge pull request #4418 from simonpasquier/log-vm-limits 
prometheus: log virtual memory limits
 2018-08-07 16:27:46 +02:00
Simon Pasquier a827f91aff Makefile: improve 'make style' reporting 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-08-07 14:54:20 +02:00
Fabian Reinartz cc878ea559
Merge pull request #4471 from prometheus/uptsdb 
vendor: update TSDB
 2018-08-07 14:29:26 +02:00
Fabian Reinartz b7e2f407de rules: Fix double-locking of mutex 
Signed-off-by: Fabian Reinartz <freinartz@google.com>
 2018-08-07 07:33:39 -04:00
Fabian Reinartz 817e379a0e vendor: update TSDB 
Signed-off-by: Fabian Reinartz <freinartz@google.com>
 2018-08-07 07:33:39 -04:00
Benji Visser 46fb4078a6 handle nil pointer in ec2 discovery (#4469) 
This handles a nil pointer that was being accessed in EC2 discovery.

Fixes: #4441

Signed-off-by: noqcks <benny@noqcks.io>
 2018-08-07 08:35:22 +01:00
Benji Visser 8bb6e0dd6e Show rule evaluation errors on rules page (#4457) 
* adding information about the health and errors for Rules

adding Health() and LastError() to the Rule interface. This will allow
us to easily surface information about rules.

Signed-off-by: noqcks <benny@noqcks.io>

* updating rules.html with fields for Rule errors and health state

Signed-off-by: noqcks <benny@noqcks.io>

* fix code comment grammar & access Rule health/error info using a mutex

Signed-off-by: noqcks <benny@noqcks.io>

* s/Errors/Error/ in rules.html to remain consistent with targets.html

Signed-off-by: noqcks <benny@noqcks.io>

* adding periods to code comments in reporting/alerting

Signed-off-by: noqcks <benny@noqcks.io>

* putting health/error below mutex in struct field

Signed-off-by: noqcks <benny@noqcks.io>
 2018-08-07 00:33:45 +02:00
Julius Volz 2b8fc062a8
rules: HTML-escape rule YAML marshal errors (#4464) 
This was pointed out by `gosec`.

Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2018-08-05 14:01:51 +02:00
Dave Henderson 73a08f0045 promtool - Adding --step flag to 'query range' subcommand (#4454) 
Signed-off-by: Dave Henderson <dhenderson@gmail.com>
 2018-08-05 11:03:18 +02:00
Julius Volz 159e1537d2
Remove /heap endpoint (#4460) 
It was added 5 years ago by Matt and I'm not sure anyone ever used
it after public release (since we have /debug/pprof/heap as well).

It also lacked error checking and allows people to write to disk over HTTP.

Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2018-08-04 21:31:28 +02:00
Julius Volz 90521a65f8
Remove error return value from NotifyFunc() (#4459) 
It's always nil and we also forgot to check it.

Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2018-08-04 21:31:12 +02:00
Julius Volz 0c54cf489b
Document "<bool>" placeholder in API (#4465) 
Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2018-08-04 21:30:53 +02:00
Ganesh Vernekar f1db699dff Persist alert 'for' state across restarts (#4061) 
Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>
 2018-08-02 11:18:24 +01:00
Johannes Scheuermann f978f5bba3 Fixes #4202, correctly parse VMs with empty tags (#4450) 
Signed-off-by: Johannes M. Scheuermann <joh.scheuer@gmail.com>
 2018-08-02 10:10:17 +01:00
Frederic Branczyk 2236bb6c59
Merge pull request #4336 from jojohappy/upgrade_k8s_client 
Upgrade k8s client to kubernetes-1.11.0
 2018-08-02 09:58:46 +02:00
jojohappy e060f7755f To keep comment of NodeLegacyHostIP for k8s node address 
Signed-off-by: jojohappy <sarahdj0917@gmail.com>
 2018-08-02 10:25:28 +08:00
jojohappy f5794b0ff9 Revert the testdata.txt, should be no change 
Signed-off-by: jojohappy <sarahdj0917@gmail.com>
 2018-08-02 10:25:28 +08:00
jojohappy e81785d1a3 To keep depecrate k8s node NodeLegacyHostIP as local constant to keep compatibility for older k8s version 
Signed-off-by: jojohappy <sarahdj0917@gmail.com>
 2018-08-02 10:25:28 +08:00
jojohappy f3735d0ead Remove useless testdata 
Signed-off-by: jojohappy <sarahdj0917@gmail.com>
 2018-08-02 10:25:28 +08:00
jojohappy b33f48920c Fixed remove unused package & fetch golang.org/x/text 
Signed-off-by: jojohappy <sarahdj0917@gmail.com>
 2018-08-02 10:25:28 +08:00
jojohappy 21e50a3f9d Upgrade k8s client to kubernetes-1.11.0 
Signed-off-by: jojohappy <sarahdj0917@gmail.com>
 2018-08-02 10:25:27 +08:00
Brian Brazil 70c98a06f1
Handle empty HELP in text parser. (#4444) 
Fixes #4427

Signed-off-by: Brian Brazil <brian.brazil@robustperception.io>
 2018-08-01 13:29:58 +01:00
Johannes Scheuermann 7608ee87d0 Inital support for Azure VMSS (#4202) 
* Inital support for Azure VMSS

Signed-off-by: Johannes Scheuermann <johannes.scheuermann@inovex.de>

* Add documentation for the newly introduced label

Signed-off-by: Johannes M. Scheuermann <joh.scheuer@gmail.com>
 2018-08-01 12:52:21 +01:00
Simon Pasquier a94450c288 Fix build for openbsd 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-07-31 14:41:30 +02:00
Max Inden 41b0580e7e
Merge pull request #4318 from mxinden/expose-alerts-and-rules 
api/v1: Expose rules and alerts
 2018-07-31 13:50:55 +02:00
Max Leonard Inden 71fafad099
api/v1: Coninue work exposing rules and alerts 
Signed-off-by: Max Leonard Inden <IndenML@gmail.com>
 2018-07-30 15:31:51 +02:00
mg03 31f8ca0dfb
api v1 alerts/rules json endpoint 
Signed-off-by: mg03 <mgeng03@gmail.com>
 2018-07-30 15:29:44 +02:00
Catalin Patulea 50850c0ad9 Add link to TSDB format page. (#4402) 
Signed-off-by: Catalin Patulea <catalinp@google.com>
 2018-07-28 08:02:03 +01:00
Benjamin Raskin 9353696d77 Fix spelling and holt-winters check (#4424) 
Signed-off-by: Benjamin Raskin <braskin@uber.com>
 2018-07-27 18:17:43 +01:00
Simon Pasquier 141c188ae6 Enforce conversion for freebsd 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-07-26 14:58:56 +02:00
Henri DF ffb7836c14 Send "Accept-Encoding" header in read request (#4421) 
We should be doing this since we only accept Snappy-encoded responses.

Signed-off-by: Henri DF <henridf@gmail.com>
 2018-07-26 12:45:04 +01:00
Simon Pasquier 208d21a393 Add comment and print units 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-07-26 10:26:58 +02:00
Henri DF 3abb2cc349 Fix typo (#4423) 
Signed-off-by: Henri DF <henridf@gmail.com>
 2018-07-26 08:49:53 +01:00
Julius Volz 8763dedb9d
Update method name in rules template, fix rendering (#4416) 
Fixes https://github.com/prometheus/prometheus/issues/4407

Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2018-07-25 18:25:43 +02:00
Simon Pasquier ba22b10113 prometheus: log virtual memory limits 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-07-25 15:51:27 +02:00
Tom Wilkie b1f600343f
Merge pull request #4359 from prometheus/report-errors 
Log errors encountered when marshalling and writing responses.
 2018-07-25 13:39:04 +01:00
Tom Wilkie 02534510ca Review feedback. 
Signed-off-by: Tom Wilkie <tom.wilkie@gmail.com>
 2018-07-25 13:35:47 +01:00
Tom Wilkie 901e6d1f82 Review feedback. 
Signed-off-by: Tom Wilkie <tom.wilkie@gmail.com>
 2018-07-25 13:17:10 +01:00
Tom Wilkie 3b5dea4e6d Don't import testing in code which is imported from non-test code. (#4400) 
It polutes the flags.

Signed-off-by: Tom Wilkie <tom.wilkie@gmail.com>
 2018-07-25 13:10:09 +01:00
José Martínez 791c13b142 discovery/ec2: Add primary_subnet_id label 
Signed-off-by: José Martínez <xosemp@gmail.com>
 2018-07-25 09:20:58 +01:00
José Martínez 5e4a33c890 discovery/ec2: Maintain order of subnet_id label 
Signed-off-by: José Martínez <xosemp@gmail.com>
 2018-07-25 09:20:58 +01:00
Stafford Williams 286a8e0554 go-bindata debug clarification (#4411) 
Signed-off-by: Stafford Williams <stafford.williams@gmail.com>
 2018-07-24 14:01:56 +01:00
Harsh Agarwal 6a464ae174 expose log.level for promlog for remote_storage_adapter (#4195) 
* expose log.level for promlog for remote_storage_adapter

Signed-off-by: sipian <cs15btech11019@iith.ac.in>

* replace flag description

Signed-off-by: Harsh Agarwal <cs15btech11019@iith.ac.in>
 2018-07-22 16:11:38 +05:30
Simon Pasquier c016b63219
Merge pull request #4378 from pgier/makefile-allow-target-overrides 
add prefix "common-" to make target names
 2018-07-19 16:32:16 +02:00
Thomas Jackson 56daa1f28a Only add LookbackDelta to vector selectors (#4399) 
Signed-off-by: Thomas Jackson <jacksontj.89@gmail.com>

Related to #4226
 2018-07-19 06:16:05 +01:00