Merge pull request #4810 from brancz/cherrypick-4806-4809

Cherrypick 4806 4809

CHANGELOG.md

+## 2.5.0-rc.2 / 2018-10-31
+
+* [CHANGE] Group targets by scrape config instead of job name. #4806 #4526
+
 ## 2.5.0-rc.1 / 2018-10-29
 
-* [BUGFIX] Fix accidental breaking change in targets API exposition format.
+* [BUGFIX] Fix accidental breaking change in targets API exposition format. #4783
 
 ## 2.5.0-rc.0 / 2018-10-24
 

VERSION

-2.5.0-rc.1
+2.5.0-rc.2

web/ui/templates/targets.html

@@ -54,8 +54,7 @@
             </td>
             <td class="labels">
               <span class="cursor-pointer" data-toggle="tooltip" title="" data-html=true data-original-title="<b>Before relabeling:</b>{{range $k, $v := .DiscoveredLabels.Map}}<br>{{$ev := $v | html}}{{$k}}=&quot;{{$ev}}&quot;{{end}}">
-                {{$labels := stripLabels .Labels.Map "job"}}
-                {{range $label, $value := $labels}}
+                {{range $label, $value := .Labels.Map }}
                   <span class="label label-primary">{{$label}}="{{$value}}"</span>
                 {{else}}
                   <span class="label label-default">none</span>