Index: solr/webapp/web/js/angular/controllers/cloud.js
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- solr/webapp/web/js/angular/controllers/cloud.js (revision 7570692e02a469fdbf3badb82ed7a991abcac103)
+++ solr/webapp/web/js/angular/controllers/cloud.js (date 1533293421000)
@@ -32,9 +32,6 @@
if (view === "tree") {
$scope.resetMenu("cloud-tree", Constants.IS_ROOT_PAGE);
treeSubController($scope, Zookeeper);
- } else if (view === "rgraph") {
- $scope.resetMenu("cloud-rgraph", Constants.IS_ROOT_PAGE);
- graphSubController($scope, Zookeeper, true);
} else if (view === "graph") {
$scope.resetMenu("cloud-graph", Constants.IS_ROOT_PAGE);
graphSubController($scope, Zookeeper, false);
@@ -544,7 +541,7 @@
return returntext.trim() === '' ? '0m' : returntext.trim();
}
-var graphSubController = function ($scope, Zookeeper, isRadial) {
+var graphSubController = function ($scope, Zookeeper) {
$scope.showTree = false;
$scope.showGraph = true;
@@ -699,7 +696,7 @@
$scope.helperData.state = $.unique($scope.helperData.state);
$scope.helperData.core_node = $.unique($scope.helperData.core_node);
- if (!isRadial && data.znode && data.znode.paging) {
+ if (data.znode && data.znode.paging) {
$scope.showPaging = true;
var parr = data.znode.paging.split('|');
@@ -733,7 +730,6 @@
}
$scope.graphData = graph_data;
$scope.leafCount = leaf_count;
- $scope.isRadial = isRadial;
});
});
};
@@ -749,7 +745,6 @@
data: "=",
leafCount: "=",
helperData: "=",
- isRadial: "="
},
link: function (scope, element, attrs) {
var helper_path_class = function (p) {
@@ -832,11 +827,7 @@
scope.$watch("data", function(newValue, oldValue) {
if (newValue) {
- if (scope.isRadial) {
- radialGraph(element, scope.data, scope.leafCount);
- } else {
- flatGraph(element, scope.data, scope.leafCount);
- }
+ flatGraph(element, scope.data, scope.leafCount);
}
$('text').tooltip({
@@ -923,61 +914,6 @@
setNodeNavigationBehavior(node);
};
-
- var radialGraph = function(element, graphData, leafCount) {
- var max_val = Math.min(element.width(), $('body').height())
- var r = max_val / 2;
-
- var cluster = d3.layout.cluster()
- .size([360, r - 160]);
-
- var diagonal = d3.svg.diagonal.radial()
- .projection(function (d) {
- return [d.y, d.x / 180 * Math.PI];
- });
-
- d3.select('#canvas', element).html('');
- var vis = d3.select('#canvas').append('svg')
- .attr('width', r * 2)
- .attr('height', r * 2)
- .append('g')
- .attr('transform', 'translate(' + r + ',' + r + ')');
-
- var nodes = cluster.nodes(graphData);
-
- var link = vis.selectAll('path.link')
- .data(cluster.links(nodes))
- .enter().append('path')
- .attr('class', helper_path_class)
- .attr('d', diagonal);
-
- var node = vis.selectAll('g.node')
- .data(nodes)
- .enter().append('g')
- .attr('class', helper_node_class)
- .attr('transform', function (d) {
- return 'rotate(' + (d.x - 90) + ')translate(' + d.y + ')';
- })
-
- node.append('circle')
- .attr('r', 4.5);
-
- node.append('text')
- .attr('dx', function (d) {
- return d.x < 180 ? 8 : -8;
- })
- .attr('dy', '.31em')
- .attr('text-anchor', function (d) {
- return d.x < 180 ? 'start' : 'end';
- })
- .attr('transform', function (d) {
- return d.x < 180 ? null : 'rotate(180)';
- })
- .attr("title", helper_tooltip_text)
- .text(helper_node_text);
-
- setNodeNavigationBehavior(node, "rgraph");
- }
}
};
});
Index: solr/solr-ref-guide/src/cloud-screens.adoc
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- solr/solr-ref-guide/src/cloud-screens.adoc (revision cb8379b9070242a75f0439d80153a4f1eb3e143b)
+++ solr/solr-ref-guide/src/cloud-screens.adoc (date 1533293625000)
@@ -26,7 +26,7 @@
The "Cloud" menu option is only available on Solr instances running in <
>. Single node or master/slave replication instances of Solr will not display this option.
====
-Click on the "Cloud" option in the left-hand navigation, and a small sub-menu appears with options called "Nodes", "Tree", "Graph" and "Graph (Radial)". The sub-view selected by default is "Graph".
+Click on the "Cloud" option in the left-hand navigation, and a small sub-menu appears with options called "Nodes", "Tree" and "Graph". The sub-view selected by default is "Graph".
== Nodes view
The "Nodes" view shows a list of the hosts and nodes in the cluster along with key information for each: "CPU", "Heap", "Disk usage", "Requests", "Collections" and "Replicas".
@@ -42,7 +42,7 @@
As an aid to debugging, the data shown in the "Tree" view can be exported locally using the following command `bin/solr zk ls -r /`
-== Graph views
+== Graph view
The "Graph" view shows a graph of each collection, the shards that make up those collections, and the addresses and type ("NRT", "TLOG" or "PULL") of each replica for each shard.
This example shows a simple cluster. In addition to the 2 shard, 2 replica "gettingstarted" collection, there is an additional "tlog" collection consisting of mixed TLOG and PULL replica types.
@@ -51,8 +51,4 @@
Tooltips appear when hovering over each replica giving additional information.
-image::images/cloud-screens/cloud-hover.png[image,width=512,height=250]
-
-The "Graph (Radial)" option provides a different visual view of each node. Using the same example cluster, the radial graph view looks like:
-
-image::images/cloud-screens/cloud-radial.png[image,width=478,height=250]
+image::images/cloud-screens/cloud-hover.png[image,width=512,height=250]
\ No newline at end of file
Index: solr/webapp/web/css/angular/menu.css
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- solr/webapp/web/css/angular/menu.css (revision 7570692e02a469fdbf3badb82ed7a991abcac103)
+++ solr/webapp/web/css/angular/menu.css (date 1533293421000)
@@ -262,7 +262,6 @@
#menu #cloud.global .tree a { background-image: url( ../../img/ico/folder-tree.png ); }
#menu #cloud.global .nodes a { background-image: url( ../../img/solr-ico.png ); }
#menu #cloud.global .graph a { background-image: url( ../../img/ico/molecule.png ); }
-#menu #cloud.global .rgraph a { background-image: url( ../../img/ico/asterisk.png ); }
.sub-menu .ping.error a
{
diff --git solr/solr-ref-guide/src/images/cloud-screens/cloud-radial.png solr/solr-ref-guide/src/images/cloud-screens/cloud-radial.png
deleted file mode 100644
index 76f9e1e13c51ada7a4e34d8b8bc85f46e66f7744..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@