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

28 Commits (b0e1ea7c6c27f0a0c5cdfab01225f9d5e6eb589b)

Author SHA1 Message Date
Frederic Branczyk 0c96c4b157
notifier: expose metric for number of discovered alertmanagers 2017-05-08 10:37:19 +02:00
David Symonds 04ad889751 Preserve Alertmanager URLs as *url.URL. 
Render a nicer link in the web UI.
 2017-04-25 16:17:46 +10:00
Julius Volz 589061919a Merge pull request #2465 from Gouthamve/alert-metrics-2429 
Better Metrics For Alerts
 2017-03-31 21:45:05 +02:00
Goutham Veeramachaneni f27ce34a13
Use Registerer to Register All Metrics 
* Made Metric a Gauge so that it can be registered.
 2017-04-01 00:14:30 +05:30
Goutham Veeramachaneni 7ba0a9e81a Add Comment About Initialising Counters 2017-03-31 23:39:02 +05:30
Goutham Veeramachaneni 0d0c9d5440
Move Registerer to Config Struct in Notifier 2017-03-31 21:20:12 +05:30
Julius Volz 815762a4ad Move retrieval.NewHTTPClient -> httputil.NewClientFromConfig 2017-03-20 14:17:04 +01:00
Goutham Veeramachaneni af222b63fc
Fix broken tests 2017-03-03 03:16:30 +05:30
Goutham Veeramachaneni f35816613e
Refactored Notifier to use Registerer 
* Brought metrics back into Notifier

Notifier still implements a Collector. Check if that is needed.
 2017-03-03 02:53:16 +05:30
Goutham Veeramachaneni 41da5c4ef2
Better Metrics For Alerts 
* Closes prometheus/prometheus#2429
* Moved metrics to top of file for easier access
* Initialised CounterVecs
 2017-03-02 23:58:15 +05:30
Julius Volz f152ac5e23 notifier: Allow swapping out HTTP Doer 
We need to be able to modify the HTTP POST in Weave Cortex to add
multitenancy information to a notification. Since we only really need a
special header in the end, the other option would be to just allow
passing in headers to the notifier. But swapping out the whole Doer is
more general and allows others to swap out the network-talky bits of the
notifier for their own use. Doing this via contexts here wouldn't work
well, due to the decoupled flow of data in the notifier.

There was no existing interface containing the ctxhttp.Post() or
ctxhttp.Do() methods, so I settled on just using Do() as a swappable
function directly (and with a more minimal signature than Post).
 2017-02-27 20:36:22 +01:00
Matt Bostock 4160892109 Correct notifications_dropped description 
The current description does not accurately describe when the metric is incremented.

Aside from Alertmanger missing from the configuration, `prometheus_notifications_dropped_total` is incremented when errors occur while sending alert notifications to Alertmanager, or because the notifications queue is full, or because the number of notifications to be sent exceeds the queue capacity.

I think calling these cases 'errors' in a generic sense is more useful than the current description.
 2017-01-13 23:36:00 +00:00
Fabian Reinartz 2ad56aabd4 notifier: extract alertmanager into interface 2016-11-25 11:19:43 +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
Dominik Schulz 182e17958a Trivial spelling corrections and a small comment. 2016-10-18 20:14:38 +02:00
Frederic Branczyk 572423cbe5
notifier: attach external labels before relabelling 
By attaching external labels before relabelling, they are available
during relabelling.
 2016-09-27 14:34:56 +02:00
Tobias Schmidt 8f3b62bfe4 Simplify struct initialization 2016-09-14 23:13:27 -04:00
Frederic Branczyk b655aa002f introduce top level alerting config node 2016-08-09 14:19:25 +02:00
Frederic Branczyk 7714b9c781 move relabeling functionality to its own package 
also remove the returned error as it was always nil
 2016-08-09 14:19:20 +02:00
Frederic Branczyk 679d225c8d allow relabeling of alerts 
in case of dropping don't even enqueue them
 2016-08-09 14:18:31 +02:00
Dmitry Vorobev 273e457da4 web: return status code and error message for config resource 2016-07-15 10:15:24 +02:00
beorn7 064b57858e Consistently use the `Seconds()` method for conversion of durations 
This also fixes one remaining case of recording integral numbers
of seconds only for a metric, i.e. this will probably fix #1796.
 2016-07-07 15:24:35 +02:00
Fabian Reinartz 9baf120cd5 notifier: dispatch to multiple Alertmanagers 
This commit extends the notifier to dispatch alert batches
to multiple Alertmanagers concurrently.
It changes the `-alertmanager.url` flag to accept a comma
separated list of URLs and/or to be set multiple times.
 2016-06-06 11:41:10 +02:00
Dmitry Savintsev 7fdb62c253 fix several minor golint style issues 2016-05-11 14:26:18 +02:00
Fabian Reinartz bfa8aaa017 Rename notification to notifier 2016-03-01 12:39:08 +01:00