prometheus

Author	SHA1	Message	Date
Fabian Reinartz	9c83e815d1	Merge branch 'release-2.2' into update	2018-06-05 05:29:11 -04:00
Simon Pasquier	097439b0f9	web: limit the number of dropped targets (#4212 ) Displaying all the dropped targets in the service-discovery page hurts the Prometheus server as well as the browser when thousands of dropped targets exist. This change limits this number to 1,000 and display the number of active/total targets per scrape configuration. Add warning when more than 100 targets are dropped Signed-off-by: Simon Pasquier <spasquie@redhat.com>	2018-06-05 10:20:32 +01:00
James Turnbull	50e6aff3fd	Make job heading on service discovery consistent (#3937 ) The new Service Discovery page uses the CSS/JS from the Targets page but used slightly differently. This makes the job header match in the Service Discovery page for a more consistent look-n-feel.	2018-03-09 14:33:53 +01:00
Callum Jones	090e7e0959	Place Service Discovery labels inline (#3872 ) Fixes #3739	2018-02-24 19:44:37 +00:00
conorbroderick	8b6f3a1bd3	Added service discovery view showing labels before and after relabelling	2017-12-13 15:46:11 +00:00