github
/
prometheus
mirror of https://github.com/prometheus/prometheus
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
1,822 Commits
232 Branches
442 Tags
620 MiB
Commit Graph

1822 Commits (b105e26f4d1bb64e2025a211c1251782f6790aa8)

Author SHA1 Message Date
Björn Rabenstein 15cd8b3134 Merge pull request #633 from prometheus/beorn7/doc 
Add warning about tarballs.
 2015-04-10 14:57:52 +02:00
beorn7 f81cbb00c6 Add warning about tarballs. 2015-04-10 13:53:32 +02:00
Björn Rabenstein 04a078f5d4 Merge pull request #631 from prometheus/beorn7/release 
Cut 0.13.1.
 2015-04-09 16:41:06 +02:00
beorn7 54fc50e58c Cut 0.13.1. 2015-04-09 16:36:04 +02:00
Björn Rabenstein dc8c9a37ce Merge pull request #630 from prometheus/beorn7/persistence 
Fix the case where a series in memory has 0 chunks, but chunks on disk.
 2015-04-09 16:31:15 +02:00
beorn7 c5fa0b90c3 Fix the case where a series in memory has 0 chunks, but chunks on disk. 
This is actually completely normal for a freshly unarchived series.

Test added to expose.
 2015-04-09 15:57:11 +02:00
Tobias Schmidt 49d67fc834 Merge pull request #629 from prometheus/improve-usage-formatting 
Improve readability of usage text
 2015-04-08 17:51:29 -04:00
Tobias Schmidt 7d71d354fd Remove special listing of config.file in usage 
The -config.file parameter isn't required or any more special than the
other flags. In order to avoid confusion, this change removes the
special mention again. Instead, the error message if a config file
couldn't be loaded is changed to mention the flag name.
 2015-04-08 17:36:15 -04:00
Tobias Schmidt 35a44509fb Improve readability of usage text 
Separates flag and description by a newline to make it easier to read
the flags with long descriptions.
 2015-04-08 17:33:25 -04:00
Björn Rabenstein 2d7d1a34b6 Merge pull request #628 from prometheus/beorn7/release 
Update vendoring and release 0.13.0.
 2015-04-08 18:51:43 +02:00
beorn7 cb1650b5a9 Cut v0.13.0. 2015-04-08 18:44:58 +02:00
beorn7 191c728152 Update vendoring. 2015-04-08 18:24:23 +02:00
Björn Rabenstein 7991b4be51 Merge pull request #627 from fabxc/flag_grouping 
Make help output readable.
 2015-04-08 13:50:27 +02:00
Fabian Reinartz c012ca6039 Make help output readable. 
This commit increases the usability by grouping flags based on their
first dot-separated group. Long flag descriptions are broken into lines
printed with indentation.
 2015-04-08 12:41:49 +02:00
Björn Rabenstein e1b5f18dee Merge pull request #626 from quinox/fix-625 
#625 Fix incorrect consoles URL
 2015-04-07 17:19:35 +02:00
Björn Rabenstein d8e515e9cb Merge pull request #617 from prometheus/influxdb-write-support 
Add experimental InfluxDB write support.
 2015-04-07 13:23:06 +02:00
Ceesjan Luiten 6f5f33bd4d #625 Fix incorrect consoles URL 2015-04-06 17:30:13 +02:00
Julius Volz 059ab9383f Merge pull request #614 from quinox/master 
Make all URLs absolute to support proxies
 2015-04-02 20:49:21 +02:00
Ceesjan Luiten 0e18784c64 Make all paths absolute to support proxies 2015-04-02 20:36:47 +02:00
Julius Volz 593e565688 Allow writing to InfluxDB/OpenTSDB at the same time. 2015-04-02 20:24:38 +02:00
Björn Rabenstein 440d5df6e2 Merge pull request #621 from prometheus/beorn7/release 
Cut release 0.13.0rc2.
 2015-04-02 14:30:06 +02:00
beorn7 4a452b4274 Cut release 0.13.0rc2. 2015-04-02 14:25:02 +02:00
Björn Rabenstein 621ac10060 Merge pull request #620 from prometheus/beorn7/persistence 
Adaptively reduce the wait time for memory series maintenance.
 2015-04-02 14:09:27 +02:00
beorn7 3035b8bfdd Adaptively reduce the wait time for memory series maintenance. 
This will make in-memory series maintenance the faster the more chunks
are waiting for persistence.
 2015-04-01 17:52:03 +02:00
Julius Volz 9f198cc7b5 Merge pull request #619 from fabxc/fabxc/rule_checker 
Increase the usability of the rule_checker CLI.
 2015-04-01 16:36:56 +02:00
Fabian Reinartz c4e762adbf Increase the usability of the rule_checker CLI. 
This commit allows to invoke the rule_checker with a chain of
filepaths as arguments. If no paths are provided it reads from standard
input.
The -rule-file flag remains for backward-compatibility.
On processing errors the return code is now 1. For bad arguments
the return code is now 2.
 2015-04-01 08:17:12 +02:00
Julius Volz 61fb688dd9 Add experimental InfluxDB write support. 2015-04-01 02:03:16 +02:00
Julius Volz b456240c46 Merge pull request #612 from prometheus/strip-am-url-slash 
Strip trailing slash in alertmanager URL.
 2015-03-30 20:18:03 +02:00
Julius Volz 52d89b2173 Merge pull request #616 from brian-brazil/yotta-infinity 
Avoid +InfYs and similar, just display +Inf.
 2015-03-28 20:27:56 +01:00
Julius Volz 7793651b7d Merge pull request #615 from prometheus/api-tests 
Add initial HTTP API tests.
 2015-03-28 20:24:35 +01:00
Brian Brazil 941f585164 Avoid +InfYs and similar, just display +Inf. 2015-03-28 18:51:41 +00:00
Björn Rabenstein b841ae41cd Merge pull request #604 from prometheus/beorn7/benchmark 
Add benchmark for loading chunks and chunk descs.
 2015-03-28 11:56:17 +01:00
Julius Volz 188aec0e6d Remove now-unused utility.Time type. 2015-03-27 23:45:11 +01:00
Julius Volz 33702da8a8 Use simple Now() func in API instead of utility.Time. 2015-03-27 23:43:47 +01:00
Julius Volz a5a553f1da Add initial HTTP API tests. 
This covers the /query (instant query) endpoint for now. Others to
follow.
 2015-03-27 21:37:55 +01:00
Julius Volz 3f2686d0b3 Remove unused fields from MetricsService. 2015-03-27 18:51:13 +01:00
Julius Volz c8a6b73bff Merge pull request #606 from prometheus/custom-instant-timestamps 
Allow custom timestamps in instant query API.
 2015-03-27 18:31:51 +01:00
Julius Volz c9b76def4c Report all query API HTTP errors in JSON format. 2015-03-27 16:48:03 +01:00
Julius Volz af832f7641 Merge pull request #613 from prometheus/version-0.13.0rc1 
Cut Prometheus 0.13.0rc1.
 2015-03-26 18:19:58 +01:00
Julius Volz cd82bcff34 Cut Prometheus 0.13.0rc1. 2015-03-24 17:59:55 +01:00
Julius Volz 5aae273026 Strip trailing slash in alertmanager URL. 
Fixes https://github.com/prometheus/prometheus/issues/607
 2015-03-23 19:17:42 +01:00
Julius Volz ca94e09a23 Merge pull request #610 from prometheus/fix-html-escaping 
HTML-escape label values in Rickshaw hover-detail.
 2015-03-23 00:25:34 +01:00
Julius Volz ea8a12db59 Also fix label HTML-escaping in console graphs. 2015-03-22 23:47:00 +01:00
Julius Volz 8f6ef04d70 HTML-escape label values in Rickshaw hover-detail. 2015-03-22 21:59:14 +01:00
Julius Volz df314ead84 Remove unnecessary "else" branch in query API. 2015-03-21 17:54:30 +01:00
Julius Volz a68b880c27 Add tests for new timestamp/duration functions. 
...and fix the first bugs in them where they truncate precision below a
second.
 2015-03-21 17:50:45 +01:00
Julius Volz cb816ea14a Improve timestamp/duration parsing in query API. 
Don't handle `0` as a special timestamp value for "now" anymore, except
in the `QueryRange()` case, where existing API consumers still expect
`0` to mean "now".

Also, properly return errors now for malformed timestamp/duration
float values.
 2015-03-21 16:58:45 +01:00
Julius Volz 8a4acefd66 Allow custom timestamps in instant query API. 2015-03-20 23:10:58 +01:00
Julius Volz c78436d707 Remove unused API time dependency injection. 2015-03-20 23:10:26 +01:00
beorn7 fbc44d8f95 Add benchmark for loading chunks and chunk descs. 2015-03-19 19:28:21 +01:00