diff --git a/app/extensions/storidge/__module.js b/app/extensions/storidge/__module.js index 6c2c3a6e6..97f20ddee 100644 --- a/app/extensions/storidge/__module.js +++ b/app/extensions/storidge/__module.js @@ -79,6 +79,17 @@ angular.module('extension.storidge', []) } }; + var node = { + name: 'storidge.cluster.node', + url: '/:name', + views: { + 'content@': { + templateUrl: 'app/extensions/storidge/views/nodes/inspect/node.html', + controller: 'StoridgeNodeController' + } + } + }; + var monitor = { name: 'storidge.monitor', url: '/events', @@ -97,5 +108,6 @@ angular.module('extension.storidge', []) $stateRegistryProvider.register(profile); $stateRegistryProvider.register(profileCreation); $stateRegistryProvider.register(cluster); + $stateRegistryProvider.register(node); $stateRegistryProvider.register(monitor); }]); diff --git a/app/extensions/storidge/components/nodes-datatable/storidgeNodesDatatable.html b/app/extensions/storidge/components/nodes-datatable/storidgeNodesDatatable.html index 2a0e35f97..e9f3cef61 100644 --- a/app/extensions/storidge/components/nodes-datatable/storidgeNodesDatatable.html +++ b/app/extensions/storidge/components/nodes-datatable/storidgeNodesDatatable.html @@ -6,6 +6,20 @@ {{ $ctrl.titleText }} +
+ + + +
@@ -15,6 +29,10 @@ + + + + Name @@ -46,7 +64,13 @@ - {{ item.Name }} + + + + + + {{ item.Name }} + {{ item.IP }} {{ item.Role }} diff --git a/app/extensions/storidge/components/nodes-datatable/storidgeNodesDatatable.js b/app/extensions/storidge/components/nodes-datatable/storidgeNodesDatatable.js index 8fb01f9c4..f92cc29a1 100644 --- a/app/extensions/storidge/components/nodes-datatable/storidgeNodesDatatable.js +++ b/app/extensions/storidge/components/nodes-datatable/storidgeNodesDatatable.js @@ -7,6 +7,9 @@ angular.module('extension.storidge').component('storidgeNodesDatatable', { dataset: '<', tableKey: '@', orderBy: '@', - reverseOrder: '<' + reverseOrder: '<', + removeAction: '<', + cordonNodeAction: '<', + uncordonNodeAction: '<' } }); diff --git a/app/extensions/storidge/models/node.js b/app/extensions/storidge/models/node.js index e7e46e054..cd20b6f0c 100644 --- a/app/extensions/storidge/models/node.js +++ b/app/extensions/storidge/models/node.js @@ -4,3 +4,27 @@ function StoridgeNodeModel(name, data) { this.Role = data.role; this.Status = data.status; } + +function StoridgeNodeDetailedModel(name, properties) { + this.Name = name; + this.Domain = properties['domain:']; + this.DomainID = properties['domainID:']; + this.FreeBandwidth = properties['freeBandwidth:']; + this.FreeCapacity = properties['freeCapacity:']; + this.FreeIOPS = properties['freeIOPS:']; + this.Hdds = properties['hdds:']; + this.MetadataVersion = properties['metadataVersion:']; + this.Nodes = properties['nodes:']; + this.ProvisionedBandwidth = properties['provisionedBandwidth:']; + this.ProvisionedCapacity = properties['provisionedCapacity:']; + this.ProvisionedIOPS = properties['provisionedIOPS:']; + this.Ssds = properties['ssds:']; + this.Status = properties['status:']; + this.TotalBandwidth = properties['totalBandwidth:']; + this.TotalCapacity = properties['totalCapacity:']; + this.TotalIOPS = properties['totalIOPS:']; + this.UsedBandwidth = properties['usedBandwidth:']; + this.UsedCapacity = properties['usedCapacity:']; + this.UsedIOPS = properties['usedIOPS:']; + this.Vdisks = properties['vdisks:']; +} \ No newline at end of file diff --git a/app/extensions/storidge/rest/storidge.js b/app/extensions/storidge/rest/storidge.js index 86a5b70ee..d0a573417 100644 --- a/app/extensions/storidge/rest/storidge.js +++ b/app/extensions/storidge/rest/storidge.js @@ -10,7 +10,14 @@ angular.module('extension.storidge') queryEvents: { method: 'GET', params: { resource: 'clusters', action: 'events' }, timeout: 4500, ignoreLoadingBar: true, isArray: true }, getVersion: { method: 'GET', params: { resource: 'clusters', action: 'version' } }, getInfo: { method: 'GET', params: { resource: 'clusters', action: 'info' }, timeout: 4500, ignoreLoadingBar: true }, + queryNodes: { method: 'GET', params: { resource: 'nodes' } }, + getNode: { method: 'GET', params: { resource: 'nodes', id: '@id' } }, + addNode: { method: 'POST', params: { resource: 'nodes' } }, + removeNode: { method: 'DELETE', params: { resource: 'nodes', id: '@id' } }, + cordonNode: { method: 'POST', params : { resource: 'nodes', action:'cordon', id: '@id' } }, + uncordonNode: { method: 'POST', params : { resource: 'nodes', action: 'uncordon', id:'@id' } }, + queryProfiles: { method: 'GET', params: { resource: 'profiles' } }, getProfile: { method: 'GET', params: { resource: 'profiles' } }, createProfile: { method: 'POST', params: { resource: 'profiles' } }, @@ -19,7 +26,6 @@ angular.module('extension.storidge') queryDrives: { method: 'GET', params: { resource: 'drives' } }, getDrive: { method: 'GET', params: { resource: 'drives', id: '@id' } }, addDrive: { method: 'POST', params: { resource: 'drives' } }, - removeDrive: { method: 'DELETE', params: { resource: 'drives', id: '@id' } }, - getNode: { method: 'GET', params: { resource: 'nodes', id: '@id' } } + removeDrive: { method: 'DELETE', params: { resource: 'drives', id: '@id' } } }); }]); diff --git a/app/extensions/storidge/services/nodeService.js b/app/extensions/storidge/services/nodeService.js index 386748ffb..53f220367 100644 --- a/app/extensions/storidge/services/nodeService.js +++ b/app/extensions/storidge/services/nodeService.js @@ -20,11 +20,42 @@ angular.module('extension.storidge') deferred.resolve(nodes); }) .catch(function error(err) { - deferred.reject({ msg: 'Unable to retrieve Storidge profiles', err: err }); + deferred.reject({ msg: 'Unable to retrieve Storidge nodes', err: err }); }); return deferred.promise; }; + service.node = function (id) { + var deferred = $q.defer(); + + Storidge.getNode({id:id}).$promise + .then(function success(data) { + var node = new StoridgeNodeDetailedModel(data.name, data.properties); + deferred.resolve(node); + }) + .catch(function error(err) { + deferred.reject({ msg: 'Unable to retrieve Storidge node', err: err }); + }); + + return deferred.promise; + }; + + service.add = function () { + return Storidge.addNode().$promise; + }; + + service.cordon = function (id) { + return Storidge.cordonNode({id: id}).$promise; + }; + + service.uncordon = function (id) { + return Storidge.uncordonNode({id: id}).$promise; + }; + + service.remove = function (id) { + return Storidge.removeNode({id:id}).$promise; + }; + return service; }]); diff --git a/app/extensions/storidge/views/cluster/cluster.html b/app/extensions/storidge/views/cluster/cluster.html index 0adb52fa4..c68e6aca0 100644 --- a/app/extensions/storidge/views/cluster/cluster.html +++ b/app/extensions/storidge/views/cluster/cluster.html @@ -31,6 +31,23 @@
+
+ Information +
+
+ + To add a node to this cluster, run the following command on your new node +
+ + {{ addInfo }} + + Copy + + + +
+ +
Actions
@@ -57,7 +74,9 @@
diff --git a/app/extensions/storidge/views/cluster/clusterController.js b/app/extensions/storidge/views/cluster/clusterController.js index 6cf3d9f84..84c320e83 100644 --- a/app/extensions/storidge/views/cluster/clusterController.js +++ b/app/extensions/storidge/views/cluster/clusterController.js @@ -1,12 +1,126 @@ angular.module('extension.storidge') -.controller('StoridgeClusterController', ['$q', '$scope', '$state', 'Notifications', 'StoridgeClusterService', 'StoridgeNodeService', 'ModalService', -function ($q, $scope, $state, Notifications, StoridgeClusterService, StoridgeNodeService, ModalService) { +.controller('StoridgeClusterController', ['$q', '$scope', '$state', 'clipboard', 'Notifications', 'StoridgeClusterService', 'StoridgeNodeService', 'ModalService', +function ($q, $scope, $state, clipboard, Notifications, StoridgeClusterService, StoridgeNodeService, ModalService) { $scope.state = { shutdownInProgress: false, rebootInProgress: false }; + $scope.copyAddNodeCommand = function() { + clipboard.copyText($scope.addInfo); + $('#copyNotification').show(); + $('#copyNotification').fadeOut(2000); + }; + + $scope.removeAction = function(selectedItems) { + ModalService.confirm({ + title: 'Are you sure?', + message: 'Do you want really want to remove the nodes from the cluster?', + buttons: { + confirm: { + label: 'Remove', + className: 'btn-danger' + } + }, + callback: function onConfirm(confirmed) { + if(!confirmed) { return; } + remove(selectedItems); + } + }); + }; + + function remove(selectedItems) { + var actionCount = selectedItems.length; + angular.forEach(selectedItems, function (node) { + StoridgeNodeService.remove(node.Name) + .then(function success() { + Notifications.success('Node successfully removed', node.Name); + }) + .catch(function error(err) { + Notifications.error('Failure', err, 'Unable to remove node'); + }) + .finally(function final() { + --actionCount; + if (actionCount === 0) { + $state.reload(); + } + }); + }); + } + + $scope.cordonNodeAction = function(selectedItems) { + ModalService.confirm({ + title: 'Are you sure?', + message: 'Do you want really want to put the nodes in maintenance mode?', + buttons: { + confirm: { + label: 'Cordon', + className: 'btn-danger' + } + }, + callback: function onConfirm(confirmed) { + if(!confirmed) { return; } + cordonNode(selectedItems); + } + }); + }; + + function cordonNode(selectedItems) { + var actionCount = selectedItems.length; + angular.forEach(selectedItems, function (node) { + StoridgeNodeService.cordon(node.Name) + .then(function success() { + Notifications.success('Node successfully put in maintenance', node.Name); + }) + .catch(function error(err) { + Notifications.error('Failure', err, 'Unable to put node in maintenance mode'); + }) + .finally(function final() { + --actionCount; + if (actionCount === 0) { + $state.reload(); + } + }); + }); + } + + $scope.uncordonNodeAction = function(selectedItems) { + ModalService.confirm({ + title: 'Are you sure?', + message: 'Do you want really want to bring the nodes out of maintenance mode?', + buttons: { + confirm: { + label: 'Uncordon', + className: 'btn-danger' + } + }, + callback: function onConfirm(confirmed) { + if(!confirmed) { return; } + uncordonNode(selectedItems); + } + }); + }; + + function uncordonNode(selectedItems) { + var actionCount = selectedItems.length; + angular.forEach(selectedItems, function (node) { + StoridgeNodeService.uncordon(node.Name) + .then(function success() { + Notifications.success('Node successfully bringed back', node.Name); + }) + .catch(function error(err) { + Notifications.error('Failure', err, 'Unable to put node out of maintenance mode'); + }) + .finally(function final() { + --actionCount; + if (actionCount === 0) { + $state.reload(); + } + }); + }); + } + $scope.rebootCluster = function() { ModalService.confirm({ title: 'Are you sure?', @@ -24,6 +138,16 @@ function ($q, $scope, $state, Notifications, StoridgeClusterService, StoridgeNod }); }; + function rebootCluster() { + $scope.state.rebootInProgress = true; + StoridgeClusterService.reboot() + .finally(function final() { + $scope.state.rebootInProgress = false; + Notifications.success('Cluster successfully rebooted'); + $state.reload(); + }); + } + $scope.shutdownCluster = function() { ModalService.confirm({ title: 'Are you sure?', @@ -51,26 +175,18 @@ function ($q, $scope, $state, Notifications, StoridgeClusterService, StoridgeNod }); } - function rebootCluster() { - $scope.state.rebootInProgress = true; - StoridgeClusterService.reboot() - .finally(function final() { - $scope.state.rebootInProgress = false; - Notifications.success('Cluster successfully rebooted'); - $state.reload(); - }); - } - function initView() { $q.all({ info: StoridgeClusterService.info(), version: StoridgeClusterService.version(), - nodes: StoridgeNodeService.nodes() + nodes: StoridgeNodeService.nodes(), + addInfo: StoridgeNodeService.add() }) .then(function success(data) { $scope.clusterInfo = data.info; $scope.clusterVersion = data.version; $scope.clusterNodes = data.nodes; + $scope.addInfo = data.addInfo.content; }) .catch(function error(err) { Notifications.error('Failure', err, 'Unable to retrieve cluster information'); diff --git a/app/extensions/storidge/views/drives/drivesController.js b/app/extensions/storidge/views/drives/drivesController.js index b41538068..ec71d0d0d 100644 --- a/app/extensions/storidge/views/drives/drivesController.js +++ b/app/extensions/storidge/views/drives/drivesController.js @@ -5,7 +5,7 @@ function ($q, $scope, $state, Notifications, ModalService, StoridgeDriveService) $scope.removeAction = function(selectedItems) { ModalService.confirm({ title: 'Are you sure?', - message: 'Do you want really want to remove this drive from the storage pool?', + message: 'Do you want really want to remove the drives from the storage pool?', buttons: { confirm: { label: 'Remove', diff --git a/app/extensions/storidge/views/nodes/inspect/node.html b/app/extensions/storidge/views/nodes/inspect/node.html new file mode 100644 index 000000000..900c8e673 --- /dev/null +++ b/app/extensions/storidge/views/nodes/inspect/node.html @@ -0,0 +1,147 @@ + + + + Storidge > {{ node.Name }} + + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Name{{ node.Name }}
Domain{{ node.Domain }}
Domain ID{{ node.DomainID }}
Status{{ node.Status }}
Metadata version{{ node.MetadataVersion }}
Nodes{{ node.Nodes }}
HDDs{{ node.Hdds }}
SSDs{{ node.Ssds }}
VDisks{{ node.Vdisks }}
+ + +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + +
Free{{ node.FreeBandwidth }}
Used{{ node.UsedBandwidth }}
Provisioned{{ node.ProvisionedBandwidth }}
Total{{ node.TotalBandwidth }}
+ + +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + +
Free{{ node.FreeCapacity }}
Used{{ node.UsedCapacity }}
Provisioned{{ node.ProvisionedCapacity }}
Total{{ node.TotalCapacity }}
+ + +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + +
Free{{ node.FreeIOPS }}
Used{{ node.UsedIOPS }}
Provisioned{{ node.ProvisionedIOPS }}
Total{{ node.TotalIOPS }}
+ + +
+
\ No newline at end of file diff --git a/app/extensions/storidge/views/nodes/inspect/nodeController.js b/app/extensions/storidge/views/nodes/inspect/nodeController.js new file mode 100644 index 000000000..453f7f9b7 --- /dev/null +++ b/app/extensions/storidge/views/nodes/inspect/nodeController.js @@ -0,0 +1,20 @@ +angular.module('extension.storidge') +.controller('StoridgeNodeController', ['$scope', '$state', '$transition$', 'Notifications', 'StoridgeNodeService', +function ($scope, $state, $transition$, Notifications, StoridgeNodeService) { + + + function initView() { + $scope.name = $transition$.params().name; + + StoridgeNodeService.node($scope.name) + .then(function success(data) { + $scope.node = data; + }) + .catch(function error(err) { + Notifications.error('Failure', err, 'Unable to retrieve node details'); + }); + } + + initView(); + +}]);