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.

Sign up for GitHub

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

Jump to bottom

Added instrumentation for admin dashboard interface #245

Open
wants to merge 19 commits into
base: next
Choose a base branch
from
Open

Added instrumentation for admin dashboard interface #245

wants to merge 19 commits into from

Conversation

segphault
Copy link

@segphault segphault commented Apr 14, 2016 •
edited by danielmewes
Loading

This is a first pass at logging the relevant information for the Horizon admin dashboard (#154)

This change is Reviewable

@deontologician deontologician added this to the Release 1.0 milestone Apr 14, 2016
@deontologician
Copy link
Contributor

Is this ready to be reviewed @segphault ?

@segphault
Copy link
Author

yep, this is ready for review and can be merged if it looks good to everybody.

The one part that I'm unsure about is the handle_open invocation that I added here as a hack to work around the fact that the socket.on("open", ...) event doesn't appear to be triggering (because the socket is already opened when Client is instantiated?). Somebody might want to come up with a better way to address that.

deontologician
deontologician reviewed Apr 14, 2016
View reviewed changes
client/src/index.js
@@ -74,6 +74,7 @@ function Horizon({
horizon._horizonPath = path
horizon.authEndpoint = authEndpoint
horizon.hasAuthToken = tokenStorage.hasAuthToken.bind(tokenStorage)
horizon.send = sendRequest;
Copy link
Contributor

Choose a reason for hiding this comment

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

Maybe name this something scarier like rawRequest

@dalanmiller
Copy link
Contributor

dalanmiller commented Apr 29, 2016 •
edited
Loading

Everything works for me. Only thing is that .hzconfig needs to mv to .hz/config.toml.

As well, rather than being a separate Horizon is it going to move to some sort of --dashboard flag and with it enabled it would serve the dashboard automatically? Probably under localhost:8181/horizon/admin?

Also I think the log should be in descending order like the RethinkDB WebGUI.

screenshot 2016-04-29 13 10 29

dalanmiller and others added 16 commits April 29, 2016 13:18
@dalanmiller
Moving config
d0da434
Pass Server instance to admin endpoints
0732833
Request tracking now captures site where request originated
ba722a0
Incorporated Annie's design improvements into admin UI
99a594c
Merge branch 'ryan_adminui' of https://github.com/rethinkdb/horizon i…
4386dce 
…nto ryan_adminui
Fixed broken styling
4bceda1
Refactored model and stubbed out data browser
da71382
Added rudimentary data browser
2782596
Added styling for data browser prototype
eb29385
Refactored adminui to clean up model
c648d39
Added CSS helper and moved tree expander to its own template
e962a33
Added support for pagination
faaad31
Allow user to select a collection in the data browser
46121ea
@flipace @deontologician
replace current websocket implementation with engine.io, made tests w…
d3330e7 
…ork in node without mocking window (#356)

* replace current websocket implementation with engine.io, made tests work in node without mocking window

* Add utensils object (#351)

* fix error condition

* set fixed version 1.0.1 of ws package
Merge branch 'next' into ryan_adminui
fa1d898 
# Conflicts:
#	cli/src/serve.js
#	client/src/index.js
#	server/package.json
#	server/src/client.js
Adjust client stat tracking for engine.io
5b8eff3
@deontologician deontologician modified the milestones: Release 1.1, Release 1.0 May 18, 2016
@deontologician deontologician modified the milestones: Next Major Release, Release 1.x.x May 26, 2016
@deontologician deontologician modified the milestones: First post-2.0 release, Release 2.0 Jul 7, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@Tryneus Tryneus

Labels
admin UI PR: in progress server
Projects
None yet
Milestone
Plugins release
Development

Successfully merging this pull request may close these issues.
5 participants
@segphault @deontologician @dalanmiller @Tryneus @flipace