89 Commits (7db444739060c6a54f993c55717e782f85338b90)

Author	SHA1	Message	Date
Fabian Reinartz	7eb849e6a8	Merge pull request #2307 from joyent/triton_discovery ... Add Joyent Triton discovery	8 years ago
Richard Kiene	f3d9692d09	Add Joyent Triton discovery	8 years ago
Björn Rabenstein	ad40d0abbc	Merge pull request #2288 from prometheus/limit-scrape ... Add ability to limit scrape samples, and related metrics	8 years ago
Brian Brazil	30448286c7	Add sample_limit to scrape config. ... This imposes a hard limit on the number of samples ingested from the target. This is counted after metric relabelling, to allow dropping of problemtic metrics. This is intended as a very blunt tool to prevent overload due to misbehaving targets that suddenly jump in sample count (e.g. adding a label containing email addresses). Add metric to track how often this happens. Fixes #2137	8 years ago
Tristan Colgate-McFarlane	4d9134e6d8	Add labeldrop and labelkeep actions. (#2279) ... Introduce two new relabel actions. labeldrop, and labelkeep. These can be used to filter the set of labels by matching regex - labeldrop: drops all labels that match the regex - labelkeep: drops all labels that do not match the regex	8 years ago
Fabian Reinartz	3fb4d1191b	config: rename AlertingConfig, resolve file paths	8 years ago
Fabian Reinartz	183c5749b9	config: add Alertmanager configuration	8 years ago
Fabian Reinartz	200bbe1bad	config: extract SD and HTTPClient configurations	8 years ago
Fabian Reinartz	ec66082749	Merge branch 'ec2_sd_profile_support' of https://github.com/Ticketmaster/prometheus into Ticketmaster-ec2_sd_profile_support	8 years ago
Kraig Amador	bec6870ed4	ec2_sd_configs: Support profiles for configuring the ec2 service	8 years ago
beorn7	b2f28a9e82	Merge branch 'release-1.2'	8 years ago
Brian Brazil	d1ece12c70	Handle null Regex in the config as the empty regex. (#2150)	8 years ago
bekbulatov	2bc12fa2fb	Set timeout for marathon_sd	8 years ago
bekbulatov	c689b35858	Merge branch 'master' into marathon_tls	8 years ago
Matti Savolainen	ec6524ce74	test the labelTarget regex to make sure it properly validates pre-interpolated label names.	8 years ago
Matti Savolainen	56907ba6e3	Add interpolation to good test config. Fix regex	8 years ago
Björn Rabenstein	d93f73874f	Merge pull request #2093 from dominikschulz/spelling ... Trivial spelling corrections	8 years ago
Dominik Schulz	182e17958a	Trivial spelling corrections and a small comment.	8 years ago
bekbulatov	ac702f66eb	Resolve merge conflicts	8 years ago
Frederic Branczyk	2e18c81a00	config: adapt unit tests	8 years ago
bekbulatov	01b53c1180	Add tls support	8 years ago
Brian Brazil	77605649a9	Add support for remote write relabelling. ... Switch back to a single remote writer, as we were only ever meant to have one and the relabel semantics are clearer that way.	8 years ago
Donatas Abraitis	1aa8898b66	Allow number to be the first letter as well for `job_name`	8 years ago
Alexey Miroshkin	e29d9394e5	Forbid invalid relabel configurations ... This fix adds check if target_label value is set in case if action is replace or hashmod Issue [#1900]	8 years ago
Fabian Reinartz	7a0b3af0b7	config: validate Kubernetes role correctly.	8 years ago
Fabian Reinartz	7221228843	discovery/kubernetes: select between discovery role ... This adds `role` field to the Kubernetes SD config, which indicates which type of Kubernetes SD should be run. This no longer allows discovering pods and nodes with the same SD configuration for example.	9 years ago
Fabian Reinartz	0f21bd31ca	config: deprecate `target_groups` for `static_configs` ... This change deprecates the `target_groups` option in favor of `static_configs`. The old configuration is still accepted but prints a warning. Configuration loading errors if both options are set.	9 years ago
Jimmi Dyson	206bcfcdaa	Kubernetes SD: Remove kubeletPort config option	9 years ago
Ali Reza	c81b4e8a87	change config names to files for consistency	9 years ago
Seth Miller	0988e3b937	Add support for Azure discovery ... This change adds the ability to do target discovery with Microsoft's Azure platform.	9 years ago
Julius Volz	829a029dda	Update two more __meta_dns_srv_name references. ... Although they are only in examples/tests and don't affect anything, they could be confusing (the label has been renamed in the rest of the code a while ago).	9 years ago
Fabian Reinartz	e26e4b6e89	Restrict scrape timeout to interval length	9 years ago
beorn7	a7408bfb47	Unify duration parsing ... It's actually happening in several places (and for flags, we use the standard Go time.Duration...). This at least reduces all our home-grown parsing to one place (in model).	9 years ago
Julien Dehee	061fe2f364	Support AirBnB's Smartstack Nerve client for SD ... nerve's registration format differs from serverset. With this commit there is now a dedicated treecache file in util, and two separate files for serverset and nerve. Reference: https://github.com/airbnb/nerve	9 years ago
Fabian Reinartz	4d1c9296d5	Add new defaults for relabel configurations	9 years ago
Brian Brazil	fd2bd81cd8	Allow all instance labels in target groups ... With the blackbox exporter, the instance label will commonly be used for things other than hostnames so remove this restriction. https://example.com or https://example.com/probe/me are some examples. To prevent user error, check that urls aren't provided as targets when there's no relabelling that could potentically fix them.	9 years ago
Jimmi Dyson	87940ec213	Kubernetes SD: Rename `masters` to `api_servers` in config	9 years ago
Jimmi Dyson	7ff5cc66ea	Kubernetes SD authentication options cleanup	9 years ago
Brian Brazil	1ddf75240d	config: Don't hide username, it's not secret. ... Usernames are not generally considered to be secrets, and treating them as secrets may lead to confusion as to how secure they are. Obscuring them also makes debugging harder.	9 years ago
Matt Jibson	dcb4856d72	Add SD for Amazon EC2 instances	9 years ago
Julius Volz	dac26cef71	Rename global "labels" config option to "external_labels".	9 years ago
Matt Jibson	0e99fa6c46	Allow labelmap action	9 years ago
Jimmi Dyson	a1574aa2b3	Move TLS options to scrape config ... Fixes #1013, fixes #989	9 years ago
Fabian Reinartz	1ef5ed0cf2	Merge pull request #1048 from xperimental/fix/marathon-config ... Fix parsing Marathon SD config	9 years ago
Robert Jacob	eb7416e71f	Fix missing unmarshal for Marathon SD config.	9 years ago
Jimmi Dyson	d7a7fd4589	Kubernetes SD improvements ... * Support multiple masters with retries against each master as required. * Scrape masters' metrics. * Add role meta label for node/service/master to make it easier for relabeling.	9 years ago
Julius Volz	f63a899744	Change config regexes to full-string matches. ... This anchors all regular expressions entered via the config to match a full string vs. a substring. THIS IS A BREAKING CHANGE! Fixes part of https://github.com/prometheus/prometheus/issues/996	9 years ago
Fabian Reinartz	438e232c9b	Fix grouping of import blocks	9 years ago
Fabian Reinartz	306e8468a0	Switch from client_golang/model to common/model	9 years ago
Fabian Reinartz	ac0be60bb9	Add license headers	9 years ago