mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-12-27 06:29:42 -08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity
4487 commits 243 branches 444 tags 649 MiB
Commit graph

4487 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brian Brazil efaa8f9ce8 Update getting started with new rules format 2017-10-31 13:58:09 +00:00
Fabian Reinartz eef46ae8e5
Merge pull request #3372 from prometheus/maxblockdur 
tsdb: default too small max block duration
 2017-10-31 12:22:56 +01:00
Fabian Reinartz 30e777d10d tsdb: default too small max block duration 2017-10-30 12:09:56 +01:00
Fabian Reinartz d93273c4dc
Merge pull request #3368 from cstyan/callum-3353 
bump consul HTTP client timeout by 5s
 2017-10-29 10:34:31 +01:00
Callum Styan 7776527390 bump consul HTTP client timeout by 5s so it doesn't match up exactly with the consul SD watch timeout 2017-10-28 16:42:42 -07:00
Tobias Schmidt 94d9a200aa
Merge pull request #3367 from prometheus/docs 
A few 2.0 doc adjustments
 2017-10-28 13:22:46 +02:00
Fabian Reinartz a32e4cbdd8 docs: remove 1.x storage docs 
The only section that still aplies was the one on the default storage
directory so those docs seem obsolete.
We'll probably have a similar page on the new storage but we'll only
find out what caveats etc. we'll have to point out as we get people
reporting problems or notable behavior.
 2017-10-28 12:11:35 +02:00
Fabian Reinartz 8cc78b36a2 docs: remove obsolete info in getting started 
Go automatically configures the number of used threads appropriately
and tweaking it is no longer relevant for a basic setup of Prometheus.
The baseline consumption tied to the storage layer no longer applies.
 2017-10-28 12:09:03 +02:00
Fabian Reinartz 8a2b5a3936 docs: update flags to new double-dash syntax 2017-10-28 12:08:33 +02:00
Brian Brazil faf4bb03ee Docs: timestamp() function. 2017-10-27 15:54:45 +01:00
Brian Brazil aeb524ad14 Docs: remove keep_common, count_scalar, drop_common_labels 2017-10-27 15:54:45 +01:00
Tobias Schmidt c4a68f29bf Merge branch 'release-1.8' 2017-10-27 16:38:54 +02: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
Fabian Reinartz 43bc484b6b Remove code climate badges (#3361) 2017-10-27 12:37:00 +00:00
Tom Wilkie 48a7a00a38 Fast path the merge querier (#3358) 
* Fast path the merge querier such that it is completely removed from query path when there is no remote storage.

* Add NoopQuerier

* Add copyright notice.

* Avoid global, use a function.
 2017-10-27 13:29:05 +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
Tom Wilkie 323556b025 Merge pull request #3357 from prometheus/revert-3339-3065-remote-read-bypass 
Revert "Bypass the fanout storage merging if no remote storage is configured."
 2017-10-26 16:15:50 +01:00
Tom Wilkie 0e572686db Revert "Bypass the fanout storage merging if no remote storage is configured." 2017-10-26 16:09:39 +01: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
Tom Wilkie 7aa2930ac5 Merge pull request #3336 from tomwilkie/remote-api-update 
Update remote storage APIs from 1.8 branch
 2017-10-26 13:55:51 +01:00
Tom Wilkie 1af3ef431d s/TestRemoveLabels/TestSeriesSetFilter/ 2017-10-26 13:50:39 +01:00
Tom Wilkie 9c3c98e8de Revert "Port 'Don't disable HTTP keep-alives for remote storage connections.' to 2.0 (see #3173)" 
This reverts commit 0997191b18.
 2017-10-26 13:43:48 +01:00
Tom Wilkie 746752b946 Merge external labels in order. 2017-10-26 11:44:49 +01:00
Tom Wilkie 6e4d4ea402 Initialise some counters in remote storage API. 2017-10-26 11:09:45 +01:00
Tom Wilkie b22485bef0 Remove spurious test import. 2017-10-26 11:09:43 +01:00
Tom Wilkie 2ae04d0e79 Add license header. 2017-10-26 11:09:16 +01:00
Tom Wilkie e8c264e47a Add comment. 2017-10-26 11:09:16 +01:00
Tom Wilkie ee011d906d Port remote read server to 2.0. 2017-10-26 11:09:14 +01:00
Bryan Boreham 0997191b18 Port 'Don't disable HTTP keep-alives for remote storage connections.' to 2.0 (see #3173) 
Removes configurability introduced in #3160 in favour of hard-coding,
per advice from @brian-brazil.
 2017-10-26 11:08:33 +01:00
Tom Wilkie 56820726fa Move a couple of the encoding/decoding functions into codec.go 2017-10-26 11:08:33 +01:00
Conor Broderick 08b7328669 Port Metric name validation to 2.0 (see #2975) 2017-10-26 11:08:33 +01:00
Tom Wilkie 8fe0212ff7 Port 'Make queue manager configurable.' to 2.0, see #2991 2017-10-26 11:08:33 +01:00
Tom Wilkie 3760f56c0c remote: Expose ClientConfig type (see #3165) 2017-10-26 11:08:33 +01:00
Tom Wilkie 16f71a7723 Port codec.go over form 1.8 branch. 2017-10-26 11:08:33 +01:00
Fabian Reinartz e53040e2ac Merge pull request #3339 from tomwilkie/3065-remote-read-bypass 
Bypass the fanout storage merging if no remote storage is configured.
 2017-10-26 09:14:26 +02:00
Fabian Reinartz bf6db1bc3b Merge pull request #3344 from criteo-forks/master 
Tsdb StartTime : Use a simplier way to compute StartTime
 2017-10-26 09:08:48 +02:00
Fabian Reinartz bf56ad4233 Merge branch 'master' into master 2017-10-26 09:06:12 +02:00
Fabian Reinartz 3055b55830 Merge pull request #3354 from pgier/tsdb-block-duration-check 
storage/tsdb: check that max block duration is larger than min
 2017-10-26 09:04:54 +02:00
Fabian Reinartz 5800c257af Merge pull request #3355 from prometheus/remove-codeclimate 
Remove .codeclimate.yml
 2017-10-26 09:03:11 +02:00
Julius Volz 554ccf551c Remove .codeclimate.yml 
See https://github.com/prometheus/prometheus/pull/3333#issuecomment-339209982
 2017-10-26 04:51:11 +00:00
Paul Gier c4c3205d76 storage/tsdb: check that max block duration is larger than min 
If the user accidentally sets the max block duration smaller than the min,
the current error is not informative.  This change just performs the check
earlier and improves the error message.
 2017-10-25 19:24:49 -05:00
Fabian Reinartz ce63a5a855 Merge pull request #3352 from prometheus/rc2 
Cut v2.0.0-rc.2
 2017-10-25 20:39:39 +02:00
Thibault Chataigner fc4406201e Tsdb StartTime : Use a simplier way to compute StartTime 2017-10-25 17:41:00 +02:00
Fabian Reinartz 013f368449 *: cut v2.0.0-rc.2 2017-10-25 17:02:59 +02:00
Fabian Reinartz b5d1ec53da vendor: update prometheus/tsdb 2017-10-25 16:54:39 +02:00