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 2017/09/08 13:55:20 UTC
[1/2] storm git commit: STORM-2533 Visualization API returns "spout"
for system components
Repository: storm
Updated Branches:
refs/heads/master 06f8bc7ab -> 306f399e9
STORM-2533 Visualization API returns "spout" for system components
* also fixed STORM-2534 Visualization API missing stats/instances for "system" components
* one thing which should be fixed in issue description is "__system" shouldn't be shown
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/fee498d0
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/fee498d0
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/fee498d0
Branch: refs/heads/master
Commit: fee498d003385fe48c2e38e8707ba35f8bece77a
Parents: 9d62c13
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Fri Sep 1 18:29:13 2017 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Fri Sep 1 18:29:13 2017 +0900
----------------------------------------------------------------------
storm-core/src/clj/org/apache/storm/ui/core.clj | 4 +++-
storm-core/src/ui/public/js/script.js | 6 +++---
storm-core/src/ui/public/js/visualization.js | 2 +-
storm-core/src/ui/public/templates/topology-page-template.html | 2 +-
storm-core/src/ui/public/topology.html | 5 +++--
5 files changed, 11 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/fee498d0/storm-core/src/clj/org/apache/storm/ui/core.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/org/apache/storm/ui/core.clj b/storm-core/src/clj/org/apache/storm/ui/core.clj
index 7cf34ae..e269c36 100644
--- a/storm-core/src/clj/org/apache/storm/ui/core.clj
+++ b/storm-core/src/clj/org/apache/storm/ui/core.clj
@@ -223,7 +223,9 @@
(defn visualization-data
[spout-bolt spout-comp-summs bolt-comp-summs window storm-id]
- (let [components (for [[id spec] spout-bolt]
+ (let [components (for [[id spec] spout-bolt
+ :when (or (contains? bolt-comp-summs id)
+ (contains? spout-comp-summs id))]
[id
(let [inputs (.get_inputs (.get_common spec))
bolt-summs (.get bolt-comp-summs id)
http://git-wip-us.apache.org/repos/asf/storm/blob/fee498d0/storm-core/src/ui/public/js/script.js
----------------------------------------------------------------------
diff --git a/storm-core/src/ui/public/js/script.js b/storm-core/src/ui/public/js/script.js
index 1404061..40b49e0 100644
--- a/storm-core/src/ui/public/js/script.js
+++ b/storm-core/src/ui/public/js/script.js
@@ -469,8 +469,8 @@ function toggleComponents(elId) {
});
}
-function open_visualization() {
- window.open('/visualize.html?id='+ $.url("?id"), '_blank');
+function open_visualization(sys) {
+ window.open('/visualize.html?id='+ $.url("?id") + "&sys=" + sys, '_blank');
}
function show_visualization(sys) {
@@ -482,7 +482,7 @@ function show_visualization(sys) {
Mustache.render($(template)
.filter("#topology-visualization-container-template")
.html(),
- {id: $.url("?id")}));
+ {id: $.url("?id"), sys: sys}));
}
});
http://git-wip-us.apache.org/repos/asf/storm/blob/fee498d0/storm-core/src/ui/public/js/visualization.js
----------------------------------------------------------------------
diff --git a/storm-core/src/ui/public/js/visualization.js b/storm-core/src/ui/public/js/visualization.js
index cccb07b..ced984d 100644
--- a/storm-core/src/ui/public/js/visualization.js
+++ b/storm-core/src/ui/public/js/visualization.js
@@ -321,7 +321,7 @@ function isStreamEnabled(streamIdSanitized) {
var update = function() {
if(visNS.shouldUpdate) {
$.ajax({
- url: "/api/v1/topology/"+$.url("?id")+"/visualization",
+ url: "/api/v1/topology/"+$.url("?id")+"/visualization?sys="+$.url("?sys"),
success: function (data, status, jqXHR) {
json = data;
parseResponse(data);
http://git-wip-us.apache.org/repos/asf/storm/blob/fee498d0/storm-core/src/ui/public/templates/topology-page-template.html
----------------------------------------------------------------------
diff --git a/storm-core/src/ui/public/templates/topology-page-template.html b/storm-core/src/ui/public/templates/topology-page-template.html
index 587230b..49cb314 100644
--- a/storm-core/src/ui/public/templates/topology-page-template.html
+++ b/storm-core/src/ui/public/templates/topology-page-template.html
@@ -313,7 +313,7 @@
</script>
<script id="topology-visualization-container-template" type="text/html">
-<iframe src="/visualize.html?id={{id}}" width="100%" height="500px"></iframe>
+<iframe src="/visualize.html?id={{id}}&sys={{sys}}" width="100%" height="500px"></iframe>
</script>
<script id="topology-visualization-template" type="text/html">
http://git-wip-us.apache.org/repos/asf/storm/blob/fee498d0/storm-core/src/ui/public/topology.html
----------------------------------------------------------------------
diff --git a/storm-core/src/ui/public/topology.html b/storm-core/src/ui/public/topology.html
index d7d77a1..2eac3a4 100644
--- a/storm-core/src/ui/public/topology.html
+++ b/storm-core/src/ui/public/topology.html
@@ -340,8 +340,9 @@ $(document).ready(function() {
jsError(function() {
topologyVisualization.append(Mustache.render($(template).filter("#topology-visualization-template").html(), response));
- $("#show-hide-visualization").click(function () { show_visualization(null) });
- $("#open-visualization").click(function() { open_visualization(); });
+ var sys = $.cookies.get("sys") || "false";
+ $("#show-hide-visualization").click(function () { show_visualization(sys) });
+ $("#open-visualization").click(function() { open_visualization(sys); });
config.append(Mustache.render($(template).filter("#topology-configuration-template").html(),formattedConfig));
$('#topology-configuration td').jsonFormatter()
[2/2] storm git commit: Merge branch 'STORM-2533' of
https://github.com/HeartSaVioR/storm into STORM-2533
Posted by bo...@apache.org.
Merge branch 'STORM-2533' of https://github.com/HeartSaVioR/storm into STORM-2533
STORM-2533: Visualization API returns "spout" for system components
This closes #2305
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/306f399e
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/306f399e
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/306f399e
Branch: refs/heads/master
Commit: 306f399e9a5a9348c25b64ae33f0a7b6a7d2ea9d
Parents: 06f8bc7 fee498d
Author: Robert Evans <ev...@yahoo-inc.com>
Authored: Fri Sep 8 08:36:59 2017 -0500
Committer: Robert Evans <ev...@yahoo-inc.com>
Committed: Fri Sep 8 08:36:59 2017 -0500
----------------------------------------------------------------------
storm-core/src/clj/org/apache/storm/ui/core.clj | 4 +++-
storm-core/src/ui/public/js/script.js | 6 +++---
storm-core/src/ui/public/js/visualization.js | 2 +-
storm-core/src/ui/public/templates/topology-page-template.html | 2 +-
storm-core/src/ui/public/topology.html | 5 +++--
5 files changed, 11 insertions(+), 8 deletions(-)
----------------------------------------------------------------------