mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-11-18 11:34:05 -08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity
4763 commits 249 branches 440 tags 659 MiB
Commit graph

4763 commits

This branch
This branch
All branches
Author SHA1 Message Date
Goutham Veeramachaneni 35aaa2002d
web/api: Add tests for v2 admin API 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-10-05 15:25:09 +05:30
Julius Volz f7e8348a88 Re-add contexts to storage.Storage.Querier() (#3230) 
* Re-add contexts to storage.Storage.Querier()

These are needed when replacing the storage by a multi-tenant
implementation where the tenant is stored in the context.

The 1.x query interfaces already had contexts, but they got lost in 2.x.

* Convert promql.Engine to use native contexts
 2017-10-04 21:04:15 +02: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
Goutham Veeramachaneni d70f850a18
web/api: Fix typo which broke the 2.0 admin APIs. 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-10-04 17:02:32 +05:30
Fabian Reinartz c4270fdbf4 Merge pull request #3229 from krasi-georgiev/update-go-stack 
vendor: update go-stack to fix sigpanic when debugging with delve
 2017-10-02 16:57:04 +02:00
Krasi Georgiev 3c17e51391 vendor: update go-stack to fix sigpanic when debugging with delve 
Signed-off-by: Krasi Georgiev <krasi.root@gmail.com>
 2017-09-29 15:04:58 +03: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
 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
Tobias Schmidt 52ea748248 Merge pull request #3215 from prometheus/grobie/http-accept 
Send a HTTP Accept header when scraping
 2017-09-25 15:18:31 +02:00
Tobias Schmidt 40c278ee2d Send a HTTP Accept header when scraping 2017-09-25 14:51:29 +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
Fabian Reinartz 64c7932e85 Merge pull request #3202 from prometheus/beta5 
*: release v2.0.0-beta.5
 2017-09-21 18:20:29 +02:00
Fabian Reinartz c2166d48bb *: cut v2.0.0-beta.5 2017-09-21 16:18:49 +02:00
Fabian Reinartz 34f0af30cf vendor: update prometheus/tsdb 2017-09-21 15:27:21 +02:00
Fabian Reinartz 254ec433ee Merge branch 'dev-2.0' of github.com:prometheus/prometheus into dev-2.0 2017-09-21 09:55:17 +02:00
Fabian Reinartz 249d69b513 Merge pull request #3186 from prometheus/startweb 
web: start web handler while TSDB is starting up
 2017-09-21 09:53:03 +02:00
Fabian Reinartz 701152d574 vendor: update tsdb revisions to master 2017-09-20 15:15:42 +02:00
Fabian Reinartz 7b02bfee0a web: start web handler while TSDB is starting up 2017-09-20 15:03:19 +02:00
Fabian Reinartz 18078e3fcc Merge pull request #3192 from prometheus/scrapecache 
Fix cache maintenance on changing metric representations
 2017-09-20 15:00:27 +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
Fabian Reinartz 437f51a85f Fix cache maintenance on changing metric representations 
We were not properly maintaining the scrape cache when the same metric
was exposed with a different string representation.
This overall reduces the scraping cache's complexity, which fixes the
issue and saves about 10% of memory in a scraping-only Prometheus
instance.
 2017-09-19 15:03:27 +02:00
Fabian Reinartz a04be0bc1c vendor: update prometheus/tsdb 2017-09-19 14:31:15 +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
Fabian Reinartz d6fbfb49eb Merge pull request #3137 from krasi-georgiev/3083-api-ignores-prefix-option 
fixes #3083 - api ignores prefix option - when binary started with custom web.external-url
 2017-09-18 18:10:50 +02:00
Krasi Georgiev b4b0999e7f add prefix to the api when prometheus started with custom web.external-url 
Signed-off-by: Krasi Georgiev <krasi.root@gmail.com>
 2017-09-18 17:59:27 +03: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
Goutham Veeramachaneni 6c0070986d Merge pull request #3152 from Gouthamve/go-kit/log 
Move logging to go-kit logger
 2017-09-18 16:35:44 +05:30
beorn7 e7aab2791a Forward-merge bug fixes frem branch 'release-1.7' 2017-09-18 12:14:37 +02:00
beorn7 f6367afca4 Merge branch 'yamatoya-fix_web_ui_utc' into release-1.7 2017-09-18 12:08:14 +02:00
beorn7 7a8e340c1a Merge branch 'fix_web_ui_utc' of git://github.com/yamatoya/prometheus into yamatoya-fix_web_ui_utc 2017-09-18 12:07:52 +02:00
Takahito Yamatoya 5d707d3aa3 #2439 library version update JQuery / JQuery.Selection / JQuery.hotkey (#3183) 2017-09-18 11:45:57 +02:00
Takahito Yamatoya ff038a4a39 bug fix 2017-09-17 00:20:39 +09:00
Takahito Yamatoya 7a3c348f83 fix decimal y-axis 2017-09-17 00:16:40 +09:00
Tom Wilkie 758d64ffd9 s/EncodReadResponse/EncodeReadResponse/ 2017-09-16 11:15:03 +02:00