Repository: qpid-dispatch Updated Branches: refs/heads/master 23cb56e50 -> 71194a7ae
DISPATCH-308: Used stand-alone console for screenshots, updated websockets/tcp instructions Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/71194a7a Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/71194a7a Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/71194a7a Branch: refs/heads/master Commit: 71194a7ae294fec45afbbbda00dd254dfad74be9 Parents: 23cb56e Author: Ernest Allen <[email protected]> Authored: Thu May 19 15:15:46 2016 -0400 Committer: Ernest Allen <[email protected]> Committed: Thu May 19 15:15:46 2016 -0400 ---------------------------------------------------------------------- console/stand-alone/plugin/css/plugin.css | 5 +- console/stand-alone/plugin/css/site-base.css | 13 ++- console/stand-alone/plugin/html/qdrConnect.html | 104 +++++++++++-------- doc/book/console.rst | 2 +- doc/book/console_charts.png | Bin 59466 -> 70070 bytes doc/book/console_entity.png | Bin 86855 -> 69319 bytes doc/book/console_installation.rst | 18 +--- doc/book/console_login.png | Bin 41258 -> 39915 bytes doc/book/console_operation.rst | 22 ++-- doc/book/console_overview.png | Bin 51563 -> 87960 bytes doc/book/console_overview.rst | 2 - doc/book/console_schema.png | Bin 67664 -> 68025 bytes doc/book/console_topology.png | Bin 77879 -> 67338 bytes 13 files changed, 86 insertions(+), 80 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/71194a7a/console/stand-alone/plugin/css/plugin.css ---------------------------------------------------------------------- diff --git a/console/stand-alone/plugin/css/plugin.css b/console/stand-alone/plugin/css/plugin.css index ef8d2e1..0d9f34d 100644 --- a/console/stand-alone/plugin/css/plugin.css +++ b/console/stand-alone/plugin/css/plugin.css @@ -183,7 +183,7 @@ div#main div ul.nav li.active a { } div#main.qdr { - margin-top: 44px !important; + margin-top: 56px !important; } div.charts-header { @@ -600,7 +600,8 @@ input[type="text"], input[type="number"], input[type="password"] { } div.login.container { - width: 550px; +/* width: 550px; */ + margin-top: 4em; } #overtree .fancytree-container { http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/71194a7a/console/stand-alone/plugin/css/site-base.css ---------------------------------------------------------------------- diff --git a/console/stand-alone/plugin/css/site-base.css b/console/stand-alone/plugin/css/site-base.css index 6e05ddd..e22476b 100644 --- a/console/stand-alone/plugin/css/site-base.css +++ b/console/stand-alone/plugin/css/site-base.css @@ -19,8 +19,9 @@ under the License. * { outline: none; } + * { - font-family: OpenSans; + font-family: sans-serif; } a:focus { @@ -1999,6 +2000,8 @@ div#main div ul.nav li a.nav-primary .caret { #main-nav { max-height: 70px; + background-color: #F0f0f0; + font-size: 20px; } #main { @@ -3657,7 +3660,7 @@ th > .indicator:before { .connect-column { display: inline-block; vertical-align: top; - width: 550px; + width: 34em; } .icon-spacer:before { @@ -4274,9 +4277,9 @@ ul.dynatree-container { } .pane { - position: fixed; + position: absolute; bottom: 0; - top: 70px; + top: 100px; height: auto; width: 300px; } @@ -4317,7 +4320,7 @@ ul.dynatree-container { } .pane.left { - left: 0; + /*left: 0; */ z-index: 39; } http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/71194a7a/console/stand-alone/plugin/html/qdrConnect.html ---------------------------------------------------------------------- diff --git a/console/stand-alone/plugin/html/qdrConnect.html b/console/stand-alone/plugin/html/qdrConnect.html index e2cefde..f1fd0b8 100644 --- a/console/stand-alone/plugin/html/qdrConnect.html +++ b/console/stand-alone/plugin/html/qdrConnect.html @@ -18,54 +18,72 @@ under the License. --> <div class="row-fluid" ng-controller="QDR.SettingsController"> <div class="login container" ng-hide="connecting"> - <div class="row" id="login-container"> - <div class="span2 offset4"> - <!-- <div simple-form name="settings" data="formConfig" entity="formEntity"></div> --> - <form class="form-horizontal no-bottom-margin" novalidate name="settings" action="" method="post"> - <fieldset> - <div class="control-group"> - <label class="control-label">Address: </label> - <div class="controls"> - <input type="text" description="Router address" ng-model="formEntity.address" name="address" required="required" autofocus="autofocus" class="ng-pristine ng-valid ng-valid-required"> - <span class="help-block"></span> + <div class="row" id="dispatch-login-container"> + <div class="connect-column"> + <div class="alert alert-success"> + <p> + Enter the address and port of a <strong><a href="http://qpid.apache.org/components/dispatch-router/"; target="_blank">Qpid Dispatch Router</a></strong> to connect.. + </p> + + <p> + The port should be a websockets <==> tcp proxy. + </p> + + <p> + When Autostart is checked, you will be automatically logged in to the router the next time you start the console. + </p> + + </div> + </div> + <div class="connect-column connect-form"> + <div class="span2 offset4"> + <!-- <div simple-form name="settings" data="formConfig" entity="formEntity"></div> --> + <form class="form-horizontal no-bottom-margin" novalidate name="settings" action="" method="post"> + <fieldset> + <div class="control-group"> + <label class="control-label">Address: </label> + <div class="controls"> + <input type="text" description="Router address" ng-model="formEntity.address" name="address" required="required" autofocus="autofocus" class="ng-pristine ng-valid ng-valid-required"> + <span class="help-block"></span> + </div> </div> - </div> - <div class="control-group"> - <label class="control-label" title="Port to connect to, by default 5673">Port: </label> - <div class="controls"> - <input type="number" description="Router port" tooltip="Ports to connect to, by default 5672" ng-model="formEntity.port" name="port" title="Port to connect to, by default 5673" class="ng-scope ng-pristine ng-valid ng-valid-number"> - <span class="help-block"></span> + <div class="control-group"> + <label class="control-label" title="Port to connect to, by default 5673">Port: </label> + <div class="controls"> + <input type="number" description="Router port" tooltip="Ports to connect to, by default 5672" ng-model="formEntity.port" name="port" title="Port to connect to, by default 5673" class="ng-scope ng-pristine ng-valid ng-valid-number"> + <span class="help-block"></span> + </div> </div> - </div> - <!-- - <div class="control-group"> - <label class="control-label">Username: </label> - <div class="controls"> - <input type="text" description="User Name" ng-model="formEntity.username" name="username" class="ng-pristine ng-valid"> - <span class="help-block"></span> + <!-- + <div class="control-group"> + <label class="control-label">Username: </label> + <div class="controls"> + <input type="text" description="User Name" ng-model="formEntity.username" name="username" class="ng-pristine ng-valid"> + <span class="help-block"></span> + </div> </div> - </div> - <div class="control-group"> - <label class="control-label">Password: </label> - <div class="controls"> - <input type="password" description="Password" ng-model="formEntity.password" name="password" class="ng-pristine ng-valid"> - <span class="help-block"></span> + <div class="control-group"> + <label class="control-label">Password: </label> + <div class="controls"> + <input type="password" description="Password" ng-model="formEntity.password" name="password" class="ng-pristine ng-valid"> + <span class="help-block"></span> + </div> </div> - </div> - --> - <div class="control-group"> - <label class="control-label" title="Whether or not the connection should be started as soon as you navigate to the console">Autostart: </label> - <div class="controls"> - <input type="checkbox" description="Connect at startup" tooltip="Whether or not the connection should be started as soon as you navigate to the console" ng-model="formEntity.autostart" name="autostart" title="Whether or not the connection should be started as soon as you log into hawtio" class="ng-scope ng-pristine ng-valid"> - <span class="help-block"></span> + --> + <div class="control-group"> + <label class="control-label" title="Whether or not the connection should be started as soon as you navigate to the console">Autostart: </label> + <div class="controls"> + <input type="checkbox" description="Connect at startup" tooltip="Whether or not the connection should be started as soon as you navigate to the console" ng-model="formEntity.autostart" name="autostart" title="Whether or not the connection should be started as soon as you log into hawtio" class="ng-scope ng-pristine ng-valid"> + <span class="help-block"></span> + </div> </div> - </div> - <input type="submit" style="position: absolute; left: -9999px; width: 1px; height: 1px;"> - </fieldset> - </form> - <p></p> - <div> - <button class="btn btn-primary pull-right" ng-disabled="settings.$invalid" ng-click="connect()">{{buttonText()}}</button> + <input type="submit" style="position: absolute; left: -9999px; width: 1px; height: 1px;"> + </fieldset> + </form> + <p></p> + <div> + <button class="btn btn-primary pull-right" ng-disabled="settings.$invalid" ng-click="connect()">{{buttonText()}}</button> + </div> </div> </div> </div> http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/71194a7a/doc/book/console.rst ---------------------------------------------------------------------- diff --git a/doc/book/console.rst b/doc/book/console.rst index 38aadbf..e2a1367 100644 --- a/doc/book/console.rst +++ b/doc/book/console.rst @@ -21,7 +21,7 @@ contain the root `toctree` directive. Console -==================================== +======= .. toctree:: :maxdepth: 3 http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/71194a7a/doc/book/console_charts.png ---------------------------------------------------------------------- diff --git a/doc/book/console_charts.png b/doc/book/console_charts.png index 8a70b30..169c2ca 100644 Binary files a/doc/book/console_charts.png and b/doc/book/console_charts.png differ http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/71194a7a/doc/book/console_entity.png ---------------------------------------------------------------------- diff --git a/doc/book/console_entity.png b/doc/book/console_entity.png index 5de7cc1..130c7e7 100644 Binary files a/doc/book/console_entity.png and b/doc/book/console_entity.png differ http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/71194a7a/doc/book/console_installation.rst ---------------------------------------------------------------------- diff --git a/doc/book/console_installation.rst b/doc/book/console_installation.rst index 76a885e..6484d05 100644 --- a/doc/book/console_installation.rst +++ b/doc/book/console_installation.rst @@ -24,14 +24,13 @@ Prerequisites The following need to be installed before running a console: - One or more dispatch routers. See the documentation for the dispatch router for help in starting a router network. -- node.js This is needed to provide a proxy between the console's websocket traffic and tcp. +- A websockets to tcp proxy. - A web server. This can be any server capable of serving static html/js/css/image files. -A nodejs proxy is distributed with proton. -To start the proton's nodejs proxy:: +To install a websockets to tcp proxy:: - cd ~/rh-qpid-proton/examples/javascript/messenger - node proxy.js & + sudo dnf install python-websockify + websockify localhost:5673 localhost:5672 This will start the proxy listening to ws traffic on port 5673 and translating it to tcp on port 5672. One of the routers in the network needs to have a listener configured on port 5672. That listener's role should be 'normal'. For example:: @@ -47,16 +46,9 @@ One of the routers in the network needs to have a listener configured on port 56 The console files ----------------- -The files for the console are located under the console directory in -the source tree.:: - app/ - bower_components/ - css/ - img/ +The files for the console are located under the console/stand-alone directory in the source tree.:: index.html - lib/ plugin/ - vendor.js Copy these files to a directory under the the html or webapps directory of your web server. For example, for apache tomcat the files should be under webapps/dispatch. Then the console is available as:: http://localhost:8080/dispatch http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/71194a7a/doc/book/console_login.png ---------------------------------------------------------------------- diff --git a/doc/book/console_login.png b/doc/book/console_login.png index 97a805e..63e22c6 100644 Binary files a/doc/book/console_login.png and b/doc/book/console_login.png differ http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/71194a7a/doc/book/console_operation.rst ---------------------------------------------------------------------- diff --git a/doc/book/console_operation.rst b/doc/book/console_operation.rst index fbd8358..1d382b5 100644 --- a/doc/book/console_operation.rst +++ b/doc/book/console_operation.rst @@ -21,45 +21,40 @@ Console operation Logging in to a router network ------------------------------ -The console communicates to the router network using the proton javascript bindings. When run from a web page, the proton bindings use web sockets to send and receive commands. However, the dispatch router requires tcp. Therefore a web-sockets to tcp proxy is used. - .. image:: console_login.png -Enter the address of a proxy that is connected to a router in the network. - -User name and password are not used at this time. +Enter the address of the websockets to tcp proxy that is connected to a router in the network. The Autostart checkbox, when checked, will automatically log in with the previous host:port the next time you start the console. Overview page ------------- -On the overview page, aggregate information about routers, addresses, and connections is displayed. - .. image:: console_overview.png +On the overview page, aggregate information about routers, addresses, and connections is displayed. + Topology page ------------- -This page displays the router network in a graphical form showing how the routers are connected and information about the individual routers and links. - .. image:: console_topology.png -Router entity details page +This page displays the router network in a graphical form showing how the routers are connected and information about the individual routers and links. + +List page -------------------------- .. image:: console_entity.png Displays detailed information about entities such as routers, links, addresses, memory. -Numeric attributes can be graphed by clicking on the graph icon. - Charts page ----------- .. image:: console_charts.png -This page displays graphs of numeric values that are on the entity details page. +This page displays graphs of numeric values that are on the list page. + Schema page ----------- @@ -67,4 +62,3 @@ Schema page .. image:: console_schema.png This page displays the json schema that is used to manage the router network. - http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/71194a7a/doc/book/console_overview.png ---------------------------------------------------------------------- diff --git a/doc/book/console_overview.png b/doc/book/console_overview.png index c613a09..af25f36 100644 Binary files a/doc/book/console_overview.png and b/doc/book/console_overview.png differ http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/71194a7a/doc/book/console_overview.rst ---------------------------------------------------------------------- diff --git a/doc/book/console_overview.rst b/doc/book/console_overview.rst index a01ddec..8644555 100644 --- a/doc/book/console_overview.rst +++ b/doc/book/console_overview.rst @@ -22,8 +22,6 @@ The console is an HTML based web site that displays information about a qpid dis The console requires an HTML web server that can serve static html, javascript, style sheets, and images. -The current version of the is read-only. The ability to call management methods that change the running of the router network is planned for a future version of console. - The console only provides limited information about the clients that are attached to the router network and is therfore more appropriate for administrators needing to know the layout and health of the router network. http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/71194a7a/doc/book/console_schema.png ---------------------------------------------------------------------- diff --git a/doc/book/console_schema.png b/doc/book/console_schema.png index bb83a78..ba56c7b 100644 Binary files a/doc/book/console_schema.png and b/doc/book/console_schema.png differ http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/71194a7a/doc/book/console_topology.png ---------------------------------------------------------------------- diff --git a/doc/book/console_topology.png b/doc/book/console_topology.png index ca86ddb..ae4b22a 100644 Binary files a/doc/book/console_topology.png and b/doc/book/console_topology.png differ --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
