github
/
prometheus
mirror of https://github.com/prometheus/prometheus
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
7,187 Commits
252 Branches
442 Tags
625 MiB
Commit Graph

68 Commits (1a38075f83831cb26162dd521b22b2da05bbe6e4)

Author SHA1 Message Date
beorn7 94ff07b81d Merge branch 'release-2.2' 
Signed-off-by: beorn7 <beorn@soundcloud.com>
 2018-04-10 16:50:35 +02:00
Krasi Georgiev dc29dd1c6f add mutex for DiscoveredLabels 
Signed-off-by: Krasi Georgiev <krasi.root@gmail.com>
 2018-04-10 00:18:58 +03:00
Krasi Georgiev ddd46de6f4 Races/3994 (#4005) 
Fix race by properly locking access to scrape pools. Use separate mutex for information needed by UI so that UI isn't blocked when targets are being updated.
 2018-04-09 15:18:25 +01:00
Mario Trangoni 464e747f1e fix some comments typos (#4059) 2018-04-08 10:51:54 +01:00
Fabian Reinartz 184b6e3767
Merge pull request #3968 from zjwzte/fix-magic-number 
Fix magic number.
 2018-03-28 14:09:43 +02:00
ferhat elmas ec8e4d8a7c all: remove unnecessary type conversions (#3992) 
excep promql due to not to create conflict with #3966.
 2018-03-21 09:25:22 +00:00
zjwzte b7a37a1604 Fix magic number. 2018-03-15 10:15:35 +08:00
Fabian Reinartz ef567ceb7d
Merge pull request #3835 from krasi-georgiev/pool-package-generalize 
Pool package generalize
 2018-02-28 14:30:46 +01:00
ferhat elmas ffa673f7d8 General simplifications (#3887) 
Another try as in #1516
 2018-02-26 07:58:10 +00:00
Conor Broderick 99006d3baf Added dropped targets API to targets endpoint (#3870) 2018-02-21 17:26:18 +00:00
Krasi Georgiev 933ab8a34e stupid return mistake fix, and dropped the additional assertion check! 2018-02-20 13:32:23 +02:00
Krasi Georgiev 675ce533c9 refactored TestScrapeLoopAppend and added a test for empty labels 2018-02-20 11:05:54 +00:00
Brian Brazil 4addee2bee Fix honor_labels for empty labels, prune empty labels. 
The semantics of honor_labels are that if a target exposes
and empty label it will override the target labels. This PR
fixes that by once again distinguishing between empty labels
and missing labels in this one use case.

Beyond that empty labels should be pruned and not added to storage,
which this also fixes.

Fixes #3841
 2018-02-20 11:05:54 +00:00
Krasi Georgiev 9878d66484 exit early and panic for non slice on buffer.Put 2018-02-19 14:31:04 +02:00
Krasi Georgiev f2c5913416 generalize the pool package and refactor scraper to use it. 2018-02-13 22:44:51 +02:00
Krasi Georgiev 404b306fb9 Meta labels sd 3693 (#3805) 
Always keep the discovered labels up to date.

add test that DiscoveredLabels are always updated
 2018-02-07 10:29:27 +00:00
Krasi Georgiev 6ce84dbcb1 rename ScrapeManager struct to Manager to remove stutter 2018-02-01 10:06:24 +00:00
Krasi Georgiev b75428ec19 rename package retrieve to scrape 
no fucnctinal changes just renaming retrieval to scrape
 2018-02-01 09:55:07 +00:00