prometheus

Commit Graph

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
Christian Hoffmann	db13003721	ui: clarify alert state toggle via checkbox icon (#7936 ) The current meaning of the alert firing/pending/inactive toggle seems ambiguouos as #7460 demonstrates. This commit adds a checkbox icon to clarify the active state of the button. Signed-off-by: Christian Hoffmann <mail@hoffmann-christian.info>	4 years ago
Michał	040425b0eb	filtering alerts by state and display count of alerts in each state (#5758 ) * local storage selectedTab on targets tab was renamed Signed-off-by: Michał Szczygieł <1153719+mszczygiel@users.noreply.github.com> * added filters when displaying alerts Signed-off-by: Michał Szczygieł <1153719+mszczygiel@users.noreply.github.com> * function was simplified Signed-off-by: Michał Szczygieł <1153719+mszczygiel@users.noreply.github.com> * fixed rebase Signed-off-by: Michał Szczygieł <1153719+mszczygiel@users.noreply.github.com> * minor rename Signed-off-by: Michał Szczygieł <1153719+mszczygiel@users.noreply.github.com> * Active -> Pending Signed-off-by: Michał Szczygieł <1153719+mszczygiel@users.noreply.github.com>	5 years ago
pbhudiaBAE	43953b105b	Sorting alerts by group name in /alerts (#5448 ) * Working group name Signed-off-by: Pritam Bhudia <pritam.bhudia@baesystems.com> * Working categorised by group name Signed-off-by: Pritam Bhudia <pritam.bhudia@baesystems.com> * Changed group sorting in web Signed-off-by: Pritam Bhudia <pritam.bhudia@baesystems.com> * Fixed group sorting and comments Signed-off-by: Pritam Bhudia <pritam.bhudia@baesystems.com> * Fixed group sorting and comments with gofmt Signed-off-by: Pritam Bhudia <pritam.bhudia@baesystems.com> * Added file and group name Signed-off-by: Pritam Bhudia <pritam.bhudia@baesystems.com> * reverted back to full path to yml file Signed-off-by: Pritam Bhudia <pritam.bhudia@baesystems.com>	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
James Turnbull	4486ef013b	Make show annotations checkbox match query history checkbox (#3936 ) After removing the checkbox in #3913 the only remaining element that looked like it was the new Show Annotations checkbox on the Alerts page. Which in turn didn't look like the Enable query history checkout on the graph page. So: 1. This takes the Enable query history button as canonical. 2. Updates the show annotations button code to match it. 3. Simplifies the JS for the checkbox.	7 years ago
Julien Pivotto	155faab7a2	Display annotations on Alerts page (#3900 ) Fixes #1219 Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>	7 years ago
James Turnbull	d127a21071	Removed alert_header (#3836 ) This is a very minor UX change. The current "No Alert rules" present table row has the `alert_header` class attached. This changes the cursor and some other stuff and makes sense with the populated table but less sense with the unpopulated table. So removing it the latter case.	7 years ago
Julius Volz	13006feb1e	Fix alert label display in /alerts UI	8 years ago
Fabian Reinartz	9a9211845e	ui: fix alert template	8 years ago
Erdem Agaoglu	241da87f7f	Adding version to names of static files to prevent browsers using old files in local caches after an upgrade.	8 years ago
Harmen	512b3f8d95	Friendlier message when there are no alerting rules	8 years ago
Matt Bostock	78715e4182	Alerts template: remove silence table header There's no corresponding table column for this table header. The placeholder link for silences was removed in `e8800730`. Accordingly, regenerate `web/ui/bindata.go` by running: make assets format	8 years ago
Fabian Reinartz	bf6abac8f4	Send resolved notifications	9 years ago
Fabian Reinartz	57ca7108aa	Enable debug generation of go-bindata, rename blob/ to ui/	9 years ago

15 Commits (5bf9a3365103522e415e331cb31dd01b80d03520)