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 11 Packages Projects Releases Wiki Activity
3470 commits 242 branches 446 tags 652 MiB
Commit graph

3470 commits

This branch
This branch
All branches
Author SHA1 Message Date
Frederic Branczyk 0fcea6e9fb retrieval/discovery/kubernetes: fix cache state unknown behavior (#2180) 
* retrieval/discovery/kubernetes: fix cache state unknown behavior

* retrieval/discovery/kubernetes: extract type casting

* retrieval/discovery/kubernetes: add tests for possible regressions
 2016-11-14 16:21:38 +01:00
Björn Rabenstein 036715370f Merge pull request #2184 from huydx/master 
Fix possible memory leak by defer inside loop
 2016-11-14 15:26:39 +01:00
Fabian Reinartz fa82c65d15 Merge pull request #2186 from prometheus/fixes 
Test fixes
 2016-11-14 09:52:15 +01:00
Fabian Reinartz ae806af7d8 Merge pull request #2185 from prometheus/errhandler 
kubernetes: only use one error logging handler
 2016-11-14 09:52:07 +01:00
huydx c999902761 Fix possible memory leak by defer inside loop 2016-11-14 14:08:08 +09:00
Fabian Reinartz 7ecc271411 Move Fatalf call into main test goroutine 2016-11-13 18:21:42 +01:00
Fabian Reinartz 856de30c09 Check error before defer closing 
If an error is returned the file might be nil and a Close call
would cause a panic.
 2016-11-13 18:16:02 +01:00
Fabian Reinartz 530cdba103 kubernetes: only use one error logging handler 2016-11-12 14:13:38 +01:00
beorn7 e193579df8 Merge branch 'release-1.3' 2016-11-09 11:09:56 +01:00
Björn Rabenstein aa662cb0a9 Merge pull request #2167 from prometheus/beorn7/promql 
Check for int64 overflow when converting from float64
 2016-11-09 11:08:19 +01:00
beorn7 4e3abc6cbf Simply use math.Mod(float64, float64) after all 
This circumvents all the problems with int overflow, plus it is what was originally intended.
 2016-11-08 21:03:31 +01:00
Brian Brazil 79f8514c9c Point user to POST if they try to GET /-/reload (#2172) 2016-11-07 15:14:22 +00:00
beorn7 5cf5bb427a Check for int64 overflow when converting from float64 2016-11-05 00:48:32 +01:00
beorn7 a94a8807f9 Merge branch 'release-1.3' 2016-11-04 22:47:12 +01:00
Björn Rabenstein 63630a0416 Merge pull request #2166 from prometheus/beorn7/release 
Cut v1.3.1
 2016-11-04 21:20:03 +01:00
beorn7 be476954e8 Cut v1.3.1 2016-11-04 21:08:26 +01:00
Fabian Reinartz 96a93c0bc1 Merge pull request #2159 from prometheus/beorn7/release 
Merge release1.2 into release-1.3
 2016-11-04 12:56:11 -07:00
beorn7 92c0ef1a92 Merge branch 'release-1.2' into beorn7/release 2016-11-03 22:48:39 +01:00
Björn Rabenstein c1eee5b0da Merge pull request #2157 from prometheus/beorn7/release 
Cut v1.2.3
 2016-11-03 22:40:08 +01:00
Fabian Reinartz 2d203e777f Merge pull request #2158 from prometheus/merge-1.3 
Merge release-1.3 into master
 2016-11-03 14:27:10 -07:00
Fabian Reinartz 817ecb8ddd Merge branch 'release-1.3' into merge-1.3 2016-11-03 14:19:34 -07:00
beorn7 cd8d3822f4 Cut v1.2.3 2016-11-03 20:24:45 +01:00
Björn Rabenstein 6ba87cbc87 Merge pull request #2153 from prometheus/beorn7/vendoring 
Improve DNS error reporting and update to current miekg/dns
 2016-11-03 20:06:58 +01:00
beorn7 c4c31a85ab Merge branch 'release-1.2' 2016-11-03 19:56:25 +01:00
Björn Rabenstein e072e7f903 Merge pull request #2156 from prometheus/beorn7/promql 
Fix MOD binop for scalars and vectors
 2016-11-03 19:54:57 +01:00
beorn7 07f1bdfe94 Fix MOD binop for scalars and vectors 
Previously, a floating point number that would round down to 0 would
cause a "division by zero" panic.
 2016-11-03 19:03:44 +01:00
beorn7 0fdb74c069 Adjust dns.go to new miekg/dns package and improve error handling. 
When hitting the 64kiB limit of DNS, the error message so far was
really misleading.
 2016-11-03 15:42:11 +01:00
beorn7 b2f28a9e82 Merge branch 'release-1.2' 2016-11-03 14:42:15 +01:00
beorn7 9a63ff0c32 Update vendoring github.com/miekg/dns 
This is to pull in bug fixes. However, it also requires code changes,
see next commit.
 2016-11-03 14:40:30 +01:00
Fabian Reinartz 0634509f96 Merge pull request #2148 from jimmidyson/prom-1.3-k8s-disco-example 
Kubernetes SD: Update config for discovery in 1.3
 2016-11-03 06:35:03 -07:00
Brian Brazil d1ece12c70 Handle null Regex in the config as the empty regex. (#2150) 2016-11-03 13:34:15 +00:00
Jimmi Dyson da23543f29
Kubernetes SD: Update example config to use endpoints role for API server discovery 2016-11-02 20:48:01 +00:00
Jimmi Dyson 4d37dca669
Kubernetes SD: Update config for discovery in 1.3 2016-11-02 15:06:20 +00:00
Fabian Reinartz 18254a172b Merge pull request #2144 from prometheus/cut-1.3.0 
Cut release 1.3.0
 2016-11-01 17:24:33 +01:00
Fabian Reinartz 6fc9cf3a96 Cut release 1.3.0 2016-11-01 17:08:09 +01:00
Fabian Reinartz 6703404cb4 Merge remote-tracking branch 'origin/release-1.2' 2016-11-01 16:35:22 +01:00
Fabian Reinartz fc4d9c13e8 Merge pull request #2143 from prometheus/beorn7/fix 
Protect against negative time ranges.
 2016-11-01 16:34:57 +01:00
Fabian Reinartz 30af47535d Merge remote-tracking branch 'origin/release-1.2' 2016-11-01 15:42:13 +01:00
Fabian Reinartz 6875e9ef91 Merge pull request #2142 from amorken/issue-2140 
query_range: Validate that start comes before end
 2016-11-01 15:40:06 +01:00
Anders Daljord Morken 5c025a2f41 query_range: Validate that start comes before end 2016-11-01 15:28:28 +01:00
beorn7 5c41ca84e5 Catch negative staleness delta set on the command line 2016-11-01 15:17:59 +01:00
beorn7 c5bd178b93 Protect exported Querier interface method against negative time ranges 2016-11-01 15:05:01 +01:00
beorn7 2f6899cbb8 Add missing line to CHANGELOG.md 
This got dropped in the cherrypicking.
 2016-11-01 14:21:22 +01:00
beorn7 5b16d6bd6e Merge branch 'release-1.2' 2016-10-31 00:06:23 +01:00
beorn7 e3d7c39529 Update date of v1.2.2 2016-10-30 23:48:15 +01:00
Björn Rabenstein 720f7e8636 Merge pull request #2135 from prometheus/beorn7/vendoring 
Revert "Update github.com/miekg/dns to pull in bug fixes."
 2016-10-30 17:43:50 +01:00
beorn7 b216e91b61 Revert "Update github.com/miekg/dns to pull in bug fixes." 
This reverts commit 590446434f.

Sadly, there's a problem with truncated messages:
WARN[0684] resolving all.telemetry.pm.prod.bazooka.dd.srv.int.s-cloud.net failed: dns: failed to unpack truncated message  source=dns.go:187

We have to revisit the SRV DNS part later.
 2016-10-30 16:37:32 +01:00
Fabian Reinartz 1c3531af4e Merge pull request #2133 from prometheus/beorn7/vendoring 
Cut v1.2.2
 2016-10-30 14:34:07 +01:00
beorn7 d2f1ace31d vendoring: re-add snappy/*_other.go files 
For some reason, govendor doesn't add these files (but it works for
platform dependent files elsewhere).
 2016-10-28 16:03:10 +02:00
beorn7 9c60dce1de vendoring: Update vendor/golang.org/x/sys/unix/ vendoring 
No immediate need here, but after adding the windows vendoring, we
have different commits vendored from the same repository. To avoid
confusion, this commit brings them in line.
 2016-10-28 15:36:41 +02:00