Merge branch 'STORM-1994_add_per_worker_components_and_resource_usage_1x' of https://github.com/abellina/storm into STORM-1994-1.x
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/39544ead Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/39544ead Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/39544ead Branch: refs/heads/1.x-branch Commit: 39544ead3201d2915c53881896357958076735a4 Parents: ce38849 0e0bcf2 Author: Jungtaek Lim <[email protected]> Authored: Mon Aug 22 17:17:18 2016 +0900 Committer: Jungtaek Lim <[email protected]> Committed: Mon Aug 22 17:17:18 2016 +0900 ---------------------------------------------------------------------- docs/STORM-UI-REST-API.md | 121 +- docs/images/supervisor_page.png | Bin 0 -> 133290 bytes .../src/clj/org/apache/storm/daemon/nimbus.clj | 296 +- storm-core/src/clj/org/apache/storm/stats.clj | 68 +- storm-core/src/clj/org/apache/storm/ui/core.clj | 94 +- .../org/apache/storm/generated/Assignment.java | 244 +- .../storm/generated/ClusterWorkerHeartbeat.java | 52 +- .../storm/generated/ComponentPageInfo.java | 220 +- .../org/apache/storm/generated/Credentials.java | 44 +- .../jvm/org/apache/storm/generated/HBNodes.java | 32 +- .../org/apache/storm/generated/HBRecords.java | 36 +- .../storm/generated/LSApprovedWorkers.java | 44 +- .../generated/LSSupervisorAssignments.java | 48 +- .../apache/storm/generated/LSTopoHistory.java | 64 +- .../storm/generated/LSTopoHistoryList.java | 36 +- .../storm/generated/LSWorkerHeartbeat.java | 36 +- .../apache/storm/generated/ListBlobsResult.java | 32 +- .../apache/storm/generated/LocalAssignment.java | 36 +- .../apache/storm/generated/LocalStateData.java | 48 +- .../org/apache/storm/generated/LogConfig.java | 48 +- .../jvm/org/apache/storm/generated/Nimbus.java | 3486 ++++++++++++------ .../org/apache/storm/generated/NodeInfo.java | 32 +- .../storm/generated/RebalanceOptions.java | 44 +- .../storm/generated/SettableBlobMeta.java | 36 +- .../org/apache/storm/generated/StormBase.java | 92 +- .../apache/storm/generated/SupervisorInfo.java | 152 +- .../storm/generated/SupervisorPageInfo.java | 624 ++++ .../storm/generated/TopologyHistoryInfo.java | 32 +- .../storm/generated/TopologyPageInfo.java | 284 +- .../apache/storm/generated/WorkerSummary.java | 1880 ++++++++++ .../jvm/org/apache/storm/scheduler/Cluster.java | 217 +- .../resource/ResourceAwareScheduler.java | 9 + .../auth/authorizer/SimpleACLAuthorizer.java | 7 +- storm-core/src/py/storm/Nimbus-remote | 7 + storm-core/src/py/storm/Nimbus.py | 272 +- storm-core/src/py/storm/ttypes.py | 1457 ++++++-- storm-core/src/storm.thrift | 25 + storm-core/src/ui/public/component.html | 8 + storm-core/src/ui/public/css/style.css | 20 + storm-core/src/ui/public/js/script.js | 191 + storm-core/src/ui/public/supervisor.html | 132 + .../public/templates/index-page-template.html | 4 +- .../templates/supervisor-page-template.html | 145 + .../templates/topology-page-template.html | 208 +- storm-core/src/ui/public/topology.html | 12 +- .../test/clj/org/apache/storm/nimbus_test.clj | 72 +- .../test/clj/org/apache/storm/stats_test.clj | 134 + 47 files changed, 8820 insertions(+), 2361 deletions(-) ----------------------------------------------------------------------
