RepoMirrors/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus synced 2024-12-27 17:13:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,680 Commits 243 Branches 444 Tags 653 MiB
f35816613e
Commit Graph

3680 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Björn Rabenstein
c1ae61a2cc Merge pull request #2116 from prometheus/beorn7/fix 
Add guard against non-monotonic samples in series
 2016-10-26 22:50:10 +02:00
Brian Brazil
64263f280d Add scrape_samples_scraped to indicate samples scraped. (#2123) 2016-10-26 17:43:01 +01:00
Brian Brazil
6bc29ba857 Fix regression from #1957, specify non-zero default timeout. (#2121) 
Fixes #2075
 2016-10-26 14:47:41 +01:00
Brian Brazil
bbec65d454 Call SD metrics refresh rather than scrape. (#2120) 
This avoids confusion with scrape_duration_seconds, and
is more in line with the API naming.
 2016-10-26 10:03:35 +01:00
beorn7
876e5da4f8 Add guard against non-monotonic samples in series 
This can only happen due to data corruption.
 2016-10-25 14:59:33 +02:00
beorn7
569a1d78eb Regenerate bindata after merge 2016-10-25 12:15:55 +02:00
beorn7
7e4d005ee1 Merge branch 'release-1.2' 2016-10-25 12:15:41 +02:00
Björn Rabenstein
233a25a060 Merge pull request #2113 from tattsun/fix/ISSUE-2109-v1.2 
ui: fix decode query params bug(ISSUE-2109)
 2016-10-25 12:12:59 +02:00
tattsun
68e20bd9ac ISSUE-2109 ui: fix decode query params bug 2016-10-25 07:41:24 +09:00
Julius Volz
72e4f1caa3 Merge pull request #2045 from bekbulatov/marathon_tls 
Add tls support for marathon
 2016-10-24 12:10:47 +01:00
bekbulatov
2bc12fa2fb Set timeout for marathon_sd 2016-10-24 11:27:08 +01:00
bekbulatov
c689b35858 Merge branch 'master' into marathon_tls 2016-10-24 10:37:32 +01:00
Dominik Schulz
eb10ff9871 Also handle service update in endpoints.go 2016-10-23 13:33:54 +02:00
Dominik Schulz
f002fe186a Add Marathon-SD metrics. (#2106) 2016-10-21 11:14:53 +01:00
Mitsuhiro Tanda
296644adeb Expose ec2_instance_type (#2107) 2016-10-21 11:13:47 +01:00
Dominik Schulz
36de163900 Add File-SD metrics (#2103) 
* Add File-SD metrics

* Count read errors, not scan errors.
 2016-10-21 11:12:19 +01:00
Dominik Schulz
3d0fb0cf17 Avoid too generic label type. 2016-10-21 12:11:15 +02:00
Dominik Schulz
e1e30f12cd Add Kubernetes-SD metrics. 2016-10-21 10:48:28 +02:00
Dominik Schulz
552ab61fa1 Change SD metric names to make logical grouping more visible. (#2102) 2016-10-21 09:18:28 +01:00
Dominik Schulz
0c69227616 Add Consul-SD metrics (#2097) 
* Add Consul-SD metrics

* Remove unnecessary metric and add labels to summary.

* Do not stutter
 2016-10-21 08:59:43 +01:00
Fabian Reinartz
5273b55a0c Merge pull request #2090 from brancz/release-1.3 
Cut v1.3.0-beta.0
 2016-10-20 10:49:04 +02:00
Frederic Branczyk
26a0fa9f98
Cut v1.3.0-beta.0 2016-10-20 10:10:26 +02:00
Dominik Schulz
255a8c8b4c Fix small typo in EC2 SD metric name (#2100) 2016-10-20 09:01:00 +01:00
Dominik Schulz
00e486a05b Add Azure-SD metrics (#2099) 2016-10-20 08:23:50 +01:00
Julius Volz
17691d9141 Merge pull request #2098 from prometheus/add-coc 
Add CNCF code of conduct as the Prometheus code of conduct
 2016-10-20 00:48:05 +01:00
Julius Volz
9eefce6811 Add CNCF code of conduct as the Prometheus code of conduct 2016-10-19 21:39:19 +02:00
Brian Brazil
c4b4a58e3a Correctly handle on() in alerts. (#2096) 
Fixes #2082
 2016-10-19 18:38:26 +01:00