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
beorn7	dd81912554	Add objectives to Summaries With the next release of client_golang, Summaries will not have objectives by default. To not lose the objectives we have right now, explicitly state the current default objectives. Signed-off-by: beorn7 <beorn@grafana.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
Tariq Ibrahim	8fdfa8abea	refine error handling in prometheus (#5388 ) i) Uses the more idiomatic Wrap and Wrapf methods for creating nested errors. ii) Fixes some incorrect usages of fmt.Errorf where the error messages don't have any formatting directives. iii) Does away with the use of fmt package for errors in favour of pkg/errors Signed-off-by: tariqibrahim <tariq181290@gmail.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
Lv Jiawei	b50ea4834f	Fix typo in comment (#5061 ) I think it is a typo in comment of Alert.ResolvedAt . Signed-off-by: MIBc <lvjiawei@cmss.chinamobile.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
Ben Kochie	c6399296dc	Fix spelling/typos (#4921 ) * Fix spelling/typos Fix spelling/typos reported by codespell/misspell. * UK -> US spelling changes. Signed-off-by: Ben Kochie <superq@gmail.com>	6 years ago
Daniele Sluijters	f25a6baedb	remote: Set User-Agent header in requests (#4891 ) Currently Prometheus requests show up with a UA of Go-http-client/1.1 which isn't super helpful. Though the X-Prometheus-Remote-* headers exist they need to be explicitly configured when logging the request in order to be able to deduce this is a request originating from Prometheus. By setting the header we remove this ambiguity and make default server logs just a bit more useful. This also updates a few other places to consistently capitalize the 'P' in the user agent, as well as ensure we set a UA to begin with. Signed-off-by: Daniele Sluijters <daenney@users.noreply.github.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
Karsten Weiss	d79d573f71	Fix spelling mistakes found by codespell (#4065 ) Signed-off-by: Karsten Weiss <knweiss@gmail.com>	7 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
Conor Broderick	1fd20fc954	Add dropped alertmanagers to alertmanagers API (#3865 )	7 years ago
Matt Bostock	f0fd701309	Clarify notify metric descriptions (#2551 ) The implementation of `sendAll` means that we observe latencies even for notifications that would be considered dropped due to errors when sending them. Similarly, we count alerts as 'sent' even if an error occurred when trying to send them (meaning they are potentially not sent at all). `336c7870ea/notifier/notifier.go (L340-L347)`	7 years ago
Krasi Georgiev	7858745c04	rename structs for consistency	7 years ago
Krasi Georgiev	719c579f7b	refactor main execution reloadReady handling, update some comments	7 years ago
Krasi Georgiev	5260c650ec	use the config hash for the map lookup	7 years ago
Krasi Georgiev	8369826808	comment to rethink the map reference for the notifier discovery	7 years ago
Krasi Georgiev	d12e6f29fc	discovery manager ApplyConfig now takes a direct ServiceDiscoveryConfig so that it can be used for the notify manager reimplement the service discovery for the notify manager Signed-off-by: Krasi Georgiev <krasi.root@gmail.com>	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
Krasi Georgiev	e405e2f1ea	refactored discovery	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
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	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
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	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

1 2

64 Commits (fb2b3c2b0b9a69f70b867a6efeb20058701ca88c)