+
JVM: {{node.jvm_version}}
ES: {{node.es_version}}
diff --git a/src/app/app.routes.js b/src/app/app.routes.js
index 5704813a..d6e65915 100644
--- a/src/app/app.routes.js
+++ b/src/app/app.routes.js
@@ -55,6 +55,10 @@ angular.module('cerebro', ['ngRoute', 'ngAnimate', 'ui.bootstrap'])
templateUrl: 'cat/index.html',
controller: 'CatController',
})
+ .when('/indices', {
+ templateUrl: 'indices_view/index.html',
+ controller: 'IndicesController',
+ })
.otherwise({
redirectTo: '/connect',
}
diff --git a/src/app/components/connect/controller.js b/src/app/components/connect/controller.js
index a5310b59..640939bb 100644
--- a/src/app/components/connect/controller.js
+++ b/src/app/components/connect/controller.js
@@ -34,6 +34,7 @@ angular.module('cerebro').controller('ConnectController', [
$location.path('/overview');
break;
case 401:
+ case 403:
$scope.unauthorized = true;
break;
default:
diff --git a/src/app/components/indices_view/controller.js b/src/app/components/indices_view/controller.js
new file mode 100644
index 00000000..dafb1bb7
--- /dev/null
+++ b/src/app/components/indices_view/controller.js
@@ -0,0 +1,223 @@
+angular.module('cerebro').controller('IndicesController', ['$scope',
+ 'IndicesDataService', 'AlertService', 'RefreshService', 'OverviewDataService',
+ function($scope, IndicesDataService, AlertService, RefreshService, OverviewDataService) {
+ $scope.paginator = new Paginator(1, 20, [],
+ new IndicesFilter(''));
+ $scope.$watch('paginator', function(filter, previous) {
+ $scope.page = $scope.paginator.getPage();
+ }, true);
+
+ $scope._indices = undefined; // keeps unfiltered list of nodes
+ $scope.indices = undefined;
+
+ $scope.sortBy = 'totalSize';
+ $scope.reverse = true;
+ $scope.data = undefined;
+ $scope.merge = true;
+ $scope.special = false;
+
+ $scope.pattern = '[^a-z]+$';
+
+ $scope.$watch(
+ function() {
+ return RefreshService.lastUpdate();
+ },
+ function() {
+ $scope.refresh();
+ },
+ true
+ );
+
+ $scope.$watch('paginator', function() {
+ $scope.page = $scope.paginator.getPage();
+ },
+ true);
+ $scope.$watch('merge', function() {
+ $scope.paginator.setCollection($scope.refreshMergeIndices());
+ $scope.page = $scope.paginator.getPage();
+ },
+ true);
+ $scope.$watch('special', function() {
+ $scope.paginator.setCollection($scope.refreshMergeIndices());
+ $scope.page = $scope.paginator.getPage();
+ },
+ true);
+
+ $scope.refreshMergeIndices = function() {
+ var arr;
+ if ($scope.merge) {
+ arr = $scope.mergetIndexName($scope._indices, $scope.pattern);
+ } else {
+ arr = $scope.reBuildOriginData($scope._indices);
+ }
+ arr.sort(function(v1, v2) {
+ var number;
+ if (typeof v1[$scope.sortBy] !== 'string' || typeof v2[$scope.sortBy] !== 'string') {
+ number = (v1[$scope.sortBy] < v2[$scope.sortBy]) ? -1 : 1;
+ } else {
+ number = v1.index.localeCompare(v2.index);
+ }
+ if ($scope.reverse) {
+ return 0 - number;
+ } else {
+ return number;
+ }
+ });
+ if (!$scope.special) {
+ var result = arr.filter(function(value) {
+ return !value.index.startsWith('.');
+ });
+ return result;
+ }
+ return arr;
+ };
+ $scope.setSortBy = function(field) {
+ if ($scope.sortBy === field) {
+ $scope.reverse = !$scope.reverse;
+ }
+ $scope.sortBy = field;
+ $scope.paginator = new Paginator(1, 20, $scope.refreshMergeIndices(),
+ new IndicesFilter($scope.paginator.filter.index));
+ $scope.page = $scope.paginator.getPage();
+ };
+
+ $scope.setindices = function(indices) {
+ $scope._indices = indices;
+ };
+
+ $scope.refresh = function() {
+ OverviewDataService.getOverview(
+ function(data) {
+ $scope.data = data;
+ },
+ function(error) {
+ AlertService.error('Error while loading data', error);
+ $scope.data = undefined;
+ }
+ );
+ IndicesDataService.load(
+ function(data) {
+ $scope.setindices(data.indices);
+ $scope.paginator.setCollection($scope.refreshMergeIndices());
+ $scope.page = $scope.paginator.getPage();
+ },
+ function(error) {
+ $scope.setindices(undefined);
+ AlertService.error('Error while loading nodes data', error);
+ }
+ );
+ };
+ $scope.mergetIndexName = function(tempData, pattern) {
+ var resultDataArray = [];
+ var map = new Map();
+ var regx = new RegExp(pattern);
+ for (var key in tempData) {
+ if (tempData.hasOwnProperty(key)) {
+ var result = regx.exec(key);
+ var prefix = '';
+ if (result != null && result.index > 0) {
+ prefix = key.substring(0, result.index);
+ } else {
+ prefix = key;
+ }
+ if (map.has(prefix)) {
+ var temp = map.get(prefix);
+ temp.push(tempData[key]);
+ map.set(prefix, temp);
+ } else {
+ var temp1 = [];
+ temp1.push(tempData[key]);
+ map.set(prefix, temp1);
+ }
+ }
+ }
+ map.forEach(function(value, key) {
+ var size = 0;
+ var totalDocs = 0;
+ var primariesSize = 0;
+ var primariesDocs = 0;
+ var search = 0;
+ var get = 0;
+ var query = 0;
+ for (var i = 0, len = value.length; i < len; i++) {
+ var data = value[i];
+ var indexSize = data.total.store.size_in_bytes;
+ size = size + indexSize;
+ totalDocs = totalDocs + data.total.docs.count;
+ primariesSize = primariesSize + data.primaries.store.size_in_bytes;
+ primariesDocs = primariesDocs + data.primaries.docs.count;
+ search = search + data.total.search.query_total;
+ get = get + data.total.get.total;
+ query = query + data.total.query_cache.total_count;
+ }
+ var obj = {
+ index: key + '*(' + value.length + ')',
+ totalSize: size,
+ totalDocs: totalDocs,
+ primariesSize: primariesSize,
+ primariesDocs: primariesDocs,
+ searchCount: search,
+ getCount: get,
+ queryCount: query,
+ };
+ resultDataArray.push(obj);
+ });
+
+ return resultDataArray;
+ };
+ $scope.reBuildOriginData = function(orignData) {
+ var arr1 = [];
+ for (var key in orignData) {
+ if (orignData.hasOwnProperty(key)) {
+ var element = orignData[key];
+ var obj = {
+ index: key,
+ totalSize: element.total.store.size_in_bytes,
+ totalDocs: element.total.docs.count,
+ primariesSize: element.primaries.store.size_in_bytes,
+ primariesDocs: element.primaries.docs.count,
+ searchCount: element.total.search.query_total,
+ getCount: element.total.get.total,
+ queryCount: element.total.query_cache.total_count,
+ };
+ arr1.push(obj);
+ }
+ }
+ return arr1;
+ };
+ $scope.formatBytes = function(size) {
+ if (size == undefined) {
+ return '';
+ }
+ var kb = 1024;
+ var mb = 1024 * 1024;
+ var gb = 1024 * 1024 * 1024;
+ var tb = 1024 * 1024 * 1024 * 1024;
+ if (size > tb) {
+ size = (size / tb).toFixed(2) + ' TB';
+ } else if (size > gb) {
+ size = (size / gb).toFixed(2) + ' GB';
+ } else if (size > mb) {
+ size = (size / mb).toFixed(2) + ' MB';
+ } else {
+ size = (size / kb).toFixed(2) + ' KB';
+ }
+ return size;
+ };
+ $scope.renderNum = function(numValue) {
+ if (numValue == undefined) {
+ return '';
+ }
+ var num = (numValue || 0).toString();
+ var result = '';
+ while (num.length > 3) {
+ result = ',' + num.slice(-3) + result;
+ num = num.slice(0, num.length - 3);
+ }
+ if (num) {
+ result = num + result;
+ }
+ return result;
+ };
+ }]
+);
diff --git a/src/app/components/indices_view/data.js b/src/app/components/indices_view/data.js
new file mode 100644
index 00000000..0ec446e6
--- /dev/null
+++ b/src/app/components/indices_view/data.js
@@ -0,0 +1,9 @@
+angular.module('cerebro').factory('IndicesDataService', ['DataService',
+ function(DataService) {
+ this.load = function(success, error) {
+ DataService.send('indices', {}, success, error);
+ };
+
+ return this;
+ },
+]);
diff --git a/src/app/components/indices_view/indices_filter.js b/src/app/components/indices_view/indices_filter.js
new file mode 100644
index 00000000..4b27b0a1
--- /dev/null
+++ b/src/app/components/indices_view/indices_filter.js
@@ -0,0 +1,34 @@
+function IndicesFilter(index) {
+ this.index = index;
+ this.clone = function() {
+ // eslint-disable-next-line no-unused-vars
+ return new IndicesFilter(this.index);
+ };
+
+ this.getSorting = function() {
+ return function(a, b) {
+ return 0;
+ };
+ };
+
+ this.equals = function(other) {
+ return (other !== null &&
+ this.index == other);
+ };
+
+ this.isBlank = function() {
+ return !this.index;
+ };
+
+ this.matches = function(alias) {
+ if (this.isBlank()) {
+ return true;
+ } else {
+ var matches = true;
+ if (this.index) {
+ matches = alias.index.indexOf(this.index) != -1;
+ }
+ return matches;
+ }
+ };
+}
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/components/templates/index_template_filter.js b/src/app/components/templates/index_template_filter.js
index f697d049..eedd0ea5 100644
--- a/src/app/components/templates/index_template_filter.js
+++ b/src/app/components/templates/index_template_filter.js
@@ -1,40 +1,43 @@
-function IndexTemplateFilter(name, pattern) {
- this.name = name;
- this.pattern = pattern;
+// eslint-disable-next-line no-unused-vars
+class IndexTemplateFilter {
+ constructor(name, pattern) {
+ this.name = name;
+ this.pattern = pattern;
- this.clone = function() {
- // eslint-disable-next-line no-unused-vars
- return new IndexTemplateFilter(name, pattern);
- };
+ this.clone = function() {
+ // eslint-disable-next-line no-unused-vars
+ return new IndexTemplateFilter(name, pattern);
+ };
- this.getSorting = function() {
- return function(a, b) {
- return a.name.localeCompare(b.name);
+ this.getSorting = function() {
+ return function(a, b) {
+ return a.name.localeCompare(b.name);
+ };
};
- };
- this.equals = function(other) {
- return (other !== null &&
- this.name === other.name &&
- this.pattern === other.pattern);
- };
+ this.equals = function(other) {
+ return (other !== null &&
+ this.name === other.name &&
+ this.pattern === other.pattern);
+ };
- this.isBlank = function() {
- return !this.name && !this.pattern;
- };
+ this.isBlank = function() {
+ return !this.name && !this.pattern;
+ };
- this.matches = function(template) {
- if (this.isBlank()) {
- return true;
- } else {
- var matches = true;
- if (this.name) {
- matches = template.name.indexOf(this.name) != -1;
+ this.matches = function(template) {
+ if (this.isBlank()) {
+ return true;
+ } else {
+ var matches = true;
+ if (this.name) {
+ matches = template.name.indexOf(this.name) != -1;
+ }
+ if (matches && this.pattern) {
+ matches = template.template.template.indexOf(this.pattern) != -1;
+ }
+ return matches;
}
- if (matches && this.pattern) {
- matches = template.template.template.indexOf(this.pattern) != -1;
- }
- return matches;
- }
- };
+ };
+ }
}
diff --git a/src/app/shared/alias_filter.js b/src/app/shared/alias_filter.js
index d3061e3a..e45a6e6b 100644
--- a/src/app/shared/alias_filter.js
+++ b/src/app/shared/alias_filter.js
@@ -1,43 +1,46 @@
-function AliasFilter(index, alias) {
- this.index = index;
- this.alias = alias;
+// eslint-disable-next-line no-unused-vars
+class AliasFilter {
+ constructor(index, alias) {
+ this.index = index;
+ this.alias = alias;
- this.clone = function() {
- // eslint-disable-next-line no-unused-vars
- return new AliasFilter(this.index, this.alias);
- };
+ this.clone = function() {
+ // eslint-disable-next-line no-unused-vars
+ return new AliasFilter(this.index, this.alias);
+ };
- this.getSorting = function() {
- return function(a, b) {
- if (a.alias === b.alias) {
- return a.index.localeCompare(b.index);
- }
- return a.alias.localeCompare(b.alias);
+ this.getSorting = function() {
+ return function(a, b) {
+ if (a.alias === b.alias) {
+ return a.index.localeCompare(b.index);
+ }
+ return a.alias.localeCompare(b.alias);
+ };
};
- };
- this.equals = function(other) {
- return (other !== null &&
- this.index == other.index &&
- this.alias == other.alias);
- };
+ this.equals = function(other) {
+ return (other !== null &&
+ this.index == other.index &&
+ this.alias == other.alias);
+ };
- this.isBlank = function() {
- return !this.index && !this.alias;
- };
+ this.isBlank = function() {
+ return !this.index && !this.alias;
+ };
- this.matches = function(alias) {
- if (this.isBlank()) {
- return true;
- } else {
- var matches = true;
- if (this.index) {
- matches = alias.index.indexOf(this.index) != -1;
- }
- if (matches && this.alias) {
- matches = alias.alias.indexOf(this.alias) != -1;
+ this.matches = function(alias) {
+ if (this.isBlank()) {
+ return true;
+ } else {
+ var matches = true;
+ if (this.index) {
+ matches = alias.index.indexOf(this.index) != -1;
+ }
+ if (matches && this.alias) {
+ matches = alias.alias.indexOf(this.alias) != -1;
+ }
+ return matches;
}
- return matches;
- }
- };
+ };
+ }
}
diff --git a/src/app/shared/index_filter.js b/src/app/shared/index_filter.js
index a71ea1f7..7a17150d 100644
--- a/src/app/shared/index_filter.js
+++ b/src/app/shared/index_filter.js
@@ -1,98 +1,101 @@
-function IndexFilter(name, closed, special, healthy, asc, timestamp) {
- this.name = name;
- this.closed = closed;
- this.special = special;
- this.healthy = healthy;
- this.sort = 'name';
- this.asc = asc;
- this.timestamp = timestamp;
+// eslint-disable-next-line no-unused-vars
+class IndexFilter {
+ constructor(name, closed, special, healthy, asc, timestamp) {
+ this.name = name;
+ this.closed = closed;
+ this.special = special;
+ this.healthy = healthy;
+ this.sort = 'name';
+ this.asc = asc;
+ this.timestamp = timestamp;
- this.getSorting = function() {
- var asc = this.asc;
- switch (this.sort) {
- case 'name':
- return function(a, b) {
- if (asc) {
- return a.name.localeCompare(b.name);
- } else {
- return b.name.localeCompare(a.name);
- }
- };
- default:
- return undefined;
- }
- };
+ this.getSorting = function() {
+ var asc = this.asc;
+ switch (this.sort) {
+ case 'name':
+ return function(a, b) {
+ if (asc) {
+ return a.name.localeCompare(b.name);
+ } else {
+ return b.name.localeCompare(a.name);
+ }
+ };
+ default:
+ return undefined;
+ }
+ };
- this.clone = function() {
- // eslint-disable-next-line no-unused-vars
- return new IndexFilter(
- this.name,
- this.closed,
- this.special,
- this.healthy,
- this.asc,
- this.timestamp
- );
- };
+ this.clone = function() {
+ // eslint-disable-next-line no-unused-vars
+ return new IndexFilter(
+ this.name,
+ this.closed,
+ this.special,
+ this.healthy,
+ this.asc,
+ this.timestamp
+ );
+ };
- this.equals = function(other) {
- return (
- other !== null &&
- this.name === other.name &&
- this.closed === other.closed &&
- this.special === other.special &&
- this.healthy === other.healthy &&
- this.asc === other.asc &&
- this.timestamp === other.timestamp
- );
- };
+ this.equals = function(other) {
+ return (
+ other !== null &&
+ this.name === other.name &&
+ this.closed === other.closed &&
+ this.special === other.special &&
+ this.healthy === other.healthy &&
+ this.asc === other.asc &&
+ this.timestamp === other.timestamp
+ );
+ };
- this.isBlank = function() {
- return (
- !this.name &&
- this.closed &&
- this.special &&
- this.healthy &&
- this.asc
- );
- };
+ this.isBlank = function() {
+ return (
+ !this.name &&
+ this.closed &&
+ this.special &&
+ this.healthy &&
+ this.asc
+ );
+ };
- this.matches = function(index) {
- var matches = true;
- if (!this.special && index.special) {
- matches = false;
- }
- if (!this.closed && index.closed) {
- matches = false;
- }
- // Hide healthy == show unhealthy only
- if (!this.healthy && !index.unhealthy) {
- matches = false;
- }
- if (matches && this.name) {
- try {
- var regExp = new RegExp(this.name.trim(), 'i');
- matches = regExp.test(index.name);
- if (!matches && index.aliases) {
- for (var idx = 0; idx < index.aliases.length; idx++) {
- if ((matches = regExp.test(index.aliases[idx]))) {
- break;
+ this.matches = function(index) {
+ var matches = true;
+ if (!this.special && index.special) {
+ matches = false;
+ }
+ if (!this.closed && index.closed) {
+ matches = false;
+ }
+ // Hide healthy == show unhealthy only
+ if (!this.healthy && !index.unhealthy) {
+ matches = false;
+ }
+ if (matches && this.name) {
+ try {
+ var regExp = new RegExp(this.name.trim(), 'i');
+ matches = regExp.test(index.name);
+ if (!matches && index.aliases) {
+ for (var idx = 0; idx < index.aliases.length; idx++) {
+ if ((matches = regExp.test(index.aliases[idx]))) {
+ break;
+ }
}
}
- }
- } catch (err) { // if not valid regexp, still try normal matching
- matches = index.name.indexOf(this.name.toLowerCase()) != -1;
- if (!matches) {
- for (var _idx = 0; _idx < index.aliases.length; _idx++) {
- var alias = index.aliases[_idx].toLowerCase();
- matches = true;
- if ((matches = (alias.indexOf(this.name.toLowerCase()) != -1))) {
- break;
+ } catch (err) { // if not valid regexp, still try normal matching
+ matches = index.name.indexOf(this.name.toLowerCase()) != -1;
+ if (!matches) {
+ for (var _idx = 0; _idx < index.aliases.length; _idx++) {
+ var alias = index.aliases[_idx].toLowerCase();
+ matches = true;
+ if ((matches = (alias.indexOf(this.name.toLowerCase()) != -1))) {
+ break;
+ }
}
}
}
}
- }
- return matches;
- };
+ return matches;
+ };
+ }
}
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/src/app/shared/services/data.js b/src/app/shared/services/data.js
index 663ca685..f1aa11b3 100644
--- a/src/app/shared/services/data.js
+++ b/src/app/shared/services/data.js
@@ -106,6 +106,7 @@ angular.module('cerebro').factory('DataService', ['$rootScope', '$timeout',
$window.location.href = './login';
break;
case 401: // unauthorized in ES instance
+ case 403: // user does not have permissions
$location.path('/connect').search({host: host, unauthorized: true});
break;
default:
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
diff --git a/tests/controllers/connect.tests.js b/tests/controllers/connect.tests.js
index a5949249..d92a285c 100644
--- a/tests/controllers/connect.tests.js
+++ b/tests/controllers/connect.tests.js
@@ -85,6 +85,19 @@ describe('ConnectController', function() {
expect(this.scope.connecting).toEqual(false);
expect(this.scope.unauthorized).toEqual(true);
});
+ it('connect to a host with insufficient permissions', function() {
+ this.ConnectDataService.testConnection = function(host, success, error) {
+ success({data: {status: 403} });
+ };
+ spyOn(this.ConnectDataService, "connect").and.returnValue(true);
+ spyOn(this.ConnectDataService, "testConnection").and.callThrough();
+ this.scope.connect('http://localhost:9200');
+ expect(this.ConnectDataService.connect).not.toHaveBeenCalledWith(
+ 'http://localhost:9200'
+ );
+ expect(this.scope.connecting).toEqual(false);
+ expect(this.scope.unauthorized).toEqual(true);
+ });
it('handles unexpected response from host', function() {
this.ConnectDataService.testConnection = function(host, success, error) {
success({data: {status: 301}});