373 Commits (cf528bef034dcf078d3bff0d50224a13068c391e)

Author	SHA1	Message	Date
Daisy T	7d01ead689	change time.duration to model.duration for standardization (#4479) ... Signed-off-by: Daisy T <daisyts@gmx.com>	6 years ago
Goutham Veeramachaneni	c28cc5076c	Saner defaults and metrics for remote-write (#4279) ... * Rename queueCapacity to shardCapacity * Saner defaults for remote write * Reduce allocs on retries Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>	6 years ago
Paul Gier	d24d2acd11	config: set target group source index during unmarshalling (#4245) ... * config: set target group source index during unmarshalling Fixes issue #4214 where the scrape pool is unnecessarily reloaded for a config reload where the config hasn't changed. Previously, the discovery manager changed the static config after loading which caused the in-memory config to differ from a freshly reloaded config. Signed-off-by: Paul Gier <pgier@redhat.com> * [issue #4214] Test that static targets are not modified by discovery manager Signed-off-by: Paul Gier <pgier@redhat.com>	7 years ago
Philippe Laflamme	2aba238f31	Use common HTTPClientConfig for marathon_sd configuration (#4009) ... This adds support for basic authentication which closes #3090 The support for specifying the client timeout was removed as discussed in https://github.com/prometheus/common/pull/123. Marathon was the only sd mechanism doing this and configuring the timeout is done through `Context`. DC/OS uses a custom `Authorization` header for authenticating. This adds 2 new configuration properties to reflect this. Existing configuration files that use the bearer token will no longer work. More work is required to make this backwards compatible.	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
Kristiyan Nikolov	be85ba3842	discovery/ec2: Support filtering instances in discovery (#4011)	7 years ago
Corentin Chary	60dafd425c	consul: improve consul service discovery (#3814) ... * consul: improve consul service discovery Related to #3711 - Add the ability to filter by tag and node-meta in an efficient way (`/catalog/services` allow filtering by node-meta, and returns a `map[string]string` or `service`->`tags`). Tags and nore-meta are also used in `/catalog/service` requests. - Do not require a call to the catalog if services are specified by name. This is important because on large cluster `/catalog/services` changes all the time. - Add `allow_stale` configuration option to do stale reads. Non-stale reads can be costly, even more when you are doing them to a remote datacenter with 10k+ targets over WAN (which is common for federation). - Add `refresh_interval` to minimize the strain on the catalog and on the service endpoint. This is needed because of that kind of behavior from consul: https://github.com/hashicorp/consul/issues/3712 and because a catalog on a large cluster would basically change *all* the time. No need to discover targets in 1sec if we scrape them every minute. - Added plenty of unit tests. Benchmarks ---------- ```yaml scrape_configs: - job_name: prometheus scrape_interval: 60s static_configs: - targets: ["127.0.0.1:9090"] - job_name: "observability-by-tag" scrape_interval: "60s" metrics_path: "/metrics" consul_sd_configs: - server: consul.service.par.consul.prod.crto.in:8500 tag: marathon-user-observability # Used in After refresh_interval: 30s # Used in After+delay relabel_configs: - source_labels: [__meta_consul_tags] regex: ^(.*,)?marathon-user-observability(,.*)?$ action: keep - job_name: "observability-by-name" scrape_interval: "60s" metrics_path: "/metrics" consul_sd_configs: - server: consul.service.par.consul.prod.crto.in:8500 services: - observability-cerebro - observability-portal-web - job_name: "fake-fake-fake" scrape_interval: "15s" metrics_path: "/metrics" consul_sd_configs: - server: consul.service.par.consul.prod.crto.in:8500 services: - fake-fake-fake ``` Note: tested with ~1200 services, ~5000 nodes. | Resource | Empty | Before | After | After + delay | | -------- |:-----:|:------:|:-----:|:-------------:| |/service-discovery size|5K|85MiB|27k|27k|27k| |`go_memstats_heap_objects`|100k|1M|120k|110k| |`go_memstats_heap_alloc_bytes`|24MB|150MB|28MB|27MB| |`rate(go_memstats_alloc_bytes_total[5m])`|0.2MB/s|28MB/s|2MB/s|0.3MB/s| |`rate(process_cpu_seconds_total[5m])`|0.1%|15%|2%|0.01%| |`process_open_fds`|16|*1236*|22|22| |`rate(prometheus_sd_consul_rpc_duration_seconds_count{call="services"}[5m])`|~0|1|1|*0.03*| |`rate(prometheus_sd_consul_rpc_duration_seconds_count{call="service"}[5m])`|0.1|*80*|0.5|0.5| |`prometheus_target_sync_length_seconds{quantile="0.9",scrape_job="observability-by-tag"}`|N/A|200ms|0.2ms|0.2ms| |Network bandwidth|~10kbps|~2.8Mbps|~1.6Mbps|~10kbps| Filtering by tag using relabel_configs uses **100kiB and 23kiB/s per service per job** and quite a lot of CPU. Also sends and additional *1Mbps* of traffic to consul. Being a little bit smarter about this reduces the overhead quite a lot. Limiting the number of `/catalog/services` queries per second almost removes the overhead of service discovery. * consul: tweak `refresh_interval` behavior `refresh_interval` now does what is advertised in the documentation, there won't be more that one update per `refresh_interval`. It now defaults to 30s (which was also the current waitTime in the consul query). This also make sure we don't wait another 30s if we already waited 29s in the blocking call by substracting the number of elapsed seconds. Hopefully this will do what people expect it does and will be safer for existing consul infrastructures.	7 years ago
pasquier-s	fc8cf08f42	Prevent invalid label names with labelmap (#3868) ... This change ensures that the relabeling configurations using labelmap can't generate invalid label names.	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
Brian Brazil	fba80da635	Fix default of read_recent to be false. (#3617) ... This is what is documented in the migration guide, and the default settings should make sense for a true long term storage. Document the setting.	7 years ago
Krasi Georgiev	e405e2f1ea	refactored discovery	7 years ago
Alberto Cortés	29da2fb9cd	testutil: update to go1.9 testing.Helper	7 years ago
Alberto Cortés	8f6a9f7833	config: simplify tests by using testutil.NotOk (#3289) ... Also include filename in all LoadFile errors Also add mesage to testuitl.NotOk so we can identify failing tests when using table driven tests.	7 years ago
Tobias Schmidt	7098c56474	Add remote read filter option ... For special remote read endpoints which have only data for specific queries, it is desired to limit the number of queries sent to the configured remote read endpoint to reduce latency and performance overhead.	7 years ago
Krasi Georgiev	e86d82ad2d	Fix regression of alert rules state loss on config reload. (#3382) ... * incorrect map name for the group prevented copying state from existing alert rules on config reload * applyConfig test * few nits * nits 2	7 years ago
Thibault Chataigner	bf4a279a91	Remote storage reads based on oldest timestamp in primary storage (#3129) ... Currently all read queries are simply pushed to remote read clients. This is fine, except for remote storage for wich it unefficient and make query slower even if remote read is unnecessary. So we need instead to compare the oldest timestamp in primary/local storage with the query range lower boundary. If the oldest timestamp is older than the mint parameter, then there is no need for remote read. This is an optionnal behavior per remote read client. Signed-off-by: Thibault Chataigner <t.chataigner@criteo.com>	7 years ago
Alberto Cortés	6c67296423	config: fix error message for unexpected result of yaml marshal	7 years ago
Alberto Cortés	0f3d8ea075	config: use testutil package	7 years ago
Fabian Reinartz	2d0b8e8b94	Merge branch 'master' into dev-2.0	7 years ago
Alberto Cortés	bb3dad9cba	config: simplify some returns	7 years ago
Bryan Boreham	9d6b945e41	Default HTTP keep-alive ON for remote read/write	7 years ago
Bryan Boreham	e0a4d18301	Allow http keep-alive setting to be overridden in config	7 years ago
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
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
Fabian Reinartz	435fc7234f	config: add overflow detection for serverset config	10 years ago
Fabian Reinartz	02e06839f2	config: hide authentication credentials in String() output	10 years ago
Brian Brazil	52859b8033	Merge pull request #836 from prometheus/shard ... Add 'hashmod' relabel action.	10 years ago
Brian Brazil	682f949ab1	Add 'hashmod' relabel action. ... This takes the modulus of a hash of some labels. Combined with a keep relabel action, this allows for sharding of targets across multiple prometheus servers.	10 years ago
Fabian Reinartz	4319b06dd2	config: add omitempty for consul SD config.	10 years ago
Fabian Reinartz	7ec15956e4	config: show original input on String()	10 years ago
Fabian Reinartz	dc7d27ab9a	retrieval: add honor label handling and parametrized querying. ... This commit adds the honor_labels and params arguments to the scrape config. This allows to specify query parameters used by the scrapers and handling scraped labels with precedence.	10 years ago
Brian Brazil	4d895242f9	Add support for Zookeeper Serversets for SD. ... It can discover an entire tree of serversets, or just one.	10 years ago
Brian Brazil	0dbae36d36	Allow ingested metrics to be relabeled. ... The main purpose of this is to allow for blacklisting of expensive metrics as a tactical option. It could also find uses for renaming and removing labels from federation.	10 years ago
Brian Brazil	58ceae82bc	Revert "Allow ingested metrics to be relabeled." ... This reverts commit f2f26ca08f. Was accidentally pushed to master instead of a branch for PR.	10 years ago
Brian Brazil	f2f26ca08f	Allow ingested metrics to be relabeled. ... The main purpose of this is to allow for blacklisting of expensive metrics as a tactical option. It could also find uses for renaming and removing labels from federation.	10 years ago
Fabian Reinartz	116e6df096	config: raise error on unknown config parameters. ... The YAML parser ignores additional parameters on unmarshaling. This causes frequent confusion with bad configs that pass parsing. These changes raise errors on additional parameters.	10 years ago
Fabian Reinartz	3a24a7779d	config: extend and format config example/test.	10 years ago
Fabian Reinartz	458550560c	config: error on missing regex in relabel config. ... Fixes issue #787.	10 years ago
Fabian Reinartz	b5fe2e9afe	Merge pull request #773 from prometheus/fabxc/simple-cfg ... config: simplify default config handling.	10 years ago
Fabian Reinartz	f6c33a2347	config: prevent overwrite of DefaultGlobalConfig	10 years ago
Fabian Reinartz	db3367e83f	config: ensure correct labelname in JSON target group.	10 years ago
Fabian Reinartz	0af1cff8af	config: simplify default config handling.	10 years ago
Fabian Reinartz	17c4c8ed95	config: fix json/yaml tag inconsistencies.	10 years ago
Fabian Reinartz	867f2ac979	Merge pull request #762 from prometheus/0.14.1 ... 0.14.1	10 years ago
Joonas Bergius	5d5c3878ed	Restore default ScrapeInterval of 1 minute instead of 10 seconds	10 years ago
Fabian Reinartz	0de6edbdfc	Move pkg/ to util/	10 years ago
Fabian Reinartz	dbc0d30e3e	Move string functionality to pkg/strutil	10 years ago
Fabian Reinartz	c44ac7bc26	Load rule files from entire directories	10 years ago
Fabian Reinartz	ed6572fc0c	Fix typos	10 years ago
Fabian Reinartz	b0c181dc0d	Add Consul SD configuration.	10 years ago
Fabian Reinartz	93548a8882	Add initial file based service discovery. ... This commits adds file based service discovery which reads target groups from specified files. It detects changes based on file watches and regular refreshes.	10 years ago
Fabian Reinartz	3b21c7037a	Add file SD to configuration.	10 years ago
Fabian Reinartz	d5aa012fd0	Make HTTP basic auth configurable for scrape targets.	10 years ago
Fabian Reinartz	86087120dd	Replace example config with new YAML format.	10 years ago
Fabian Reinartz	5fbde88919	Switch config to YAML format.	10 years ago
Fabian Reinartz	b5a8f7b8fa	Cleanup, test, and document config.	10 years ago
Fabian Reinartz	945c49a2dd	Add relabelling to target management. ... This commit adds a relabelling stage on the set of base labels from which a target is created. It allows to drop targets and rewrite any regular or internal label.	10 years ago
Fabian Reinartz	0b619b46d6	Change JobConfig to ScrapeConfig. ... This commit changes the configuration interface from job configs to scrape configs. This includes allowing multiple ways of target definition at once and moving DNS SD to its own config message. DNS SD can now contain multiple DNS names per configured discovery.	10 years ago
Fabian Reinartz	5015c2a0e8	Make target manager source based. ... This commit shifts responsibility for maintaining targets from providers and pools to the target manager. Target groups have a source name that identifies them for updates.	10 years ago
Fabian Reinartz	4f8673aa88	Simplify update sync for targets, format config fixtures.	10 years ago
Fabian Reinartz	0280d74167	Fix scrape timeout in config. ... The scrape timeout helper was wrapping the scrape interval.	10 years ago
Julius Volz	464524fa44	Make config/Makefile use user Go installation. ... Otherwise it will fail to "go get" the "github.com/golang/protobuf" package because its dir already exists in the vendored packages, but the copy isn't a git repository.	10 years ago
Julius Volz	af627bb2b9	Copy vendored deps manually instead of using Godeps. ... We were using Godep incorrectly (cloning repos from the internet during build time instead of including Godeps/_workspace in the GOPATH via "godep go"). However, to avoid even having to fetch "godeps" from the internet during build, this now just copies the vendored files into the GOPATH. Also, the protocol buffer library moved from Google Code to GitHub, which is reflected in these updates. This fixes https://github.com/prometheus/prometheus/issues/525	10 years ago
Bjoern Rabenstein	cf28c2efbb	Change autogenerated protobuf code.	10 years ago
Bjoern Rabenstein	5859b74f1b	Clean up license issues. ... - Move CONTRIBUTORS.md to the more common AUTHORS. - Added the required NOTICE file. - Changed "Prometheus Team" to "The Prometheus Authors". - Reverted the erroneous changes to the Apache License.	10 years ago
Bjoern Rabenstein	39efe6358b	Fix typos and import order. ... This doesn't make the import order consistend everywhere, just where it was touched by the previous commit. Change-Id: I82fc75f8691da9901c7ceb808e6f6fe8e5d62c0e	10 years ago
Bjoern Rabenstein	b1e4956142	Apply a giant code cleanup. ... Essentially: - Remove unused code. - Make it 'go vet' clean. The only remaining warnings are in generated code. - Make it 'golint' clean. The only remaining warnings are in gerenated code. - Smoothed out same minor things. Change-Id: I3fe5c1fbead27b0e7a9c247fee2f5a45bc2d42c6	10 years ago
Bjoern Rabenstein	006b5517e2	Simplify makefiles. ... This removes the dependancy on C leveldb and snappy. It also takes care of fewer dependencies as they would anyway not work on any non-Debian, non-Brew system. Change-Id: Ia70dce1ba8a816a003587927e0b3a3f8ad2fd28c	10 years ago
Julius Volz	7b013e6491	Merge "Replace some uses of obsolete `/metrics.json` with `/metrics` (haven't touched test files yet)."	11 years ago
Julius Volz	78ebc1a61f	Ensure that job names are unique in parsed configs. ... Change-Id: I6bd89e6401bd924315981db797af21bdf0b81252	11 years ago
Conor Hennessy	aada5ded85	Replace some uses of obsolete `/metrics.json` with `/metrics` ... (haven't touched test files yet). Change-Id: I48c7c0cf27a39d596627a06cbb4f5913fb3da13c	11 years ago
Conor Hennessy	2d26db7e37	Trivial regeneration of config proto (wasn't regenerated with new comments). ... Change-Id: Iaa97c8b96b40b7f13884e85a39d5a229c2d33f37	11 years ago
Julius Volz	788587426b	Make scrape timeouts configurable per job. ... Change-Id: I77a7514ad9e7969771f873d63d6353ec50082a62	11 years ago