Commit Graph

4079 Commits (34ab7a885a6d4ec877a0f74281fcf413660d360c)
 

Author SHA1 Message Date
Fabian Reinartz 2a89e8733f Merge pull request #2230 from prometheus/cut-1.4.1
8 years ago
Fabian Reinartz 6be1e98278 *: cut 1.4.1
8 years ago
Fabian Reinartz d95e61d418 Merge pull request #2223 from prometheus/consulfix
8 years ago
Fabian Reinartz 35da23fd82 consul: start service watch as goroutine
8 years ago
Fabian Reinartz 56f57a826f Merge pull request #2219 from prometheus/builderimg
8 years ago
Fabian Reinartz 340de6c31c circle: update golang-builder image version
8 years ago
Fabian Reinartz ecad074e46 Merge pull request #2218 from prometheus/cut-1.4.0
8 years ago
Fabian Reinartz 80455950ee *: cut 1.4.0
8 years ago
Fabian Reinartz b97f19a85e travis: update used Go compiler version
8 years ago
Fabian Reinartz 9b7f5c7f29 Merge pull request #2217 from prometheus/alertingsd
8 years ago
Fabian Reinartz 2ad56aabd4 notifier: extract alertmanager into interface
8 years ago
Fabian Reinartz cc35104504 config: fix naming and typo
8 years ago
Fabian Reinartz fd51ab46e5 Merge pull request #2215 from prometheus/alertingsd2
8 years ago
Fabian Reinartz b1f28b48a3 Fix typo
8 years ago
Fabian Reinartz 3fb4d1191b config: rename AlertingConfig, resolve file paths
8 years ago
Fabian Reinartz d4deb8bbf2 web: show discovered Alertmanagers in UI
8 years ago
Fabian Reinartz f210d96497 notifier: use dynamic service discovery
8 years ago
Fabian Reinartz 183c5749b9 config: add Alertmanager configuration
8 years ago
Fabian Reinartz 200bbe1bad config: extract SD and HTTPClient configurations
8 years ago
Fabian Reinartz dd1a656cc4 Merge pull request #2212 from prometheus/alertingsd
8 years ago
Fabian Reinartz 47623202c7 retrieval: remove metric namespaces
8 years ago
Fabian Reinartz d7f4f8b879 discovery: move TargetSet into discovery package
8 years ago
Tobias Schmidt 8b11646276 Merge pull request #2164 from tcolgate/master
8 years ago
Fabian Reinartz c34f55d7c0 Merge pull request #2213 from prometheus/alertannotations
8 years ago
Fabian Reinartz e68a3cf21f rules: update annotations on each iteration
8 years ago
Fabian Reinartz d19d1bcad3 discovery: move into top-level package
8 years ago
Fabian Reinartz 7bd9508c9b discovery: move TargetProvider and multi-constructor
8 years ago
Fabian Reinartz bd0048477c discovery: move remaining SDs into own package
8 years ago
Fabian Reinartz 5b72eae1b0 Merge pull request #2203 from prometheus/sdfix
8 years ago
Tristan Colgate ab60bc3929 Fix export of grouping modifier
8 years ago
Fabian Reinartz ec66082749 Merge branch 'ec2_sd_profile_support' of https://github.com/Ticketmaster/prometheus into Ticketmaster-ec2_sd_profile_support
8 years ago
Fabian Reinartz 06555bde93 Merge branch 'k8s_sd_metrics' of https://github.com/dominikschulz/prometheus into dominikschulz-k8s_sd_metrics
8 years ago
gambrose 52c762e9f1 The defaults stated in the example config where wrong (#2110)
8 years ago
Fabian Reinartz 0b1a07b531 Merge pull request #2197 from tcolgate/fix_error_types
8 years ago
Fabian Reinartz dbd6810ea0 Merge pull request #2207 from weaveworks/expose-rules
8 years ago
Jonathan Lange d78dd3593d Set evaluation interval on Group construction
8 years ago
Jonathan Lange 31fc357cd8 Make NewGroup and Group.Eval public
8 years ago
Jonathan Lange 2a2da40223 Make rule evaluation publicly available
8 years ago
Fabian Reinartz a1eec447a4 discovery: fix+consolidate Zookeeper discoveries
8 years ago
Tristan Colgate 68fc15fe4e Report type names in the form used in documentation
8 years ago
Fabian Reinartz b4d7ce1370 discovery: respect context cancellation everywhere
8 years ago
Julius Volz 9b7e097a76 Merge pull request #2201 from prometheus/consul-race
8 years ago
Fabian Reinartz bc7bd7202c discovery: terminate senders before closing channel
8 years ago
Julius Volz 127332c56f Merge pull request #2168 from tomwilkie/chunk-len
8 years ago
Tom Wilkie 585878cdb2 Add call to estimate number of samples in a chunk to the API
8 years ago
Julius Volz 7daa21eeb6 Merge pull request #2194 from TheTincho/replace-js-libs
8 years ago
Martín Ferrari 4298d91a9c Update bindata.go
8 years ago
Martín Ferrari fe83ea511f Replace handlebars with the simpler and saner mustache library.
8 years ago
Martín Ferrari 0a6972b6a3 Replace datetimepicker library with a more maintained version.
8 years ago
Björn Rabenstein 4a80448b7e Merge pull request #2190 from prometheus/beorn7/doc
8 years ago