9 Commits (5bf9a3365103522e415e331cb31dd01b80d03520)

Author	SHA1	Message	Date
Julius Volz	3470ee1fbf	Make React UI the default, keep old UI under /classic (#8142) ... The React app's assets are now served under /assets, while all old custom web assets (including the ones for console templates) are now served from /classic/static. I tested different combinations of --web.external-url and --web.route-prefix with proxies in front, and I couldn't find a problem yet with the routing. Console templates also still work. While migrating old endpoints to /classic, I noticed that /version was being treated like a lot of the old UI pages, with readiness check handler in front of it, etc. I kept it in /version and removed that readiness wrapper, since it doesn't seem to be needed for that endpoint. Signed-off-by: Julius Volz <julius.volz@gmail.com>	4 years ago
Sylvain Rabot	7cd5cf0b69	Sanitize HTML output (#5665) ... * Compact html output * Fix html style block location Signed-off-by: Sylvain Rabot <s.rabot@lectra.com>	6 years ago
Julien Pivotto	5a162dc1ab	ui: remove extra table tag in service discovery ... Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>	6 years ago
jritchieBAE	b8f0a41745	Update to Bootstrap 4.1.3 (#5192) ... * web: updated bootstrap3-typeahead file to work with bootstrap 4.0.0 Signed-off-by: Andrew Chiu <andrew.chiu2@baesystems.com> * web: Replaced bootstrap-3.3.1 with bootstrap 4.0.0 Signed-off-by: Andrew Chiu <andrew.chiu2@baesystems.com> * web: Added bootstrap4-glyphicons as 4.0.0 doesnt include bootstrap3 glyphicons Signed-off-by: Andrew Chiu <andrew.chiu2@baesystems.com> * web: updated js jquery to 3.3.1 Signed-off-by: Andrew Chiu <andrew.chiu2@baesystems.com> * web: updated _base.html to import new bootstrap 4.0.0, jquery3.3.1 and bootstrap class tags to be 4.0 compatible Signed-off-by: Andrew Chiu <andrew.chiu2@baesystems.com> * web: _base.html missed word out in title tag (Server). Signed-off-by: Andrew Chiu <andrew.chiu2@baesystems.com> * web: updated alerts.html class names and tags to be bootstrap 4 compatible. Signed-off-by: Andrew Chiu <andrew.chiu2@baesystems.com> * web: updated config.html class names and tags to be bootstrap 4 compatible. Signed-off-by: Andrew Chiu <andrew.chiu2@baesystems.com> * web: updated flags.html class names and tags to be bootstrap 4 compatible. Signed-off-by: Andrew Chiu <andrew.chiu2@baesystems.com> * web: updated service-discovery.html class names and tags to be bootstrap 4 compatible. Signed-off-by: Andrew Chiu <andrew.chiu2@baesystems.com> * web: updated status.html class names and tags to be bootstrap 4 compatible. Signed-off-by: Andrew Chiu <andrew.chiu2@baesystems.com> * web: updated targets.html class names and tags to be bootstrap 4 compatible. Signed-off-by: Andrew Chiu <andrew.chiu2@baesystems.com> * web: updated graph_template.handlebar class names and tags to be bootstrap 4 compatible. Signed-off-by: Andrew Chiu <andrew.chiu2@baesystems.com> * web: alerts.css fix for button color inheritance on alerts page. Signed-off-by: Andrew Chiu <andrew.chiu2@baesystems.com> * web: graph.css fix for color inheritance. Signed-off-by: Andrew Chiu <andrew.chiu2@baesystems.com> * web: prometheus.css updated to fix nav bar. Signed-off-by: Andrew Chiu <andrew.chiu2@baesystems.com> * web: previous merge conflict not fixed correctly on _base.html Signed-off-by: Andrew Chiu <andrew.chiu2@baesystems.com> * menu.lib and prom.lib imports updated Signed-off-by: ksherryBAE <kieran.sherry@baesystems.com> * bootstrap 4.1.3 imported Signed-off-by: ksherryBAE <kieran.sherry@baesystems.com> * Bootstrap 4.1.3 imported into _base.html Signed-off-by: ksherryBAE <kieran.sherry@baesystems.com> * bootstrap 4.1.3 imported into prom.lib Signed-off-by: ksherryBAE <kieran.sherry@baesystems.com> * menu.lib style adjusted to view sidebar Signed-off-by: ksherryBAE <kieran.sherry@baesystems.com> * Alert colour uplifted to bootstrap 4.1.3 Signed-off-by: ksherryBAE <kieran.sherry@baesystems.com> * Alerts display code reformatted similarly to config Signed-off-by: ksherryBAE <kieran.sherry@baesystems.com> * Consoles pages adjusted to account for new navbar Signed-off-by: ksherryBAE <kieran.sherry@baesystems.com> * LHS Menu fixed in console pages Signed-off-by: ksherryBAE <kieran.sherry@baesystems.com> * Minor changes to prom_console to adjust lhs nav Signed-off-by: ksherryBAE <kieran.sherry@baesystems.com> * Prom.lib and some css updated to fix console graph controls Signed-off-by: ksherryBAE <kieran.sherry@baesystems.com> * Bootstrap 4.0.0 files removed Signed-off-by: ksherryBAE <kieran.sherry@baesystems.com> * Consoles configured so that the graph fits with the new side bar, css files also adjusted Signed-off-by: ksherryBAE <kieran.sherry@baesystems.com> * Import popper.min.js for dropdowns Signed-off-by: ksherryBAE <kieran.sherry@baesystems.com> * Popper.min.js imported locally Signed-off-by: ksherryBAE <kieran.sherry@baesystems.com> * Re-added #4764 and fixed css Signed-off-by: ksherryBAE <kieran.sherry@baesystems.com> * Removed .DS_Store Signed-off-by: ksherryBAE <kieran.sherry@baesystems.com> * Rebuilt assets Signed-off-by: ksherryBAE <kieran.sherry@baesystems.com> * Spaces between buttons and inputs on graph page removed Signed-off-by: ksherryBAE <kieran.sherry@baesystems.com> * fixed spacing in buttons on /targets Signed-off-by: Pritam Bhudia <pritam.bhudia@baesystems.com> * Updated vfsdata.go Signed-off-by: Pritam Bhudia <pritam.bhudia@baesystems.com> * fixed typeahead issue Signed-off-by: James Ritchie <james.g.ritchie@baesystems.com> * added css for dropdown Signed-off-by: James Ritchie <james.g.ritchie@baesystems.com> * changed order of css imports Signed-off-by: James Ritchie <james.g.ritchie@baesystems.com> * tinkered with CSS changes to make keyboard select and mouseover match Signed-off-by: James Ritchie <james.g.ritchie@baesystems.com>	6 years ago
Fabian Reinartz	9c83e815d1	Merge branch 'release-2.2' into update	7 years ago
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>	7 years ago
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.	7 years ago
Callum Jones	090e7e0959	Place Service Discovery labels inline (#3872) ... Fixes #3739	7 years ago
conorbroderick	8b6f3a1bd3	Added service discovery view showing labels before and after relabelling	7 years ago