mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-12-30 07:59:40 -08:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity
2860 commits 242 branches 446 tags 652 MiB
Commit graph

2860 commits

This branch
This branch
All branches
Author SHA1 Message Date
beorn7 d43c0159aa Fix style issues in retrieval/... 2016-05-19 17:14:04 +02:00
beorn7 b95c096a45 Fix style issues in rules/... 2016-05-19 16:59:53 +02:00
Fabian Reinartz d9394eb359 Merge pull request #1641 from prometheus/beorn7/vendoring 
Update vendoring of golang.org/x/net/context/...
 2016-05-18 16:58:23 -07:00
beorn7 5ae32dce1c Update vendoring of golang.org/x/net/context/... 
This should fix problems with hung scrapes.
 2016-05-19 01:12:47 +02:00
Fabian Reinartz a2fc876306 Merge pull request #1631 from prometheus/beorn7/ui 
Pull targets and rules out of status into their own tab
 2016-05-18 10:12:30 -07:00
beorn7 da8cb10b43 Partition the status tab into items in a dropdown 
I got feedback from different sources about rules and targets being
too heavy in the status tab if their are lots of them.

This change also allows for more fine-granular locking.
 2016-05-18 18:13:55 +02:00
Tobias Schmidt 8ec10ae7a5 Merge pull request #1627 from prometheus/effect-affect 
effect -> affect
 2016-05-12 10:35:54 -04:00
Brian Brazil 74094947ea effect -> affect 2016-05-12 15:14:48 +01:00
Fabian Reinartz 54de6afd22 Merge pull request #1625 from prometheus/series-api-time-bounds 
Support time range in /api/v1/series endpoint.
 2016-05-12 11:53:31 +02:00
Julius Volz 0c1e7a5b00 Support time range in /api/v1/series endpoint. 
This adds optional "start" and "end" form values that may be used to
restrict the time range of returned series.

Fixes https://github.com/prometheus/prometheus/issues/1542
 2016-05-12 07:28:02 +02:00
Brian Brazil 68aaea618a Merge pull request #1624 from dmitris/golint 
(trivial) fix several minor golint style issues
 2016-05-11 14:20:19 +01:00
Fabian Reinartz bbc4f11bcc Merge pull request #945 from msiebuhr/fuzz 
Fuzz parsers
 2016-05-11 14:31:31 +02:00
Dmitry Savintsev 7fdb62c253 fix several minor golint style issues 2016-05-11 14:26:18 +02:00
Morten Siebuhr ffc8cab39a Updates fuzzers to discard less interesting data 2016-05-10 11:46:03 +02:00
Brian Brazil ba87e2d8c1 Merge pull request #1619 from prometheus/threshold_vars 
Add unittest for using a metric for thresholds with group_left.
 2016-05-08 17:11:06 +01:00
Brian Brazil ef55fd6176 Add unittest for using a metric for thresholds with group_left. 2016-05-08 16:58:23 +01:00
Fabian Reinartz 2ca9ee7b0d Merge pull request #1612 from prometheus/stn-dns-mv 
[discovery][dns] move dns to own package
 2016-05-06 12:23:59 +02:00
stuart nelson d959d2b90a discovery/dns: Maintain argument order consistency 2016-05-06 11:14:26 +02:00
stuart nelson d02591814b discovery/dns: move dns to own package 2016-05-06 11:14:26 +02:00
Fabian Reinartz baa3e19fa0 Merge pull request #1614 from sdurrheimer/common-version 
Make version informations consistent between prometheus components
 2016-05-06 10:58:24 +02:00
Fabian Reinartz d5a9ce18c5 Merge pull request #1613 from sdurrheimer/fix-circleci-flanky-go-get 
Fix CircleCI flanky go get
 2016-05-06 10:22:43 +02:00
Steve Durrheimer 399d5c6375
Make version informations consistent between prometheus components 2016-05-05 22:33:18 +02:00
Steve Durrheimer d00e8f114d
Fallback to default promu's crossbuild platforms list 2016-05-05 13:55:14 +02:00
Steve Durrheimer a2b913f018
Change the test docker image tag to match promu golang version 2016-05-05 13:48:00 +02:00
Steve Durrheimer b07768f613
Fix CircleCI problems during go get promu 2016-05-05 13:47:51 +02:00
Brian Brazil 82a96167f6 Merge pull request #1611 from shawnps/patch-1 
fix typo
 2016-05-04 05:45:57 +01:00
Shawn Smith d7481f266e fix typo 2016-05-04 13:42:27 +09:00
Tobias Schmidt a32cab5992 Merge pull request #1598 from sdurrheimer/master 
Update README image shields
 2016-05-03 18:14:07 -04:00
Steve Durrheimer 4ebf7970ce
Update README image shields 2016-05-04 00:01:05 +02:00
Fabian Reinartz ad1542cf95 ci: fix inconsistent indentation 2016-05-02 14:53:20 +02:00
Fabian Reinartz 26799411f6 Merge pull request #1609 from prometheus/fabxc-goversion 
*: bump default Go version to 1.6.2
 2016-05-02 13:10:01 +02:00
Fabian Reinartz d153dc3e82 *: bump default Go version to 1.6.2 2016-05-02 12:15:41 +02:00
Tobias Schmidt 3ce895e86d Merge pull request #1608 from prometheus/fix-printf 
Fix format argument in retrieval test.
 2016-05-01 17:44:16 -04:00
Julius Volz 97b018d26d Fix format argument in retrieval test. 2016-05-01 23:37:45 +02:00
Fabian Reinartz f94fc76608 Merge pull request #1592 from prometheus/fabxc-consul-ref 
discovery: sanitize Consul service discovery
 2016-04-30 21:18:33 +02:00
Fabian Reinartz 289f306dd9 Merge pull request #1590 from prometheus/fabxc-marathon-ref 
Fix basic issues in marathon SD
 2016-04-30 21:17:22 +02:00
Fabian Reinartz 76076bfb47 discovery: simplify client initialization 2016-04-30 21:07:49 +02:00
Fabian Reinartz b5bfb502df discovery: properly check context on chan send 2016-04-30 11:57:20 +02:00
Fabian Reinartz 9f8feb9ff6 discovery: consolidate Marathon SD files 2016-04-30 11:56:11 +02:00
Fabian Reinartz 086f7caceb discovery: extract Consul shouldWatch logic 2016-04-30 11:50:19 +02:00
Fabian Reinartz e805e68c01 discovery: sanitize Consul service discovery 
This commits simplifies the SD's structure and ensures that all
channel sends are checked against a canceled context.
 2016-04-30 11:50:19 +02:00
Morten Siebuhr 981b636004 Bring fuzzer error handling in line. 2016-04-29 22:50:24 +02:00
Morten Siebuhr 9eb2e98509 Fix up documentation + go fmt. 2016-04-29 22:50:24 +02:00
Morten Siebuhr 7371dcc787 Fuzzing corpus for ParseMetric. 2016-04-29 22:50:24 +02:00
Morten Siebuhr 5fec020b27 Initial fuzzing corpus for ParseExpr. 2016-04-29 22:50:24 +02:00
Morten Siebuhr 0ebcca5eb7 Add basic fuzzer of the parser. 2016-04-29 22:50:24 +02:00
Brian Brazil 04293424eb Merge pull request #1571 from prometheus/ignoring 
Fix for #1503
 2016-04-26 16:02:12 +01:00
Brian Brazil 68e70d992a Clarify error message around on(x) group_left(x) 2016-04-26 14:31:00 +01:00
Brian Brazil 7201c010c4 Rename On to MatchingLabels 2016-04-26 14:28:36 +01:00
Björn Rabenstein 95a7a58eb5 Merge pull request #1591 from prometheus/beorn7/logging 
Bring back logging of discarded samples
 2016-04-26 01:47:24 +02:00