Merge pull request #5416 from prometheus/release-2.8
Merge 2.8.1 into master
This commit is contained in:
Ganesh Vernekar
GitHub
commit
0afd172224
|
|
@ -1,3 +1,7 @@
|
|||
## 2.8.1 / 2019-03-28
|
||||
|
||||
* [BUGFIX] Display the job labels in `/targets` which was removed accidentally. #5406
|
||||
|
||||
## 2.8.0 / 2019-03-12
|
||||
|
||||
This release uses Write-Ahead Logging (WAL) for the remote_write API. This currently causes a slight increase in memory usage, which will be addressed in future releases.
|
||||
|
|
|
|||
|
|
@ -682,9 +682,9 @@ var Assets = func() http.FileSystem {
|
|||
"/templates/targets.html": &vfsgen۰CompressedFileInfo{
|
||||
name: "targets.html",
|
||||
modTime: time.Date(1970, 1, 1, 0, 0, 1, 0, time.UTC),
|
||||
uncompressedSize: 3266,
|
||||
uncompressedSize: 3209,
|
||||
|
||||
compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xbc\x56\xdd\x8f\xdc\x34\x10\x7f\xdf\xbf\x62\x14\x56\x08\xa4\x66\xa3\xf6\xb1\x64\x83\x80\x56\x2a\x52\x41\xa5\xd7\xe3\x81\x97\xca\x89\x67\x37\xbe\xf3\xda\xc1\x9e\x2c\xb7\xe4\xfc\xbf\x23\xdb\xf9\xda\xaf\x83\x43\x82\x97\x28\x63\xcf\xf7\xfc\x66\xc6\x5d\xc7\x71\x23\x14\x42\x52\x23\xe3\x89\x73\x8b\x5c\x0a\x75\x0f\x74\x68\x70\x9d\x10\x3e\x50\x56\x59\x9b\x80\x41\xb9\x4e\x2c\x1d\x24\xda\x1a\x91\x12\xa8\x0d\x6e\xd6\x49\xd7\x41\xc3\xa8\xfe\x60\x70\x23\x1e\xc0\xb9\xcc\x12\x23\x51\x79\x99\x8c\x98\xd9\x22\xd9\x55\x65\xed\xb7\xfb\x75\xd7\x41\xd9\x0a\xc9\x7f\x45\x63\x85\x56\xe0\x5c\x52\x2c\x72\x5b\x19\xd1\x10\x58\x53\x5d\xd7\x75\x37\xa9\xba\xbb\xa6\x29\xcf\xa2\xa6\x62\xd1\x75\xa8\xb8\x73\x8b\xc5\x62\x0a\xad\xd2\x8a\x50\x91\x8f\x0e\x20\xe7\x62\x0f\x95\x64\xd6\xae\xc3\x05\x13\x0a\x4d\xba\x91\xad\xe0\x49\xb1\x00\x00\xc8\xeb\x97\xc5\xa7\x68\x31\xcf\xea\x97\xfd\xa1\x17\x13\x7c\x9d\xd8\x5a\xff\xd1\xdf\x26\x83\x9e\x92\x54\xba\x35\xba\x6d\x60\xfc\x4b\x49\x6f\xb7\x12\x13\xe0\x8c\x58\x4f\xac\x93\xb2\x25\xd2\xca\xf6\x86\x00\x72\xc9\x4a\x94\x33\x35\x41\x41\x63\xc4\x8e\x99\xc3\xc8\x05\x90\x0b\xd5\xb4\xd4\x57\xc5\x30\x2e\x74\x02\x8a\xed\x7c\x89\x06\x57\xbc\x6f\x4c\xca\x74\x3c\x60\x2d\xe9\x4a\xef\x1a\x89\x84\xeb\x44\x6f\x36\x09\x54\x35\x56\xf7\xc8\x0b\xf8\x4e\xca\xc1\x83\x2c\xb8\xf0\x1f\x39\xd4\xaa\x1a\x99\xa4\xfa\xf0\x94\x5b\x05\xdc\x0e\x6c\x57\x9c\xca\x4a\xe3\xff\xf3\x8c\x8b\x7d\xb1\x08\xa7\x5d\x67\x98\xda\x22\x2c\xef\x74\xf9\x02\x96\x8d\xd6\x12\x5e\xaf\x61\x15\x4b\xf3\x41\x6b\x69\x43\xb9\x3d\xe7\xb2\xd7\xee\x19\x54\xbb\x7b\xd7\x53\x41\x68\x62\x22\x4d\x2c\xe8\x90\xa8\xc6\xbb\xa9\xf6\x7d\x4a\x88\x95\x12\xd3\x11\x38\x53\x25\xeb\x57\x03\xcb\x9d\x2e\x3f\xfb\x6e\x42\xd3\x75\x62\x03\x92\x60\x74\x20\x1a\x71\x0e\xb8\x77\xde\xf4\x60\x9d\xe7\x95\x85\xbc\xdd\xe9\x32\xed\x3a\x1f\x9b\x73\x43\xaf\x7d\x71\x74\x58\x0c\x7f\xf0\xd5\x14\xa0\x73\xd9\x10\x88\x73\xd0\x36\x5f\xe7\x19\x9b\xe9\x8e\xe8\xeb\x8b\x16\x89\x64\x8a\x2b\xd4\x07\xf0\xa1\x61\x8a\x23\x4f\x43\xa0\x70\x86\x00\x0f\x7f\x90\x68\x6d\x9e\x45\x0d\x53\x91\xea\x57\xe3\x7f\x14\x9e\xa7\x0c\x62\xe2\xec\xae\xff\x29\xb5\xe1\x68\x90\x0f\xe7\x64\x44\x33\x52\xb5\xde\xcf\x52\xeb\xf5\xf9\x7c\xce\xf3\xcb\x91\x98\x90\x76\xc6\xe3\xb9\xcc\x9c\x0c\x62\xc5\x5b\xc5\x1b\x2d\x14\xe5\x19\xd5\xe7\xb7\x37\xc4\x08\x2f\x5f\xbd\xf7\x08\xb4\xd7\xee\x2c\xc1\x4d\x65\x58\x73\x45\x38\xde\xc1\x9b\xd6\x30\x12\x5a\x5d\x66\x7a\x6b\x8c\x36\xa7\x57\x79\x36\x8f\xc2\xdf\x22\xe3\xf3\x4c\x94\x9a\x1f\x26\x7a\x6c\x83\x19\x96\xaf\x66\x63\xcc\x20\xf6\x49\x49\x8e\x39\x02\xfc\x86\xc1\xbe\xba\xfd\xf8\x1e\x1e\x61\x2b\x75\xc9\xe4\xed\xc7\xf7\x11\x73\xfe\x74\x75\x53\xd5\xb8\x43\xe7\x5e\x67\x59\x7f\xf2\x4e\x5b\x72\xae\x27\x3e\x30\xaa\x9d\xf3\xd0\xcb\x4b\x73\x6a\x61\x74\x38\x74\xf8\x0b\x58\xee\x99\x6c\xd1\x86\xde\xf5\xc2\xbf\xb4\x68\x0e\x70\x14\xc9\x89\xa0\x18\x84\xbc\x4c\x2f\x7e\x81\x1f\x20\xb7\x0d\x53\xe3\x28\x63\x7c\x8b\x10\xbe\x13\x98\xbb\x2e\xba\xe1\x9c\x8f\x38\xea\x72\x2e\xc9\x33\x2f\x79\xea\xb9\x77\x21\xee\x96\xbf\x3f\xcd\x33\xe2\x57\xb3\xef\xf7\x1a\x9e\xa7\x7e\xee\x2d\x93\x68\x08\xc2\x37\xed\x3a\x58\xc5\x91\x05\x8f\x10\xdb\x34\x92\x9f\xf4\x0f\x9e\x1b\x9c\x83\xa0\xf2\xb3\x50\x5c\x54\x8c\xb4\x01\xbf\xb8\xd3\xb6\x69\xd0\x54\xcc\x9e\xdb\xf2\x4e\xf7\x3a\xcf\xc2\xb9\x14\xfc\x93\xe1\x84\x0c\xda\xa7\xe3\xa9\x5a\x63\xb5\x49\x03\xe8\xd0\x9c\x2c\x45\xd2\x5a\x92\x68\x12\x20\x41\x9e\xee\xaf\x6b\xda\xc9\x35\x99\x16\x23\xa9\x8d\xd8\x0a\xc5\x64\xda\x73\xe5\x65\xf1\x3d\x6e\xb4\x41\xff\x36\xf1\x2e\x08\xb5\x7d\x9d\x67\x65\x31\x02\xe5\xde\x03\x25\x00\xeb\x8d\xb0\x95\x1f\x29\xc8\x63\x57\xaf\x7e\x62\x8d\x73\x1e\x9d\x5d\xb7\xc4\x7d\x04\x12\x3c\x82\x37\xe9\x61\xbc\xbc\x77\x6e\xfd\xe5\xef\xad\xa6\x6f\x02\x83\x73\x03\x71\x3a\xaf\xa7\x7c\x46\x24\x05\x20\x87\x61\x16\x2d\xc1\x6a\xb2\x08\x7e\x72\x25\x4f\x41\xfb\xa8\x27\x82\x57\x51\xe9\xff\x06\x6f\x69\xf1\x79\xb6\x38\x6e\x58\x2b\x29\x29\x94\x56\xf8\xbc\xbe\xf9\x17\x40\xb3\x94\xda\x30\x59\xcf\x2a\x10\x36\xed\xca\xcf\xe5\x38\x7a\x57\x3f\xda\xdf\xd0\x68\xe7\x7e\xc6\x7d\xd8\xb3\x21\xb2\xae\xb3\x42\x55\x38\x67\x74\x0e\xd8\x56\x3f\xbf\x87\x83\x70\xca\xfb\x01\x7f\xc1\x9f\xba\xdd\x31\x25\xfe\xc4\x61\x07\xcc\x8d\x0e\x67\xab\x1b\xac\xb4\xe2\xa7\xf5\x7d\xd2\x32\xfa\xad\x71\xde\x6e\x53\x02\xc2\x5a\x39\xcf\xf6\xb5\xf1\x12\x5f\x22\xa7\x13\x24\xcc\xfa\x99\xb6\xcb\xa5\xfd\x27\x69\x3b\x5e\x68\xa7\x12\x79\x76\xb4\xd0\xf2\x2c\x3c\x00\xfa\x27\x77\x7c\xee\x45\x31\x40\xc5\xe3\x5a\xe8\x8f\x07\x4d\x7f\x05\x00\x00\xff\xff\xe2\xb0\x90\x63\xc2\x0c\x00\x00"),
|
||||
compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xbc\x56\x4b\x8f\xe4\x34\x10\xbe\xf7\xaf\x28\x85\x16\x02\x69\xd3\xd1\xee\x71\x49\x07\x01\xbb\xd2\x22\x0d\x68\xd8\xd9\xe1\xc0\x65\xe5\xc4\xd5\x1d\xcf\xb8\xed\x60\x57\x9a\x69\x32\xfe\xef\xc8\x76\x5e\xd3\x8f\x81\x41\x82\x4b\xe4\xb2\xeb\xf9\xf9\x73\x55\xba\x8e\xe3\x46\x28\x84\xa4\x46\xc6\x13\xe7\x16\xb9\x14\xea\x1e\xe8\xd0\xe0\x3a\x21\x7c\xa0\xac\xb2\x36\x01\x83\x72\x9d\x58\x3a\x48\xb4\x35\x22\x25\x50\x1b\xdc\xac\x93\xae\x83\x86\x51\x7d\x6d\x70\x23\x1e\xc0\xb9\xcc\x12\x23\x51\x79\x9b\x8c\x98\xd9\x22\xd9\x55\x65\xed\xb7\xfb\x75\xd7\x41\xd9\x0a\xc9\x7f\x45\x63\x85\x56\xe0\x5c\x52\x2c\x72\x5b\x19\xd1\x10\x58\x53\x5d\xf6\x75\x37\xb9\xba\xbb\xe4\x29\xcf\xa2\xa7\x62\xd1\x75\xa8\xb8\x73\x8b\xc5\x62\x2a\xad\xd2\x8a\x50\x91\xaf\x0e\x20\xe7\x62\x0f\x95\x64\xd6\xae\xc3\x01\x13\x0a\x4d\xba\x91\xad\xe0\x49\xb1\x00\x00\xc8\xeb\xd7\xc5\xa7\x18\x31\xcf\xea\xd7\xfd\xa6\x37\x13\x7c\x9d\xd8\x5a\xff\xd1\x9f\x26\x83\x9f\x92\x54\xba\x35\xba\x6d\x60\x5c\xa5\xa4\xb7\x5b\x89\x09\x70\x46\xac\x17\xd6\x49\xd9\x12\x69\x65\xfb\x40\x00\xb9\x64\x25\xca\x99\x9b\xe0\xa0\x31\x62\xc7\xcc\x61\xd4\x02\xc8\x85\x6a\x5a\xea\x6f\xc5\x30\x2e\x74\x02\x8a\xed\xfc\x15\x0d\xa9\xf8\xdc\x98\x94\xe9\xb8\xc1\x5a\xd2\x95\xde\x35\x12\x09\xd7\x89\xde\x6c\x12\xa8\x6a\xac\xee\x91\x17\xf0\x9d\x94\x43\x06\x59\x48\xe1\x3f\x4a\xa8\x55\x35\x32\x49\xf5\xe1\xb9\xb4\x0a\xb8\x1d\xd4\x2e\x24\x95\x95\xc6\xaf\xf3\x8c\x8b\x7d\xb1\x08\xbb\x5d\x67\x98\xda\x22\x2c\xef\x74\xf9\x0a\x96\x8d\xd6\x12\xde\xae\x61\x15\xaf\xe6\x5a\x6b\x69\xc3\x75\x7b\xcd\x65\xef\xdd\x2b\xa8\x76\xf7\xa1\x97\x82\xd1\xa4\x44\x9a\x58\xf0\x21\x51\x8d\x67\xd3\xdd\xf7\x90\x10\x2b\x25\xa6\x23\x71\xa6\x9b\xac\xdf\x0c\x2a\x77\xba\xfc\xec\x5f\x13\x9a\xae\x13\x1b\x90\x04\x63\x02\x31\x88\x73\xc0\x7d\xf2\xa6\x27\xeb\x1c\x57\x16\x70\xbb\xd3\x65\xda\x75\xbe\x36\xe7\x86\xb7\xf6\xc5\x93\xcd\x62\x58\xc1\x57\x53\x81\xce\x65\x43\x21\xce\x41\xdb\x7c\x9d\x67\x6c\xe6\x3b\xb2\xaf\xbf\xb4\x28\x24\x53\x5d\xe1\x7e\x00\x1f\x1a\xa6\x38\xf2\x34\x14\x0a\x27\x0c\xf0\xf4\x07\x89\xd6\xe6\x59\xf4\x30\x5d\x52\xfd\x66\x5c\x47\xe3\x39\x64\x10\x81\xb3\xbb\x7e\x51\x6a\xc3\xd1\x20\x1f\xf6\xc9\x88\x66\x94\x6a\xbd\x9f\x41\xeb\xfd\x79\x3c\xe7\xf8\x72\x24\x26\xa4\x9d\xe9\x78\x2d\x33\x17\x83\x59\xf1\x5e\xf1\x46\x0b\x45\x79\x46\xf5\xe9\xe9\x0d\x31\xc2\xf3\x47\x57\x9e\x81\xf6\xd2\x99\x25\xb8\xa9\x0c\x6b\x2e\x18\xc7\x33\x78\xd7\x1a\x46\x42\xab\xf3\x4a\xef\x8d\xd1\xe6\xf8\x28\xcf\xe6\x55\xf8\x53\x64\x7c\x8e\x44\xa9\xf9\x61\x92\xc7\x67\x30\xe3\xf2\x45\x34\x46\x04\xb1\x07\x25\x79\xaa\x11\xe8\x37\x34\xf6\xd5\xed\xc7\x2b\x78\x84\xad\xd4\x25\x93\xb7\x1f\xaf\x22\xe7\xfc\xee\xea\xa6\xaa\x71\x87\xce\xbd\xcd\xb2\x7e\xe7\x83\xb6\xe4\x5c\x2f\x5c\x33\xaa\x9d\xf3\xd4\xcb\x4b\x73\x1c\x61\x4c\x38\xbc\xf0\x57\xb0\xdc\x33\xd9\xa2\x0d\x6f\xd7\x1b\xff\xd2\xa2\x39\xc0\x93\x4a\x8e\x0c\xc5\x60\xe4\x6d\x7a\xf3\x33\xfa\x00\xb9\x6d\x98\x1a\x5b\x19\xe3\x5b\x84\xf0\x9d\xc8\xdc\x75\x31\x0d\xe7\x7c\xc5\xd1\x97\x73\x49\x9e\x79\xcb\xe3\xcc\x7d\x0a\x71\xb6\xfc\xfd\x6e\x9e\x11\xbf\x88\xbe\x9f\x6b\x78\x0a\xfd\x3c\x5b\x26\xd1\x10\x84\x6f\xda\x75\xb0\x8a\x2d\x0b\x1e\x21\x3e\xd3\x28\x7e\xd2\x3f\x78\x6d\x70\x0e\x82\xcb\xcf\x42\x71\x51\x31\xd2\x06\xfc\xe0\x4e\xdb\xa6\x41\x53\x31\x7b\x1a\xcb\x27\xdd\xfb\x3c\x29\xe7\x5c\xf1\xcf\x96\x13\x10\xb4\xcf\xd7\x53\xb5\xc6\x6a\x93\x06\xd2\xa1\x39\x1a\x8a\xa4\xb5\x24\xd1\x24\x40\x82\xbc\xdc\x1f\xd7\xb4\x93\x6b\x32\x2d\x46\x51\x1b\xb1\x15\x8a\xc9\xb4\xd7\xca\xcb\xe2\x7b\xdc\x68\x83\xfe\xdf\xc4\xa7\x20\xd4\xf6\x6d\x9e\x95\xc5\x48\x94\x7b\x4f\x94\x40\xac\x77\xc2\x56\xbe\xa5\x20\x8f\xaf\x7a\xf5\x13\x6b\x9c\xf3\xec\xec\xba\x25\xee\x23\x91\xe0\x11\x7c\x48\x4f\xe3\xe5\xbd\x73\xeb\x2f\x7f\x6f\x35\x7d\x13\x14\x9c\x1b\x84\xe3\x7e\x3d\xe1\x79\x8e\xd6\x21\xf8\x3c\xe4\xff\xc4\x52\x69\xf1\x65\xb1\x38\x6e\x58\x2b\x29\x29\x94\x56\xf8\x32\xfa\xff\x0b\xbe\x58\x4a\x6d\x68\x90\x27\x40\x86\x81\xb9\xf2\xed\x35\x76\xd0\xd5\x8f\xf6\x37\x34\xda\xb9\x9f\x71\x1f\xc6\x65\xa8\xac\xeb\xac\x50\x15\xce\x15\x9d\x03\xb6\xd5\x2f\x7f\x8a\xc1\x38\xe5\x7d\x9f\x3e\x93\x4f\xdd\xee\x98\x12\x7f\xe2\xd0\xca\xe7\x41\x87\xbd\xd5\x0d\x56\x5a\xf1\xe3\x2e\xf4\x6c\x64\xf4\xcd\xff\xf4\xd5\x4c\x00\x84\xe9\x70\x8a\xf6\xa5\x2e\x11\x7f\x28\x8e\x1b\x41\x68\xd9\x33\x6f\xe7\xaf\xf6\x9f\xc0\xf6\x74\x2e\x1d\x5b\xe4\xd9\x93\xb9\x94\x67\x61\x8e\xf7\x7f\xce\xf1\xaf\x2d\x9a\x01\x2a\x1e\xbb\x7b\xbf\x3d\x78\xfa\x2b\x00\x00\xff\xff\x93\xc0\xac\xfd\x89\x0c\x00\x00"),
|
||||
},
|
||||
}
|
||||
fs["/"].(*vfsgen۰DirInfo).entries = []os.FileInfo{
|
||||
|
|
|
|||
|
|
@ -55,8 +55,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}}="{{$ev}}"{{end}}">
|
||||
{{$labels := stripLabels .Labels.Map "job"}}
|
||||
{{range $label, $value := $labels}}
|
||||
{{range $label, $value := .Labels.Map}}
|
||||
<span class="badge badge-primary">{{$label}}="{{$value}}"</span>
|
||||
{{else}}
|
||||
<span class="badge badge-default">none</span>
|
||||
|
|
|
|||
|
|
@ -766,12 +766,6 @@ func tmplFuncs(consolesPath string, opts *Options) template_text.FuncMap {
|
|||
"pathPrefix": func() string { return opts.ExternalURL.Path },
|
||||
"pageTitle": func() string { return opts.PageTitle },
|
||||
"buildVersion": func() string { return opts.Version.Revision },
|
||||
"stripLabels": func(lset map[string]string, labels ...string) map[string]string {
|
||||
for _, ln := range labels {
|
||||
delete(lset, ln)
|
||||
}
|
||||
return lset
|
||||
},
|
||||
"globalURL": func(u *url.URL) *url.URL {
|
||||
host, port, err := net.SplitHostPort(u.Host)
|
||||
if err != nil {
|
||||
|
|
|
|||
Loading…
Reference in New Issue