mirrors/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2026-05-17 02:26:56 +02:00
Code Issues Projects Releases Wiki Activity
4,056 Commits 364 Branches 529 Tags
Commit Graph

4056 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Björn Rabenstein
5211b96d4d
Merge pull request #3408 from prometheus/beorn7/release 
Cut 1.8.2
v1.8.2 		2017-11-04 16:57:38 +01:00
beorn7
d7e9cca287 Cut 1.8.2 2017-11-04 11:49:35 +01:00
Björn Rabenstein
bf8e002fce
Merge pull request #3405 from dominikschulz/fix/issue-3001 
Guard against tags being nil in EC2 discovery
 2017-11-03 17:20:40 +01:00
Dominik Schulz
a731a43302 Guard against tags being nil in EC2 discovery 
Fixes #3001
 2017-11-03 13:23:01 +01:00
Tobias Schmidt
7435a3f574 Merge pull request #3273 from prometheus/docs 
Import documentation
 2017-10-27 16:10:20 +02:00
Tobias Schmidt
f49ae044d7 Import template reference and examples 2017-10-27 16:08:38 +02:00
Tobias Schmidt
f432b8176d Consolidate configuration and rules docs in docs/configuration/ 2017-10-27 09:54:02 +02:00
Tobias Schmidt
4d30a11ab6 Import storage and federation documentation from docs 2017-10-26 22:36:47 +02:00
Tobias Schmidt
e6cdc2d355 Import querying documentation from prometheus/docs 2017-10-26 22:36:47 +02:00
Tobias Schmidt
299802dfd0 Integrate changes from prometheus/docs 2017-10-26 16:14:43 +02:00
Tobias Schmidt
41281aff81 Include 1.8 changes in configuration docs 2017-10-26 16:14:43 +02:00
Tobias Schmidt
53a5f52224 Import first batch of Prometheus documentation 
In order to provide documentation for each individual version, this
commit starts moving Prometheus server specific documentation into the
repository itself.
 2017-10-26 16:14:43 +02:00
Brian Brazil
3a7c51ab70 Remote read endpoint should handle matchers for external labels. (#3325) 
If the other Prometheus has an external label that matches that of
the Prometheus being read from, then we need to remove that matcher
from the request as it's not actually stored in the database - it's
only added for alerts, federation and on the output of the remote read
endpoint.
Instead we check for that label being empty, in case there is a time
series with a different label value for that external label.
v1.8.1 		2017-10-23 15:12:22 +01:00
Brian Brazil
f6df3b7d57 Bump version for 1.8.1 2017-10-19 16:45:27 +01:00
Brian Brazil
ced935e2d2 Release 1.8.1 (#3318) 2017-10-19 15:05:25 +01:00
Brian Brazil
c25f7c600b Apply external labels to remote read endpoint (#3263) 
Fixes #3261
 2017-10-16 14:35:47 +01:00
Björn Rabenstein
3569eef8b1 Merge pull request #3260 from prometheus/beorn7/release 
Cut v1.8.0
v1.8.0 		2017-10-07 00:08:01 +02:00
beorn7
5829e4880d Cut v1.8.0 2017-10-06 22:13:36 +02:00
Björn Rabenstein
6bfc8f094c Merge pull request #3259 from prometheus/beorn7/web 
Only respond to API requests once the server is ready
 2017-10-06 18:41:11 +02:00
beorn7
f20e6a0ae4 Only respond to API requests once the server is ready 2017-10-06 17:20:20 +02:00
Björn Rabenstein
5fad671af9 Merge pull request #3257 from prometheus/beorn7/storage2 
Avoid blocking in the logThrottling loop
 2017-10-06 14:55:16 +02:00
beorn7
2fad91d25a Avoid blocking in the logThrottling loop 
The timer semantics is really hard. The simple pattern as given in the
godoc for the time package assumes we are not elsewhere consuming from
the timer's channel. However, exactly that can happen here with the
right sequence of events. Thus, we have to drain the channel only if
it has something to drain.
 2017-10-06 14:19:30 +02:00
Björn Rabenstein
a5412cfc59 Merge pull request #3252 from LK4D4/proper_reset 
[storage/local] fix timer.Reset usage
 2017-10-06 13:31:07 +02:00
Jack Neely
128b31d058 Log failure to send NaN values to remote store as Debug (#3235) 
This was a warning and can be a frequent occurrence.  Let's not fill up
logs unless we are asked to.
 2017-10-06 11:22:55 +01:00
Alexander Morozov
7e814ada72 [storage/local] fix timer.Reset usage 
According to https://golang.org/pkg/time/#Timer.Reset you must not rely
on a returned value from Reset.

Signed-off-by: Alexander Morozov <lk4d4math@gmail.com>
 2017-10-05 15:48:03 -07:00
Bryan Boreham
a03193232a Don't disable HTTP keep-alives for remote storage connections. (#3173) 
Removes configurability introduced in #3160 in favour of hard-coding,
per advice from @brian-brazil.
 2017-10-05 12:32:24 +01:00
Tobias Schmidt
9c475b95db Merge pull request #3199 from pgier/remove-go-validator 
cmd/prometheus: remove govalidator for url validation
 2017-10-04 18:37:44 +02:00
Paul Gier
08af129b4d cmd/prometheus: don't allow quotes at beginning or end of url 
This prevents accidental copy/paste error where a the web.external-url
or alertmanager.url params could have an extra set of quotes.
See also: https://github.com/prometheus/prometheus/issues/1229
 2017-10-04 10:10:02 -05:00
Paul Gier
f79b55d057 cmd/prometheus: remove govalidator for url validation 
The usage of govalidator is redundant with the call to url.Parse for
url validation. Removing it has the following benefits:

 - The explicit error message is displayed instead of just a generic
   valid/invalid message
 - Slightly smaller code with one fewer external dependency
 - Speed improvement by removing duplicate call to url.Parse (inside
   govalidator.IsURL()
 - Resolves issue #2717

The only potential drawback of removing govalidator is that certain
URLs will be considered valid which were previously invalid. For example:

 - URLs with hostnames that start and/or end with an underscore (http://_example.com_)
 - URLs with hostnames that contain some special characters (http://foo&*bar.org)

These are valid URIs according to RFC 3986 and valid domain names per RFC 2181,
however they are not valid hostnames per RFC 952.
 2017-10-04 10:08:34 -05:00
Tom Wilkie
639d5c6f98 Merge pull request #3023 from tomwilkie/2945-remote-read-server 
Implement remote read server in Prometheus.
 2017-09-28 17:19:37 +01:00
beorn7
f1d4558469 Merge branch 'release-1.7' 2017-09-28 16:46:33 +02:00
Björn Rabenstein
2e8092aec9 Merge pull request #3177 from prometheus/beorn7/release2 
Move to Go1.9
 2017-09-28 16:25:11 +02:00
beorn7
bea12d4be1 Merge branch 'release-1.7' 2017-09-26 17:46:56 +02:00
Björn Rabenstein
22eadbe635 Merge pull request #3222 from prometheus/beorn7/release 
Cut v1.7.2
v1.7.2 		2017-09-26 17:41:38 +02:00
Tobias Schmidt
e8ce37ad0d Merge pull request #3223 from alcortesm/dead-code-at-stats 
util/stats: remove dead code
 2017-09-26 17:39:53 +02:00
Tobias Schmidt
f104a5dfc6 Merge pull request #3224 from alcortesm/config-simplify-returns 
config: simplify some returns
 2017-09-26 17:18:41 +02:00
Alberto Cortés
bb3dad9cba config: simplify some returns 2017-09-26 16:57:56 +02:00
Alberto Cortés
2c9739162e utils/stats: remove dead code 2017-09-26 16:32:45 +02:00
beorn7
f51c97c7d4 Cut v1.7.2 2017-09-26 15:31:34 +02:00
Björn Rabenstein
398fa4fd02 Merge pull request #3205 from prometheus/beorn7/ui 
Make all rule links link to the "Console" tab rather than "Graph"
 2017-09-21 19:53:48 +02:00
beorn7
c2e9a151ab Make all rule links link to the "Console" tab rather than "Graph" 
Clicking on a rule, either the name or the expression, opens the rule
result (or the corresponding expression, repsectively) in the
expression browser. This should by default happen in the console tab,
as, more often than not, displaying it in the graph tab runs into a
timeout.
 2017-09-21 18:28:00 +02:00
beorn7
16c95ae8e7 Merge branch 'release-1.7' 2017-09-21 18:27:12 +02:00
beorn7
dd381356a5 Tweak floating point number rendering 2017-09-19 18:53:00 +02:00
beorn7
eaff0dcfc3 Merge branch 'yamatoya-fix_ui_graph_decimal_axis' into release-1.7 2017-09-19 18:30:45 +02:00
beorn7
61b6311504 Merge branch 'fix_ui_graph_decimal_axis' of git://github.com/yamatoya/prometheus into yamatoya-fix_ui_graph_decimal_axis 2017-09-19 18:30:18 +02:00
Takahito Yamatoya
b1151bdabc ui changed, limit the number of digits for the larger units is 5 2017-09-19 11:11:39 +09:00
Takahito Yamatoya
1eac566d09 add ; , and change from B to G, and change from K to k, and add all the prefixes 2017-09-18 22:55:22 +09:00
Tom Wilkie
fae3bd17b9 Merge pull request #3132 from tomwilkie/fix-debug-handlers 
Get pprof handlers working again
 2017-09-18 14:24:08 +01:00
Tom Wilkie
bbc9671d50 Get profile handlers working again after #3054 and #3146. 
Ensures the pprod endpoints deal with path-prefixes correctly; adds a test so we don't break it again.
 2017-09-18 13:27:09 +01:00
beorn7
e7aab2791a Forward-merge bug fixes frem branch 'release-1.7' 2017-09-18 12:14:37 +02:00