mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-09-23 17:27:36 -07:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity
3657 commits 210 branches 425 tags 689 MiB
Commit graph

3657 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Kraig Amador bec6870ed4 ec2_sd_configs: Support profiles for configuring the ec2 service 2016-11-03 08:38:02 -07:00
Kraig Amador ba3fcceaa5 vendoring: updated aws-sdk-go to v1.5.1 2016-11-03 08:37:56 -07: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
beorn7 0cc51a5c5d vendoring: Vendor packages not vendored so far 2016-10-28 15:34:39 +02:00
beorn7 43cddad30b vendor: Update consul client 
We were so much behind...
 2016-10-28 15:27:00 +02:00
beorn7 5754f5237e vendoring: Clean up files accidentally left behind 2016-10-28 15:23:59 +02:00
beorn7 9d91b9f2a5 vendoring: Update checksum 
Govendor insisted on changing this checksum. I don't know why.
 2016-10-28 15:21:42 +02:00
beorn7 997864a1f4 Update context vendoring 
Most fixes here are mostly http2, but since I'm suspecting a bug in
the context package, I thought we better go with the current version
to rule out bugs already fixed.
 2016-10-28 15:19:33 +02:00
beorn7 fefe55d11e Cut 1.2.2 2016-10-28 15:15:29 +02:00
beorn7 56c9e024cb Update goleveldb vendoring to pick up many bug fixes 
Including data races and shutdown fixes.
Might be the reason for some reported problems.
 2016-10-28 14:58:36 +02:00
beorn7 13c1086f18 Update vendoring of our own Prometheus packages. 
This most notably updates to v0.8.0 of client_golang.
Also, it unifies the commit of different packages from the same repo.
 2016-10-28 14:54:47 +02:00
beorn7 590446434f Update github.com/miekg/dns to pull in bug fixes. 
Most notable a race condition.
 2016-10-28 14:42:36 +02:00
beorn7 98e6e4fbee Update github.com/golang/protobuf/proto vendoring 
This fixes a memory leak in Unmarshal code
 2016-10-28 14:33:45 +02:00
beorn7 50fb82f987 vendor: Remove duplicate entries for "gopkg.in/yaml.v2" from vendor.json 2016-10-28 14:33:32 +02:00
beorn7 f0acde7721 Regenerate assets after cherry-pick 2016-10-28 14:16:48 +02:00
Frederic Branczyk e6dc9b05d5 vendor: update govalidator package (#2125) 
Fixes #2025
 2016-10-28 14:16:36 +02:00
Brian Brazil e1cfc994f7 Correctly handle on() in alerts. (#2096) 
Fixes #2082
 2016-10-28 14:15:24 +02:00
Stuart Olivera 223a22457f ui: don’t consider aborted requests complete 
If an existing request is aborted due to a new request, ignore the completion of the initial request.

Example:
1. Chrome dev tools: enable 5 second network latency
2. Execute query
3. A second later, execute the query again
4. Currently, the spinner will hide, and the stats will immediately display, as if the request had completed. Instead, the spinner and stats should wait until the 2nd execution finishes.
 2016-10-28 14:15:11 +02:00
Frederic Branczyk 04dfd2fab3 vendor: update govalidator package (#2125) 
Fixes #2025
 2016-10-27 09:55:42 +01:00