RepoMirrors/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus synced 2025-01-13 18:33:34 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,883 Commits 265 Branches 448 Tags 637 MiB
8fe8ccce63
Commit Graph

350 Commits

Author SHA1 Message Date
Fabian Reinartz
8fe8ccce63 retrieval: document panic behavior 2016-05-25 17:33:01 -07:00
Fabian Reinartz
021ef27fe3 retrieval: don't panic on non-HTTP scheme 2016-05-25 17:33:01 -07:00
Tobias Schmidt
0c6ed9d437 Fix type usage in Kubernetes discovery 
The event types have been recently changed to be exported types which
wasn't reflected in the new pod discovery.
 2016-05-20 11:03:19 -04:00
Fabian Reinartz
f7ed2ff706 Merge pull request #1644 from prometheus/beorn7/logging 
Add missing logging of out-of-order samples
 2016-05-20 05:52:00 -07:00
Fabian Reinartz
dec56838fc Merge pull request #1449 from pdbogen/master 
k8s pod discovery
 2016-05-20 05:45:09 -07:00
Patrick Bogen
89940eb48d Write tests to include testing determinancy of various slice orders; ensure that container order is deterministic 2016-05-19 10:57:23 -07:00
Patrick Bogen
b3350d872a Add one label named for each port name, mapping it to port number; add corresponding tests; prefix port list label with a comma 2016-05-19 10:37:11 -07:00
beorn7
d43c0159aa Fix style issues in retrieval/... 2016-05-19 17:14:04 +02:00
beorn7
45e5775f9b Add missing logging of out-of-order samples 
So far, out-of-order samples during rule evaluation were not logged,
and neither scrape health samples. The latter are unlikely to cause
any errors. That's why I'm logging them always now. (It's alway highly
irregular should it happen.) For rules, I have used the same plumbing
as for samples, just with a different wording in the message to mark
them as a result of rule evaluation.
 2016-05-19 16:22:53 +02:00
Patrick Bogen
ae413704e8 kubernetes pod-level discovery 2016-05-18 17:18:52 -07:00
Fabian Reinartz
2ca9ee7b0d Merge pull request #1612 from prometheus/stn-dns-mv 
[discovery][dns] move dns to own package
 2016-05-06 12:23:59 +02:00
stuart nelson
d959d2b90a discovery/dns: Maintain argument order consistency 2016-05-06 11:14:26 +02:00
stuart nelson
d02591814b discovery/dns: move dns to own package 2016-05-06 11:14:26 +02:00
Shawn Smith
d7481f266e fix typo 2016-05-04 13:42:27 +09:00
Tobias Schmidt
3ce895e86d Merge pull request #1608 from prometheus/fix-printf 
Fix format argument in retrieval test.
 2016-05-01 17:44:16 -04:00
Julius Volz
97b018d26d Fix format argument in retrieval test. 2016-05-01 23:37:45 +02:00
Fabian Reinartz
f94fc76608 Merge pull request #1592 from prometheus/fabxc-consul-ref 
discovery: sanitize Consul service discovery
 2016-04-30 21:18:33 +02:00
Fabian Reinartz
289f306dd9 Merge pull request #1590 from prometheus/fabxc-marathon-ref 
Fix basic issues in marathon SD
 2016-04-30 21:17:22 +02:00
Fabian Reinartz
76076bfb47 discovery: simplify client initialization 2016-04-30 21:07:49 +02:00
Fabian Reinartz
b5bfb502df discovery: properly check context on chan send 2016-04-30 11:57:20 +02:00
Fabian Reinartz
9f8feb9ff6 discovery: consolidate Marathon SD files 2016-04-30 11:56:11 +02:00
Fabian Reinartz
086f7caceb discovery: extract Consul shouldWatch logic 2016-04-30 11:50:19 +02:00
Fabian Reinartz
e805e68c01 discovery: sanitize Consul service discovery 
This commits simplifies the SD's structure and ensures that all
channel sends are checked against a canceled context.
 2016-04-30 11:50:19 +02:00
Fabian Reinartz
5837e6a97f discovery: move consul SD into own package 2016-04-25 16:56:27 +02:00
beorn7
d566808d40 Bring back logging of discarded samples 
But only on DEBUG level.

Also, count and report the two cases of out-of-order timestamps on the
one hand and same timestamp but different value on the other hand
separately.
 2016-04-25 16:43:52 +02:00
Fabian Reinartz
585ab6b163 Merge pull request #1494 from iamseth/master 
Add discovery capability for Microsoft Azure
 2016-04-21 13:49:44 +02:00
Jonathan Boulle
38098f8c95 Add missing license headers 
Prometheus is Apache 2 licensed, and most source files have the
appropriate copyright license header, but some were missing it without
apparent reason. Correct that by adding it.
 2016-04-13 16:08:22 +02:00
Seth Miller
0988e3b937 Add support for Azure discovery 
This change adds the ability to do target discovery with Microsoft's Azure platform.
 2016-04-06 22:47:02 -05:00
Fabian Reinartz
769389e559 Fix potential race in ctx intialization 2016-04-05 20:27:31 +02:00
Tobias Schmidt
e82ef154ee Remove unused code leftovers 2016-04-02 20:20:55 -04:00
stuart nelson
dbe5d18b6e Instrument scrape pool sync() 
Instruments:
- duration
- count
 2016-03-14 18:30:16 +01:00
stuart nelson
813f61e551 Merge pull request #1484 from prometheus/instrument-retrieval 
Instrument retrieval/scrape.go
 2016-03-11 12:26:00 +01:00
stuart nelson
a1ee77601a Instrument the duration of the reload function 2016-03-11 12:12:42 +01:00
Fabian Reinartz
895f2f092f Fix flaky scrape test 
t
 2016-03-09 16:00:33 +01:00
Fabian Reinartz
f2e359962c Sort exported targets 2016-03-08 17:12:27 +01:00
Fabian Reinartz
56fc9bdff3 Handle closed target provider channel 
This fixes the case where a target provider closes the update
channel and exits before the context is canceled.
This should only be true for the static provider but it's safer
to generally handle this case.
 2016-03-08 15:49:03 +01:00
beorn7
d44b83690e Fix flaky file-sd test 2016-03-07 15:39:18 +01:00
Fabian Reinartz
ddc74f712b Add sortable target list 2016-03-02 09:10:20 +01:00
Fabian Reinartz
499f4af4aa Test target URL 2016-03-01 14:49:57 +01:00
Fabian Reinartz
50c2f20756 Add targetScraper tests 2016-03-01 14:33:28 +01:00
Fabian Reinartz
1ede7b9d72 Consolidate TargetStatus into Target. 
This commit simplifies the TargetHealth type and moves the target
status into the target itself. This also removes a race where error
and last scrape time could have been out of sync.
 2016-03-01 14:33:21 +01:00
Fabian Reinartz
2060a0a15b Turn target group members into plain lists. 
As the scrape pool deduplicates targets now, it is no longer necessary
to store a hash map for members of each group.
 2016-03-01 14:33:12 +01:00
Fabian Reinartz
0d7105abee Remove scrape config from Target. 
This commit removes the scrapeConfig entirely from Target.
All identity defining parameters are thus immutable now and the mutex
can be removed..

Target identity is now correctly defined by the labels and the full URL.
This in particular includes URL parameters that are not specified in the
label set.

Fingerprint is also removed from hash to remove an unnecessary tight coupling
to the common/model package.
 2016-03-01 14:32:57 +01:00
Fabian Reinartz
75681b691a Extract HTTP client from Target. 
The HTTP client is the same across all targets with the same
scrape configuration. Thus, this commit moves it into the scrape
pool.
 2016-03-01 14:31:57 +01:00
Fabian Reinartz
9bea27ae8a Add scraping tests 2016-03-01 14:00:48 +01:00
Fabian Reinartz
76a8c6160d Deduplicate targets in scrape pool. 
With this commit the scrape pool deduplicates incoming
targets before scraping them. This way multiple target providers
can produce the same target but it will be scraped only once.
 2016-03-01 13:50:51 +01:00
Fabian Reinartz
84f74b9a84 Apply new scrape config on reload. 
This commit updates a target set's scrape configuration
on reload. This will cause all running scrape loops to be
stopped and started again with new parameters.
 2016-03-01 13:50:51 +01:00
Fabian Reinartz
02f635dc24 Remove interval/timeout from Target internals 2016-03-01 13:50:51 +01:00
Fabian Reinartz
775316f8d2 Move appender construction from Target to scrapePool 2016-03-01 13:50:51 +01:00
Fabian Reinartz
fbe251c2df Fix scrape interval length calculation 2016-03-01 13:48:36 +01:00