Commit graph

13544 commits

Author SHA1 Message Date
Julius Volz 4133020de1 Align graph controls with graph edge. 2015-01-20 16:43:23 +01:00
Julius Volz 25148e55c6 Prometheus version 0.9.0rc4. 2015-01-20 15:15:37 +01:00
juliusv 0b1029a7ea Merge pull request #443 from prometheus/bootstrap3
Bootstrap3 conversion
2015-01-19 16:20:46 +01:00
Björn Rabenstein e6a1ac8f12 Merge pull request #450 from prometheus/beorn7/double-start-protection
Add double-start protection.
2015-01-19 14:32:46 +01:00
Bjoern Rabenstein f298af5756 Use named returns in flock.New. 2015-01-19 14:31:16 +01:00
Julius Volz 12a99ab5b4 Some more UI/JS fixes/cleanups. 2015-01-19 14:27:07 +01:00
Julius Volz 013c22ca01 Adjust input group margins for more equal spacing. 2015-01-19 14:15:37 +01:00
juliusv ebcd32c04e Merge pull request #448 from prometheus/rework-dockerfile
Rework dockerfile
2015-01-19 13:58:47 +01:00
Julius Volz 170da9460d Focus/typeahead fix. 2015-01-19 13:33:56 +01:00
Julius Volz d96d4933d9 Complete Bootstrap 3 conversion.
- use the autocomplete plugin from
  https://github.com/bassjobsen/Bootstrap-3-Typeahead
- use native Bootstrap tabs
- make everything look much nicer (hopefully)
- other minor fixes/additions
2015-01-19 01:29:30 +01:00
Johannes 'fish' Ziemke 8a7289ce55 Use golang base image and not make
Instead of using make to install all dependencies, this uses the golang
base image. This way those common base layers can be shared across other
golang based images.
This also stops using the Makefile to install the dependencies because
we would have to install all dependencies everytime something changes.

Change-Id: I5e143cc4ec3e5c9027ec4912be12297e704ffff5
2015-01-14 17:54:08 +01:00
Bjoern Rabenstein baca6faa1c Add double-start protection.
This mimics the locking leveldb is performing anyway. Advantages of
doing it separately:

- Should we ever replace the leveldb implementation by one without
  double-start protection, we are still good.

- In contrast to leveldb, the new code creates a meaningful error
  message.
2015-01-14 17:13:42 +01:00
Julius Volz ff5eeb49fa Fix datepicker timezone issues. 2015-01-14 15:09:58 +01:00
Björn Rabenstein 7ca29308e6 Merge pull request #449 from prometheus/beorn7/fix-partitioning-by-outcome
Adjust the partitioning by outcome.
2015-01-13 18:48:54 +01:00
Bjoern Rabenstein 3b4e5e8be6 Improve help string. 2015-01-13 18:47:51 +01:00
Bjoern Rabenstein ae70eac97d Adjust the partitioning by outcome. 2015-01-13 18:34:56 +01:00
Stuart Nelson 97ad5d3d1b Update jquery and jquery-ui. 2015-01-12 16:37:25 +01:00
Stuart Nelson 5cd8030c37 Include bootstrap.js.min 2015-01-12 16:37:13 +01:00
Johannes 'fish' Ziemke 7b8fd9c7a5 Read version from VERSION file
Change-Id: Idfbe2dbe6cb8cd90c6c728dca7d10ff580c7b9d6
2015-01-12 15:05:36 +01:00
Stuart Nelson 8d7581d8c4 Add datetimepicker css. 2015-01-12 14:26:09 +01:00
Stuart Nelson 0529e3fcfa Use datetimepicker. 2015-01-12 14:18:28 +01:00
juliusv e0a90d3da5 Merge pull request #446 from prometheus/fix-dockerfile
Installing gcc as rule_checker and procfs dependency
2015-01-11 22:31:45 +01:00
Johannes 'fish' Ziemke a6e320a88c Installing gcc as rule_checker and procfs dep
Change-Id: I370e9192a6bfd9275dd6f4b4c0f35c6675cfb75f
2015-01-11 14:26:30 +01:00
Stuart Nelson 2d5c2c5726 style rickshaw legend 2015-01-09 14:27:58 +01:00
Stuart Nelson 3814daac48 Make Loadtime/ Resolution info look nicer. 2015-01-09 14:23:09 +01:00
Stuart Nelson 071d98f3d0 Square corners 2015-01-09 14:23:00 +01:00
Stuart Nelson 7b9bf8d3e5 Query header. 2015-01-09 14:12:52 +01:00
Stuart Nelson 46f7bd2820 graph controls 2015-01-09 13:55:01 +01:00
Julius Volz 3836fc01d1 Prometheus version 0.9.0rc3. 2015-01-09 13:11:03 +01:00
stuart nelson 5201cbf3c6 Merge pull request #441 from prometheus/vendor-dependencies
Vendor external dependencies with godep.
2015-01-09 12:47:23 +01:00
Julius Volz cc1f2b6cad Fix environment variables for godep invocation. 2015-01-09 12:33:58 +01:00
Stuart Nelson f1c257845f Vendor external dependencies with godep. 2015-01-09 12:00:42 +01:00
Julius Volz a6bc42bc61 Minor formatting/spelling fixups. 2015-01-09 11:04:20 +01:00
juliusv cca2e58f20 Merge pull request #442 from prometheus/beorn7/fix-crash-recovery
Fix ALL the crash-recovery related problems.
2015-01-09 10:56:02 +01:00
Julius Volz 8ce89f0086 WIP: Upgrade to Bootstrap 3. 2015-01-09 10:15:56 +01:00
Bjoern Rabenstein 0851945054 Add a heuristics to checkpoint early if there are many "dirty" series.. 2015-01-08 20:15:58 +01:00
juliusv 325788f2ef Merge pull request #440 from prometheus/report-rule-failures
Report rule eval failures, remove extraction.Result type
2015-01-08 17:55:55 +01:00
Julius Volz bb1e49383e Log rule evalation errors. 2015-01-08 17:50:55 +01:00
Julius Volz d6b9e97655 Remove extraction.Result type, simplify code. 2015-01-08 16:34:01 +01:00
Julius Volz 9a4ca68a61 Add metrics for rule evaluation failures.
Fixes https://github.com/prometheus/prometheus/issues/417
2015-01-08 16:33:35 +01:00
Bjoern Rabenstein 622e8350cd Fix a bug handling freshly unarchived series.
Usually, if you unarchive a series, it is to add something to it,
which will create a new head chunk. However, if a series in
unarchived, and before anything is added to it, it is handled by the
maintenance loop, it will be archived again. In that case, we have to
load the chunkDescs to know the lastTime of the series to be
archived. Usually, this case will happen only rarely (as a race, has
never happened so far, possibly because the locking around unarchiving
and the subsequent sample append is smart enough). However, during
crash recovery, we sometimes treat series as "freshly unarchived"
without directly appending a sample. We might add more cases of that
type later, so better deal with archiving properly and load chunkDescs
if required.
2015-01-08 16:25:50 +01:00
Björn Rabenstein 7aae5dd873 Merge pull request #439 from prometheus/beorn7/remove-deadlock
Remove a deadlock during shutdown.
2015-01-07 19:18:40 +01:00
Bjoern Rabenstein eb932d1524 Remove a deadlock during shutdown. 2015-01-07 19:02:38 +01:00
juliusv 917acb6baf Merge pull request #429 from brian-brazil/scrape-time
Have scrape time as a pseudovariable, not a prometheus variable.
2015-01-02 13:22:04 +01:00
juliusv ba0bc6adce Merge pull request #431 from brian-brazil/contrib
Update contributing guide to remove gerrit.
2015-01-02 13:18:56 +01:00
Brian Brazil a7eb9f6fb0 Update contributing guide to remove gerrit.
The contributors list is outdated, update. Looks like we're sorting by first name.
2015-01-02 10:14:05 +00:00
juliusv 6cd29eec48 Merge pull request #434 from brian-brazil/graphlink
Fix regression from 5e8d57bec1
2014-12-29 01:53:38 +01:00
Brian Brazil e56786b221 Have scrape time as a pseudovariable, not a prometheus variable.
This ensures it has the right timestamp, and is easier to work with.

Switch sd variable away from 'outcome', using total/failed instead.
2014-12-27 00:39:33 +00:00
Brian Brazil ffa2e73803 Fix regression from 5e8d57bec1
0 is a false value, so shortcutting no longer works.
Update other places in the code that assumed graph was the default.
2014-12-27 00:28:36 +00:00
juliusv 48d6ba2505 Merge pull request #433 from brian-brazil/upgrade-rickshaw
Upgrade rickshaw to v1.5.1
2014-12-27 01:21:56 +01:00