From 851607394c78edfec07f75a5f95d59cb8e4aae87 Mon Sep 17 00:00:00 2001 From: baron_l Date: Fri, 24 May 2019 23:53:10 +0200 Subject: [PATCH] feat(integrations): storidge evolution (#2711) * feat(storidge): update storidge routes * feat(storidge): add new fields on profile create/edit * feat(storidge): add drives list and details view * feat(storidge): add node details / cordon / uncordon / remove * feat(storidge): add volume and snapshot details * feat(storidge): add snapshot creation on volume details * feat(storidge): add rescan drives button * refactor(storidge): move add / remove / put in / put ouf maintenance buttons for cluster nodes * style(storidge): change cluster / node icon color based on status * feat(storidge): profiles can enable snapshots without interval + interval in minutes * refactor(storidge): split cluster and node status badge filter * fix(storidge): error on volume IOPS update * fix(storidge): snapshot can now be created without comments * feat(storidge): remove snapshots panels when volume snapshots are disabled * fix(app): paginatedItemLimit now retrieved for datables extending GenericDatatableController * fix(storidge): addDrive is called with the good parameters * fix(storidge): update model and views for Storidge v2695 * refactor(storidge): webpack migration * fix(storidge): display modifications + fix js errors * feat(storidge): snapshots, profile and nodes evolution * fix(storidge): values for InterfaceDriver on profile create/edit * feat(storidge): v5 update without style (profile / statuses / volume) * fix(storidge): description tables on the same view have now the same fixed offset * fix(app): override rdash-ui select style * Revert "fix(app): override rdash-ui select style" This reverts commit e7248332611345dc803be83560282517c44c0646. * feat(storidge): wip on update 6 * feat(storidge): update 6 * feat(storidge): update 6 * feat(storidge): update 6 * feat(storidge): update 7 - node details + cluster views * fix(storidge): update 7 - profiles creation + volume details * fix(storidge): update 7 - profile create/edit interface type * feat(storidge): update 8 - add drive * feat(storidge): update 8 - UI refactors + cluster availability * fix(storidge): update 8 - revert cluster availability * feat(storidge): update 8 - node availability on swarm overview * feat(storidge): cluster condition badge * fix(storidge): update 9 - move add storage button + api profile filesystem kv to obj * feat(storidge): update 9 - disable add drive button when action is in progress * fix(storidge): update 9 - add drive button will now change only for the concerned drive * fix(storidge): update 10 - disable remove drive button when removal in progress * fix(api): update Storidge proxy creation process * refactor(api): update version number * feat(extensions): fix an issue with Storidge API URL * feat(storidge): force the use of a manager node --- .../handler/endpointproxy/proxy_storidge.go | 2 +- .../endpoints/endpoint_extension_add.go | 6 +- api/http/proxy/manager.go | 2 +- .../nodes-datatable/nodesDatatable.html | 8 + app/docker/filters/filters.js | 12 ++ app/docker/services/nodeService.js | 21 ++ app/docker/views/volumes/edit/volume.html | 25 +++ .../views/volumes/edit/volumeController.js | 67 +++++- app/extensions/storidge/__module.js | 48 +++++ .../storidgeClusterEventsDatatable.js | 2 +- .../storidgeDrivesDatatable.html | 130 ++++++++++++ .../storidgeDrivesDatatable.js | 17 ++ .../storidgeDrivesDatatableController.js | 16 ++ .../storidgeNodesDatatable.html | 25 ++- .../nodes-datatable/storidgeNodesDatatable.js | 4 +- .../storidgeNodesDatatableController.js | 23 ++ .../storidgeProfilesDatatable.js | 2 +- .../storidgeSnapshotCreation.html | 23 ++ .../storidgeSnapshotCreation.js | 7 + .../storidgeSnapshotCreationController.js | 26 +++ .../storidgeSnapshotsDatatable.html | 95 +++++++++ .../storidgeSnapshotsDatatable.js | 13 ++ .../storidgeSnapshotsDatatableController.js | 7 + .../volumeStoridgeInfo.html | 198 ++++++++++++++++++ .../volumeStoridgeInfo.js | 7 + .../volumeStoridgeInfoController.js | 103 +++++++++ app/extensions/storidge/filters/filters.js | 51 +++++ app/extensions/storidge/models/drive.js | 9 + app/extensions/storidge/models/info.js | 2 +- app/extensions/storidge/models/node.js | 25 +++ app/extensions/storidge/models/profile.js | 76 +++++++ app/extensions/storidge/models/snapshot.js | 9 + app/extensions/storidge/models/volume.js | 40 ++++ app/extensions/storidge/rest/storidge.js | 37 +++- .../storidge/services/driveService.js | 79 +++++++ .../storidge/services/nodeService.js | 35 +++- .../storidge/services/snapshotService.js | 80 +++++++ .../storidge/services/volumeService.js | 38 ++++ .../storidge/views/cluster/cluster.html | 90 +------- .../views/cluster/clusterController.js | 20 +- .../storidge/views/drives/drives.html | 24 +++ .../storidge/views/drives/drivesController.js | 48 +++++ .../storidge/views/drives/inspect/drive.html | 56 +++++ .../views/drives/inspect/driveController.js | 49 +++++ .../storidge/views/nodes/inspect/node.html | 170 +++++++++++++++ .../views/nodes/inspect/nodeController.js | 107 ++++++++++ .../create/createProfileController.js | 44 +++- .../views/profiles/create/createprofile.html | 160 +++++++++++++- .../storidge/views/profiles/edit/profile.html | 144 +++++++++++++ .../views/profiles/edit/profileController.js | 53 ++++- .../views/profiles/profilesController.js | 8 +- .../views/snapshots/inspect/snapshot.html | 53 +++++ .../snapshots/inspect/snapshotController.js | 44 ++++ .../datatables/genericDatatableController.js | 7 +- .../components/slider/sliderController.js | 2 +- app/portainer/filters/filters.js | 2 +- .../services/legacyExtensionManager.js | 8 +- app/portainer/services/localStorage.js | 4 +- app/portainer/services/notifications.js | 2 + app/portainer/views/sidebar/sidebar.html | 9 +- assets/css/app.css | 10 + 61 files changed, 2338 insertions(+), 146 deletions(-) create mode 100644 app/extensions/storidge/components/drives-datatable/storidgeDrivesDatatable.html create mode 100644 app/extensions/storidge/components/drives-datatable/storidgeDrivesDatatable.js create mode 100644 app/extensions/storidge/components/drives-datatable/storidgeDrivesDatatableController.js create mode 100644 app/extensions/storidge/components/nodes-datatable/storidgeNodesDatatableController.js create mode 100644 app/extensions/storidge/components/snapshot-creation/storidgeSnapshotCreation.html create mode 100644 app/extensions/storidge/components/snapshot-creation/storidgeSnapshotCreation.js create mode 100644 app/extensions/storidge/components/snapshot-creation/storidgeSnapshotCreationController.js create mode 100644 app/extensions/storidge/components/snapshots-datatable/storidgeSnapshotsDatatable.html create mode 100644 app/extensions/storidge/components/snapshots-datatable/storidgeSnapshotsDatatable.js create mode 100644 app/extensions/storidge/components/snapshots-datatable/storidgeSnapshotsDatatableController.js create mode 100644 app/extensions/storidge/components/volume-storidge-info/volumeStoridgeInfo.html create mode 100644 app/extensions/storidge/components/volume-storidge-info/volumeStoridgeInfo.js create mode 100644 app/extensions/storidge/components/volume-storidge-info/volumeStoridgeInfoController.js create mode 100644 app/extensions/storidge/filters/filters.js create mode 100644 app/extensions/storidge/models/drive.js create mode 100644 app/extensions/storidge/models/snapshot.js create mode 100644 app/extensions/storidge/models/volume.js create mode 100644 app/extensions/storidge/services/driveService.js create mode 100644 app/extensions/storidge/services/snapshotService.js create mode 100644 app/extensions/storidge/services/volumeService.js create mode 100644 app/extensions/storidge/views/drives/drives.html create mode 100644 app/extensions/storidge/views/drives/drivesController.js create mode 100644 app/extensions/storidge/views/drives/inspect/drive.html create mode 100644 app/extensions/storidge/views/drives/inspect/driveController.js create mode 100644 app/extensions/storidge/views/nodes/inspect/node.html create mode 100644 app/extensions/storidge/views/nodes/inspect/nodeController.js create mode 100644 app/extensions/storidge/views/snapshots/inspect/snapshot.html create mode 100644 app/extensions/storidge/views/snapshots/inspect/snapshotController.js diff --git a/api/http/handler/endpointproxy/proxy_storidge.go b/api/http/handler/endpointproxy/proxy_storidge.go index b375cee09..465ebfb52 100644 --- a/api/http/handler/endpointproxy/proxy_storidge.go +++ b/api/http/handler/endpointproxy/proxy_storidge.go @@ -41,7 +41,7 @@ func (handler *Handler) proxyRequestsToStoridgeAPI(w http.ResponseWriter, r *htt return &httperror.HandlerError{http.StatusServiceUnavailable, "Storidge extension not supported on this endpoint", portainer.ErrEndpointExtensionNotSupported} } - proxyExtensionKey := string(endpoint.ID) + "_" + string(portainer.StoridgeEndpointExtension) + proxyExtensionKey := strconv.Itoa(endpointID) + "_" + strconv.Itoa(int(portainer.StoridgeEndpointExtension)) + "_" + storidgeExtension.URL var proxy http.Handler proxy = handler.ProxyManager.GetLegacyExtensionProxy(proxyExtensionKey) diff --git a/api/http/handler/endpoints/endpoint_extension_add.go b/api/http/handler/endpoints/endpoint_extension_add.go index a7d152058..f91a714c3 100644 --- a/api/http/handler/endpoints/endpoint_extension_add.go +++ b/api/http/handler/endpoints/endpoint_extension_add.go @@ -50,9 +50,9 @@ func (handler *Handler) endpointExtensionAdd(w http.ResponseWriter, r *http.Requ extensionType := portainer.EndpointExtensionType(payload.Type) var extension *portainer.EndpointExtension - for _, ext := range endpoint.Extensions { - if ext.Type == extensionType { - extension = &ext + for idx := range endpoint.Extensions { + if endpoint.Extensions[idx].Type == extensionType { + extension = &endpoint.Extensions[idx] } } diff --git a/api/http/proxy/manager.go b/api/http/proxy/manager.go index f7d875fcf..8d1efb404 100644 --- a/api/http/proxy/manager.go +++ b/api/http/proxy/manager.go @@ -132,7 +132,7 @@ func (manager *Manager) CreateLegacyExtensionProxy(key, extensionAPIURL string) } proxy := manager.proxyFactory.newHTTPProxy(extensionURL) - manager.extensionProxies.Set(key, proxy) + manager.legacyExtensionProxies.Set(key, proxy) return proxy, nil } diff --git a/app/docker/components/datatables/nodes-datatable/nodesDatatable.html b/app/docker/components/datatables/nodes-datatable/nodesDatatable.html index dac5c644b..5ca2ba136 100644 --- a/app/docker/components/datatables/nodes-datatable/nodesDatatable.html +++ b/app/docker/components/datatables/nodes-datatable/nodesDatatable.html @@ -63,6 +63,13 @@ + + + Availability + + + + @@ -77,6 +84,7 @@ {{ item.EngineVersion }} {{ item.Addr }} {{ item.Status }} + {{ item.Availability }} Loading... diff --git a/app/docker/filters/filters.js b/app/docker/filters/filters.js index 315f62014..3ba22ef50 100644 --- a/app/docker/filters/filters.js +++ b/app/docker/filters/filters.js @@ -97,6 +97,18 @@ angular.module('portainer.docker') return 'success'; }; }) +.filter('dockerNodeAvailabilityBadge', function () { + 'use strict'; + return function (text) { + if (text === 'pause') { + return 'warning'; + } + else if (text === 'drain') { + return 'danger'; + } + return 'success'; + }; +}) .filter('trimcontainername', function () { 'use strict'; return function (name) { diff --git a/app/docker/services/nodeService.js b/app/docker/services/nodeService.js index 7dae3f46f..943f4201d 100644 --- a/app/docker/services/nodeService.js +++ b/app/docker/services/nodeService.js @@ -9,6 +9,7 @@ angular.module('portainer.docker').factory('NodeService', [ service.nodes = nodes; service.node = node; service.updateNode = updateNode; + service.getActiveManager = getActiveManager; function node(id) { var deferred = $q.defer(); @@ -45,6 +46,26 @@ angular.module('portainer.docker').factory('NodeService', [ return Node.update({ id: node.Id, version: node.Version }, node).$promise; } + function getActiveManager() { + var deferred = $q.defer(); + + service.nodes() + .then(function success(data) { + for (var i = 0; i < data.length; ++i) { + var node = data[i]; + if (node.Role === 'manager' && node.Availability === 'active' && node.Status === 'ready' && node.Addr !== '0.0.0.0') { + deferred.resolve(node); + break; + } + } + }) + .catch(function error(err) { + deferred.reject({ msg: 'Unable to retrieve nodes', err: err }); + }); + + return deferred.promise; + } + return service; } ]); diff --git a/app/docker/views/volumes/edit/volume.html b/app/docker/views/volumes/edit/volume.html index ce9744c16..475a7ea85 100644 --- a/app/docker/views/volumes/edit/volume.html +++ b/app/docker/views/volumes/edit/volume.html @@ -49,6 +49,31 @@ +
+
+ + +
+
+ +
+
+ + +
+
+ +
+
+ + +
+
+ + + +
+
+ {{ $ctrl.titleText }} +
+
+
+ +
+
+ + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + Id + + + + + + Node + + + + + + Device + + + + + + Size + + + + + + Use + + + + + + Type + + + + + + Status + + + + + Actions +
+ {{ item.Id }} + {{ item.Node }}{{ item.Device }}{{ item.Size }}{{ item.Use }}{{ item.Type }} + {{ item.Status|capitalize }} + + +
Loading...
No drives available.
+
+
+
+ {{ $ctrl.state.selectedItemCount }} item(s) selected +
+
+
+ + + Items per page + + + + +
+
+
+ + + diff --git a/app/extensions/storidge/components/drives-datatable/storidgeDrivesDatatable.js b/app/extensions/storidge/components/drives-datatable/storidgeDrivesDatatable.js new file mode 100644 index 000000000..9e236ce7c --- /dev/null +++ b/app/extensions/storidge/components/drives-datatable/storidgeDrivesDatatable.js @@ -0,0 +1,17 @@ +angular.module('extension.storidge').component('storidgeDrivesDatatable', { + templateUrl: './storidgeDrivesDatatable.html', + controller: 'StoridgeDrivesDatatableController', + bindings: { + titleText: '@', + titleIcon: '@', + dataset: '<', + tableKey: '@', + orderBy: '@', + reverseOrder: '<', + removeAction: '<', + addAction: '<', + rescanAction: '<', + actionInProgress: '<', + additionInProgress: '<' + } +}); diff --git a/app/extensions/storidge/components/drives-datatable/storidgeDrivesDatatableController.js b/app/extensions/storidge/components/drives-datatable/storidgeDrivesDatatableController.js new file mode 100644 index 000000000..65f44972b --- /dev/null +++ b/app/extensions/storidge/components/drives-datatable/storidgeDrivesDatatableController.js @@ -0,0 +1,16 @@ +angular.module('portainer.docker') + .controller('StoridgeDrivesDatatableController', ['$scope', '$controller', + function ($scope, $controller) { + angular.extend(this, $controller('GenericDatatableController', {$scope: $scope})); + + this.selectAll = function() { + for (var i = 0; i < this.state.filteredDataSet.length; i++) { + var item = this.state.filteredDataSet[i]; + if (item.Status !== 'normal' && item.Checked !== this.state.selectAll) { + item.Checked = this.state.selectAll; + this.selectItem(item); + } + } + }; + } +]); \ No newline at end of file diff --git a/app/extensions/storidge/components/nodes-datatable/storidgeNodesDatatable.html b/app/extensions/storidge/components/nodes-datatable/storidgeNodesDatatable.html index 2a0e35f97..4a8857844 100644 --- a/app/extensions/storidge/components/nodes-datatable/storidgeNodesDatatable.html +++ b/app/extensions/storidge/components/nodes-datatable/storidgeNodesDatatable.html @@ -6,6 +6,25 @@ {{ $ctrl.titleText }} +
+
+ +
+ + To add a node to this cluster, run the following command on your new node + + {{ $ctrl.addInfo }} + + Copy + + + + +
+
+
@@ -46,11 +65,13 @@ - {{ item.Name }} + + {{ item.Name }} + {{ item.IP }} {{ item.Role }} - + {{ item.Status }} diff --git a/app/extensions/storidge/components/nodes-datatable/storidgeNodesDatatable.js b/app/extensions/storidge/components/nodes-datatable/storidgeNodesDatatable.js index 32bbef2b2..4f22e67e7 100644 --- a/app/extensions/storidge/components/nodes-datatable/storidgeNodesDatatable.js +++ b/app/extensions/storidge/components/nodes-datatable/storidgeNodesDatatable.js @@ -1,8 +1,8 @@ angular.module('extension.storidge').component('storidgeNodesDatatable', { templateUrl: './storidgeNodesDatatable.html', - controller: 'GenericDatatableController', + controller: 'StoridgeNodesDatatableController', bindings: { - title: '@', + titleText: '@', titleIcon: '@', dataset: '<', tableKey: '@', diff --git a/app/extensions/storidge/components/nodes-datatable/storidgeNodesDatatableController.js b/app/extensions/storidge/components/nodes-datatable/storidgeNodesDatatableController.js new file mode 100644 index 000000000..6de915392 --- /dev/null +++ b/app/extensions/storidge/components/nodes-datatable/storidgeNodesDatatableController.js @@ -0,0 +1,23 @@ +angular.module('extension.storidge') +.controller('StoridgeNodesDatatableController', ['$scope', '$controller', 'clipboard', 'Notifications', 'StoridgeNodeService', +function($scope, $controller, clipboard, Notifications, StoridgeNodeService) { + angular.extend(this, $controller('GenericDatatableController', { $scope: $scope })); + + var ctrl = this; + + this.addNodeAction = function() { + StoridgeNodeService.add() + .then(function sucess(data) { + ctrl.addInfo = data.content; + }) + .catch(function error(err) { + Notifications.error('Failure', err, 'Unable to retrieve the "add node" command'); + }); + }; + + this.copyAddNodeCommand = function() { + clipboard.copyText(ctrl.addInfo); + $('#copyNotification').show(); + $('#copyNotification').fadeOut(2000); + }; +}]); diff --git a/app/extensions/storidge/components/profiles-datatable/storidgeProfilesDatatable.js b/app/extensions/storidge/components/profiles-datatable/storidgeProfilesDatatable.js index ee18abbc6..1fb5f51d5 100644 --- a/app/extensions/storidge/components/profiles-datatable/storidgeProfilesDatatable.js +++ b/app/extensions/storidge/components/profiles-datatable/storidgeProfilesDatatable.js @@ -2,7 +2,7 @@ angular.module('extension.storidge').component('storidgeProfilesDatatable', { templateUrl: './storidgeProfilesDatatable.html', controller: 'GenericDatatableController', bindings: { - title: '@', + titleText: '@', titleIcon: '@', dataset: '<', tableKey: '@', diff --git a/app/extensions/storidge/components/snapshot-creation/storidgeSnapshotCreation.html b/app/extensions/storidge/components/snapshot-creation/storidgeSnapshotCreation.html new file mode 100644 index 000000000..11f6b570c --- /dev/null +++ b/app/extensions/storidge/components/snapshot-creation/storidgeSnapshotCreation.html @@ -0,0 +1,23 @@ + + + + +
+
+ +
+ +
+
+
+
+ +
+
+
+ + diff --git a/app/extensions/storidge/components/snapshot-creation/storidgeSnapshotCreation.js b/app/extensions/storidge/components/snapshot-creation/storidgeSnapshotCreation.js new file mode 100644 index 000000000..ebd1aed11 --- /dev/null +++ b/app/extensions/storidge/components/snapshot-creation/storidgeSnapshotCreation.js @@ -0,0 +1,7 @@ +angular.module('portainer.docker').component('storidgeSnapshotCreation', { + templateUrl: './storidgeSnapshotCreation.html', + controller: 'StoridgeSnapshotCreationController', + bindings: { + volumeId: '<' + } +}); diff --git a/app/extensions/storidge/components/snapshot-creation/storidgeSnapshotCreationController.js b/app/extensions/storidge/components/snapshot-creation/storidgeSnapshotCreationController.js new file mode 100644 index 000000000..c47f89f21 --- /dev/null +++ b/app/extensions/storidge/components/snapshot-creation/storidgeSnapshotCreationController.js @@ -0,0 +1,26 @@ +angular.module('portainer.docker') +.controller('StoridgeSnapshotCreationController', ['StoridgeSnapshotService', 'Notifications', '$state', +function (StoridgeSnapshotService, Notifications, $state) { + var ctrl = this; + + this.formValues = {}; + this.state = { + actionInProgress: false + }; + + this.createSnapshot = function () { + ctrl.state.actionInProgress = true; + StoridgeSnapshotService.create(ctrl.volumeId, ctrl.formValues.Description) + .then(function success() { + Notifications.success('Success', 'Snapshot successfully created'); + $state.reload(); + }) + .catch(function error(err) { + Notifications.error('Failure', err, 'Unable to create snapshot'); + }) + .finally(function final() { + ctrl.state.actionInProgress = false; + }); + }; + +}]); diff --git a/app/extensions/storidge/components/snapshots-datatable/storidgeSnapshotsDatatable.html b/app/extensions/storidge/components/snapshots-datatable/storidgeSnapshotsDatatable.html new file mode 100644 index 000000000..bd652567a --- /dev/null +++ b/app/extensions/storidge/components/snapshots-datatable/storidgeSnapshotsDatatable.html @@ -0,0 +1,95 @@ +
+ + +
+
+ {{ $ctrl.titleText }} +
+
+
+ +
+
+ + +
+
+ + + + + + + + + + + + + + + + + + + + + +
+ + + + + + Id + + + + + + Date + + + + + + Description + + + +
+ + + + + {{ item.Id }} + {{ item.Date }}{{ item.Description }}
Loading...
No snapshots available.
+
+
+
+ {{ $ctrl.state.selectedItemCount }} item(s) selected +
+
+
+ + + Items per page + + + + +
+
+
+ + +
diff --git a/app/extensions/storidge/components/snapshots-datatable/storidgeSnapshotsDatatable.js b/app/extensions/storidge/components/snapshots-datatable/storidgeSnapshotsDatatable.js new file mode 100644 index 000000000..5f3c145e9 --- /dev/null +++ b/app/extensions/storidge/components/snapshots-datatable/storidgeSnapshotsDatatable.js @@ -0,0 +1,13 @@ +angular.module('extension.storidge').component('storidgeSnapshotsDatatable', { + templateUrl: './storidgeSnapshotsDatatable.html', + controller: 'StoridgeSnapshotsDatatableController', + bindings: { + titleText: '@', + titleIcon: '@', + dataset: '<', + tableKey: '@', + orderBy: '@', + reverseOrder: '<', + removeAction: '<' + } +}); diff --git a/app/extensions/storidge/components/snapshots-datatable/storidgeSnapshotsDatatableController.js b/app/extensions/storidge/components/snapshots-datatable/storidgeSnapshotsDatatableController.js new file mode 100644 index 000000000..501a74343 --- /dev/null +++ b/app/extensions/storidge/components/snapshots-datatable/storidgeSnapshotsDatatableController.js @@ -0,0 +1,7 @@ +angular.module('portainer.docker') + .controller('StoridgeSnapshotsDatatableController', ['$scope', '$controller', + function ($scope, $controller) { + angular.extend(this, $controller('GenericDatatableController', {$scope: $scope})); + + } +]); \ No newline at end of file diff --git a/app/extensions/storidge/components/volume-storidge-info/volumeStoridgeInfo.html b/app/extensions/storidge/components/volume-storidge-info/volumeStoridgeInfo.html new file mode 100644 index 000000000..4792986f3 --- /dev/null +++ b/app/extensions/storidge/components/volume-storidge-info/volumeStoridgeInfo.html @@ -0,0 +1,198 @@ + + +
+
+ + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Name{{ $ctrl.volume.Name }}
UUID{{ $ctrl.volume.Uuid }}
Node{{ $ctrl.volume.Node }}
Node ID{{ $ctrl.volume.NodeID }}
Directory{{ $ctrl.volume.Directory }}
Capacity{{ $ctrl.volume.Capacity }}
Allocated{{ $ctrl.volume.Allocated }}
IOPS Min{{ $ctrl.volume.IOPSMin }}
IOPS Max{{ $ctrl.volume.IOPSMax }}
Bandwidth Min{{ $ctrl.volume.BandwidthMin }}
Bandwidth Max{{ $ctrl.volume.BandwidthMax }}
Local Drive Only{{ $ctrl.volume.LocalDriveOnly }}
Provisioning{{ $ctrl.volume.Provisioning }}
Redundancy{{ $ctrl.volume.Redundancy }}
Vdisk{{ $ctrl.volume.Vdisk }}
IP{{ $ctrl.volume.IP}}
Drive Type{{ $ctrl.volume.DriveType}}
Encryption{{ $ctrl.volume.Encryption}}
Snapshot Enabled{{ $ctrl.volume.SnapshotEnabled}}
Snapshot Interval{{ $ctrl.volume.SnapshotInterval}} minute(s)
Max Snapshots{{ $ctrl.volume.SnapshotMax}}
Filesystem{{ $ctrl.volume.Filesystem}}
Labels + + + + + +
{{ var|key: '=' }}{{ var|value: '=' }}
+
+ + +
+ +
+ +
+ +
+
+ + +
+ +
+ +
+
+ + +
+ +
+ +
+
+
+ +
+ +
+
+ + +
+ +
+ +
+
+
+ +
+ +
+
+ + +
+
+ + + add label + +
+ +
+
+
+ name + +
+
+ value + +
+ +
+
+ +
+ +
+ + \ No newline at end of file diff --git a/app/extensions/storidge/components/volume-storidge-info/volumeStoridgeInfo.js b/app/extensions/storidge/components/volume-storidge-info/volumeStoridgeInfo.js new file mode 100644 index 000000000..67b5f8829 --- /dev/null +++ b/app/extensions/storidge/components/volume-storidge-info/volumeStoridgeInfo.js @@ -0,0 +1,7 @@ +angular.module('portainer.docker').component('volumeStoridgeInfo', { + templateUrl: './volumeStoridgeInfo.html', + controller: 'VolumeStoridgeInfoController', + bindings: { + volume: '<' + } +}); diff --git a/app/extensions/storidge/components/volume-storidge-info/volumeStoridgeInfoController.js b/app/extensions/storidge/components/volume-storidge-info/volumeStoridgeInfoController.js new file mode 100644 index 000000000..65b637ef4 --- /dev/null +++ b/app/extensions/storidge/components/volume-storidge-info/volumeStoridgeInfoController.js @@ -0,0 +1,103 @@ +angular.module('portainer.docker') +.controller('VolumeStoridgeInfoController', ['$state', 'StoridgeVolumeService', 'Notifications', +function ($state, StoridgeVolumeService, Notifications) { + var ctrl = this; + + this.state = { + updateInProgress: false, + isUpdating: false + }; + + this.addLabel = function() { + this.formValues.Labels.push({ name: '', value: ''}); + }; + + this.removeLabel = function(index) { + this.formValues.Labels.splice(index, 1); + }; + + this.initLabels = function() { + var labels = this.volume.Labels; + if (labels) { + this.formValues.Labels = Object.keys(labels).map(function(key) { + return { name:key, value:labels[key] }; + }); + } + }; + + this.updateVolume = function() { + this.state.updateInProgress = true; + this.formValues = { + IOPSMin: this.volume.IOPSMin, + IOPSMax: this.volume.IOPSMax, + Node: this.volume.Node, + Capacity: this.volume.Capacity, + BandwidthMin: this.volume.BandwidthMin, + BandwidthMax: this.volume.BandwidthMax, + Labels: [] + }; + this.initLabels(); + }; + + this.cancelUpdate = function() { + this.state.updateInProgress = false; + this.formValues = {}; + }; + + this.prepareLabels = function(volume) { + var labels = {}; + this.formValues.Labels.forEach(function (label) { + if (label.name && label.value) { + labels[label.name] = label.value; + } + }); + volume.Labels = labels; + }; + + this.prepareVolume = function() { + var volume = angular.copy(this.formValues); + var data = this.volume; + + if (volume.Node === data.Node || !volume.Node) { + delete volume.Node; + } + if (volume.Capacity === data.Capacity || !volume.Capacity) { + delete volume.Capacity; + } + if (volume.IOPSMin === data.IOPSMin || !volume.IOPSMin) { + delete volume.IOPSMin; + } else { + volume.IOPSMin = volume.IOPSMin.toString(); + } + if (volume.IOPSMax === data.IOPSMax || !volume.IOPSMax) { + delete volume.IOPSMax; + } else { + volume.IOPSMax = volume.IOPSMax.toString(); + } + if (volume.BandwidthMin === data.BandwidthMin || !volume.BandwidthMin) { + delete volume.BandwidthMin; + } + if (volume.BandwidthMax === data.BandwidthMax || !volume.BandwidthMax) { + delete volume.BandwidthMax; + } + this.prepareLabels(volume); + return volume; + }; + + this.confirmUpdate = function() { + this.state.isUpdating = true; + + var volume = this.prepareVolume(); + volume.Name = this.volume.Name; + StoridgeVolumeService.update(volume) + .then(function success() { + Notifications.success('Volume successfully updated'); + $state.reload(); + }) + .catch(function error(err) { + Notifications.error('Failure', err, 'Unable to update volume'); + ctrl.state.isUpdating = false; + }); + }; + +}]); diff --git a/app/extensions/storidge/filters/filters.js b/app/extensions/storidge/filters/filters.js new file mode 100644 index 000000000..494135785 --- /dev/null +++ b/app/extensions/storidge/filters/filters.js @@ -0,0 +1,51 @@ +import _ from 'lodash-es'; + +angular.module('extension.storidge') +.filter('drivestatusbadge', function () { +'use strict'; + return function (text) { + var status = text ? _.toLower(text) : ''; + if (status === 'available') { + return 'info'; + } else if (status === 'faulty') { + return 'danger'; + } + return 'success'; + }; +}) +.filter('storidgeNodeStatusBadge', function () { +'use strict'; + return function (text) { + var status = text ? _.toLower(text) : ''; + if (status === 'cordoned' || status === 'maintenance') { + return 'orange-icon'; + } else if (status === 'leaving' || status === 'failed') { + return 'red-icon' + } + return 'green-icon'; + }; +}) +.filter('storidgeClusterConditionBadge', function () { +'use strict'; + return function (text) { + var status = text ? _.toLower(text) : ''; + if (status === 'alert') { + return 'red-icon'; + } else if (status === 'warning') { + return 'orange-icon'; + } + return 'green-icon'; + }; +}).filter('bytes', function() { + return function(bytes, precision) { + bytes = parseFloat(bytes); + if (isNaN(bytes) || !isFinite(bytes)) return '-'; + if (!precision) precision = 1; + var units = ['B', 'kB', 'MB', 'GB', 'TB', 'PB']; + var number = Math.floor(Math.log(bytes) / Math.log(1024)); + if (bytes === 0) { + return ('0 B'); + } + return (bytes / Math.pow(1024, Math.floor(number))).toFixed(precision) + ' ' + units[number]; + } +}); \ No newline at end of file diff --git a/app/extensions/storidge/models/drive.js b/app/extensions/storidge/models/drive.js new file mode 100644 index 000000000..715165095 --- /dev/null +++ b/app/extensions/storidge/models/drive.js @@ -0,0 +1,9 @@ +export function StoridgeDriveModel(data) { + this.Id = data.driveid; + this.Node = data.node; + this.Use = data.use; + this.Status = data.drivestatus.toLowerCase(); + this.Size = data.size; + this.Type = data.type; + this.Device = data.device; +} diff --git a/app/extensions/storidge/models/info.js b/app/extensions/storidge/models/info.js index 7d0f2f92f..90b30608d 100644 --- a/app/extensions/storidge/models/info.js +++ b/app/extensions/storidge/models/info.js @@ -1,7 +1,7 @@ export function StoridgeInfoModel(data) { this.Domain = data.domain; this.Nodes = data.nodes; - this.Status = data.status; + this.Condition = data.condition; this.ProvisionedBandwidth = data.provisionedBandwidth; this.UsedBandwidth = data.usedBandwidth; this.FreeBandwidth = data.freeBandwidth; diff --git a/app/extensions/storidge/models/node.js b/app/extensions/storidge/models/node.js index 30f7aba88..73708603f 100644 --- a/app/extensions/storidge/models/node.js +++ b/app/extensions/storidge/models/node.js @@ -4,3 +4,28 @@ export function StoridgeNodeModel(name, data) { this.Role = data.role; this.Status = data.status; } + +export function StoridgeNodeDetailedModel(name, properties) { + this.Name = name; + this.Condition = properties.condition; + 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/models/profile.js b/app/extensions/storidge/models/profile.js index b451d4bc8..f9e2defbe 100644 --- a/app/extensions/storidge/models/profile.js +++ b/app/extensions/storidge/models/profile.js @@ -8,6 +8,16 @@ export function StoridgeProfileDefaultModel() { this.MaxIOPS = 2000; this.MinBandwidth = 1; this.MaxBandwidth = 100; + this.Filesystem = 'btrfs'; + this.SnapshotEnabled = false; + this.SnapshotInterval = 1440; + this.SnapshotMax = 1; + this.EncryptionEnabled = false; + this.InterfaceType = ''; + this.InterfaceDriver = ''; + this.InterfaceNetwork = ''; + this.InterfaceConf = ''; + this.Labels = []; } export function StoridgeProfileListModel(data) { @@ -32,6 +42,40 @@ export function StoridgeProfileModel(name, data) { this.MinBandwidth = data.bandwidth.min; this.MaxBandwidth = data.bandwidth.max; } + + if (data.filesystem) { + this.Filesystem = data.filesystem.type; + } + // this.Filesystem = data.filesystem; + + var service = data.service; + + if (service.snapshot) { + this.SnapshotEnabled = service.snapshot.enabled; + this.SnapshotInterval = service.snapshot.interval; + this.SnapshotMax = service.snapshot.max; + } else { + this.SnapshotEnabled = false; + } + + if (service.encryption) { + this.EncryptionEnabled = service.encryption.enabled; + } else { + this.EncryptionEnabled = false; + } + + if (data.interface) { + this.InterfaceType = data.interface.type; + this.InterfaceDriver = data.interface.driver; + this.InterfaceNetwork = data.interface.network; + this.InterfaceConf = data.interface.conf; + } + + if (data.label) { + this.Labels = data.label; + } else { + this.Labels = []; + } } export function StoridgeCreateProfileRequest(model) { @@ -54,4 +98,36 @@ export function StoridgeCreateProfileRequest(model) { max: model.MaxBandwidth }; } + + this.filesystem = { + type: model.Filesystem + }; + + var service = {}; + + service.snapshot = { + enabled: model.SnapshotEnabled + }; + if (model.SnapshotEnabled) { + service.snapshot.interval = model.SnapshotInterval; + service.snapshot.max = model.SnapshotMax; + } + + service.encryption = { + enabled: model.EncryptionEnabled + }; + + this.service = service; + + this.interface = { + driver: model.InterfaceDriver, + network: model.InterfaceNetwork, + conf: model.InterfaceConf + }; + + if (model.InterfaceType) { + this.interface.type = model.InterfaceType; + } + + this.label = model.Labels; } diff --git a/app/extensions/storidge/models/snapshot.js b/app/extensions/storidge/models/snapshot.js new file mode 100644 index 000000000..3ee5d62ca --- /dev/null +++ b/app/extensions/storidge/models/snapshot.js @@ -0,0 +1,9 @@ +export function StoridgeSnapshotModel(data) { + this.Id = data.identifier; + this.Date = data.date; + this.Description = data.description; + this.SourceID = data.sourceid; + this.Type = data.type; + this.Directory = data.directory; + this.Source = data.source; +} diff --git a/app/extensions/storidge/models/volume.js b/app/extensions/storidge/models/volume.js new file mode 100644 index 000000000..a87e5b871 --- /dev/null +++ b/app/extensions/storidge/models/volume.js @@ -0,0 +1,40 @@ +export function StoridgeVolumeModel(data) { + this.Allocated = data.allocated; + this.Capacity = data.capacity; + this.Directory = data.directory; + this.IOPSMax = data.maximumIOPS; + this.IOPSMin = data.minimumIOPS; + this.BandwidthMin = data.minimumBandwidth; + this.BandwidthMax = data.maximumBandwidth; + this.LocalDriveOnly = data.localDriveOnly; + this.Name = data.name; + this.Node = data.node; + this.NodeID = data.nodeid; + this.Provisioning = data.provisioning; + this.Redundancy = data.redundancy; + this.Uuid = data.uuid; + this.Vdisk = data.vdisk; + this.Labels = data.labels; + + this.IP = data.ipaddr; + this.DriveType = data.driveType; + this.Encryption = data.encryption; + this.SnapshotEnabled = data.snapshot; + this.SnapshotInterval = data.snapInterval; + this.SnapshotMax = data.maximumSnapshots; + this.Filesystem = data.filesystem; +} + +export function StoridgeVolumeUpdateModel(data) { + this.name = data.Name; + this.opts = { + node: data.Node, + nodeid: data.NodeID, + capacity: data.Capacity, + iopsmin: data.IOPSMin, + iopsmax: data.IOPSMax, + bandwidthmin: data.BandwidthMin, + bandwidthmax: data.BandwidthMax + }; + this.labels = data.Labels; +} \ No newline at end of file diff --git a/app/extensions/storidge/rest/storidge.js b/app/extensions/storidge/rest/storidge.js index 5636c96cd..bb6a36333 100644 --- a/app/extensions/storidge/rest/storidge.js +++ b/app/extensions/storidge/rest/storidge.js @@ -5,16 +5,41 @@ angular.module('extension.storidge') endpointId: EndpointProvider.endpointID }, { - rebootCluster: { method: 'POST', params: { resource: 'cluster', action: 'reboot' } }, - shutdownCluster: { method: 'POST', params: { resource: 'cluster', action: 'shutdown' } }, - queryEvents: { method: 'GET', params: { resource: 'events' }, timeout: 4500, ignoreLoadingBar: true, isArray: true }, - getVersion: { method: 'GET', params: { resource: 'version' } }, - getInfo: { method: 'GET', params: { resource: 'info' }, timeout: 4500, ignoreLoadingBar: true }, + rebootCluster: { method: 'POST', params: { resource: 'clusters', action: 'reboot' } }, + shutdownCluster: { method: 'POST', params: { resource: 'clusters', action: 'shutdown' } }, + 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' } }, updateProfile: { method: 'PUT', params: { resource: 'profiles', id: '@name' } }, - deleteProfile: { method: 'DELETE', params: { resource: 'profiles' } } + deleteProfile: { method: 'DELETE', params: { resource: 'profiles' } }, + + 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' } }, + rescanDrives: { method: 'POST', params: { resource: 'drives', action: 'rescan' } }, + + queryVolumes: { method: 'GET', params: { resource: 'volumes' } }, + createVolume: { method: 'POST', params: { resource: 'volumes' } }, + getVolume: { method: 'GET', params: { resource: 'volumes', id: '@id' } }, + updateVolume: { method: 'POST', params: { resource: 'volumes', id: '@name' } }, + removeVolume: { method: 'DELETE', params: { resource: 'volumes' , id: '@id' } }, + + querySnapshots: { method: 'GET', params: { resource: 'volumes', id: '@id', action: 'snapshots' } }, + createSnapshot: { method: 'POST', params: { resource: 'volumes', id: '@id', action: 'snapshot' } }, + getSnapshot: { method: 'GET', params: { resource: 'snapshots', id: '@id' } }, + removeSnapshot: { method: 'DELETE', params: { resource: 'snapshots', id: '@id'} } + }); }]); diff --git a/app/extensions/storidge/services/driveService.js b/app/extensions/storidge/services/driveService.js new file mode 100644 index 000000000..8daa9d358 --- /dev/null +++ b/app/extensions/storidge/services/driveService.js @@ -0,0 +1,79 @@ +import { StoridgeDriveModel } from '../models/drive'; + +angular.module('extension.storidge') +.factory('StoridgeDriveService', ['$q', 'Storidge', function StoridgeDriveServiceFactory($q, Storidge) { + 'use strict'; + var service = {}; + + service.drives = function () { + var deferred = $q.defer(); + + Storidge.queryDrives().$promise + .then(function success(data) { + var driveData = data.drives; + var drives = driveData.map(function (drive) { + return new StoridgeDriveModel(drive); + }); + + deferred.resolve(drives); + }) + .catch(function error(err) { + deferred.reject({ msg: 'Unable to retrieve Storidge drives', err: err }); + }); + + return deferred.promise; + }; + + service.drive = function (id) { + var deferred = $q.defer(); + + Storidge.getDrive({ id: id }).$promise + .then(function success(data) { + var drive = new StoridgeDriveModel(data); + Storidge.getNode({ id: data.nodeid }).$promise + .then(function (data) { + drive.Node = data.name; + deferred.resolve(drive); + }); + }) + .catch(function error(err) { + deferred.reject({ msg: 'Unable to retrieve Storidge drive', err: err }); + }); + + return deferred.promise; + }; + + service.add = function (device, node) { + var deferred = $q.defer(); + + Storidge.addDrive({ device: device, node: node }).$promise + .then(function success() { + deferred.resolve(); + }) + .catch(function error(err) { + deferred.reject({ msg: 'Unable to add Storidge drive', err: err }); + }); + + return deferred.promise; + }; + + service.remove = function (id) { + var deferred = $q.defer(); + + Storidge.removeDrive({ id: id }).$promise + .then(function success() { + deferred.resolve(); + }) + .catch(function error(err) { + deferred.reject({ msg: 'Unable to remove Storidge drive', err: err }); + }); + + return deferred.promise; + }; + + service.rescan = function () { + return Storidge.rescanDrives().$promise; + }; + + return service; +}]); diff --git a/app/extensions/storidge/services/nodeService.js b/app/extensions/storidge/services/nodeService.js index 6e4ad721a..de960224f 100644 --- a/app/extensions/storidge/services/nodeService.js +++ b/app/extensions/storidge/services/nodeService.js @@ -1,4 +1,4 @@ -import { StoridgeNodeModel } from '../models/node'; +import { StoridgeNodeModel, StoridgeNodeDetailedModel } from '../models/node'; angular.module('extension.storidge') .factory('StoridgeNodeService', ['$q', 'Storidge', function StoridgeNodeServiceFactory($q, Storidge) { @@ -22,11 +22,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/services/snapshotService.js b/app/extensions/storidge/services/snapshotService.js new file mode 100644 index 000000000..eac194073 --- /dev/null +++ b/app/extensions/storidge/services/snapshotService.js @@ -0,0 +1,80 @@ +import { StoridgeSnapshotModel } from '../models/snapshot' + +angular.module('extension.storidge') +.factory('StoridgeSnapshotService', ['$q', 'Storidge', function StoridgeSnapshotServiceFactory($q, Storidge) { + 'use strict'; + var service = {}; + + service.snapshots = snapshots; + service.snapshot = snapshot; + service.create = create; + service.remove = remove; + + function snapshots(volumeId) { + var deferred = $q.defer(); + + Storidge.querySnapshots({id: volumeId}).$promise + .then(function success(data) { + var snapshotsData = data.snapshots; + let snapshotsArray = []; + for (const key in snapshotsData) { + if (snapshotsData.hasOwnProperty(key)) { + snapshotsArray.push(snapshotsData[key]); + } + } + var snapshots = snapshotsArray.map(function (snapshot) { + return new StoridgeSnapshotModel(snapshot); + }); + deferred.resolve(snapshots); + }) + .catch(function error(err) { + deferred.reject({ msg: 'Unable to retrieve Storidge snapshots', err: err }); + }); + + return deferred.promise; + } + + function snapshot(id) { + var deferred = $q.defer(); + + Storidge.getSnapshot({id:id}).$promise + .then(function success(data) { + var snapshot = new StoridgeSnapshotModel(data.snapshot); + deferred.resolve(snapshot); + }) + .catch(function error(err) { + deferred.reject({ msg: 'Unable to retrieve Storidge snapshot', err: err }); + }); + + return deferred.promise; + } + + function create(volumeId, description) { + var deferred = $q.defer(); + Storidge.createSnapshot({id: volumeId, opts: {description: description}}).$promise + .then(function success(data) { + deferred.resolve(data); + }) + .catch(function error(err) { + deferred.reject({ msg: 'Unable to create Storidge volume snapshot', err: err }); + }); + + return deferred.promise; + } + + function remove(id) { + var deferred = $q.defer(); + + Storidge.removeSnapshot({ id: id }).$promise + .then(function success() { + deferred.resolve(); + }) + .catch(function error(err) { + deferred.reject({ msg: 'Unable to remove Storidge volume snapshot', err: err }); + }); + + return deferred.promise; + } + + return service; +}]); diff --git a/app/extensions/storidge/services/volumeService.js b/app/extensions/storidge/services/volumeService.js new file mode 100644 index 000000000..a0da586c3 --- /dev/null +++ b/app/extensions/storidge/services/volumeService.js @@ -0,0 +1,38 @@ +import { StoridgeVolumeModel, StoridgeVolumeUpdateModel } from '../models/volume'; + +angular.module('extension.storidge') +.factory('StoridgeVolumeService', ['$q', 'Storidge', function StoridgeVolumeServiceFactory($q, Storidge) { + 'use strict'; + var service = {}; + + service.volume = function(id) { + var deferred = $q.defer(); + + Storidge.getVolume({id:id}).$promise + .then(function success(data) { + var volume = new StoridgeVolumeModel(data); + deferred.resolve(volume); + }) + .catch(function error(err) { + deferred.reject({ msg: 'Unable to retrieve Storidge volume', err: err }); + }); + + return deferred.promise; + }; + + service.update = function(data) { + var deferred = $q.defer(); + var volume = new StoridgeVolumeUpdateModel(data); + Storidge.updateVolume(volume).$promise + .then(function success(data) { + deferred.resolve(data); + }) + .catch(function error(err) { + deferred.reject({ msg: 'Unable to update Storidge volume', err: err }); + }); + + return deferred.promise; + }; + + return service; +}]); diff --git a/app/extensions/storidge/views/cluster/cluster.html b/app/extensions/storidge/views/cluster/cluster.html index 0adb52fa4..b722f0d94 100644 --- a/app/extensions/storidge/views/cluster/cluster.html +++ b/app/extensions/storidge/views/cluster/cluster.html @@ -21,8 +21,10 @@ {{ clusterInfo.Domain }} - Status - {{ clusterInfo.Status }} + Condition + + {{ clusterInfo.Condition }} + Version @@ -57,89 +59,7 @@
- - diff --git a/app/extensions/storidge/views/cluster/clusterController.js b/app/extensions/storidge/views/cluster/clusterController.js index 6cf3d9f84..0bf2a1568 100644 --- a/app/extensions/storidge/views/cluster/clusterController.js +++ b/app/extensions/storidge/views/cluster/clusterController.js @@ -24,6 +24,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,16 +61,6 @@ 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(), diff --git a/app/extensions/storidge/views/drives/drives.html b/app/extensions/storidge/views/drives/drives.html new file mode 100644 index 000000000..58cf2182c --- /dev/null +++ b/app/extensions/storidge/views/drives/drives.html @@ -0,0 +1,24 @@ + + + + + + + + Storidge > Drives + + + +
+
+ +
+
diff --git a/app/extensions/storidge/views/drives/drivesController.js b/app/extensions/storidge/views/drives/drivesController.js new file mode 100644 index 000000000..837433240 --- /dev/null +++ b/app/extensions/storidge/views/drives/drivesController.js @@ -0,0 +1,48 @@ +angular.module('extension.storidge') +.controller('StoridgeDrivesController', ['$scope', '$state', 'Notifications', 'StoridgeDriveService', +function ($scope, $state, Notifications, StoridgeDriveService) { + + $scope.state = { + additionInProgress: [], + actionInProgress: false + }; + + $scope.addAction = function (drive, idx) { + $scope.state.additionInProgress[idx] = true; + $scope.state.actionInProgress = true; + StoridgeDriveService.add(drive.Device, drive.Node) + .then(function success() { + Notifications.success('Drive ' + drive.Device + ' successfully added on node ' + drive.Node); + $state.reload(); + }) + .catch(function error(err) { + Notifications.error('Failure', err, 'Unable to add drive'); + }) + .finally(function final() { + $scope.state.additionInProgress[idx] = false; + $scope.state.actionInProgress = false; + }); + }; + + $scope.rescanAction = function () { + StoridgeDriveService.rescan() + .then(function sucess() { + $state.reload(); + }) + .catch(function error(err) { + Notifications.error('Failure', err, 'Unable to scan drives'); + }); + }; + + function initView() { + StoridgeDriveService.drives() + .then(function success(data) { + $scope.drives = data; + }) + .catch(function error(err) { + Notifications.error('Failure', err, 'Unable to retrieve drives'); + }); + } + + initView(); +}]); diff --git a/app/extensions/storidge/views/drives/inspect/drive.html b/app/extensions/storidge/views/drives/inspect/drive.html new file mode 100644 index 000000000..bef7ba2a2 --- /dev/null +++ b/app/extensions/storidge/views/drives/inspect/drive.html @@ -0,0 +1,56 @@ + + + + Storidge > Drives > {{ drive.Id }} + + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
ID + {{ drive.Id }} + +
Node{{ drive.Node }}
Device{{ drive.Device }}
Size{{ drive.Size }}
Use{{ drive.Use }}
Type{{ drive.Type }}
Status + {{ drive.Status|capitalize }} +
+ + +
+
\ No newline at end of file diff --git a/app/extensions/storidge/views/drives/inspect/driveController.js b/app/extensions/storidge/views/drives/inspect/driveController.js new file mode 100644 index 000000000..7d4c0ccef --- /dev/null +++ b/app/extensions/storidge/views/drives/inspect/driveController.js @@ -0,0 +1,49 @@ +angular.module('extension.storidge') +.controller('StoridgeDriveController', ['$scope', '$state', '$transition$', 'Notifications', 'ModalService', 'StoridgeDriveService', +function ($scope, $state, $transition$, Notifications, ModalService, StoridgeDriveService) { + + $scope.actionInProgress = false; + + $scope.removeDrive = function () { + ModalService.confirm({ + title: 'Are you sure?', + message: 'Do you want really want to remove this drive from the storage pool?', + buttons: { + confirm: { + label: 'Remove', + className: 'btn-danger' + } + }, + callback: function onConfirm(confirmed) { + if(!confirmed) { return; } + $scope.actionInProgress = true; + StoridgeDriveService.remove($scope.drive.Id) + .then(function () { + Notifications.success('Success', 'Drive removed from storage pool'); + $state.go('storidge.drives', {}, { reload:true }); + }) + .catch(function error(err) { + Notifications.error('Failure', err, 'Unable to remove drive from storage pool'); + }) + .finally(function final() { + $scope.actionInProgress = false; + }); + } + }); + }; + + function initView() { + $scope.id = $transition$.params().id; + + StoridgeDriveService.drive($scope.id) + .then(function success(data) { + $scope.drive = data; + }) + .catch(function error(err) { + Notifications.error('Failure', err, 'Unable to retrieve drive details'); + }); + } + + initView(); + +}]); 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..a0a7c718e --- /dev/null +++ b/app/extensions/storidge/views/nodes/inspect/node.html @@ -0,0 +1,170 @@ + + + + Storidge > {{ node.Name }} + + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Name{{ node.Name }}
Domain{{ node.Domain }}
Domain ID{{ node.DomainID }}
Node status + + {{ node.Status }} +
Operating condition + + {{ node.Condition }} +
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 | bytes }}
Used{{ node.UsedCapacity | bytes }}
Provisioned{{ node.ProvisionedCapacity | bytes }}
Total{{ node.TotalCapacity | bytes }}
+ + +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + +
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..3d9993cc4 --- /dev/null +++ b/app/extensions/storidge/views/nodes/inspect/nodeController.js @@ -0,0 +1,107 @@ +angular.module('extension.storidge') +.controller('StoridgeNodeController', ['$scope', '$state', '$transition$', 'Notifications', 'StoridgeNodeService', 'ModalService', +function ($scope, $state, $transition$, Notifications, StoridgeNodeService, ModalService) { + + $scope.removeNodeAction = function(selectedItems) { + ModalService.confirm({ + title: 'Are you sure?', + message: 'Do you want really want to remove the node from the cluster?', + buttons: { + confirm: { + label: 'Remove', + className: 'btn-danger' + } + }, + callback: function onConfirm(confirmed) { + if(!confirmed) { return; } + remove(selectedItems); + } + }); + }; + + function remove() { + StoridgeNodeService.remove($scope.node.Name) + .then(function success() { + Notifications.success('Node successfully removed', $scope.node.Name); + $state.go('storidge.cluster'); + }) + .catch(function error(err) { + Notifications.error('Failure', err, 'Unable to remove node'); + }); + } + + $scope.cordonNodeAction = function(selectedItems) { + ModalService.confirm({ + title: 'Are you sure?', + message: 'Do you want really want to put the node in maintenance mode?', + buttons: { + confirm: { + label: 'Enter maintenance', + className: 'btn-danger' + } + }, + callback: function onConfirm(confirmed) { + if(!confirmed) { return; } + cordonNode(selectedItems); + } + }); + }; + + function cordonNode() { + StoridgeNodeService.cordon($scope.node.Name) + .then(function success() { + Notifications.success('Node successfully put in maintenance'); + }) + .catch(function error(err) { + Notifications.error('Failure', err, 'Unable to put node in maintenance mode'); + }) + .finally(function final() { + $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: 'Exit maintenance', + className: 'btn-danger' + } + }, + callback: function onConfirm(confirmed) { + if(!confirmed) { return; } + uncordonNode(selectedItems); + } + }); + }; + + function uncordonNode() { + StoridgeNodeService.uncordon($scope.node.Name) + .then(function success() { + Notifications.success('Node successfully bringed back'); + }) + .catch(function error(err) { + Notifications.error('Failure', err, 'Unable to put node out of maintenance mode'); + }) + .finally(function final() { + $state.reload(); + }); + } + + 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(); + +}]); diff --git a/app/extensions/storidge/views/profiles/create/createProfileController.js b/app/extensions/storidge/views/profiles/create/createProfileController.js index fbb894d96..89c0658af 100644 --- a/app/extensions/storidge/views/profiles/create/createProfileController.js +++ b/app/extensions/storidge/views/profiles/create/createProfileController.js @@ -1,9 +1,14 @@ +import _ from 'lodash-es'; import { StoridgeProfileDefaultModel } from '../../../models/profile'; angular.module('extension.storidge') .controller('StoridgeCreateProfileController', ['$scope', '$state', '$transition$', 'Notifications', 'StoridgeProfileService', function ($scope, $state, $transition$, Notifications, StoridgeProfileService) { + $scope.formValues = { + Labels: [] + }; + $scope.state = { NoLimit: true, LimitIOPS: false, @@ -17,6 +22,24 @@ function ($scope, $state, $transition$, Notifications, StoridgeProfileService) { { value: 3, label: '3-copy' } ]; + $scope.addLabel = function() { + $scope.formValues.Labels.push({ name: '', value: ''}); + }; + + $scope.removeLabel = function(index) { + $scope.formValues.Labels.splice(index, 1); + }; + + function prepareLabels(profile) { + var labels = {}; + $scope.formValues.Labels.forEach(function (label) { + if (label.name && label.value) { + labels[label.name] = label.value; + } + }); + profile.Labels = labels; + } + $scope.create = function () { var profile = $scope.model; @@ -30,6 +53,23 @@ function ($scope, $state, $transition$, Notifications, StoridgeProfileService) { delete profile.MaxBandwidth; } + if (profile.SnapshotEnabled) { + if (!profile.SnapshotMax || profile.SnapshotMax <= 0) { + profile.SnapshotMax = 1; + } + if (!$scope.state.RecurringSnapshotEnabled) { + delete profile.SnapshotInterval; + } + if ($scope.state.RecurringSnapshotEnabled && (!profile.SnapshotInterval || profile.SnapshotInterval <= 0)) { + profile.SnapshotInterval = 1440; + } + } else { + delete profile.SnapshotMax; + delete profile.SnapshotInterval; + } + + prepareLabels(profile); + $scope.state.actionInProgress = true; StoridgeProfileService.create(profile) .then(function success() { @@ -47,7 +87,7 @@ function ($scope, $state, $transition$, Notifications, StoridgeProfileService) { $scope.updatedName = function() { if (!$scope.state.ManualInputDirectory) { var profile = $scope.model; - profile.Directory = '/cio/' + profile.Name; + profile.Directory = '/cio/' + (profile.Name ? _.toLower(profile.Name) : ''); } }; @@ -60,7 +100,7 @@ function ($scope, $state, $transition$, Notifications, StoridgeProfileService) { function initView() { var profile = new StoridgeProfileDefaultModel(); profile.Name = $transition$.params().profileName; - profile.Directory = '/cio/' + profile.Name; + profile.Directory = profile.Directory + _.toLower(profile.Name); $scope.model = profile; } diff --git a/app/extensions/storidge/views/profiles/create/createprofile.html b/app/extensions/storidge/views/profiles/create/createprofile.html index 7680d515e..c95764928 100644 --- a/app/extensions/storidge/views/profiles/create/createprofile.html +++ b/app/extensions/storidge/views/profiles/create/createprofile.html @@ -91,20 +91,164 @@ + +
+ +
+ +
+
+ + +
+ + +
+ + +
+ +
+ +
+
+ +
+
+

+ Snapshot max (count) +

+
+
+ + +
+ + +
+ + +
+ +
+ +
+
+ +
+
+

+ Snapshot interval (minutes) +

+
+
+ + +
+ + +
+ + +
+ +
+ +
+
+ + +
+ +
+ +
+
+ + +
+ +
+ +
+
+ + +
+ +
+ +
+
+ + +
+
+ + + add label + +
+ +
+
+
+ name + +
+
+ value + +
+ +
+
+ +
+
IOPS
-
+
-
+
@@ -142,14 +286,14 @@ Bandwidth
-
+
-
+
diff --git a/app/extensions/storidge/views/profiles/edit/profile.html b/app/extensions/storidge/views/profiles/edit/profile.html index 12994ad5f..5b5903913 100644 --- a/app/extensions/storidge/views/profiles/edit/profile.html +++ b/app/extensions/storidge/views/profiles/edit/profile.html @@ -84,6 +84,150 @@
+ +
+ +
+ +
+
+ + +
+ + +
+ + +
+ +
+ +
+
+ +
+
+

+ Snapshot max (count) +

+
+
+ + +
+ + +
+ + +
+ +
+ +
+
+ +
+
+

+ Snapshot interval (minutes) +

+
+
+ + +
+ + +
+ + +
+ +
+ +
+
+ + +
+ +
+ +
+
+ + +
+ +
+ +
+
+ + +
+ +
+ +
+
+ + +
+
+ + + add label + +
+ +
+
+
+ name + +
+
+ value + +
+ +
+
+ +
+
diff --git a/app/extensions/storidge/views/profiles/edit/profileController.js b/app/extensions/storidge/views/profiles/edit/profileController.js index ff6aecfc0..ecafae46f 100644 --- a/app/extensions/storidge/views/profiles/edit/profileController.js +++ b/app/extensions/storidge/views/profiles/edit/profileController.js @@ -2,21 +2,49 @@ angular.module('extension.storidge') .controller('StoridgeProfileController', ['$scope', '$state', '$transition$', 'Notifications', 'StoridgeProfileService', 'ModalService', function ($scope, $state, $transition$, Notifications, StoridgeProfileService, ModalService) { + $scope.formValues = { + Labels: [] + }; + $scope.state = { NoLimit: false, LimitIOPS: false, LimitBandwidth: false, updateInProgress: false, - deleteInProgress: false + deleteInProgress: false, + RecurringSnapshotEnabled: false }; + $scope.addLabel = function() { + $scope.formValues.Labels.push({ name: '', value: ''}); + }; + + $scope.removeLabel = function(index) { + $scope.formValues.Labels.splice(index, 1); + }; + + function prepareLabels(profile) { + var labels = {}; + $scope.formValues.Labels.forEach(function (label) { + if (label.name && label.value) { + labels[label.name] = label.value; + } + }); + profile.Labels = labels; + } + + function initLabels(labels) { + $scope.formValues.Labels = Object.keys(labels).map(function(key) { + return { name:key, value:labels[key] }; + }); + } + $scope.RedundancyOptions = [ { value: 2, label: '2-copy' }, { value: 3, label: '3-copy' } ]; $scope.update = function() { - var profile = $scope.profile; if (!$scope.state.LimitIOPS) { @@ -29,6 +57,23 @@ function ($scope, $state, $transition$, Notifications, StoridgeProfileService, M delete profile.MaxBandwidth; } + if (profile.SnapshotEnabled) { + if (!profile.SnapshotMax || profile.SnapshotMax <= 0) { + profile.SnapshotMax = 1; + } + if (!$scope.state.RecurringSnapshotEnabled) { + delete profile.SnapshotInterval; + } + if ($scope.state.RecurringSnapshotEnabled && (!profile.SnapshotInterval || profile.SnapshotInterval <= 0)) { + profile.SnapshotInterval = 1440; + } + } else { + delete profile.SnapshotMax; + delete profile.SnapshotInterval; + } + + prepareLabels(profile); + $scope.state.updateInProgress = true; StoridgeProfileService.update(profile) .then(function success() { @@ -81,6 +126,10 @@ function ($scope, $state, $transition$, Notifications, StoridgeProfileService, M } else { $scope.state.NoLimit = true; } + if (profile.SnapshotEnabled && profile.SnapshotInterval !== 0) { + $scope.state.RecurringSnapshotEnabled = true; + } + initLabels(profile.Labels); $scope.profile = profile; }) .catch(function error(err) { diff --git a/app/extensions/storidge/views/profiles/profilesController.js b/app/extensions/storidge/views/profiles/profilesController.js index 2214739c7..f60d5c6d5 100644 --- a/app/extensions/storidge/views/profiles/profilesController.js +++ b/app/extensions/storidge/views/profiles/profilesController.js @@ -1,3 +1,4 @@ +import _ from 'lodash-es'; import { StoridgeProfileDefaultModel } from '../../models/profile'; angular.module('extension.storidge') @@ -35,8 +36,13 @@ function ($q, $scope, $state, Notifications, StoridgeProfileService) { $scope.create = function() { var model = new StoridgeProfileDefaultModel(); + model.Labels = {}; model.Name = $scope.formValues.Name; - model.Directory = model.Directory + model.Name; + model.Directory = model.Directory + _.toLower(model.Name); + delete model.MinBandwidth; + delete model.MaxBandwidth; + delete model.MinIOPS; + delete model.MaxIOPS; $scope.state.actionInProgress = true; StoridgeProfileService.create(model) diff --git a/app/extensions/storidge/views/snapshots/inspect/snapshot.html b/app/extensions/storidge/views/snapshots/inspect/snapshot.html new file mode 100644 index 000000000..fb9d1afa4 --- /dev/null +++ b/app/extensions/storidge/views/snapshots/inspect/snapshot.html @@ -0,0 +1,53 @@ + + + + Volumes > {{ volumeId }} > Snapshots > {{ snapshot.Id }} + + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
ID + {{ snapshot.Id }} + +
Date{{ snapshot.Date }}
Description{{ snapshot.Description }}
SourceID{{ snapshot.SourceID }}
Type{{ snapshot.Type }}
Directory{{ snapshot.Directory }}
Source{{ snapshot.Source }}
+ + +
+
\ No newline at end of file diff --git a/app/extensions/storidge/views/snapshots/inspect/snapshotController.js b/app/extensions/storidge/views/snapshots/inspect/snapshotController.js new file mode 100644 index 000000000..1534087cd --- /dev/null +++ b/app/extensions/storidge/views/snapshots/inspect/snapshotController.js @@ -0,0 +1,44 @@ +angular.module('extension.storidge') +.controller('StoridgeSnapshotController', ['$scope', '$state', '$transition$', 'Notifications', 'ModalService', 'StoridgeSnapshotService', +function ($scope, $state, $transition$, Notifications, ModalService, StoridgeSnapshotService) { + + $scope.removeSnapshot = function () { + ModalService.confirm({ + title: 'Are you sure?', + message: 'Do you want really want to remove this snapshot?', + buttons: { + confirm: { + label: 'Remove', + className: 'btn-danger' + } + }, + callback: function onConfirm(confirmed) { + if(!confirmed) { return; } + StoridgeSnapshotService.remove($scope.snapshot.Id) + .then(function () { + Notifications.success('Success', 'Snapshot removed'); + $state.go('portainer.volumes.volume', {id: $scope.volumeId}); + }) + .catch(function error(err) { + Notifications.error('Failure', err, 'Unable to remove snapshot'); + }); + } + }); + }; + + function initView() { + $scope.volumeId = $transition$.params().id; + $scope.snapshotId = $transition$.params().snapshotId; + + StoridgeSnapshotService.snapshot($scope.snapshotId) + .then(function success(data) { + $scope.snapshot = data; + }) + .catch(function error(err) { + Notifications.error('Failure', err, 'Unable to retrieve snapshot details'); + }); + } + + initView(); + +}]); diff --git a/app/portainer/components/datatables/genericDatatableController.js b/app/portainer/components/datatables/genericDatatableController.js index 15fe1a8d0..3fb1db1c8 100644 --- a/app/portainer/components/datatables/genericDatatableController.js +++ b/app/portainer/components/datatables/genericDatatableController.js @@ -1,13 +1,13 @@ import './datatable.css'; angular.module('portainer.app') -.controller('GenericDatatableController', ['PaginationService', 'DatatableService', -function (PaginationService, DatatableService) { +.controller('GenericDatatableController', ['PaginationService', 'DatatableService', 'PAGINATION_MAX_ITEMS', +function (PaginationService, DatatableService, PAGINATION_MAX_ITEMS) { this.state = { selectAll: false, orderBy: this.orderBy, - paginatedItemLimit: PaginationService.getPaginationLimit(this.tableKey), + paginatedItemLimit: PAGINATION_MAX_ITEMS, displayTextFilter: false, selectedItemCount: 0, selectedItems: [] @@ -67,5 +67,6 @@ function (PaginationService, DatatableService) { function setDefaults(ctrl) { ctrl.showTextFilter = ctrl.showTextFilter ? ctrl.showTextFilter : false; ctrl.state.reverseOrder = ctrl.reverseOrder ? ctrl.reverseOrder : false; + ctrl.state.paginatedItemLimit = PaginationService.getPaginationLimit(ctrl.tableKey); } }]); diff --git a/app/portainer/components/slider/sliderController.js b/app/portainer/components/slider/sliderController.js index 21175579d..8755097cb 100644 --- a/app/portainer/components/slider/sliderController.js +++ b/app/portainer/components/slider/sliderController.js @@ -10,7 +10,7 @@ angular.module('portainer.app') showSelectionBar: true, enforceStep: false, translate: function(value, sliderId, label) { - if (label === 'floor' || value === 0) { + if ((label === 'floor' && ctrl.floor === 0) || value === 0) { return 'unlimited'; } return value; diff --git a/app/portainer/filters/filters.js b/app/portainer/filters/filters.js index f6b6d881f..30ef37384 100644 --- a/app/portainer/filters/filters.js +++ b/app/portainer/filters/filters.js @@ -38,7 +38,7 @@ angular.module('portainer.app') .filter('capitalize', function () { 'use strict'; return function (text) { - return _.capitalize(text); + return text ? _.capitalize(text) : ''; }; }) .filter('stripprotocol', function() { diff --git a/app/portainer/services/legacyExtensionManager.js b/app/portainer/services/legacyExtensionManager.js index 580457b14..8b0aa783a 100644 --- a/app/portainer/services/legacyExtensionManager.js +++ b/app/portainer/services/legacyExtensionManager.js @@ -2,8 +2,8 @@ import _ from 'lodash-es'; // TODO: legacy extension management angular.module('portainer.app') -.factory('LegacyExtensionManager', ['$q', 'PluginService', 'SystemService', 'LegacyExtensionService', -function ExtensionManagerFactory($q, PluginService, SystemService, LegacyExtensionService) { +.factory('LegacyExtensionManager', ['$q', 'PluginService', 'SystemService', 'NodeService', 'LegacyExtensionService', +function ExtensionManagerFactory($q, PluginService, SystemService, NodeService, LegacyExtensionService) { 'use strict'; var service = {}; @@ -59,9 +59,9 @@ function ExtensionManagerFactory($q, PluginService, SystemService, LegacyExtensi function registerStoridgeUsingSwarmManagerIP() { var deferred = $q.defer(); - SystemService.info() + NodeService.getActiveManager() .then(function success(data) { - var managerIP = data.Swarm.NodeAddr; + var managerIP = data.Addr; var storidgeAPIURL = 'tcp://' + managerIP + ':8282'; return LegacyExtensionService.registerStoridgeExtension(storidgeAPIURL); }) diff --git a/app/portainer/services/localStorage.js b/app/portainer/services/localStorage.js index f23f0ba50..31754881d 100644 --- a/app/portainer/services/localStorage.js +++ b/app/portainer/services/localStorage.js @@ -60,10 +60,10 @@ angular.module('portainer.app') localStorageService.remove('JWT'); }, storePaginationLimit: function(key, count) { - localStorageService.cookie.set('pagination_' + key, count); + localStorageService.set('datatable_pagination_' + key, count); }, getPaginationLimit: function(key) { - return localStorageService.cookie.get('pagination_' + key); + return localStorageService.get('datatable_pagination_' + key); }, getDataTableOrder: function(key) { return localStorageService.get('datatable_order_' + key); diff --git a/app/portainer/services/notifications.js b/app/portainer/services/notifications.js index cff57364e..010c27079 100644 --- a/app/portainer/services/notifications.js +++ b/app/portainer/services/notifications.js @@ -21,6 +21,8 @@ angular.module('portainer.app') msg = e.data.details; } else if (e.data && e.data.message) { msg = e.data.message; + } else if (e.data && e.data.content) { + msg = e.data.content; } else if (e.message) { msg = e.message; } else if (e.err && e.err.data && e.err.data.message) { diff --git a/app/portainer/views/sidebar/sidebar.html b/app/portainer/views/sidebar/sidebar.html index 6193f73ef..0f833f739 100644 --- a/app/portainer/views/sidebar/sidebar.html +++ b/app/portainer/views/sidebar/sidebar.html @@ -25,16 +25,19 @@ offline-mode="endpointState.OfflineMode" >
  • - Extensions + Integrations
  • Storidge -
    +
    Monitor
    -
    +
    Profiles
    +
    + Drives +
  • Scheduler diff --git a/assets/css/app.css b/assets/css/app.css index b255c1718..48a153f38 100644 --- a/assets/css/app.css +++ b/assets/css/app.css @@ -144,6 +144,10 @@ a[ng-click]{ word-break: break-word; } +.widget .widget-body table.description-table { + table-layout: fixed; +} + .template-widget { height: 100%; } @@ -267,6 +271,12 @@ a[ng-click]{ border-radius: 3px; } +.btn-datatable { + padding: 2.6px 7.8px 3.9px; + line-height: 1; + margin: 0px 0px 0px 0px; +} + @media screen and (min-width: 1107px) { .btn-responsive { padding: 6px 12px;