mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-10-01 05:07:32 -07:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity
7443 commits 215 branches 425 tags 750 MiB
Commit graph

7443 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Thibault Chataigner 0ff8f91ec8 Add db.Head() method 
Signed-off-by: Thibault Chataigner <t.chataigner@criteo.com>
 2017-09-25 16:45:24 +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
Goutham Veeramachaneni 87c01dd5fb Merge pull request #134 from criteo-forks/master 
Expose `Blocks()` on DB
 2017-09-25 17:41:25 +05:30
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 69f105f4f9 Merge pull request #151 from prometheus/waltrunc 
Use boolean function instead of postings to drop WAL series
 2017-09-21 15:04:43 +02:00
Fabian Reinartz 1e88ba06b4 Use boolean function instead of postings to drop WAL series 
There is not guarantee or requirement for WAL writers to only add
series entries in increasing order of IDs. A postings list cannot look
back and thus unordered WAL entries would skip over IDs to not truncate
from the WAL.
We replace it with a simple boolean check function that does not require
order.
 2017-09-21 13:31:01 +02:00
Thibault Chataigner 5ca18837e9 Make DB blocks list public. 
This enable computing the first timestamp in the DB
only accessing public interfaces.

Signed-off-by: Thibault Chataigner <t.chataigner@criteo.com>
 2017-09-21 11:56:12 +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 5fa1c993b9 Merge pull request #150 from prometheus/postingssort 
Ensure postings are always sorted
 2017-09-21 09:37:31 +02:00
Fabian Reinartz 6ee254e353 Ensure postings are always sorted 
IDs for new series are handed out before the postings are locked. Thus
series are not indexed in order of their IDs, which could result in only
partially sorted postings list.
Iterating over those silently skipped elements as the sort invariant was
violated.
 2017-09-21 09:38:18 +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
Goutham Veeramachaneni f39388c9af Merge pull request #147 from prometheus/deadlock 
Simplify series create logc in head
 2017-09-19 19:11:53 +05:30
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
Fabian Reinartz 162a48e4f2 Create series with ID recorded in WAL when reading it back 2017-09-19 11:31:16 +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
Fabian Reinartz 7ada9cd805 Simplify series create logic in head 2017-09-18 12:38:39 +02:00
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
Goutham Veeramachaneni 2187388292 Merge pull request #146 from prometheus/deadlock 
Add missing unlock on early return
 2017-09-18 15:02:32 +05:30
Fabian Reinartz ab8d9b9706 Add missing unlock on early return 2017-09-18 11:23:22 +02:00
Fabian Reinartz 99d39174f6 Merge branch 'master' of github.com:prometheus/tsdb 2017-09-18 11:20:45 +02:00
Fabian Reinartz 8214dc82a7 Remove infinite block in benchmark 2017-09-18 11:20:25 +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