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

4504 commits

This branch
This branch
All branches
Author SHA1 Message Date
Björn Rabenstein c686f40adf
Merge pull request #3396 from prometheus/beorn7/doc 
Remove @beorn7 from MAINTAINERS.md, promote @fabxc to storage maintainer
 2017-11-03 12:56:16 +01:00
beorn7 d8c58d17e0 Remove _local storage_ from fabxc's responsibilities again 
This is just for now, as fabxc doesn't seem to be available to agree
to his new role. Just revert this commit once he has.
 2017-11-03 12:52:24 +01:00
beorn7 2121b4628b Update NOTICE for gogo/protobuf 2017-11-02 15:28:47 +01:00
Björn Rabenstein 7ff9ea9ae3
Merge pull request #3394 from krasi-georgiev/gogo-vs-golang-protobuf 
replace golang/protobuf with  gogo/protobuf
 2017-11-02 15:26:27 +01:00
Björn Rabenstein fe3cde2d50
Merge pull request #3392 from krasi-georgiev/updated-gitignore 
updated-gitignore
 2017-11-02 15:25:14 +01:00
Björn Rabenstein 35507d9e9a
Merge pull request #3398 from prometheus/marathon-docs 
Tweak marathon wording around clustering.
 2017-11-02 15:17:59 +01:00
Brian Brazil a5b7955ace Tweak marathon wording around clustering. 2017-11-02 13:03:19 +00:00
Krasi Georgiev 5d8f93a22a now using only github.com/gogo/protobuf 
bumped all grpc-gateway packages to v1.2.2
updated and run  the denproto.sh script
 2017-11-02 11:31:57 +00:00
beorn7 f306b9100c Remove @beorn7 from MAINTAINERS.md, promote @fabxc to storage maintainer 
With the merge of dev-2.0 into master, the local storage code I used
to own has disappeared. @fabxc is the obvious most qualified person
for the new storage code.

Leaving me in just for “general code-level issues” would suggest I'm
in some overarching code custodian role, which doesn't really match
reality.

Open for other suggestions.
 2017-11-02 12:17:43 +01:00
Krasi Georgiev bc3ed97166 updated-gitignore 2017-11-01 21:49:59 +00:00
Goutham Veeramachaneni 646e33242e docs: Fix minor issues with the docs. (#3389) 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-11-01 15:35:50 +00:00
Brian Brazil b6494960d1
docs: Document new recording rule format (#3378) 2017-11-01 12:58:32 +00:00
Brian Brazil 7187771f20
Document new staleness (#3380) 
Remove "interpolation" for this heading, that hasn't
been in these docs for a long time.
 2017-11-01 12:40:47 +00:00
Krasi Georgiev e86d82ad2d Fix regression of alert rules state loss on config reload. (#3382) 
* incorrect map name for the group prevented copying state from existing alert rules on config reload

* applyConfig test

* few nits

* nits 2
 2017-11-01 12:58:00 +01:00
Julien Pivotto 3382f39046 Explicitely add alertmanager to example config (#3383) 
As alertmanager needs to be configured in the config file in Prometheus 2, I think it is useful to have it in the example config.

Also renamed the rules in the example config so they are explicitely yml files.
 2017-10-31 22:02:08 +00:00
James Turnbull 3701a827cf Updates to alerting rules docs (#3381) 
1. Added a further explanation of the for clause.
2. Added further clarification of non identifying labels.
 2017-10-31 19:19:17 +00:00
Brian Brazil 8cf279efb1 Document new alerting rule format. 2017-10-31 14:46:34 +00:00
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