mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-01-10 21:37:26 -08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

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

Browse source 
Cherrypick 4806 4809
This commit is contained in:
Frederic Branczyk 2018-10-31 12:33:31 +01:00 committed by GitHub
parent 68ea9840eb 6662b4fd9f
commit bb81bac12d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 74 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CHANGELOG.md
View file

@ -1,6 +1,10 @@
## 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 ## 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 ## 2.5.0-rc.0 / 2018-10-24

2
VERSION
View file

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

134
web/ui/assets_vfsdata.go
View file

File diff suppressed because one or more lines are too long

3
web/ui/templates/targets.html
View file

@ -54,8 +54,7 @@
</td> </td>
<td class="labels"> <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}}"> <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.Map }}
{{range $label, $value := $labels}}
<span class="label label-primary">{{$label}}="{{$value}}"</span> <span class="label label-primary">{{$label}}="{{$value}}"</span>
{{else}} {{else}}
<span class="label label-default">none</span> <span class="label label-default">none</span>