prometheus

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
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
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	b75428ec19	rename package retrieve to scrape no fucnctinal changes just renaming retrieval to scrape	2018-02-01 09:55:07 +00:00

1 2