Frederic Branczyk
8f8cea4fbd
retrieval: refactor TargetManager to return flat list of Targets
2016-12-02 13:28:58 +01:00
Fabian Reinartz
200bbe1bad
config: extract SD and HTTPClient configurations
2016-11-23 18:23:37 +01:00
Fabian Reinartz
47623202c7
retrieval: remove metric namespaces
2016-11-23 09:17:04 +01:00
Fabian Reinartz
d7f4f8b879
discovery: move TargetSet into discovery package
2016-11-23 09:14:44 +01:00
Fabian Reinartz
d19d1bcad3
discovery: move into top-level package
2016-11-22 12:56:33 +01:00
Fabian Reinartz
7bd9508c9b
discovery: move TargetProvider and multi-constructor
2016-11-22 12:56:33 +01:00
Fabian Reinartz
bd0048477c
discovery: move remaining SDs into own package
2016-11-22 12:56:33 +01:00
Fabian Reinartz
5b72eae1b0
Merge pull request #2203 from prometheus/sdfix
...
Service discovery fixes
2016-11-21 16:46:20 +01:00
Fabian Reinartz
ec66082749
Merge branch 'ec2_sd_profile_support' of https://github.com/Ticketmaster/prometheus into Ticketmaster-ec2_sd_profile_support
2016-11-21 11:49:23 +01:00
Fabian Reinartz
06555bde93
Merge branch 'k8s_sd_metrics' of https://github.com/dominikschulz/prometheus into dominikschulz-k8s_sd_metrics
2016-11-21 11:44:48 +01:00
Fabian Reinartz
a1eec447a4
discovery: fix+consolidate Zookeeper discoveries
2016-11-18 13:20:58 +01:00
Fabian Reinartz
b4d7ce1370
discovery: respect context cancellation everywhere
...
This also removes closing of the target group channel everywhere
as the contexts cancels across all stages and we don't care about
draining all events once that happened.
2016-11-18 10:55:29 +01:00
Fabian Reinartz
bc7bd7202c
discovery: terminate senders before closing channel
...
Fixes #2200
2016-11-18 10:03:12 +01:00
Frederic Branczyk
0fcea6e9fb
retrieval/discovery/kubernetes: fix cache state unknown behavior ( #2180 )
...
* retrieval/discovery/kubernetes: fix cache state unknown behavior
* retrieval/discovery/kubernetes: extract type casting
* retrieval/discovery/kubernetes: add tests for possible regressions
2016-11-14 16:21:38 +01:00
Fabian Reinartz
fa82c65d15
Merge pull request #2186 from prometheus/fixes
...
Test fixes
2016-11-14 09:52:15 +01:00
Fabian Reinartz
7ecc271411
Move Fatalf call into main test goroutine
2016-11-13 18:21:42 +01:00
Fabian Reinartz
530cdba103
kubernetes: only use one error logging handler
2016-11-12 14:13:38 +01:00
beorn7
92c0ef1a92
Merge branch 'release-1.2' into beorn7/release
2016-11-03 22:48:39 +01:00
Kraig Amador
bec6870ed4
ec2_sd_configs: Support profiles for configuring the ec2 service
2016-11-03 08:38:02 -07:00
beorn7
0fdb74c069
Adjust dns.go to new miekg/dns package and improve error handling.
...
When hitting the 64kiB limit of DNS, the error message so far was
really misleading.
2016-11-03 15:42:11 +01:00
Brian Brazil
64263f280d
Add scrape_samples_scraped to indicate samples scraped. ( #2123 )
2016-10-26 17:43:01 +01:00
Brian Brazil
bbec65d454
Call SD metrics refresh rather than scrape. ( #2120 )
...
This avoids confusion with scrape_duration_seconds, and
is more in line with the API naming.
2016-10-26 10:03:35 +01:00
bekbulatov
2bc12fa2fb
Set timeout for marathon_sd
2016-10-24 11:27:08 +01:00
bekbulatov
c689b35858
Merge branch 'master' into marathon_tls
2016-10-24 10:37:32 +01:00
Dominik Schulz
eb10ff9871
Also handle service update in endpoints.go
2016-10-23 13:33:54 +02:00
Dominik Schulz
f002fe186a
Add Marathon-SD metrics. ( #2106 )
2016-10-21 11:14:53 +01:00
Mitsuhiro Tanda
296644adeb
Expose ec2_instance_type ( #2107 )
2016-10-21 11:13:47 +01:00
Dominik Schulz
36de163900
Add File-SD metrics ( #2103 )
...
* Add File-SD metrics
* Count read errors, not scan errors.
2016-10-21 11:12:19 +01:00
Dominik Schulz
3d0fb0cf17
Avoid too generic label type.
2016-10-21 12:11:15 +02:00
Dominik Schulz
e1e30f12cd
Add Kubernetes-SD metrics.
2016-10-21 10:48:28 +02:00
Dominik Schulz
552ab61fa1
Change SD metric names to make logical grouping more visible. ( #2102 )
2016-10-21 09:18:28 +01:00
Dominik Schulz
0c69227616
Add Consul-SD metrics ( #2097 )
...
* Add Consul-SD metrics
* Remove unnecessary metric and add labels to summary.
* Do not stutter
2016-10-21 08:59:43 +01:00
Dominik Schulz
255a8c8b4c
Fix small typo in EC2 SD metric name ( #2100 )
2016-10-20 09:01:00 +01:00
Dominik Schulz
00e486a05b
Add Azure-SD metrics ( #2099 )
2016-10-20 08:23:50 +01:00
Dominik Schulz
163d5a8977
Add EC2 SD metrics ( #2095 )
...
* Add EC2 SD metrics
* Address review comments
2016-10-19 10:20:00 +01:00
Fabian Reinartz
3c8140f2e6
kubernetes: fix typo in endpoint switch case
2016-10-18 16:20:26 +02:00
bekbulatov
ac702f66eb
Resolve merge conflicts
2016-10-18 14:14:24 +01:00
Fabian Reinartz
228bfc1bb5
Merge pull request #2040 from prometheus/kubernetes
...
Add K8S v2 pod discovery
2016-10-17 20:09:22 +02:00
Fabian Reinartz
ce45040e47
kubernetes: fix missing port labels
...
This commit fixes endpoint port labeling, adjusts tests accordingly
and enhances test delta printing
2016-10-17 11:05:13 +02:00
Frederic Branczyk
8f576a8510
retrieval: add kubernetes endpoint discovery tests
2016-10-17 10:32:10 +02:00
Frederic Branczyk
08fa4eaa92
retrieval: add kubernetes pod discovery tests
2016-10-17 10:32:10 +02:00
Frederic Branczyk
3762e39ce5
retrieval: add kubernetes service discovery tests
2016-10-17 10:32:10 +02:00
Frederic Branczyk
397072a482
retrieval: add kubernetes node discovery tests
2016-10-17 10:32:10 +02:00
Frederic Branczyk
cc46058802
retrieval: kubernetes nodes are not namespaced
2016-10-17 10:32:10 +02:00
Frederic Branczyk
a318d9ad27
retrieval: fix pod label and annotation prefixes
2016-10-17 10:32:10 +02:00
Fabian Reinartz
b24602f713
kubernetes: merge back into single configuration
2016-10-17 10:32:10 +02:00
Fabian Reinartz
a9cfb66b28
kubernetes: add node discovery
2016-10-17 10:32:10 +02:00
Fabian Reinartz
d896a654f9
kubernetes: Add discovery of services
2016-10-17 10:32:10 +02:00
Fabian Reinartz
6d269ed870
kubernetes: infer pod information in endpoints discovery
2016-10-17 10:32:10 +02:00
Fabian Reinartz
7c439a9060
kubernetes: use and vendor 1.5 client
2016-10-17 10:32:10 +02:00
