143 Commits (cbfb207ccac38614f8417bb7759d1f054c4d9233)

Author	SHA1	Message	Date
sev3ryn	cc917aee7f	fix of endless loop while doing Consul service discovery. (#4044) ... Reloading Prometheus configs doesn't make loop end. It produced a goroutine leak	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
albatross0	0245fd55bf	Add a machine type label to GCE SD (#4032)	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
Ben Kochie	0d9fe18f5e	Fix nil context staticcheck error.	7 years ago
Aaron Kirkbride	c47fbcb626	Fix moved fsnotify dependency (#3995)	7 years ago
Jeeyoung Kim	5b962c5748	Revert "Feature: Allow getting credentials via EC2 role (#3343)" (#3985) ... This reverts commit 808f79f00a.	7 years ago
Matt Palmer	042090a6d3	[dns_sd] Send an EDNS0 query by default (#3586) ... Based on https://groups.google.com/d/topic/prometheus-users/02kezHbuea4/discussion Does not attempt to handle a situation where the server does not understand EDNS0, however that is an unlikely case, and the behaviour of such ancient systems is hard to predict in advance, so if it does come up, it will need to be handled on a case-by-case basis.	7 years ago
Yecheng Fu	56ed29fbf7	Map target infos of endpoints to prometheus meta labels. (#3770)	7 years ago
Marek Siarkowicz	86011047ca	Validate required fields in sd configuration (#3911)	7 years ago
Krasi Georgiev	6b0e9ef183	Validate json parse for TargetGroup Unmarshal (#3614) ... Using DisallowUnknownFields in golang 1.10 to forbid unknown fields in targetGroups added the license header for the targetGroup test	7 years ago
Krasi Georgiev	4fa7e719f4	race in Triton SD Test (#3885)	7 years ago
ferhat elmas	ffa673f7d8	General simplifications (#3887) ... Another try as in #1516	7 years ago
Pedro Araújo	575f665944	Add OS type meta label to Azure SD (#3863) ... There is currently no way to differentiate Windows instances from Linux ones. This is needed when you have a mix of node_exporters / wmi_exporters for OS-level metrics and you want to have them in separate scrape jobs. This change allows you to do just that. Example: ``` - job_name: 'node' azure_sd_configs: - <azure_sd_config> relabel_configs: - source_labels: [__meta_azure_machine_os_type] regex: Linux action: keep ``` The way the vendor'd AzureSDK provides to get the OsType is a bit awkward - as far as I can tell, this information can only be gotten from the startup disk. Newer versions of the SDK appear to improve this a bit (by having OS information in the InstanceView), but the current way still works.	7 years ago
Simon Pasquier	2072bbc824	Send update when pod's IP address is empty ... When the pod gets evicted, its IP address becomes empty and it needs to be removed from the targets.	7 years ago
Krasi Georgiev	b75428ec19	rename package retrieve to scrape ... no fucnctinal changes just renaming retrieval to scrape	7 years ago
Frederic Branczyk	d3ae1ac40e	Merge pull request #3741 from krasi-georgiev/discovery-race ... read/write race for the context field in the discovery package	7 years ago
pasquier-s	bde64cf5a6	Fix Kubernetes endpoints SD for empty subsets (#3660) ... * Fix Kubernetes endpoints SD for empty subsets When an endpoints object has no associated pods (replica scaled to zero for instance), the endpoints SD should return a target group with no targets so that the SD manager propagates this information to the scrape manager. Fixes #3659 * Don't send nil target groups from the Kubernetes SD This is to be consistent with the endpoints SD part.	7 years ago
Krasi Georgiev	818dda72db	updated the sd tests	7 years ago
Krasi Georgiev	acc4197098	remove dicovery race for the context field	7 years ago
Frederic Branczyk	47538cf6ce	Merge pull request #3747 from prometheus/sched-update-throttle ... Update throttle & tsdb update	7 years ago
Frederic Branczyk	73e829137b	discovery: Cleanup ticker	7 years ago
Ganesh Vernekar	66b0aa3b45	Fixed race condition in map iteration and map write in Discovery (#3735) (#3738) ... * Fixed concurrent map iteration and map write in Discovery (#3735) * discovery: Changed Lock to RLock in Collect	7 years ago
Krasi Georgiev	fe926e7829	update the discover tests ... the discovery test is now only testing update and get groups. It doesn't do an e2e test but just a unit test of setting and receiving target groups	7 years ago
Callum Styan	7dc05538f7	docs: SD implementations do not have to only send new/changed target groups (#3713)	7 years ago
Frederic Branczyk	cfa0253ed8	discovery: Schedule updates to throttle	7 years ago
zemek	8a01a0fbed	Set consul server default to localhost:8500 (#3703)	7 years ago
Julius Volz	09e460a647	discovery: Rename file SD mtime metric (#3723) ... - "timestamp" -> "mtime" to be in line with node exporter and clearer. - add unit suffix	7 years ago
Krasi Georgiev	ec26751fd2	use mutexes for the discovery manager instead of a loop as this was a stupid idea	7 years ago
Krasi Georgiev	767faa44b6	fixed the tests ... Signed-off-by: Krasi Georgiev <krasi.root@gmail.com>	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
Goutham Veeramachaneni	b20a1b1b1b	Merge pull request #3654 from krasi-georgiev/discovery-handle-discoverer-updates ... discovery - handle Discoverers that send only target Group updates.	7 years ago
Krasi Georgiev	790cf30fcb	remove uneeded check	7 years ago
Krasi Georgiev	38938ba493	comment nits	7 years ago
Krasi Georgiev	febebcd49a	more comments for the future ME, and reverted the Discovery manager execution changes as these were correct in the first place	7 years ago
Krasi Georgiev	78ba5e62a6	few mote usefull comments	7 years ago
Krasi Georgiev	cabce21b70	delete empty targets sets to avoid memory leaks	7 years ago
Krasi Georgiev	abfd9f1920	nits	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
Krasi Georgiev	546c29af5b	return early for nil target groups	7 years ago
Callum Styan	97464236c7	comments with TargetProvider should read Discoverer instead (#3667)	7 years ago
Krasi Georgiev	77bf6bece0	discovery-manager comment update	7 years ago
Krasi Georgiev	135ea0f793	discovery manager - doesn't need sorting of the target groups so move it in the discovery manager tests as we only need it there. ... discovery manager - refactor the discovery tests. Signed-off-by: Krasi Georgiev <krasi.root@gmail.com>	7 years ago
Krasi Georgiev	638818a974	some Discoverers send nil targetgroup so need to check for it when updating a group	7 years ago
Krasi Georgiev	7e28397a2c	discovery - handle Discoverers that send only target Group updates rather than all Targets on every update. ... 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
Callum Styan	d76d5de66f	refactor to make timestamp collector work for multiple file_sd's	7 years ago
KalivarapuReshma	a00fc883c3	Add metric for timestamp of the files file_sd is using.	7 years ago