200 Commits (35aaa2002d24d13c4ff797cd97691904aaedb9c8)

Author	SHA1	Message	Date
Fabian Reinartz	e746282772	Merge branch 'master' into dev-2.0	7 years ago
Jamie Moore	7a135e0a1b	Add the ability to assume a role for ec2 discovery	7 years ago
Fabian Reinartz	87918f3097	Merge branch 'master' into dev-2.0	7 years ago
Johannes 'fish' Ziemke	70f3d1e9f9	k8s: Support discovery of ingresses (#3111) ... * k8s: Support discovery of ingresses * Move additional labels below allocation This makes it more obvious why the additional elements are allocated. Also fix allocation for node where we only set a single label. * k8s: Remove port from ingress discovery * k8s: Add comment to ingress discovery example	7 years ago
CuiHaozhi	b1c18bf29b	discovery openstack: support discovery hosts, add rule option. ... Signed-off-by: CuiHaozhi <cuihz@wise2c.com>	7 years ago
Max Leonard Inden	1c96fbb992	Expose current Prometheus config via /status/config ... This PR adds the `/status/config` endpoint which exposes the currently loaded Prometheus config. This is the same config that is displayed on `/config` in the UI in YAML format. The response payload looks like such: ``` { "status": "success", "data": { "yaml": <CONFIG> } } ```	7 years ago
Fabian Reinartz	25f3e1c424	Merge branch 'master' into mergemaster	7 years ago
Yuki Ito	1bf3b91ae0	Make sure that url for remote_read/write is not nil (#3024)	7 years ago
Tom Wilkie	5169f990f9	Review feedback: add yaml struct tags, don't embed queue config. ... Also, rename QueueManageConfig to QueueConfig, for consistency with tags.	7 years ago
Tom Wilkie	454b661145	Make queue manager configurable.	7 years ago
Fabian Reinartz	dba7586671	Merge branch 'master' into dev-2.0	7 years ago
Fuente, Pablo Andres	9eb8c6e1d2	Renaming the config_notwin test to config_default	7 years ago
Fuente, Pablo Andres	fe73de9452	Renaming config test file to fix build tags ... Renaming the name of a file of the config tests, in order to properly use the Go build tags feature.	7 years ago
Fuente, Pablo Andres	193dc47230	Fixing code style to adhere gofmt	7 years ago
Fuente, Pablo Andres	902fafb8e7	Fixing tests for Windows ... Fixing the config/config_test, the discovery/file/file_test and the promql/promql_test tests for Windows. For most of the tests, the fix involved correct handling of path separators. In the case of the promql tests, the issue was related to the removal of the temporal directories used by the storage. The issue is that the RemoveAll() call returns an error when it tries to remove a directory which is not empty, which seems to be true due to some kind of process that is still running after closing the storage. To fix it I added some retries to the remove of the temporal directories. Adding tags file from Universal Ctags to .gitignore	7 years ago
Goutham Veeramachaneni	98d20d5880	Make sure rendering config produces valid config ... Fixes #2899 Signed-off-by: Goutham Veeramachaneni <goutham@boomerangcommerce.com>	8 years ago
Fabian Reinartz	65b087bcc1	config: resolve file SD paths relative to config	8 years ago
Fabian Reinartz	9ba61df45a	Merge pull request #2789 from mtanda/aws_default_region ... config: set default region for EC2 SD	8 years ago
Mitsuhiro Tanda	64cef5cd05	handle NewSession() error	8 years ago
Christian Groschupp	8f781e411c	Openstack Service Discovery (#2701) ... * Add openstack service discovery. * Add gophercloud code for openstack service discovery. * first changes for juliusv comments. * add gophercloud code for floatingip. * Add tests to openstack sd. * Add testify suite vendor files. * add copyright and make changes for code climate. * Fixed typos in provider openstack. * Renamed tenant to project in openstack sd. * Change type of password to Secret in openstack sd.	8 years ago
Roman Vynar	dbe2eb2afc	Hide consul token on UI. (#2797)	8 years ago
Mitsuhiro Tanda	a1ddab463e	config: set default region for EC2 SD	8 years ago
Tobias Schmidt	287ec6e6cc	Fix outdated target_group naming in error message ... The target_groups config has been renamed to static_configs, the error message for overflow attributes should reflect that.	8 years ago
Julius Volz	240bb671e2	config: Fix overflow checking in global config (#2783)	8 years ago
Conor Broderick	6766123f93	Replace regex with Secret type and remarshal config to hide secrets (#2775)	8 years ago
Brian Akins	27d66628a1	Allow limiting Kubernetes service discover to certain namespaces ... Allow namespace discovery to be more easily extended in the future by using a struct rather than just a list. Rename fields for kubernetes namespace discovery	8 years ago
Julius Volz	eb14678a25	Make remote read/write use config.HTTPClientConfig	8 years ago
Julius Volz	02395a224d	[WIP] Remote Read	8 years ago
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