222 Commits (566c80b47cba769dc72288af19638992252413fb)

Author	SHA1	Message	Date
Julius Volz	525da88c35	Merge pull request #2479 from YKlausz/consul-tls ... Adding consul capability to connect via tls	8 years ago
Goutham Veeramachaneni	5c89cec65c	Stricter Relabel Config Checking for Labeldrop/keep (#2510) ... * Minor code cleanup * Labeldrop/Labelkeep Now *Only* Support Regex Ref promtheus/prometheus#2368	8 years ago
yklausz	75880b594f	Adding consul capability to connect via tls	8 years ago
Michael Kraus	04eadf6e20	Allow Marathon SD without bearer_token and bearer_token_file	8 years ago
Michael Kraus	47bdcf0f67	Allow the use of bearer_token or bearer_token_file for MarathonSD	8 years ago
Julius Volz	e9476b35d5	Re-add multiple remote writers ... Each remote write endpoint gets its own set of relabeling rules. This is based on the (yet-to-be-merged) https://github.com/prometheus/prometheus/pull/2419, which removes legacy remote write implementations.	8 years ago
Alex Somesan	b22eb65d0f	Cleaner separation between ServiceAccount and custom authentication in K8S SD (#2348) ... * Canonical usage of cluster service-account in K8S SD * Early validation for opt-in custom auth in K8S SD * Fix typo in condition	8 years ago
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	cc35104504	config: fix naming and typo	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	aabf4a419b	use LabelNam.IsValid() instead of LabelNameRE and MatchString instead of Match	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	f867c1fd58	formating and text fixes, adjust regexp	8 years ago
Matti Savolainen	56907ba6e3	Add interpolation to good test config. Fix regex	8 years ago
Matti Savolainen	7a36af1c85	add comment about interpolation	8 years ago
Matti Savolainen	3b8e7c1277	Merge branch 'master' of https://github.com/prometheus/prometheus into bug/target_label_unmarshal	8 years ago
Matti Savolainen	5a1e909b5d	Make TargetLabel in RelabelConfig a string	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
Fabian Reinartz	1b6dfa32a9	config: rename role 'endpoint' to 'endpoints'	8 years ago
Frederic Branczyk	2e18c81a00	config: adapt unit tests	8 years ago
Fabian Reinartz	b24602f713	kubernetes: merge back into single configuration	8 years ago
Fabian Reinartz	2331701b50	kubernetes: Add K8S v2 pod discovery ... This adds plumbing for a parallel version of the new K8S SD and adds pod discovery as the first role.	8 years ago
Dominik Schulz	72cbf8af6f	Fix small copy and paste error	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
Tom Wilkie	4520e12440	Add HTTP Basic Auth & TLS support to the generic write path. (#1957) ... * Add config, HTTP Basic Auth and TLS support to the generic write path. - Move generic write path configuration to the config file - Factor out config.TLSConfig -> tlf.Config translation - Support TLSConfig for generic remote storage - Rename Run to Start, and make it non-blocking. - Dedupe code in httputil for TLS config. - Make remote queue metrics global.	8 years ago
Tobias Schmidt	874cb44bb6	Merge pull request #1996 from ton31337/Fix/allow_numbers_as_first_letter ... Allow number to be the first letter as well for `job_name`	8 years ago
Donatas Abraitis	1aa8898b66	Allow number to be the first letter as well for `job_name`	8 years ago
Ingo Gottwald	3b546d061f	Add support for GCE discovery	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	be596f82b4	Merge pull request #1783 from knyar/json ... Allow URLs in targets defined via a JSON file	8 years ago
Frederic Branczyk	b655aa002f	introduce top level alerting config node	8 years ago
Frederic Branczyk	679d225c8d	allow relabeling of alerts ... in case of dropping don't even enqueue them	8 years ago
Fabian Reinartz	7a0b3af0b7	config: validate Kubernetes role correctly.	8 years ago
Fabian Reinartz	919558f601	config: remove deprecated `target_groups` configuration	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
Anton Tolchanov	772a3af38f	Allow URLs in targets defined via a JSON file ... This enables defining `blackbox_exporter` targets (which can be URLs, because of relabeling) in a JSON file. Not sure if this is the best approach, but current behaviour is inconsistent (`UnmarshalYAML` does not have this check) and breaks officially documented way to use `blackbox_exporter`.	9 years ago
Ali Reza	98c156c361	reorder config validation, move checkOverflow before any other validation	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
Gregory G. Tseng	7997c14b0d	Add ServerName into TLS Config	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
Fabian Reinartz	37c709f917	Fix global config YAML issues	9 years ago
Fabian Reinartz	44a5e860ed	Fix scrape timeout config checks	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
Fabian Reinartz	f2a8261cdb	Merge pull request #1177 from fabric8io/kubernetes-discovery ... Kubernetes SD authentication options cleanup	9 years ago
Fabian Reinartz	180da1ba65	Add overflow check in TLS config	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	ec04ba38a2	Kubernetes SD config check	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
Julius Volz	995d3b831d	Fix most golint warnings. ... This is with `golint -min_confidence=0.5`. I left several lint warnings untouched because they were either incorrect or I felt it was better not to change them at the moment.	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
Fabian Reinartz	139f27bf8a	Increase default retry interval for file SD ... The automatic refresh is a safety mechanism in case file watches fail. As they seem to be working well the interval can be increased.	9 years ago
Fabian Reinartz	3c6dd161d7	Scrape all services on empty services list.	9 years ago
Fabian Reinartz	b964da4b75	Merge pull request #905 from fabric8io/kubernetes-discovery ... Kubernetes discovery	9 years ago
Fabian Reinartz	24e91720ad	Merge pull request #980 from prometheus/map-labels ... Retrieval: Add relabel action to map labels names with a regex.	9 years ago
Brian Brazil	4e70a0a14e	Retrieval: Add relabel action to map label names with a regex. ... The intended use case is where a user has tags/labels coming from metadata in Kubernetes or EC2, and wants to make some subset of them into target labels.	9 years ago
Brian Brazil	43449b0581	config: Update tests/examples to use __tmp_	9 years ago
Jimmi Dyson	923f8111d4	Initial Kubernetes discovery ... Fixes #904	9 years ago
Fabian Reinartz	cdcfada2ac	Merge pull request #965 from prometheus/fabxc/relpath ... Resolve relative paths on configuration loading	9 years ago
Fabian Reinartz	73f1cc807d	Check token and cert file existence in promtool	9 years ago
Fabian Reinartz	54202bc5a8	Merge pull request #902 from xperimental/feature/marathon-discovery ... retrieval/discovery: Service discovery using marathon API	9 years ago
Robert Jacob	4d0f974c42	Add service discovery using Marathon API.	9 years ago
Will Rouesnel	7810448dbe	Add proxy_url parameter to allow specifying per-job HTTP proxy servers ... Allow scrape_configs to have an optional proxy_url option which specifies a proxy to be used for all connections to hosts in that config. Internally this modifies the various client functions to take a *url.URL pointer which currently must point to an HTTP proxy (but has been left open-ended to allow the url format to be extended to support others, such as maybe SOCKS if needed).	9 years ago
Fabian Reinartz	7a67472fc1	Resolve relative paths on configuration loading ... This moves the concern of resolving the files relative to the config file into the configuration loading itself. It also fixes #921 which did not load the cert and token files relatively.	9 years ago
Jimmi Dyson	52cf6b3e6e	Configuration options for bearer tokens, client certs & CA certs ... Fixes #918, fixes #917	9 years ago
Johannes 'fish' Ziemke	9ab340e95e	Add support for A record based DNS SD ... If using A records, the user needs to specify "port" and set "type" to "A".	9 years ago
Fabian Reinartz	187fe4e3d3	Fix missing defaults for empty global config blocks	9 years ago
Fabian Reinartz	2a53b107c1	Fix missing defaults in empty configurations	9 years ago