github
/
prometheus
mirror of https://github.com/prometheus/prometheus
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
3,604 Commits
280 Branches
442 Tags
622 MiB
Commit Graph

3604 Commits (e44d80314d4859218d90e3a697a31f783da748be)

Author SHA1 Message Date
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
Björn Rabenstein 8462fe9fac Merge pull request #2094 from Nomon/bug/target_label_unmarshal 
Bug/target label unmarshal
 2016-10-19 18:21:40 +02:00
Matti Savolainen aabf4a419b use LabelNam.IsValid() instead of LabelNameRE and MatchString instead of Match 2016-10-19 16:30:52 +03:00
Matti Savolainen ec6524ce74 test the labelTarget regex to make sure it properly validates pre-interpolated label names. 2016-10-19 13:32:42 +03:00
Matti Savolainen f867c1fd58 formating and text fixes, adjust regexp 2016-10-19 13:31:55 +03:00
Dominik Schulz 163d5a8977 Add EC2 SD metrics (#2095) 
* Add EC2 SD metrics

* Address review comments
 2016-10-19 10:20:00 +01:00
Matti Savolainen 56907ba6e3 Add interpolation to good test config. Fix regex 2016-10-19 01:19:19 +03:00
Matti Savolainen 7a36af1c85 add comment about interpolation 2016-10-19 00:42:49 +03:00
Matti Savolainen 3b8e7c1277 Merge branch 'master' of https://github.com/prometheus/prometheus into bug/target_label_unmarshal 2016-10-19 00:33:52 +03:00
Matti Savolainen 5a1e909b5d Make TargetLabel in RelabelConfig a string 2016-10-19 00:33:22 +03:00
Björn Rabenstein d93f73874f Merge pull request #2093 from dominikschulz/spelling 
Trivial spelling corrections
 2016-10-18 22:46:03 +02:00
Dominik Schulz 182e17958a Trivial spelling corrections and a small comment. 2016-10-18 20:14:38 +02:00
Fabian Reinartz 3c8140f2e6 kubernetes: fix typo in endpoint switch case 2016-10-18 16:20:26 +02:00
bekbulatov ac702f66eb Resolve merge conflicts 2016-10-18 14:14:24 +01:00
Fabian Reinartz 228bfc1bb5 Merge pull request #2040 from prometheus/kubernetes 
Add K8S v2 pod discovery
 2016-10-17 20:09:22 +02:00
Björn Rabenstein b10879a450 Merge pull request #2078 from Nomon/master 
Add support for interpolating target_label
 2016-10-17 14:52:30 +02:00
Fabian Reinartz 1b6dfa32a9 config: rename role 'endpoint' to 'endpoints' 2016-10-17 11:53:49 +02:00
Fabian Reinartz ce45040e47 kubernetes: fix missing port labels 
This commit fixes endpoint port labeling, adjusts tests accordingly
and enhances test delta printing
 2016-10-17 11:05:13 +02:00
Fabian Reinartz 1df905ea42 vendor: add testing require dependencies 2016-10-17 11:04:52 +02:00
Frederic Branczyk 8f576a8510 retrieval: add kubernetes endpoint discovery tests 2016-10-17 10:32:10 +02:00
Frederic Branczyk 08fa4eaa92 retrieval: add kubernetes pod discovery tests 2016-10-17 10:32:10 +02:00
Frederic Branczyk 3762e39ce5 retrieval: add kubernetes service discovery tests 2016-10-17 10:32:10 +02:00
Frederic Branczyk 397072a482 retrieval: add kubernetes node discovery tests 2016-10-17 10:32:10 +02:00
Frederic Branczyk cc46058802 retrieval: kubernetes nodes are not namespaced 2016-10-17 10:32:10 +02:00
Frederic Branczyk a318d9ad27 retrieval: fix pod label and annotation prefixes 2016-10-17 10:32:10 +02:00
Frederic Branczyk 2e18c81a00 config: adapt unit tests 2016-10-17 10:32:10 +02:00
Fabian Reinartz b24602f713 kubernetes: merge back into single configuration 2016-10-17 10:32:10 +02:00