prometheus

Commit Graph

Author	SHA1	Message	Date
Max Leonard Inden	41c22effbe	config&notifier: Add option to use Alertmanager API v2 With v0.16.0 Alertmanager introduced a new API (v2). This patch adds a configuration option for Prometheus to send alerts to the v2 endpoint instead of the defautl v1 endpoint. Signed-off-by: Max Leonard Inden <IndenML@gmail.com>	6 years ago
Yao Zengzeng	dbd7a7400e	some minor fixes: (#5535 ) 1. If alerts is empty after `relabelAlerts`, just return to avoid subsequent unnecessary operations 2. minor fix in notifier's test case 3. minor fix in comment Signed-off-by: YaoZengzeng <yaozengzeng@zju.edu.cn>	6 years ago
Romain Baugue	95193fa027	Exhaust every request body before closing it (#5166 ) (#5479 ) From the documentation: > The default HTTP client's Transport may not > reuse HTTP/1.x "keep-alive" TCP connections if the Body is > not read to completion and closed. This effectively enable keep-alive for the fixed requests. Signed-off-by: Romain Baugue <romain.baugue@elwinar.com>	6 years ago
Tom Wilkie	c7b3535997	Use pkg/relabelling in remote write. - Unmarshall external_labels config as labels.Labels, add tests. - Convert some more uses of model.LabelSet to labels.Labels. - Remove old relabel pkg (fixes #3647). - Validate external label names. Signed-off-by: Tom Wilkie <tom.wilkie@gmail.com>	6 years ago
Bartek Płotka	62c8337e77	Moved configuration into `relabel` package. (#4955 ) Adapted top dir relabel to use pkg relabel structs. Removal of this in a separate tracked here: https://github.com/prometheus/prometheus/issues/3647 Signed-off-by: Bartek Plotka <bwplotka@gmail.com>	6 years ago
Simon Pasquier	ed19373a78	: remove use of golang.org/x/net/context (#4869 ) : remove use of golang.org/x/net/context Signed-off-by: Simon Pasquier <spasquie@redhat.com> scrape: fix TestTargetScrapeScrapeCancel Signed-off-by: Simon Pasquier <spasquie@redhat.com>	6 years ago
Daisy T	7d01ead689	change time.duration to model.duration for standardization (#4479 ) Signed-off-by: Daisy T <daisyts@gmx.com>	6 years ago
Adam Shannon	809881d7f5	support reading basic_auth password_file for HTTP basic auth (#4077 ) Issue: https://github.com/prometheus/prometheus/issues/4076 Signed-off-by: Adam Shannon <adamkshannon@gmail.com>	7 years ago
Manos Fokas	25f929b772	Yaml UnmarshalStrict implementation. (#4033 ) * Updated yaml vendor package. * remove checkOverflow duplicate in rulefmt * remove duplicated HTTPClientConfig.Validate() * Added yaml static check.	7 years ago
Solomon Van	68e394a56e	notifier: update use testutil for testing (#3695 )	7 years ago
Conor Broderick	1fd20fc954	Add dropped alertmanagers to alertmanagers API (#3865 )	7 years ago
Krasi Georgiev	7858745c04	rename structs for consistency	7 years ago
Krasi Georgiev	87a8fc24d5	fix the test	7 years ago
Krasi Georgiev	2e058b1c6f	reload test Signed-off-by: Krasi Georgiev <krasi.root@gmail.com>	7 years ago
Krasi Georgiev	767faa44b6	fixed the tests Signed-off-by: Krasi Georgiev <krasi.root@gmail.com>	7 years ago
Shubheksha Jalan	0471e64ad1	Use shared types from the `common` repo (#3674 ) * refactor: use shared types from common repo, remove util/config * vendor: add common/config * fix nit	7 years ago
Shubheksha Jalan	ec94df49d4	Refactor SD configuration to remove `config` dependency (#3629 ) * refactor: move targetGroup struct and CheckOverflow() to their own package * refactor: move auth and security related structs to a utility package, fix import error in utility package * refactor: Azure SD, remove SD struct from config * refactor: DNS SD, remove SD struct from config into dns package * refactor: ec2 SD, move SD struct from config into the ec2 package * refactor: file SD, move SD struct from config to file discovery package * refactor: gce, move SD struct from config to gce discovery package * refactor: move HTTPClientConfig and URL into util/config, fix import error in httputil * refactor: consul, move SD struct from config into consul discovery package * refactor: marathon, move SD struct from config into marathon discovery package * refactor: triton, move SD struct from config to triton discovery package, fix test * refactor: zookeeper, move SD structs from config to zookeeper discovery package * refactor: openstack, remove SD struct from config, move into openstack discovery package * refactor: kubernetes, move SD struct from config into kubernetes discovery package * refactor: notifier, use targetgroup package instead of config * refactor: tests for file, marathon, triton SD - use targetgroup package instead of config.TargetGroup * refactor: retrieval, use targetgroup package instead of config.TargetGroup * refactor: storage, use config util package * refactor: discovery manager, use targetgroup package instead of config.TargetGroup * refactor: use HTTPClient and TLS config from configUtil instead of config * refactor: tests, use targetgroup package instead of config.TargetGroup * refactor: fix tagetgroup.Group pointers that were removed by mistake * refactor: openstack, kubernetes: drop prefixes * refactor: remove import aliases forced due to vscode bug * refactor: move main SD struct out of config into discovery/config * refactor: rename configUtil to config_util * refactor: rename yamlUtil to yaml_config * refactor: kubernetes, remove prefixes * refactor: move the TargetGroup package to discovery/ * refactor: fix order of imports	7 years ago
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
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	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	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	8b4e4a9d2b	notifier: fully use labels.Labels	8 years ago
Fabian Reinartz	2ad56aabd4	notifier: extract alertmanager into interface	8 years ago
Fabian Reinartz	3fb4d1191b	config: rename AlertingConfig, resolve file paths	8 years ago
Fabian Reinartz	f210d96497	notifier: use dynamic service discovery	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	679d225c8d	allow relabeling of alerts in case of dropping don't even enqueue them	8 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
Fabian Reinartz	bfa8aaa017	Rename notification to notifier	9 years ago

40 Commits (0f007373087bfb2d581f77a4a9a47941e5eeee6b)