Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support to query elements by a specific time #4764

Merged
merged 2 commits into from
Oct 26, 2018

Conversation

kdada
Copy link
Contributor

@kdada kdada commented Oct 20, 2018

Implement #1246.

UI:
image

There are two options in URL query string:

  • g[index].moment_input: date string. ex. 2018-10-20 10:11:12
  • g[index].timestamp: unix timestamp. ex. 1540012198.141

If time and timestamp are provided, timestamp is choosen. After page loading, timestamp will be applied to moment_input and removed from URL.

Examples of URL:

/graph?g0.expr=go_memstats_alloc_bytes_total&g0.tab=1&g0.moment_input=2018-10-20 05:10:08
/graph?g0.expr=go_memstats_alloc_bytes_total&g0.tab=1&g0.timestamp=1540013881.663

@kdada kdada force-pushed the master branch 3 times, most recently from 72949a8 to 737853f Compare October 20, 2018 08:57
Signed-off-by: Wei Guo <[email protected]>
@kdada
Copy link
Contributor Author

kdada commented Oct 22, 2018

@grobie @SuperQ please take a look.

Copy link
Contributor

@stuartnelson3 stuartnelson3 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me

@kdada
Copy link
Contributor Author

kdada commented Oct 25, 2018

@SuperQ @stuartnelson3 What's the next?

@stuartnelson3
Copy link
Contributor

I'm happy with the PR, so unless someone disagrees, I'll merge this later today.

@kdada
Copy link
Contributor Author

kdada commented Oct 26, 2018

@stuartnelson3

@stuartnelson3 stuartnelson3 merged commit 742583e into prometheus:master Oct 26, 2018
@brancz
Copy link
Member

brancz commented Oct 26, 2018

we're in code freeze for 2.5.0, so I'm reverting this until that's lifted strike that, as this PR cannot be automatically reverted, we have decided to cut the release branch now and cherry-pick fixes into that branch instead. Sorry for the noise.

@simonpasquier simonpasquier added this to the v2.6.0 milestone Nov 23, 2018
juliusv pushed a commit that referenced this pull request Feb 7, 2019
* web: updated bootstrap3-typeahead file to work with bootstrap 4.0.0

Signed-off-by: Andrew Chiu <[email protected]>

* web: Replaced bootstrap-3.3.1 with bootstrap 4.0.0

Signed-off-by: Andrew Chiu <[email protected]>

* web: Added bootstrap4-glyphicons as 4.0.0 doesnt include bootstrap3 glyphicons

Signed-off-by: Andrew Chiu <[email protected]>

* web: updated js jquery to 3.3.1

Signed-off-by: Andrew Chiu <[email protected]>

* 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 <[email protected]>

* web: _base.html missed word out in title tag (Server).

Signed-off-by: Andrew Chiu <[email protected]>

* web: updated alerts.html class names and tags to be bootstrap 4 compatible.

Signed-off-by: Andrew Chiu <[email protected]>

* web: updated config.html class names and tags to be bootstrap 4 compatible.

Signed-off-by: Andrew Chiu <[email protected]>

* web: updated flags.html class names and tags to be bootstrap 4 compatible.

Signed-off-by: Andrew Chiu <[email protected]>

* web: updated service-discovery.html class names and tags to be bootstrap 4 compatible.

Signed-off-by: Andrew Chiu <[email protected]>

* web: updated status.html class names and tags to be bootstrap 4 compatible.

Signed-off-by: Andrew Chiu <[email protected]>

* web: updated targets.html class names and tags to be bootstrap 4 compatible.

Signed-off-by: Andrew Chiu <[email protected]>

* web: updated graph_template.handlebar class names and tags to be bootstrap 4 compatible.

Signed-off-by: Andrew Chiu <[email protected]>

* web: alerts.css fix for button color inheritance on alerts page.

Signed-off-by: Andrew Chiu <[email protected]>

* web: graph.css fix for color inheritance.

Signed-off-by: Andrew Chiu <[email protected]>

* web: prometheus.css updated to fix nav bar.

Signed-off-by: Andrew Chiu <[email protected]>

* web: previous merge conflict not fixed correctly on _base.html

Signed-off-by: Andrew Chiu <[email protected]>

* menu.lib and prom.lib imports updated

Signed-off-by: ksherryBAE <[email protected]>

* bootstrap 4.1.3 imported

Signed-off-by: ksherryBAE <[email protected]>

* Bootstrap 4.1.3 imported into _base.html

Signed-off-by: ksherryBAE <[email protected]>

* bootstrap 4.1.3 imported into prom.lib

Signed-off-by: ksherryBAE <[email protected]>

* menu.lib style adjusted to view sidebar

Signed-off-by: ksherryBAE <[email protected]>

* Alert colour uplifted to bootstrap 4.1.3

Signed-off-by: ksherryBAE <[email protected]>

* Alerts display code reformatted similarly to config

Signed-off-by: ksherryBAE <[email protected]>

* Consoles pages adjusted to account for new navbar

Signed-off-by: ksherryBAE <[email protected]>

* LHS Menu fixed in console pages

Signed-off-by: ksherryBAE <[email protected]>

* Minor changes to prom_console to adjust lhs nav

Signed-off-by: ksherryBAE <[email protected]>

* Prom.lib and some css updated to fix console graph controls

Signed-off-by: ksherryBAE <[email protected]>

* Bootstrap 4.0.0 files removed

Signed-off-by: ksherryBAE <[email protected]>

* Consoles configured so that the graph fits with the new side bar, css files also adjusted

Signed-off-by: ksherryBAE <[email protected]>

* Import popper.min.js for dropdowns

Signed-off-by: ksherryBAE <[email protected]>

* Popper.min.js imported locally

Signed-off-by: ksherryBAE <[email protected]>

* Re-added #4764 and fixed css

Signed-off-by: ksherryBAE <[email protected]>

* Removed .DS_Store

Signed-off-by: ksherryBAE <[email protected]>

* Rebuilt assets

Signed-off-by: ksherryBAE <[email protected]>

* Spaces between buttons and inputs on graph page removed

Signed-off-by: ksherryBAE <[email protected]>

* fixed spacing in buttons on /targets

Signed-off-by: Pritam Bhudia <[email protected]>

* Updated vfsdata.go

Signed-off-by: Pritam Bhudia <[email protected]>

* fixed typeahead issue

Signed-off-by: James Ritchie <[email protected]>

* added css for dropdown

Signed-off-by: James Ritchie <[email protected]>

* changed order of css imports

Signed-off-by: James Ritchie <[email protected]>

* tinkered with CSS changes to make keyboard select and mouseover match

Signed-off-by: James Ritchie <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants