mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-12-25 21:54:10 -08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity
5881 commits 243 branches 444 tags 649 MiB
Commit graph

5881 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Frederic Branczyk ac7b0ae4e6
RELEASE.md: Add command to run benchmark on release candidates 
Signed-off-by: Frederic Branczyk <fbranczyk@gmail.com>
 2019-07-04 19:43:15 +02:00
Frederic Branczyk 2914a537db
RELEASE.md: Add procedure for when to publish docs 
Signed-off-by: Frederic Branczyk <fbranczyk@gmail.com>
 2019-07-04 19:42:59 +02:00
Frederic Branczyk 5d84b76b81
Merge pull request #5729 from brancz/cut-2.11.0-rc.0 
Cut v2.11.0-rc.0
 2019-07-04 13:26:40 +02:00
Frederic Branczyk dc37d3d729
Cut v2.11.0-rc.0 
Signed-off-by: Frederic Branczyk <fbranczyk@gmail.com>
 2019-07-04 11:04:41 +02:00
Frederic Branczyk 0727318b95
Merge pull request #5592 from csmarchbanks/compress-wal 
Compress WAL
 2019-07-03 17:41:05 +02:00
Chris Marchbanks 06f1ba73eb
Provide flag to compress the tsdb WAL 
Signed-off-by: Chris Marchbanks <csmarchbanks@gmail.com>
 2019-07-03 08:03:29 -06:00
Chris Marchbanks 475ca2ecd0
Update to tsdb 0.9.1 
Signed-off-by: Chris Marchbanks <csmarchbanks@gmail.com>
 2019-07-03 07:51:11 -06:00
Frederic Branczyk a3d030350f
Merge pull request #5722 from c2c-engg-20170100/dockerhub_link 
Fix docker hub link in installation guide
 2019-07-03 15:40:05 +02:00
Björn Rabenstein 52e28b41d3
Merge pull request #5728 from prometheus/beorn7/doc 
Clarifying honor_labels documentation
 2019-07-02 13:39:19 +02:00
beorn7 5973acd65d Clarifying honor_labels documentation 
Previously, the wording could be misunderstood as setting honor_labels
to "false" for federation.

This also adds scraping the Pushgateway as a typical use case for
honor_labels=true.

Signed-off-by: beorn7 <beorn@grafana.com>
 2019-07-02 13:23:20 +02:00
c2c-engg-20170100 81f9dac6a0 Fix docker hub link in installation guide 
Signed-off-by: c2c-engg-20170100 <c2c-20170100@click2cloud.net>
 2019-07-01 16:26:23 +05:30
Tom Wilkie 851131b074
Allow injection of arbitrary headers in promtool, for auth etc. (#4389) 
Signed-off-by: Tom Wilkie <tom.wilkie@gmail.com>
 2019-06-30 11:50:23 +01:00
Björn Rabenstein 32c3a1beef
Merge pull request #4474 from prometheus/mixin 
Prometheus Monitoring Mixin for Prometheus itself.
 2019-06-29 00:14:00 +02:00