Browse Source

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.
pull/3936/head
James Turnbull 7 years ago committed by Julius Volz
parent
commit
50e6aff3fd
  1. 16
      web/ui/bindata.go
  2. 2
      web/ui/templates/service-discovery.html

16
web/ui/bindata.go

@ -146,7 +146,7 @@ func webUiTemplatesAlertsHtml() (*asset, error) {
return nil, err return nil, err
} }
info := bindataFileInfo{name: "web/ui/templates/alerts.html", size: 2533, mode: os.FileMode(420), modTime: time.Unix(1520297719, 0)} info := bindataFileInfo{name: "web/ui/templates/alerts.html", size: 2533, mode: os.FileMode(420), modTime: time.Unix(1520598177, 0)}
a := &asset{bytes: bytes, info: info} a := &asset{bytes: bytes, info: info}
return a, nil return a, nil
} }
@ -231,7 +231,7 @@ func webUiTemplatesRulesHtml() (*asset, error) {
return a, nil return a, nil
} }
var _webUiTemplatesServiceDiscoveryHtml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x55\x51\x8b\xdb\x38\x10\x7e\xf7\xaf\x18\x74\x79\x3a\xd6\x6b\x76\xe1\xee\x21\x27\xfb\x5e\xf6\xe5\xe0\x0e\x0e\x5a\xfa\x52\x4a\x91\xad\x49\x3c\x59\xad\x64\x24\x25\x4d\x30\xfe\xef\x45\x96\xed\xd8\x69\x52\xda\x2d\x7d\xeb\xc2\x06\x69\x46\xfa\xe6\x9b\x99\x4f\xe3\xb6\x95\xb8\x21\x8d\xc0\x6a\x14\x92\x75\x5d\xc2\x15\xe9\x67\xf0\xa7\x06\x73\xe6\xf1\xe8\xb3\xca\x39\x06\x16\x55\xce\x9c\x3f\x29\x74\x35\xa2\x67\x50\x5b\xdc\xe4\xac\x6d\xa1\x11\xbe\xfe\xdf\xe2\x86\x8e\xd0\x75\x99\xf3\xc2\x53\x15\xee\x64\x5e\xd8\x2d\x7a\x77\x5f\x39\xf7\xf7\x21\x6f\x5b\x28\xf7\xa4\xe4\x3b\xb4\x8e\x8c\x86\xae\x63\x45\xc2\x5d\x65\xa9\xf1\xe0\x6c\x75\x1b\x6b\x77\x86\xda\xdd\x42\xe2\x59\x44\x2a\x92\xb6\x45\x2d\xbb\x2e\x49\x78\xcf\xb6\x48\x00\x7e\x7f\x4f\xf2\xc3\xba\xc4\x8d\xb1\x08\x6d\x02\x00\x20\xc9\x35\x4a\x9c\xd6\x50\x2a\x53\x3d\xff\xd5\xdb\x2a\xa3\x3d\x6a\xbf\x06\x06\x2c\x5a\x5e\x84\xdd\x92\x4e\xbd\x69\xd6\x90\xfe\xf9\x47\x73\x8c\xe6\x1a\x69\x5b\xfb\x35\x9c\x2d\x07\x72\x54\x92\x22\x7f\x5a\x43\x4d\x52\xa2\x0e\xf6\x2e\xe1\xd9\x40\x22\x39\xd7\x79\x08\x13\x4a\x0d\xc0\x25\x1d\xa0\x52\xc2\xb9\xbc\x77\x08\xd2\x68\xd3\x8d\xda\x93\x64\x45\xd2\x63\xf3\xfa\xa1\x78\x83\xf6\x40\x15\xc2\x13\xb9\xca\x1c\xd0\x9e\x78\x56\x3f\x14\xd1\x3d\x43\xf0\xa2\x54\x98\x4e\x38\x2c\x9e\x00\xe0\xbd\x63\x71\x0a\xa6\xb3\x12\xb5\x43\x39\xec\x4b\x63\x25\xda\x69\xeb\xbc\xa5\x66\xda\xd5\x21\xf4\x19\x74\xaf\xc6\x25\x40\xdb\x5a\xa1\xb7\x08\x2b\xba\x83\xd5\xce\x94\xb0\xce\xe1\xfe\x1f\x2d\xf1\xd8\xa7\x39\xfe\x71\x45\xc5\x6c\x0b\xc0\xc5\x20\xa4\xdf\x76\xa6\x4c\xdb\x36\xdc\x0d\xfd\x1c\x57\x3c\x13\xf3\x0b\x3c\x9b\x03\x8c\xad\x1e\x7d\x23\x21\x9e\x49\x3a\x0c\xd5\x6b\xdb\xd5\x20\x9e\x9e\xd2\xdb\xb8\x1e\x2e\x4d\xac\x2f\x19\x7f\x7b\x65\xeb\x47\x20\x99\xb3\x25\xfb\x19\xc3\x68\x9a\x0c\xbc\xdc\x7b\x6f\xf4\xf0\xbc\xe2\x86\x9d\x83\x44\xa2\x95\x51\x4a\x34\x0e\x65\x1a\x5b\x55\x7a\x1d\xfe\xd3\xc6\xd2\x8b\xb0\x27\x56\xb8\xda\x7c\x82\x17\x63\x91\x67\x11\x62\xa2\x93\xd5\x8f\x3f\xa5\xe9\xd0\xeb\x38\x67\xe3\xbb\xd1\x46\xe3\x2c\x4f\xee\xc3\xf4\x18\x63\xed\x4c\xf9\x51\xa2\x17\xa4\x1c\x5b\x74\xcf\xdb\x8b\xee\xfb\xba\x18\x25\x8d\x12\xfe\x15\x25\x2a\xc7\x33\x5f\x7f\x79\x2c\x36\xee\xc6\x11\x9e\xcd\x91\x83\x17\x85\x9c\xb3\x2b\x8d\x3c\x0d\x82\x98\xf7\x9d\x42\xbb\x61\x12\xc8\x45\xaf\xae\x12\x9e\x92\x54\x3d\x13\xb6\xf4\x0f\x3d\x8f\xbe\x5e\x51\xe7\xf4\x22\xf5\xfb\xff\x44\x03\x8b\x20\x03\xf2\x5e\x4d\xc8\xe4\x7c\x4a\x5a\x91\xc6\xa9\xee\xbd\xad\x5f\xa7\x41\x3a\x97\xf5\x9f\x47\x1f\x24\xdd\x73\xb8\x83\xd5\x41\xa8\x3d\x06\x2a\x03\xab\x2b\xb1\xe1\xda\xcb\x9c\xb9\x5c\x23\xf4\x22\x6d\xe8\x7f\xcf\x7a\x1c\x53\xee\xba\x30\xc5\x63\xc8\xae\x63\x3c\x0b\x37\xaf\xc3\x2e\x5f\xf2\x9c\x3f\x2a\x87\x57\x49\xde\xa4\x78\x93\xa0\xc4\x8d\xd8\x2b\xcf\x8a\x50\xae\xdb\x6c\xbe\xc2\x65\x36\x5f\xe6\xe7\xe7\xa3\x2f\x5a\xbc\xfc\x51\xa5\xfc\xd2\xc7\xb2\xa2\xdf\xad\x8f\xd7\x91\x9c\x34\xf2\x64\x4d\xd3\xa0\x7c\x25\xa9\x57\x0a\x65\x39\xb9\x2e\x71\x78\x36\x4c\xae\x69\x1b\x46\xf2\xe2\x23\x17\xaf\x01\x6a\x19\x55\x33\x7e\xfb\x46\xa8\xcf\x01\x00\x00\xff\xff\xa7\x61\xed\x17\xe0\x09\x00\x00") var _webUiTemplatesServiceDiscoveryHtml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x55\x41\x8b\xeb\x36\x10\xbe\xfb\x57\x0c\x6a\x4e\x65\xbd\x66\x17\xda\x43\xaa\xb8\x97\xbd\x14\x5a\x28\xb4\xf4\x52\x4a\x91\xad\x49\x3c\x59\xad\x64\x24\x25\x4d\x30\xfe\xef\x45\x96\xed\xc8\x79\xc9\xe3\xbd\x7d\xbc\xdb\x5b\xd8\x20\xcd\x8c\xbe\xf9\x66\xe6\x93\xdc\x75\x12\xb7\xa4\x11\x58\x83\x42\xb2\xbe\xcf\xb8\x22\xfd\x0a\xfe\xdc\xe2\x86\x79\x3c\xf9\xa2\x76\x8e\x81\x45\xb5\x61\xce\x9f\x15\xba\x06\xd1\x33\x68\x2c\x6e\x37\xac\xeb\xa0\x15\xbe\xf9\xdd\xe2\x96\x4e\xd0\xf7\x85\xf3\xc2\x53\x1d\xce\x14\x5e\xd8\x1d\x7a\xf7\x58\x3b\xf7\xf3\x71\xd3\x75\x50\x1d\x48\xc9\xbf\xd0\x3a\x32\x1a\xfa\x9e\x95\x19\x77\xb5\xa5\xd6\x83\xb3\xf5\x7d\xac\xfd\x05\x6a\x7f\x0f\x89\x17\x11\xa9\xcc\xba\x0e\xb5\xec\xfb\x2c\xe3\x03\xdb\x32\x03\xf8\xfe\x6f\x92\xff\xac\x2b\xdc\x1a\x8b\xd0\x65\x00\x00\x92\x5c\xab\xc4\x79\x0d\x95\x32\xf5\xeb\x4f\x83\xad\x36\xda\xa3\xf6\x6b\x60\xc0\xa2\xe5\x4d\xd8\x1d\xe9\xdc\x9b\x76\x0d\xf9\x8f\x3f\xb4\xa7\x68\x6e\x90\x76\x8d\x5f\xc3\xc5\x72\x24\x47\x15\x29\xf2\xe7\x35\x34\x24\x25\xea\x60\xef\x33\x5e\x8c\x24\xb2\x4b\x9f\xc7\x34\xa1\xd5\x00\x5c\xd2\x11\x6a\x25\x9c\xdb\x0c\x0e\x41\x1a\x6d\xbe\x55\x07\x92\xac\xcc\x06\x6c\xde\x3c\x95\x7f\xa0\x3d\x52\x8d\xf0\x42\xae\x36\x47\xb4\x67\x5e\x34\x4f\x65\x74\x27\x08\x5e\x54\x0a\xf3\x19\x87\xc5\x08\x00\x3e\x38\x16\x51\x30\xc7\x4a\xd4\x0e\xe5\xb8\xaf\x8c\x95\x68\xe7\xad\xf3\x96\xda\x79\xd7\x84\xd4\x17\xd0\x83\x9a\x96\x00\x5d\x67\x85\xde\x21\xac\xe8\x01\x56\x7b\x53\xc1\x7a\x03\x8f\xbf\x68\x89\xa7\xa1\xcc\xe9\x8f\x2b\x2a\x93\x2d\x00\x17\xa3\x90\xbe\xdb\x9b\x2a\xef\xba\x70\x36\xcc\x73\x5a\xf1\x42\xa4\x07\x78\x91\x02\x4c\xa3\x9e\x7c\x13\x21\x5e\x48\x3a\x8e\xdd\xeb\xba\xd5\x28\x9e\x81\xd2\x9f\x71\x3d\x1e\x9a\x59\x5f\x33\xfe\xf4\xce\x36\xcf\x53\xc8\xde\x54\xff\x86\x3b\x84\x96\x01\xc9\x61\x9f\x14\x94\x90\x8e\xa6\xd9\xc0\xab\x83\xf7\x46\x8f\x37\x2e\x6e\xd8\x25\x6f\xe4\x5e\x1b\xa5\x44\xeb\x50\xe6\x71\x7a\x95\xd7\xe1\x3f\x6f\x2d\xbd\x09\x7b\x66\xa5\x6b\xcc\x7f\xf0\x66\x2c\xf2\x22\x42\xcc\x0c\x8b\xe6\xf9\xab\xe8\x00\x06\x69\x6f\xd8\x74\x95\xb4\xd1\x98\xd4\xc9\x7d\x68\x46\xda\x1c\x89\x5e\x90\x72\x6c\x31\x50\x6f\xaf\x04\xe1\x9b\x72\x52\x39\x4a\xf8\x55\x54\xa8\x1c\x2f\x7c\xf3\x61\x58\x9c\xe5\x9d\x10\x5e\xa4\xc8\xc1\x8b\x42\xa6\xec\x2a\x23\xcf\xa3\x46\x52\x29\x50\x50\x00\xcc\x9a\xb9\x9a\xd5\x4d\xc2\x73\x91\x6a\x60\xc2\x96\xfe\x71\xe6\xd1\x37\x88\xec\x52\x5e\xa4\xfe\xf8\x9b\x68\x61\x91\x64\x44\x3e\xa8\x19\x99\x9c\xcf\x49\x2b\xd2\x38\xf7\x7d\xb0\x0d\xeb\x3c\x48\xe7\xba\xff\x69\xf6\x51\xe5\x03\x87\x07\x58\x1d\x85\x3a\x60\xa0\x32\xb2\xba\x91\x1b\x6e\x5d\xd6\xc4\xe5\x5a\xa1\x17\x65\xc3\xf0\x7b\xd1\xe3\x54\x72\xdf\x87\x87\x3d\xa6\xec\x7b\xc6\x8b\x70\xf2\x36\xec\xf2\x72\xa7\xfc\x51\x39\xbc\x49\xf2\x2e\xc5\xbb\x04\x25\x6e\xc5\x41\x79\x56\x86\x76\xdd\x67\xf3\x11\x2e\xc9\x93\x93\xc6\xa7\xaf\x61\xb4\x78\xf9\xa5\x4a\xf9\xa6\x8f\x65\x47\x3f\x5b\x1f\xef\x23\x39\x6b\xe4\xc5\x9a\xb6\x45\xf9\x4e\x52\xef\x14\xca\xf2\xe5\xba\xc6\xe1\xc5\xf8\x72\xcd\xdb\xf0\x24\x2f\xbe\x7b\xf1\x18\xa0\x96\x51\x35\xd3\xe7\x70\x82\xfa\x3f\x00\x00\xff\xff\x23\xec\x81\x94\xf3\x09\x00\x00")
func webUiTemplatesServiceDiscoveryHtmlBytes() ([]byte, error) { func webUiTemplatesServiceDiscoveryHtmlBytes() ([]byte, error) {
return bindataRead( return bindataRead(
@ -246,7 +246,7 @@ func webUiTemplatesServiceDiscoveryHtml() (*asset, error) {
return nil, err return nil, err
} }
info := bindataFileInfo{name: "web/ui/templates/service-discovery.html", size: 2528, mode: os.FileMode(420), modTime: time.Unix(1520297719, 0)} info := bindataFileInfo{name: "web/ui/templates/service-discovery.html", size: 2547, mode: os.FileMode(420), modTime: time.Unix(1520598182, 0)}
a := &asset{bytes: bytes, info: info} a := &asset{bytes: bytes, info: info}
return a, nil return a, nil
} }
@ -286,7 +286,7 @@ func webUiTemplatesTargetsHtml() (*asset, error) {
return nil, err return nil, err
} }
info := bindataFileInfo{name: "web/ui/templates/targets.html", size: 3086, mode: os.FileMode(420), modTime: time.Unix(1520524547, 0)} info := bindataFileInfo{name: "web/ui/templates/targets.html", size: 3086, mode: os.FileMode(420), modTime: time.Unix(1520598182, 0)}
a := &asset{bytes: bytes, info: info} a := &asset{bytes: bytes, info: info}
return a, nil return a, nil
} }
@ -306,7 +306,7 @@ func webUiStaticCssAlertsCss() (*asset, error) {
return nil, err return nil, err
} }
info := bindataFileInfo{name: "web/ui/static/css/alerts.css", size: 353, mode: os.FileMode(420), modTime: time.Unix(1520524540, 0)} info := bindataFileInfo{name: "web/ui/static/css/alerts.css", size: 353, mode: os.FileMode(420), modTime: time.Unix(1520598177, 0)}
a := &asset{bytes: bytes, info: info} a := &asset{bytes: bytes, info: info}
return a, nil return a, nil
} }
@ -406,7 +406,7 @@ func webUiStaticCssTargetsCss() (*asset, error) {
return nil, err return nil, err
} }
info := bindataFileInfo{name: "web/ui/static/css/targets.css", size: 574, mode: os.FileMode(420), modTime: time.Unix(1520524887, 0)} info := bindataFileInfo{name: "web/ui/static/css/targets.css", size: 574, mode: os.FileMode(420), modTime: time.Unix(1520598182, 0)}
a := &asset{bytes: bytes, info: info} a := &asset{bytes: bytes, info: info}
return a, nil return a, nil
} }
@ -466,7 +466,7 @@ func webUiStaticJsAlertsJs() (*asset, error) {
return nil, err return nil, err
} }
info := bindataFileInfo{name: "web/ui/static/js/alerts.js", size: 1135, mode: os.FileMode(420), modTime: time.Unix(1520297719, 0)} info := bindataFileInfo{name: "web/ui/static/js/alerts.js", size: 1135, mode: os.FileMode(420), modTime: time.Unix(1520598177, 0)}
a := &asset{bytes: bytes, info: info} a := &asset{bytes: bytes, info: info}
return a, nil return a, nil
} }
@ -546,7 +546,7 @@ func webUiStaticJsTargetsJs() (*asset, error) {
return nil, err return nil, err
} }
info := bindataFileInfo{name: "web/ui/static/js/targets.js", size: 1542, mode: os.FileMode(420), modTime: time.Unix(1520524547, 0)} info := bindataFileInfo{name: "web/ui/static/js/targets.js", size: 1542, mode: os.FileMode(420), modTime: time.Unix(1520598182, 0)}
a := &asset{bytes: bytes, info: info} a := &asset{bytes: bytes, info: info}
return a, nil return a, nil
} }

2
web/ui/templates/service-discovery.html

@ -32,7 +32,7 @@
{{range $job := .Index}} {{range $job := .Index}}
<div class="table-container"> <div class="table-container">
<h2 id="job-{{$job}}"> <h2 class="job_header" id="job-{{$job}}">
{{$job}} {{$job}}
<button type="button" class="targets collapsed-table btn btn-primary">show more</button> <button type="button" class="targets collapsed-table btn btn-primary">show more</button>
</h2> </h2>

Loading…
Cancel
Save