Commit graph

5371 commits

Author SHA1 Message Date
Fabian Reinartz 9b7f5c7f29 Merge pull request #2217 from prometheus/alertingsd
Extract alertmanager into interface
2016-11-25 11:28:38 +01:00
Fabian Reinartz 2ad56aabd4 notifier: extract alertmanager into interface 2016-11-25 11:19:43 +01:00
Fabian Reinartz cc35104504 config: fix naming and typo 2016-11-25 11:04:33 +01:00
Fabian Reinartz fd51ab46e5 Merge pull request #2215 from prometheus/alertingsd2
Discover Alertmanagers dynamically
2016-11-25 10:38:00 +01:00
Fabian Reinartz b1f28b48a3 Fix typo 2016-11-25 08:47:04 +01:00
Fabian Reinartz 3fb4d1191b config: rename AlertingConfig, resolve file paths 2016-11-24 15:19:37 +01:00
Fabian Reinartz d4deb8bbf2 web: show discovered Alertmanagers in UI 2016-11-24 15:06:50 +01:00
Fabian Reinartz f210d96497 notifier: use dynamic service discovery 2016-11-23 18:23:37 +01:00
Fabian Reinartz 183c5749b9 config: add Alertmanager configuration 2016-11-23 18:23:37 +01:00
Fabian Reinartz 200bbe1bad config: extract SD and HTTPClient configurations 2016-11-23 18:23:37 +01:00
Fabian Reinartz dd1a656cc4 Merge pull request #2212 from prometheus/alertingsd
Extract discovery package
2016-11-23 17:46:48 +01:00
Fabian Reinartz 47623202c7 retrieval: remove metric namespaces 2016-11-23 09:17:04 +01:00
Fabian Reinartz d7f4f8b879 discovery: move TargetSet into discovery package 2016-11-23 09:14:44 +01:00
Tobias Schmidt 8b11646276 Merge pull request #2164 from tcolgate/master
Fix export of grouping modifier
2016-11-22 22:59:25 -06:00
Fabian Reinartz c34f55d7c0 Merge pull request #2213 from prometheus/alertannotations
rules: update annotations on each iteration
2016-11-22 15:55:18 +01:00
Fabian Reinartz e68a3cf21f rules: update annotations on each iteration 2016-11-22 15:43:07 +01:00
Fabian Reinartz d19d1bcad3 discovery: move into top-level package 2016-11-22 12:56:33 +01:00
Fabian Reinartz 7bd9508c9b discovery: move TargetProvider and multi-constructor 2016-11-22 12:56:33 +01:00
Fabian Reinartz bd0048477c discovery: move remaining SDs into own package 2016-11-22 12:56:33 +01:00
Fabian Reinartz 5b72eae1b0 Merge pull request #2203 from prometheus/sdfix
Service discovery fixes
2016-11-21 16:46:20 +01:00
Tristan Colgate ab60bc3929 Fix export of grouping modifier 2016-11-21 14:42:45 +00:00
Fabian Reinartz ec66082749 Merge branch 'ec2_sd_profile_support' of https://github.com/Ticketmaster/prometheus into Ticketmaster-ec2_sd_profile_support 2016-11-21 11:49:23 +01:00
Fabian Reinartz 06555bde93 Merge branch 'k8s_sd_metrics' of https://github.com/dominikschulz/prometheus into dominikschulz-k8s_sd_metrics 2016-11-21 11:44:48 +01:00
gambrose 52c762e9f1 The defaults stated in the example config where wrong (#2110)
* The stated defaults where wrong

* Update prometheus.yml
2016-11-21 09:53:59 +01:00
Fabian Reinartz 0b1a07b531 Merge pull request #2197 from tcolgate/fix_error_types
Report type names in the form used in documentation
2016-11-21 09:49:49 +01:00
Fabian Reinartz dbd6810ea0 Merge pull request #2207 from weaveworks/expose-rules
Expose rule & group evaluation
2016-11-21 09:48:55 +01:00
Jonathan Lange d78dd3593d Set evaluation interval on Group construction
Prevents having object in invalid state, and allows users of public API
to construct valid Groups.
2016-11-18 16:32:30 +00:00
Jonathan Lange 31fc357cd8 Make NewGroup and Group.Eval public
Allows callers to execute evaluate lists of rules without first writing
them to disk.
2016-11-18 16:25:58 +00:00
Jonathan Lange 2a2da40223 Make rule evaluation publicly available
Means that a third-party can parse rules and run them with their own
execution model.
2016-11-18 16:12:50 +00:00
Fabian Reinartz a1eec447a4 discovery: fix+consolidate Zookeeper discoveries 2016-11-18 13:20:58 +01:00
Tristan Colgate 68fc15fe4e Report type names in the form used in documentation 2016-11-18 10:12:55 +00:00
Fabian Reinartz b4d7ce1370 discovery: respect context cancellation everywhere
This also removes closing of the target group channel everywhere
as the contexts cancels across all stages and we don't care about
draining all events once that happened.
2016-11-18 10:55:29 +01:00
Julius Volz 9b7e097a76 Merge pull request #2201 from prometheus/consul-race
discovery: terminate senders before closing channel
2016-11-18 01:07:34 -08:00
Fabian Reinartz bc7bd7202c discovery: terminate senders before closing channel
Fixes #2200
2016-11-18 10:03:12 +01:00
Julius Volz 127332c56f Merge pull request #2168 from tomwilkie/chunk-len
Add call to estimate number of samples in a chunk to the API
2016-11-17 23:13:50 -08:00
Tom Wilkie 585878cdb2 Add call to estimate number of samples in a chunk to the API 2016-11-17 19:09:59 +00:00
Julius Volz 7daa21eeb6 Merge pull request #2194 from TheTincho/replace-js-libs
Replace datetimepicker and handlebars JS libraries
2016-11-16 21:45:58 -08:00
Martín Ferrari 4298d91a9c Update bindata.go 2016-11-17 02:33:31 +00:00
Martín Ferrari fe83ea511f Replace handlebars with the simpler and saner mustache library. 2016-11-17 02:33:12 +00:00
Martín Ferrari 0a6972b6a3 Replace datetimepicker library with a more maintained version.
Adds also the moment.js library, which is a dependency of it.

Following conventions in the web/ui directory, I am not including the original
sources or LICENSE files.
2016-11-17 02:29:08 +00:00
Björn Rabenstein 4a80448b7e Merge pull request #2190 from prometheus/beorn7/doc
AUTHORS.md: Replace explicit list of authors with reference to git log
2016-11-15 12:53:50 +01:00
beorn7 bcdf870eda AUTHORS.md: Add link to Github contributors page 2016-11-14 21:00:51 +01:00
beorn7 5944a1d1bd AUTHORS.md: Replace explicit list of authors with reference to git log
Given the many contributors to the repository, maintaining a dedup'd
list of contributors is infeasible.
2016-11-14 19:57:07 +01:00
Fabian Reinartz 17a95f3366 Kubernetes SD: Add endpoints role to API servers job to actually discover some API servers (#2181) 2016-11-14 16:23:24 +01:00
Frederic Branczyk 0fcea6e9fb retrieval/discovery/kubernetes: fix cache state unknown behavior (#2180)
* retrieval/discovery/kubernetes: fix cache state unknown behavior

* retrieval/discovery/kubernetes: extract type casting

* retrieval/discovery/kubernetes: add tests for possible regressions
2016-11-14 16:21:38 +01:00
Björn Rabenstein 036715370f Merge pull request #2184 from huydx/master
Fix possible memory leak by defer inside loop
2016-11-14 15:26:39 +01:00
Fabian Reinartz fa82c65d15 Merge pull request #2186 from prometheus/fixes
Test fixes
2016-11-14 09:52:15 +01:00
Fabian Reinartz ae806af7d8 Merge pull request #2185 from prometheus/errhandler
kubernetes: only use one error logging handler
2016-11-14 09:52:07 +01:00
huydx c999902761 Fix possible memory leak by defer inside loop 2016-11-14 14:08:08 +09:00
Fabian Reinartz 7ecc271411 Move Fatalf call into main test goroutine 2016-11-13 18:21:42 +01:00