You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2015/08/24 15:52:22 UTC
[37/50] [abbrv] storm git commit: Merge remote-tracking branch
'upstream/master' into STORM-166
Merge remote-tracking branch 'upstream/master' into STORM-166
Conflicts:
storm-core/src/ui/public/index.html
storm-core/src/ui/public/templates/index-page-template.html
storm-core/src/ui/public/templates/topology-page-template.html
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/a11fcc30
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/a11fcc30
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/a11fcc30
Branch: refs/heads/master
Commit: a11fcc303aeb728af4c9a7a1c232b2f1213330c4
Parents: eb3a837 dcee1e2
Author: Parth Brahmbhatt <br...@gmail.com>
Authored: Fri Mar 20 11:07:07 2015 -0700
Committer: Parth Brahmbhatt <br...@gmail.com>
Committed: Fri Mar 20 11:07:07 2015 -0700
----------------------------------------------------------------------
BYLAWS.md | 95 -
CHANGELOG.md | 1 +
LICENSE | 117 +-
docs/_includes/header.html | 13 +-
docs/css/main.scss | 3 +-
docs/documentation/BYLAWS.md | 98 +
docs/documentation/Powered-By.md | 2 +-
.../src/clj/backtype/storm/daemon/logviewer.clj | 47 +-
.../src/clj/backtype/storm/ui/helpers.clj | 21 -
storm-core/src/ui/public/component.html | 167 +-
.../src/ui/public/css/bootstrap-1.4.0.css | 2469 ------------------
.../src/ui/public/css/bootstrap-3.3.1.min.css | 5 +
.../src/ui/public/css/dataTables.bootstrap.css | 319 +++
.../public/css/jquery.dataTables.1.10.4.min.css | 1 +
storm-core/src/ui/public/css/style.css | 94 +-
.../src/ui/public/images/back_disabled.png | Bin 0 -> 1361 bytes
.../src/ui/public/images/back_enabled.png | Bin 0 -> 1379 bytes
.../src/ui/public/images/back_enabled_hover.png | Bin 0 -> 1375 bytes
.../src/ui/public/images/forward_disabled.png | Bin 0 -> 1363 bytes
.../src/ui/public/images/forward_enabled.png | Bin 0 -> 1380 bytes
.../ui/public/images/forward_enabled_hover.png | Bin 0 -> 1379 bytes
storm-core/src/ui/public/images/sort_asc.png | Bin 0 -> 1118 bytes
.../src/ui/public/images/sort_asc_disabled.png | Bin 0 -> 2916 bytes
storm-core/src/ui/public/images/sort_both.png | Bin 0 -> 1136 bytes
storm-core/src/ui/public/images/sort_desc.png | Bin 0 -> 1127 bytes
.../src/ui/public/images/sort_desc_disabled.png | Bin 0 -> 1045 bytes
storm-core/src/ui/public/index.html | 120 +-
.../src/ui/public/js/bootstrap-3.3.1.min.js | 7 +
storm-core/src/ui/public/js/bootstrap-twipsy.js | 310 ---
.../ui/public/js/dataTables.bootstrap.min.js | 8 +
.../src/ui/public/js/jquery-1.11.1.min.js | 4 +
storm-core/src/ui/public/js/jquery-1.6.2.min.js | 18 -
.../public/js/jquery.dataTables.1.10.4.min.js | 157 ++
.../src/ui/public/js/jquery.tablesorter.min.js | 5 -
storm-core/src/ui/public/js/script.js | 86 +-
.../templates/component-page-template.html | 128 +-
.../public/templates/index-page-template.html | 72 +-
.../templates/topology-page-template.html | 92 +-
.../src/ui/public/templates/user-template.html | 2 +-
storm-core/src/ui/public/topology.html | 132 +-
40 files changed, 1217 insertions(+), 3376 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/a11fcc30/storm-core/src/ui/public/index.html
----------------------------------------------------------------------
diff --cc storm-core/src/ui/public/index.html
index 4cd8e5e,0c5ea10..70218a6
--- a/storm-core/src/ui/public/index.html
+++ b/storm-core/src/ui/public/index.html
@@@ -1,3 -1,3 +1,4 @@@
++
<html><head>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
@@@ -28,24 -32,43 +33,49 @@@
<script src="/js/script.js" type="text/javascript"></script>
</head>
<body>
- <div id="ui-user">
- </div>
- <h1><a href="/">Storm UI</a></h1>
- <h2>Cluster Summary</h2>
- <div id="cluster-summary">
- </div>
- <h2>Nimbus Summary</h2>
- <div id="nimbus-summary">
- </div>
- <h2>Topology summary</h2>
- <div id="topology-summary">
+ <div class="container-fluid">
+ <div class="row">
+ <div class="col-md-11">
+ <h1><a href="/">Storm UI</a></h1>
+ </div>
+ <div id="ui-user" class="col-md-1"></div>
+ </div>
+ <div class="row">
+ <div class="col-md-12">
+ <h2>Cluster Summary</h2>
+ <div id="cluster-summary"></div>
+ </div>
+ </div>
+ <div class="row">
++ <div class="col-md-12">
++ <h2>Nimbus Summary</h2>
++ <div id="nimbus-summary"></div>
++ </div>
++ </div>
++ <div class="row">
+ <div class="col-md-12">
+ <h2>Topology Summary</h2>
+ <div id="topology-summary"></div>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-md-12">
+ <h2>Supervisor Summary</h2>
+ <div id="supervisor-summary"></div>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-md-12">
+ <h2>Nimbus Configuration</h2>
+ <div id="nimbus-configuration"></div>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-md-12">
+ <div id="json-response-error"></div>
+ </div>
+ </div>
</div>
- <h2>Supervisor summary</h2>
- <div id="supervisor-summary">
- </div>
- <h2>Nimbus Configuration</h2>
- <div id="nimbus-configuration"></div>
- <div id="json-response-error"></div>
</body>
<script>
@@@ -76,16 -106,9 +114,22 @@@ $(document).ready(function()
$.get("/templates/index-page-template.html", function(template) {
clusterSummary.append(Mustache.render($(template).filter("#cluster-summary-template").html(),response));
+ $('#cluster-summary [data-toggle="tooltip"]').tooltip();
});
});
+ $.getJSON("/api/v1/nimbus/summary",function(response,status,jqXHR) {
+ $.get("/templates/index-page-template.html", function(template) {
+ nimbusSummary.append(Mustache.render($(template).filter("#nimbus-summary-template").html(),response));
- if(response["nimbuses"].length > 0) {
- $("#nimbus-summary-table").tablesorter({ sortList: [[0,0]], headers: {3: { sorter: "stormtimestr"}}});
- }
++ //host, port, isLeader, version, uptime
++ dtAutoPage("#nimbus-summary-table", {
++ columnDefs: [
++ {type: "num", targets: [1]},
++ {type: "time-str", targets: [4]}
++ ]
++ });
++ $('#nimbus-summary [data-toggle="tooltip"]').tooltip();
+ });
+ });
$.getJSON("/api/v1/topology/summary",function(response,status,jqXHR) {
$.get("/templates/index-page-template.html", function(template) {
topologySummary.append(Mustache.render($(template).filter("#topology-summary-template").html(),response));
http://git-wip-us.apache.org/repos/asf/storm/blob/a11fcc30/storm-core/src/ui/public/templates/index-page-template.html
----------------------------------------------------------------------
diff --cc storm-core/src/ui/public/templates/index-page-template.html
index 84da576,298dfff..07f1afa
--- a/storm-core/src/ui/public/templates/index-page-template.html
+++ b/storm-core/src/ui/public/templates/index-page-template.html
@@@ -24,32 -24,37 +24,32 @@@
</span>
</th>
<th>
- <span class="tip above" title="The number of nodes in the cluster currently.">
- <span data-toggle="tooltip" data-placement="right" title="The duration the current Nimbus instance has been running. (Note that the storm cluster may have been deployed and available for a much longer period than the current Nimbus process has been running.)">
- Nimbus uptime
- </span>
- </th>
- <th>
+ <span data-toggle="tooltip" data-placement="above" title="The number of nodes in the cluster currently.">
Supervisors
-- </span>
++ </span>
</th>
<th>
- <span class="tip above" title="Slots are Workers (processes).">
+ <span data-toggle="tooltip" data-placement="above" title="Slots are Workers (processes).">
Used slots
-- </span>
++ </span>
</th>
<th>
- <span class="tip above" title="Slots are Workers (processes).">
+ <span data-toggle="tooltip" data-placement="above" title="Slots are Workers (processes).">
Free slots
-- </span>
++ </span>
</th>
<th>
- <span class="tip above" title="Slots are Workers (processes).">
+ <span data-toggle="tooltip" data-placement="above" title="Slots are Workers (processes).">
Total slots
-- </span>
++ </span>
</th>
<th>
- <span class="tip above" title="Executors are threads in a Worker process.">
+ <span data-toggle="tooltip" data-placement="above" title="Executors are threads in a Worker process.">
Executors
-- </span>
++ </span>
</th>
<th>
- <span class="tip left" title="A Task is an instance of a Bolt or Spout. The number of Tasks is almost always equal to the number of Executors.">
+ <span data-toggle="tooltip" data-placement="left" title="A Task is an instance of a Bolt or Spout. The number of Tasks is almost always equal to the number of Executors.">
Tasks
</span>
</th>
@@@ -68,44 -74,8 +68,44 @@@
</tbody>
</table>
</script>
+
+<script id="nimbus-summary-template" type="text/html">
+ <table class="zebra-striped" id="nimbus-summary-table">
+ <thead>
+ <tr>
+ <th>
- <span class="tip right" title="nimbus host name.">Host</span>
++ <span data-toggle="tooltip" data-placement="right" title="nimbus host name.">Host</span>
+ </th>
+ <th>
- <span class="tip above" title="Nimbus Thrift port number.">Port</span>
++ <span data-toggle="tooltip" data-placement="above" title="Nimbus Thrift port number.">Port</span>
+ </th>
+ <th>
- <span class="tip above" title="True if this host is leader, false otherwise.">IsLeader</span>
++ <span data-toggle="tooltip" data-placement="above" title="True if this host is leader, false otherwise.">IsLeader</span>
+ </th>
+ <th>
- <span class="tip left" title="Storm version this nimbus host is running.">Version</span>
++ <span data-toggle="tooltip" data-placement="above" title="Storm version this nimbus host is running.">Version</span>
+ </th>
+ <th>
- <span class="tip left" title="Time since this nimbus host has been running.">UpTime Seconds</span>
++ <span data-toggle="tooltip" data-placement="left" title="Time since this nimbus host has been running.">UpTime Seconds</span>
+ </th>
+ </tr>
+ </thead>
+ <tbody>
+ {{#nimbuses}}
+ <tr>
+ <td>{{host}}</td>
+ <td><a href="{{nimbusLogLink}}">{{port}}</a></td>
+ <td>{{isLeader}}</td>
+ <td>{{version}}</td>
+ <td>{{nimbusUpTime}}</td>
+ </tr>
+ {{/nimbuses}}
+ </tbody>
+ </table>
+</script>
+
<script id="topology-summary-template" type="text/html">
- <table class="zebra-striped" id="topology-summary-table">
+ <table class="table table-striped compact" id="topology-summary-table">
<thead>
<tr>
<th>
@@@ -149,12 -119,7 +149,12 @@@
</span>
</th>
<th>
- <span class="tip above" title="Number of nimbus hosts on which this topology's code is replicated. ">
++ <span data-toggle="tooltip" data-placement="above" title="Number of nimbus hosts on which this topology's code is replicated. ">
+ Replication count
+ </span>
+ </th>
+ <th>
- <span class="tip left" title="This shows information from the scheduler about the latest attempt to schedule the Topology on the cluster.">
+ <span data-toggle="tooltip" data-placement="left" title="This shows information from the scheduler about the latest attempt to schedule the Topology on the cluster.">
Scheduler Info
</span>
</th>
http://git-wip-us.apache.org/repos/asf/storm/blob/a11fcc30/storm-core/src/ui/public/templates/topology-page-template.html
----------------------------------------------------------------------
diff --cc storm-core/src/ui/public/templates/topology-page-template.html
index be65772,da7929c..c379720
--- a/storm-core/src/ui/public/templates/topology-page-template.html
+++ b/storm-core/src/ui/public/templates/topology-page-template.html
@@@ -59,12 -59,7 +59,12 @@@
</span>
</th>
<th>
- <span class="tip above" title="Number of nimbus hosts on which this topology's code is replicated. ">
++ <span cdata-toggle="tooltip" data-placement="above" title="Number of nimbus hosts on which this topology's code is replicated. ">
+ Replication count
+ </span>
+ </th>
+ <th>
- <span class="tip left" title="This shows information from the scheduler about the latest attempt to schedule the Topology on the cluster.">
+ <span data-toggle="tooltip" data-placement="left" title="This shows information from the scheduler about the latest attempt to schedule the Topology on the cluster.">
Scheduler Info
</span>
</th>