3462 Commits (e193579df8897a91727d1fbff4d3676e3ed693d8)
 

Author SHA1 Message Date
beorn7 590446434f Update github.com/miekg/dns to pull in bug fixes. 8 years ago
beorn7 98e6e4fbee Update github.com/golang/protobuf/proto vendoring 8 years ago
beorn7 50fb82f987 vendor: Remove duplicate entries for "gopkg.in/yaml.v2" from vendor.json 8 years ago
beorn7 f0acde7721 Regenerate assets after cherry-pick 8 years ago
Frederic Branczyk e6dc9b05d5 vendor: update govalidator package (#2125) 8 years ago
Brian Brazil e1cfc994f7 Correctly handle on() in alerts. (#2096) 8 years ago
Stuart Olivera 223a22457f ui: don’t consider aborted requests complete 8 years ago
Frederic Branczyk 04dfd2fab3 vendor: update govalidator package (#2125) 8 years ago
Björn Rabenstein c1ae61a2cc Merge pull request #2116 from prometheus/beorn7/fix 8 years ago
Brian Brazil 64263f280d Add scrape_samples_scraped to indicate samples scraped. (#2123) 8 years ago
Brian Brazil 6bc29ba857 Fix regression from #1957, specify non-zero default timeout. (#2121) 8 years ago
Brian Brazil bbec65d454 Call SD metrics refresh rather than scrape. (#2120) 8 years ago
beorn7 876e5da4f8 Add guard against non-monotonic samples in series 8 years ago
beorn7 569a1d78eb Regenerate bindata after merge 8 years ago
beorn7 7e4d005ee1 Merge branch 'release-1.2' 8 years ago
Björn Rabenstein 233a25a060 Merge pull request #2113 from tattsun/fix/ISSUE-2109-v1.2 8 years ago
tattsun 68e20bd9ac ISSUE-2109 ui: fix decode query params bug 8 years ago
Julius Volz 72e4f1caa3 Merge pull request #2045 from bekbulatov/marathon_tls 8 years ago
bekbulatov 2bc12fa2fb Set timeout for marathon_sd 8 years ago
bekbulatov c689b35858 Merge branch 'master' into marathon_tls 8 years ago
Dominik Schulz f002fe186a Add Marathon-SD metrics. (#2106) 8 years ago
Mitsuhiro Tanda 296644adeb Expose ec2_instance_type (#2107) 8 years ago
Dominik Schulz 36de163900 Add File-SD metrics (#2103) 8 years ago
Dominik Schulz 552ab61fa1 Change SD metric names to make logical grouping more visible. (#2102) 8 years ago
Dominik Schulz 0c69227616 Add Consul-SD metrics (#2097) 8 years ago
Fabian Reinartz 5273b55a0c Merge pull request #2090 from brancz/release-1.3 8 years ago
Frederic Branczyk 26a0fa9f98
Cut v1.3.0-beta.0 8 years ago
Dominik Schulz 255a8c8b4c Fix small typo in EC2 SD metric name (#2100) 8 years ago
Dominik Schulz 00e486a05b Add Azure-SD metrics (#2099) 8 years ago
Julius Volz 17691d9141 Merge pull request #2098 from prometheus/add-coc 8 years ago
Julius Volz 9eefce6811 Add CNCF code of conduct as the Prometheus code of conduct 8 years ago
Brian Brazil c4b4a58e3a Correctly handle on() in alerts. (#2096) 8 years ago
Björn Rabenstein 8462fe9fac Merge pull request #2094 from Nomon/bug/target_label_unmarshal 8 years ago
Matti Savolainen aabf4a419b use LabelNam.IsValid() instead of LabelNameRE and MatchString instead of Match 8 years ago
Matti Savolainen ec6524ce74 test the labelTarget regex to make sure it properly validates pre-interpolated label names. 8 years ago
Matti Savolainen f867c1fd58 formating and text fixes, adjust regexp 8 years ago
Dominik Schulz 163d5a8977 Add EC2 SD metrics (#2095) 8 years ago
Matti Savolainen 56907ba6e3 Add interpolation to good test config. Fix regex 8 years ago
Matti Savolainen 7a36af1c85 add comment about interpolation 8 years ago
Matti Savolainen 3b8e7c1277 Merge branch 'master' of https://github.com/prometheus/prometheus into bug/target_label_unmarshal 8 years ago
Matti Savolainen 5a1e909b5d Make TargetLabel in RelabelConfig a string 8 years ago
Björn Rabenstein d93f73874f Merge pull request #2093 from dominikschulz/spelling 8 years ago
Dominik Schulz 182e17958a Trivial spelling corrections and a small comment. 8 years ago
Fabian Reinartz 3c8140f2e6 kubernetes: fix typo in endpoint switch case 8 years ago
bekbulatov ac702f66eb Resolve merge conflicts 8 years ago
Fabian Reinartz 228bfc1bb5 Merge pull request #2040 from prometheus/kubernetes 8 years ago
Björn Rabenstein b10879a450 Merge pull request #2078 from Nomon/master 8 years ago
Fabian Reinartz 1b6dfa32a9 config: rename role 'endpoint' to 'endpoints' 8 years ago
Fabian Reinartz ce45040e47 kubernetes: fix missing port labels 8 years ago
Fabian Reinartz 1df905ea42 vendor: add testing require dependencies 8 years ago