+
JVM: {{node.jvm_version}}
ES: {{node.es_version}}
diff --git a/src/app/components/overview/controller.js b/src/app/components/overview/controller.js
index 68a3f294..cfc253d5 100644
--- a/src/app/components/overview/controller.js
+++ b/src/app/components/overview/controller.js
@@ -14,7 +14,7 @@ angular.module('cerebro').controller('OverviewController', ['$scope', '$http',
$scope.special_indices = 0;
$scope.shardAllocation = true;
- $scope.indices_filter = new IndexFilter('', false, false, true, true, 0);
+ $scope.indices_filter = new IndexFilter('', [], false, false, true, true, 0);
$scope.nodes_filter = new NodeFilter('', true, false, false, false, 0);
$scope.getPageSize = function() {
@@ -93,6 +93,14 @@ angular.module('cerebro').controller('OverviewController', ['$scope', '$http',
$scope.$watch('nodes_filter', function() {
if ($scope.data) {
$scope.setNodes($scope.data.nodes);
+ if ($scope.nodes_filter.name) {
+ $scope.indices_filter.nodes = $scope.nodes.map(function (node) {
+ return node.id;
+ });
+ } else {
+ $scope.indices_filter.nodes = [];
+ }
+ $scope.setIndices($scope.data.indices);
}
},
true);
diff --git a/src/app/shared/node_filter.js b/src/app/shared/node_filter.js
index e997c8c5..e7249dcb 100644
--- a/src/app/shared/node_filter.js
+++ b/src/app/shared/node_filter.js
@@ -36,11 +36,53 @@ function NodeFilter(name, data, master, ingest, coordinating, timestamp) {
};
this.matches = function(node) {
- if (this.isBlank()) {
- return true;
- } else {
- return this.matchesName(node.name) && this.matchesType(node);
+ var matches = true;
+ if (!this.matchesType(node)) {
+ matches = false;
}
+ if (matches && this.name) {
+ try {
+ var regExp = new RegExp(this.name.trim(), 'i');
+ matches = regExp.test(node.name);
+ if (!matches) {
+ var attrs = Object.values(node.attributes);
+ for (var idx = 0; idx < attrs.length; idx++) {
+ if ((matches = regExp.test(attrs[idx]))) {
+ break;
+ }
+ }
+ }
+ if (!matches) {
+ for (idx = 0; idx < node.roles.length; idx++) {
+ if ((matches = regExp.test(node.roles[idx]))) {
+ break;
+ }
+ }
+ }
+ } catch (err) { // if not valid regexp, still try normal matching
+ matches = node.name.indexOf(this.name.toLowerCase()) != -1;
+ if (!matches) {
+ var _attrs = Object.values(node.attributes);
+ for (var _idx = 0; _idx < _attrs.length; _idx++) {
+ var attr = _attrs[_idx].toLowerCase();
+ matches = true;
+ if ((matches = (attr.indexOf(this.name.toLowerCase()) != -1))) {
+ break;
+ }
+ }
+ }
+ if (!matches) {
+ for (_idx = 0; _idx < node.roles.length; _idx++) {
+ var role = node.roles[_idx].toLowerCase();
+ matches = true;
+ if ((matches = (role.indexOf(this.name.toLowerCase()) != -1))) {
+ break;
+ }
+ }
+ }
+ }
+ }
+ return matches;
};
this.matchesType = function(node) {
@@ -51,12 +93,4 @@ function NodeFilter(name, data, master, ingest, coordinating, timestamp) {
node.coordinating && this.coordinating
);
};
-
- this.matchesName = function(name) {
- if (this.name) {
- return name.toLowerCase().indexOf(this.name.toLowerCase()) != -1;
- } else {
- return true;
- }
- };
}
diff --git a/test/models/overview/ClusterInitializingShards.scala b/test/models/overview/ClusterInitializingShards.scala
index 6e817b79..8a6a0007 100644
--- a/test/models/overview/ClusterInitializingShards.scala
+++ b/test/models/overview/ClusterInitializingShards.scala
@@ -12,6 +12,19 @@ object ClusterInitializingShards {
| "cluster_name" : "elasticsearch",
| "master_node" : "cPsT9o5FQ3WRnvqSTXHiVQ",
| "blocks" : { },
+ | "metadata" : {
+ | "indices" : {
+ | "hello" : {
+ | "settings" : {
+ | "index" : {
+ | "number_of_shards" : "1",
+ | "number_of_replicas" : "1"
+ | }
+ | },
+ | "aliases" : [ ]
+ | }
+ | }
+ | },
| "routing_table" : {
| "indices" : {
| "hello" : {
diff --git a/test/models/overview/ClusterRelocatingShards.scala b/test/models/overview/ClusterRelocatingShards.scala
index 8a0725b4..71724aeb 100644
--- a/test/models/overview/ClusterRelocatingShards.scala
+++ b/test/models/overview/ClusterRelocatingShards.scala
@@ -10,6 +10,19 @@ object ClusterRelocatingShards extends ClusterStub {
| "cluster_name" : "elasticsearch",
| "master_node" : "cPsT9o5FQ3WRnvqSTXHiVQ",
| "blocks" : { },
+ | "metadata" : {
+ | "indices" : {
+ | "hello" : {
+ | "settings" : {
+ | "index" : {
+ | "number_of_shards" : "1",
+ | "number_of_replicas" : "1"
+ | }
+ | },
+ | "aliases" : [ ]
+ | }
+ | }
+ | },
| "routing_table" : {
| "indices" : {
| "hello" : {
diff --git a/test/models/overview/ClusterWithData.scala b/test/models/overview/ClusterWithData.scala
index 50880ce8..69f4ffa5 100644
--- a/test/models/overview/ClusterWithData.scala
+++ b/test/models/overview/ClusterWithData.scala
@@ -20,6 +20,28 @@ trait ClusterWithData extends ClusterStub {
| }
| }
| },
+ | "metadata" : {
+ | "indices" : {
+ | "foo" : {
+ | "settings" : {
+ | "index" : {
+ | "number_of_shards" : "1",
+ | "number_of_replicas" : "1"
+ | }
+ | },
+ | "aliases" : [ ]
+ | },
+ | "bar" : {
+ | "settings" : {
+ | "index" : {
+ | "number_of_shards" : "1",
+ | "number_of_replicas" : "1"
+ | }
+ | },
+ | "aliases" : [ ]
+ | }
+ | }
+ | },
| "routing_table": {
| "indices": {
| "bar": {
diff --git a/test/models/overview/ClusterWithoutData.scala b/test/models/overview/ClusterWithoutData.scala
index f4756168..d1321705 100644
--- a/test/models/overview/ClusterWithoutData.scala
+++ b/test/models/overview/ClusterWithoutData.scala
@@ -16,6 +16,11 @@ object ClusterWithoutData extends ClusterStub {
| "indices":{
|
| }
+ | },
+ | "metadata":{
+ | "indices":{
+ |
+ | }
| }
|}
""".stripMargin