RepoMirrors/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus synced 2024-12-27 09:02:53 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,894 Commits 243 Branches 444 Tags 653 MiB
8928094b56
Commit Graph

5894 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ethan
8928094b56 func name ref correct "qauntile" -> "quantile" (#5834) 
Signed-off-by: ethan <guangming.wang@daocloud.io>
 2019-08-06 06:11:16 +01:00
slava
5e974d3170 Fix context for the showWarning function (#5833) 
* Fix context for the showWarning function

If the difference between the current time on a client and time on a server is quite big, Prometheus tries to show a related warning in UI on the Graph tab. But in the code, an incorrect context is used to invoke this method. As a result, an error is showed in the web developer console and the whole page stop working at all. This commit fixes the context.

CC @juliusv

Signed-off-by: Vyacheslav Kulakov <vkulakov@swiftserve.com>

* Fix context for the showWarning function

Fixed assets

CC @juliusv

Signed-off-by: Vyacheslav Kulakov <vkulakov@swiftserve.com>
 2019-08-05 20:03:12 +02:00
Ganesh Vernekar
a3487fc74c
Merge pull request #5830 from vmartsynovskyy/fix-docs 
Fix incorrect examples in docs
 2019-08-05 11:38:02 +05:30
Vadym Martsynovskyy
a9970a47ef Fix incorrect examples in docs 
Signed-off-by: Vadym Martsynovskyy <vmartsynovskyy@gmail.com>
 2019-08-04 16:42:42 -07:00
AllenZMC
8d6ec5acdc fix word 'seriess' to 'series' (#5828) 
Signed-off-by: czm <zhongming.chang@daocloud.io>
 2019-08-04 16:52:51 +01:00
AllenZMC
5c2c9a03e9 fix word 'consequentally' to 'consequently' (#5827) 
Signed-off-by: czm <zhongming.chang@daocloud.io>
 2019-08-03 14:56:58 +01:00
AllenZMC
9e47bb8b46 fix word 'parmeters' to 'parameters' (#5826) 
Signed-off-by: czm <zhongming.chang@daocloud.io>
 2019-08-02 14:52:15 +01:00
AllenZMC
ead0933dd9 fix word 'substracting' to 'subtracting' (#5822) 
Signed-off-by: czm <zhongming.chang@daocloud.io>
 2019-08-01 15:44:38 +01:00
Dan P
a9dea68ee6 removed document reference to meta label that doesnt exist in the kubernetes_sd (#5821) 
Signed-off-by: Dan Potepa <dan@danpotepa.co.uk>
 2019-08-01 12:34:23 +01:00
Advait Bhatwadekar
5d401f1e1b Added query logging for prometheus. Issue #1315 (#5794) 
* Added query logging for prometheus.
Options added:
1) active.queries.filepath: Filename where queries will be recorded
2) active.queries.filesize: Size of the file where queries will be recorded.

Functionality added:
All active queries are now logged in a file. If prometheus crashes unexpectedly, these queries are also printed out on stdout in the rerun.

Queries are written concurrently to an mmaped file, and removed once they are done. Their positions in the file are reused. They are written in json format. However, due to dynamic nature of application, the json has an extra comma after the last query, and is missing an ending ']'. There may also null bytes in the tail of file.

Signed-off-by: Advait Bhatwadekar <advait123@ymail.com>
 2019-07-31 16:12:43 +01:00
@aifsair
0f00737308 Fix log config setup (#5807) 
The return value of Set() was not checked.
Hence, the typo ("al" instead of "af") wasn't catched.

Signed-off-by: François (fser) <fser@code-libre.org>
 2019-07-29 18:00:30 +01:00
yeya24
b7bb278e95 make targets active parallel (#5740) 
Signed-off-by: yeya24 <yb532204897@gmail.com>
 2019-07-29 17:08:54 +01:00
Björn Rabenstein
7d36178731
Merge pull request #5804 from AllenZMC/patch-1 
fix word `encourter` to `encounter`
 2019-07-29 16:44:26 +02:00
AllenZMC
758c71b980 fix word encourter to encounter 
Signed-off-by: czm <zhongming.chang@daocloud.io>
 2019-07-29 22:16:23 +08:00
Ganesh Vernekar
42bbc6b37b
Merge pull request #5801 from dzzg/patch-1 
fix wrong spells in ingress.go
 2019-07-29 10:06:37 +05:30
dzzg
938ca06057
fix wrong spells in ingress.go 
Signed-off-by: dzzg <zhengguang.zhu@daocloud.io>
 2019-07-28 02:07:23 +08:00
Ganesh Vernekar
87a0fe0c75
Merge pull request #5793 from codesome/tsdb-vendor 
Vendor tsdb v0.10.0
 2019-07-24 16:42:39 +05:30
Johnny Lim
7645ed8fd3 Fix typo (#5796) 
Signed-off-by: Johnny Lim <izeye@naver.com>
 2019-07-24 10:41:14 +01:00
Ganesh Vernekar
c782d29310
Vendor tsdb 0.10.0 
Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>
 2019-07-24 15:09:12 +05:30
Jeffery To
d91f724637 Update fsnotify to v1.4.7 (#5792) 
fsnotify v1.3.1 uses unix.InotifyInit() which is not available on
mips64/mips64le. Updating to a newer version allows builds to succeed on
these platforms.

Signed-off-by: Jeffery To <jeffery.to@gmail.com>
 2019-07-23 15:53:50 +01:00
Simon Pasquier
fb2b3c2b0b
Bump github.com/influxdata/influxdb (#5784) 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-07-22 13:39:13 +02:00
Frederic Branczyk
818373a5f8
Merge pull request #5780 from tariq1890/upd_k8s 
Add k8s 1.15.1 as a vendor dependency.
 2019-07-19 17:29:05 -07:00
Simon Pasquier
8624913a34
Bump golangci-lint to v1.17.1 (#5778) 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-07-19 09:14:33 +02:00
Tariq Ibrahim
aacacd635c
Add k8s 1.15.1 as a vendor dependency. 
Signed-off-by: Tariq Ibrahim <tariq181290@gmail.com>
 2019-07-18 15:08:13 -07:00
Ganesh Vernekar
a08db6119a
Merge pull request #5774 from simonpasquier/fix-panic-promtool 
cmd/promtool: fix panic with empty exp_labels
 2019-07-18 14:47:46 +05:30
Simon Pasquier
75886e0464 cmd/promtool: fix panic with empty exp_labels 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-07-17 17:02:31 +02:00
Devin Trejo
d77f2aa29c Only check last directory when discovering checkpoint number (#5756) 
* Only check last directory when discovering checkpoint number

Signed-off-by: Devin Trejo <dtrejo@palantir.com>

* Comments for checkpointNum

Signed-off-by: Devin Trejo <dtrejo@palantir.com>
 2019-07-15 17:53:58 +01:00
Yao Zengzeng
3cde8a9941 pass error up if WALWathcer.segments() return err (#5741) 
Signed-off-by: YaoZengzeng <yaozengzeng@zju.edu.cn>
 2019-07-15 17:52:03 +01:00
Simon Pasquier
abdcbda82a
.circleci/config.yml: limit the number of parallel tasks (#5705) 
If unlimited, it takes too much memory and the job is killed by the CI.

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-07-15 11:20:08 +02:00
Simon Pasquier
bb3141e9f0
.circleci/config.yml: use prometheus/prometheus orb (#5760) 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-07-15 09:41:28 +02:00
Simon Pasquier
9a1935d641
scrape: remove unused type (#5761) 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-07-15 08:54:22 +02:00
Frederic Branczyk
fb6c709a5e
Merge pull request #5753 from metalmatze/grafanaDashboards 
Fix prometheus-mixin dashboards to use grafanaDashboards
 2019-07-11 15:51:01 +02:00
Matthias Loibl
20d12ff1c7
Fix prometheus-mixin dashboards to use grafanaDashboards 
Signed-off-by: Matthias Loibl <mail@matthiasloibl.com>
 2019-07-11 15:40:26 +02:00
Frederic Branczyk
28e56d974a
Merge pull request #5744 from prometheus/release-2.11 
Merge Release 2.11 back into master
 2019-07-10 17:19:34 +02:00
Frederic Branczyk
e5b2249485
Merge pull request #5752 from brancz/cherry-pick-5749 
Cherry pick 5749 & Release v2.11.1
 2019-07-10 15:46:08 +02:00
Frederic Branczyk
aea611afed
*: Cut v2.11.1 
Signed-off-by: Frederic Branczyk <fbranczyk@gmail.com>
 2019-07-10 14:13:38 +02:00
Ye Ji
8873e49a45
give each tree cache its unique channel to avoid multiple close on the same channel 
Signed-off-by: Ye Ji <ye@hioscar.com>
 2019-07-10 14:09:01 +02:00
Frederic Branczyk
dd598f906d
Merge pull request #5749 from meridional/fix-close 
Fix potential panic when prometheus is watching multiple zookeeper paths
 2019-07-10 14:06:35 +02:00
Frederic Branczyk
4c355837b7
Merge pull request #5746 from csmarchbanks/wal-compression-docs 
Add documentation for the WAL compression flag
 2019-07-10 09:38:07 +02:00
Ye Ji
9229811c94 give each tree cache its unique channel to avoid multiple close on the same channel 
Signed-off-by: Ye Ji <ye@hioscar.com>
 2019-07-09 16:38:56 -04:00
Ye Ji
2b78147417
Merge pull request #1 from prometheus/master 
update
 2019-07-09 16:11:24 -04:00
Xigang Wang
445bcd1251 Update the runShard method and change len(pendingSamples) to n=len(pendingSamples) (#5708) 
Signed-off-by: xigang <wangxigang2014@gmail.com>
 2019-07-09 19:09:11 +01:00
Chris Marchbanks
08f6a43619
Add documentation for the WAL compression flag 
Signed-off-by: Chris Marchbanks <csmarchbanks@gmail.com>
 2019-07-09 10:33:59 -06:00
Björn Rabenstein
fc3b772342
Merge pull request #5743 from tariq1890/rm_cockroach 
remove the dependency on cockroachdb in prometheus
 2019-07-09 12:09:33 +02:00
Frederic Branczyk
4ef66003d9
Merge pull request #5742 from brancz/cut-2.11.0-final 
*: cut v2.11.0
 2019-07-09 11:42:20 +02:00
Tariq Ibrahim
9fe9e66cfd
remove the dependency on cockroachdb in prometheus 
Signed-off-by: Tariq Ibrahim <tariq181290@gmail.com>
 2019-07-09 01:27:17 -07:00
Frederic Branczyk
2c1a58ee13
*: cut v2.11.0 
Signed-off-by: Frederic Branczyk <fbranczyk@gmail.com>
 2019-07-09 10:13:22 +02:00
Thomas Jackson
fef150f1b5 Add tests to ensure we can marshal and unmarshal our min/max times (#5734) 
* Add tests to ensure we can marshal and unmarshal our min/max times

Related to https://github.com/prometheus/client_golang/issues/614

Instead of implementing all the time parsing, we can special-case handle
these 2 times. This means if times in this format show up that
time.Parse can't handle they will still error, but we can marshal/parse
our own min/max time

Signed-off-by: Thomas Jackson <jacksontj.89@gmail.com>
 2019-07-08 10:43:59 +01:00
Marco Pracucci
2ccc48adc6 Documented /healthy, /ready and lifecycle API (#5737) 
Signed-off-by: Marco Pracucci <marco.pracucci@spreaker.com>
 2019-07-05 10:50:48 +01:00
Frederic Branczyk
aebf3e7520
Merge pull request #5736 from brancz/docs-release 
Add more detailed instructions for releases
 2019-07-04 21:58:34 +02:00