RepoMirrors/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus synced 2024-12-29 02:02:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,002 Commits 243 Branches 0 Tags 653 MiB
8c24dfdb86
Commit Graph

372 Commits

Author SHA1 Message Date
Fabian Reinartz
57333d1831 discovery/kubernetes: add missing locking 2016-07-01 17:07:13 +02:00
Fabian Reinartz
44036a08d0 Merge pull request #1725 from nicholascapo/use-consul-service-address 
discovery: use consul service address if available
 2016-06-30 09:30:14 +02:00
Nicholas Capo
84334a8410 discovery: use consul service address if available 2016-06-15 19:27:05 -05:00
Fabian Reinartz
4aeab798e8 Merge pull request #1738 from prometheus/release-0.19 
Forward-merge 0.19 fixes into master
 2016-06-14 18:11:47 +02:00
Fabian Reinartz
3c80609fce Merge pull request #1737 from prometheus/fabxc-0.19.3 
Bump version to 0.19.3
 2016-06-14 18:04:56 +02:00
Fabian Reinartz
4c864c8a88 retrieval: don't sync to uninitialized scrape pool 
This change does just signal a scrape target update to the scraping loop
once an initial target set is fetched.
Before, the scrape pool was directly synced, causing a race against an
uninitialized scrape pool.

Fixes #1703
 2016-06-14 14:18:40 +02:00
Fabian Reinartz
d0eeae9d0e retrieval: don't sync to uninitialized scrape pool 
This change does just signal a scrape target update to the scraping loop
once an initial target set is fetched.
Before, the scrape pool was directly synced, causing a race against an
uninitialized scrape pool.

Fixes #1703
 2016-06-14 14:04:22 +02:00
beorn7
03adbe57e4 discovery/marathon: Fix race conditions in test 
The concurrency applied before is in most cases not even needed. With
a cap=1 channel, most tests are much cleaner.

TestMarathonSDRunAndStop was trickier. It could even have blocked
before.

This also includes a general refactoring of the whole file.
 2016-06-14 13:12:53 +02:00
Björn Rabenstein
2ea3a837c3 Merge pull request #1731 from prometheus/release-0.19 
Forward-merge 0.19 fixes to master
 2016-06-14 09:21:52 +02:00
rohit01
47dd5f74ba discovery/marathon: #1722 - ignore apps with zero ports 2016-06-14 04:44:00 +05:30
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.
 2016-06-08 15:55:25 +02:00
Brian Brazil
05b918a024 Merge pull request #1713 from mattbostock/document_drop 
Relabel: Document whole label set is dropped
 2016-06-07 17:22:34 +01:00
Matt Bostock
329a00e44f Relabel: Document whole label set is dropped 
From the documentation and current tests, it wasn't immediately clear to
me whether the `target` being dropped as the result of a 'drop' action
was a label key-value pair or the entire labelset.

Add a test that documents this behaviour.

Documentation: https://prometheus.io/docs/operating/configuration/
 2016-06-07 17:13:30 +01:00
Jimmi Dyson
206bcfcdaa
Kubernetes SD: Remove kubeletPort config option 2016-06-07 12:34:55 +01:00
Jimmi Dyson
d48297c904
Kubernetes SD: Add labels for all node addresses and discover node port if available 2016-06-07 12:34:49 +01:00
Fabian Reinartz
26b1c89469 Merge pull request #1702 from pdbogen/master 
Initial local pods before using the pod list to initialize pod targets
 2016-06-06 15:14:49 +02:00
Patrick Bogen
1e6770cdc5 Initial local pods before using the pod list to initialize pod targets; include more logging in pod target creation 2016-06-02 17:49:21 -07:00
Ali Reza
c81b4e8a87 change config names to files for consistency 2016-05-30 07:47:58 +07:00
Gregory G. Tseng
4ceedffe86 Unexport testing constant 2016-05-26 14:42:17 -07:00
Gregory G. Tseng
7997c14b0d Add ServerName into TLS Config 2016-05-26 14:24:49 -07:00
Fabian Reinartz
74c448386c Merge pull request #1665 from prometheus/fabxc-retrpanic 
Fix kubernetes SD crash
 2016-05-25 17:13:27 -07:00
Fabian Reinartz
12b03db373 retrieval: handle nil target groups from updates 2016-05-25 16:59:16 -07:00
Fabian Reinartz
ea36efbbd1 retrieval: document panic behavior 2016-05-25 16:17:25 -07:00
Fabian Reinartz
a5ba166935 retrieval: don't panic on non-HTTP scheme 2016-05-25 16:05:20 -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