46 Commits (c3f9238756d1ac8ba3521bedb6986db89e61e5cc)

Author	SHA1	Message	Date
Luke Overend	9532c2c700	Pass ams to go routine when sending alerts (#3284) ... Currently when sending alerts via the go routine within `sendAll`, the value of `ams` is not passed to the routine, causing it to use the updated value of `ams`. Example config: ``` alerting: alertmanagers: - basic_auth: username: 'prometheus' password: 'test123' static_configs: - targets: - localhost:9094 - static_configs: - targets: - localhost:9095 ``` In this example alerts sent to `localhost:9094` fail with: ``` level=error ts=2017-10-12T10:03:53.456819948Z caller=notifier.go:445 component=notifier alertmanager=http://localhost:9094/api/v1/alerts count=1 msg="Error sending alert" err="bad response status 401 Unauthorized" ``` If you change the order to be: ``` alerting: alertmanagers: - static_configs: - targets: - localhost:9095 - basic_auth: username: 'prometheus' password: 'test123' static_configs: - targets: - localhost:9094 ``` It works as expected. This commit changes the behavour so `ams` is passed to the go routine so `n.sendOne` uses the appropriate `http.Client` details.	7 years ago
Julius Volz	099df0c5f0	Migrate "golang.org/x/net/context" -> "context" (#3333) ... In some places, where ctxhttp or gRPC are concerned, we still need to use the old contexts.	7 years ago
Marc Sluiter	6a633eece1	Added go-conntrack for monitoring http connections (#3241) ... Added metrics for in- and outgoing traffic with go-conntrack.	7 years ago
Fabian Reinartz	d21f149745	*: migrate to go-kit/log	7 years ago
Fabian Reinartz	87918f3097	Merge branch 'master' into dev-2.0	7 years ago
Lynn Lin	1bf25dc1b2	fix issues reported by gofmt and spelling typo (#3127)	7 years ago
Fabian Reinartz	669075c6b9	Merge branch 'master' into dev-2.0	8 years ago
Chris Goller	42de0ae013	Use log.Logger interface for all discovery services	8 years ago
Fabian Reinartz	4c31061251	Merge branch 'master' into dev-2.0	8 years ago
Frederic Branczyk	45df5c2daf	Merge branch 'release-1.6'	8 years ago
Frederic Branczyk	94e8b43aae	notifier: clone and not reuse LabelSet in AM discovery	8 years ago
Fabian Reinartz	6e804b3497	Merge branch 'master' into dev-2.0	8 years ago
Frederic Branczyk	0c96c4b157	notifier: expose metric for number of discovered alertmanagers	8 years ago
Fabian Reinartz	73b8ff0ddc	Merge branch 'master' into dev-2.0	8 years ago
David Symonds	04ad889751	Preserve Alertmanager URLs as *url.URL. ... Render a nicer link in the web UI.	8 years ago
Fabian Reinartz	8ffc851147	Merge branch 'master' into dev-2.0	8 years ago
Julius Volz	589061919a	Merge pull request #2465 from Gouthamve/alert-metrics-2429 ... Better Metrics For Alerts	8 years ago
Goutham Veeramachaneni	f27ce34a13	Use Registerer to Register All Metrics ... * Made Metric a Gauge so that it can be registered.	8 years ago
Goutham Veeramachaneni	7ba0a9e81a	Add Comment About Initialising Counters	8 years ago
Goutham Veeramachaneni	0d0c9d5440	Move Registerer to Config Struct in Notifier	8 years ago
Julius Volz	815762a4ad	Move retrieval.NewHTTPClient -> httputil.NewClientFromConfig	8 years ago
Goutham Veeramachaneni	af222b63fc	Fix broken tests	8 years ago
Goutham Veeramachaneni	f35816613e	Refactored Notifier to use Registerer ... * Brought metrics back into Notifier Notifier still implements a Collector. Check if that is needed.	8 years ago
Goutham Veeramachaneni	41da5c4ef2	Better Metrics For Alerts ... * Closes prometheus/prometheus#2429 * Moved metrics to top of file for easier access * Initialised CounterVecs	8 years ago
Fabian Reinartz	9304179ef7	Merge branch 'master' into dev-2.0	8 years ago
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).	8 years ago
Fabian Reinartz	1d3cdd0d67	Merge branch 'master' into dev-2.0-rebase	8 years ago
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.	8 years ago
Fabian Reinartz	8b4e4a9d2b	notifier: fully use labels.Labels	8 years ago
Fabian Reinartz	5817cb5bde	*: migrate from model.* to promql.* types	8 years ago
Fabian Reinartz	2ad56aabd4	notifier: extract alertmanager into interface	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
Dominik Schulz	182e17958a	Trivial spelling corrections and a small comment.	8 years ago
Frederic Branczyk	572423cbe5	notifier: attach external labels before relabelling ... By attaching external labels before relabelling, they are available during relabelling.	8 years ago
Tobias Schmidt	8f3b62bfe4	Simplify struct initialization	8 years ago
Frederic Branczyk	b655aa002f	introduce top level alerting config node	8 years ago
Frederic Branczyk	7714b9c781	move relabeling functionality to its own package ... also remove the returned error as it was always nil	8 years ago
Frederic Branczyk	679d225c8d	allow relabeling of alerts ... in case of dropping don't even enqueue them	8 years ago
Dmitry Vorobev	273e457da4	web: return status code and error message for config resource	8 years ago
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.	9 years ago
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.	9 years ago
Dmitry Savintsev	7fdb62c253	fix several minor golint style issues	9 years ago
Fabian Reinartz	bfa8aaa017	Rename notification to notifier	9 years ago