RepoMirrors/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus synced 2024-12-29 10:12:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,675 Commits 243 Branches 444 Tags 653 MiB
8809735d7f
Commit Graph

471 Commits

Author SHA1 Message Date
Erdem Agaoglu
8809735d7f Setting User-Agent header (#2447) 2017-02-28 09:59:33 -04:00
Brian Brazil
34767c2221 Clone lset before relabelling. (#2386) 
We need to not change the lset passed into populateLabels, as that
is kept around by the SDs.

Fixes 2377
 2017-02-01 19:49:50 +00:00
Fabian Reinartz
3302bb1eb1 Merge pull request #2323 from prometheus/beorn7/retrieval 
Retrieval: Avoid copying Target
 2017-01-08 06:49:47 +01:00
Björn Rabenstein
ad40d0abbc Merge pull request #2288 from prometheus/limit-scrape 
Add ability to limit scrape samples, and related metrics
 2017-01-08 01:34:06 +01:00
beorn7
5dc01202d7 Retrieval: Remove some test lines that fail on Travis only 
These lines exercise an append in
TestScrapeLoopWrapSampleAppender. Arguably, append shouldn't be tested
there in the first place.

Still it's weird why this fails on Travis:

```
--- FAIL: TestScrapeLoopWrapSampleAppender (0.00s)
    scrape_test.go:259: Expected count of 1, got 0
    scrape_test.go:290: Expected count of 1, got 0
2017/01/07 22:48:26 http: TLS handshake error from 127.0.0.1:50716: read tcp 127.0.0.1:40265->127.0.0.1:50716: read: connection reset by peer
FAIL
FAIL	github.com/prometheus/prometheus/retrieval	3.603s
```

Should anybody ever find out why, please revert this commit accordingly.
 2017-01-08 00:01:46 +01:00
beorn7
3610331eeb Retrieval: Do not buffer the samples if no sample limit configured 
Also, simplify and streamline the code a bit.
 2017-01-07 18:18:54 +01:00
beorn7
767c0709b1 Retrieval: Avoid copying Target 
retreival.Target contains a mutex. It was copied in the Targets()
call. This potentially can wreak a lot of havoc.

It might even have caused the issues reported as #2266 and #2262 .
 2017-01-06 18:43:41 +01:00
Brian Brazil
6c07453ec1 Only clone the metric in the one place relabelling needs it. (#2292) 
This cuts ~17% off memory allocations related to ingesting data
in a basic setup.
 2016-12-21 10:00:33 +00:00
Brian Brazil
f421ce0636 Remove label from prometheus_target_skipped_scrapes_total (#2289) 
This avoids it not being intialised, and breaking out by
interval wasn't partiuclarly useful.

Fixes #2269
 2016-12-16 18:00:52 +00:00
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
 2016-12-16 15:10:09 +00:00
Brian Brazil
c8de1484d5 Add scrape_samples_post_metric_relabeling 
This reports the number of samples post any keep/drop
from metric relabelling.
 2016-12-13 17:32:11 +00:00
Brian Brazil
06b9df65ec Refactor and add unittests to scrape result handling. 2016-12-13 16:49:17 +00:00
Brian Brazil
b5ded43594 Allow buffering of scraped samples before sending them to storage. 2016-12-13 15:01:35 +00:00
Frederic Branczyk
33b583d50e
web/api: add targets endpoint 2016-12-05 13:13:21 +01:00
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