Index: /branches/amp_3_7_2/extensions/auditing/webui/engine/engine.html =================================================================== --- /branches/amp_3_7_2/extensions/auditing/webui/engine/engine.html (revision 2797) +++ /branches/amp_3_7_2/extensions/auditing/webui/engine/engine.html (working copy) @@ -2,16 +2,29 @@
-
-
-
+
+
+
+
+
+
+
-
+ \ No newline at end of file Index: /branches/amp_3_7_2/extensions/auditing/webui/engine/engine.module.js =================================================================== --- /branches/amp_3_7_2/extensions/auditing/webui/engine/engine.module.js (revision 2797) +++ /branches/amp_3_7_2/extensions/auditing/webui/engine/engine.module.js (working copy) @@ -48,6 +48,26 @@ } } }) + .state('index.auditing.engine.import', { + url: '^/auditing/engine/import', + views: { + 'import@index.auditing.engine': { + templateUrl: 'app/modules/extensions/auditing/engine/import/import.html', + controller: 'auditImportCtrl', + controllerAs: 'auditImport' + } + } + }) + .state('index.auditing.engine.export', { + url: '^/auditing/engine/export', + views: { + 'export@index.auditing.engine': { + templateUrl: 'app/modules/extensions/auditing/engine/export/export.html', + controller: 'auditExportCtrl', + controllerAs: 'auditExport' + } + } + }) }]); angular.module("cmApp").requires.push('cm.audit_engine'); \ No newline at end of file Index: /branches/amp_3_7_2/extensions/auditing/webui/engine/engine.service.js =================================================================== --- /branches/amp_3_7_2/extensions/auditing/webui/engine/engine.service.js (revision 2797) +++ /branches/amp_3_7_2/extensions/auditing/webui/engine/engine.service.js (working copy) @@ -13,6 +13,10 @@ postStatus: postStatus, getServicesStatus: getServicesStatus, restartService: restartService, + exportSnapshot: exportSnapshot, + getExportStatus: getExportStatus, + importSnapshot: importSnapshot, + getImportStatus: getImportStatus }; function getConfig(app) { return apiService.get('/composer_config/' + app); @@ -30,6 +34,18 @@ return apiService.get('/observability-status'); } function restartService(serviceName) { - return apiService.post2('/observability-restart', JSON.stringify({service: serviceName})); + return apiService.post2('/observability-restart', JSON.stringify({ service: serviceName })); } + function exportSnapshot(data) { + return apiService.post2('/snapshot/export', JSON.stringify(data)); + } + function getExportStatus() { + return apiService.get('/snapshot/export/status'); + } + function importSnapshot(data) { + return apiService.post2('/snapshot/import', JSON.stringify(data)); + } + function getImportStatus() { + return apiService.get('/snapshot/import/status'); + } }]); Index: /branches/amp_3_7_2/extensions/auditing/webui/engine/export/export.controller.js =================================================================== --- /branches/amp_3_7_2/extensions/auditing/webui/engine/export/export.controller.js (nonexistent) +++ /branches/amp_3_7_2/extensions/auditing/webui/engine/export/export.controller.js (working copy) @@ -0,0 +1,82 @@ +angular.module('cm.audit_engine') + .controller('auditExportCtrl', [ + '$scope', + '$rootScope', + 'engineService', + '$interval', + function ($scope, $rootScope, engineService, $interval) { + $rootScope.title = 'Export Logs'; + $scope.exportData = { + location: 'primary', + ip: '', + username: '', + password: '', + path: '' + }; + $scope.exportStatus = 'unknown'; + $scope.isExporting = false; + $scope.message = ''; + $scope.error = ''; + + var statusInterval; + + $scope.startExport = function () { + $scope.isExporting = true; + $scope.message = ''; + $scope.error = ''; + $scope.exportStatus = 'unknown'; + + var payload = { + location: $scope.exportData.location + }; + + if ($scope.exportData.location === 'custom') { + payload.ip = $scope.exportData.ip; + payload.username = $scope.exportData.username; + payload.password = $scope.exportData.password; + payload.path = $scope.exportData.path; + } + + engineService.exportSnapshot(payload).then(function (response) { + var msg = response.data && response.data.message; + if (msg && (msg.indexOf("Error") !== -1 || msg.indexOf("ERROR") !== -1)) { + $scope.isExporting = false; + $scope.error = msg; + } else { + $scope.message = msg; + startStatusPolling(); + } + }, function (error) { + $scope.isExporting = false; + $scope.error = error.data && error.data.message ? error.data.message : ''; + }); + }; + + function startStatusPolling() { + if (angular.isDefined(statusInterval)) return; + + statusInterval = $interval(function () { + engineService.getExportStatus().then(function (response) { + $scope.exportStatus = response.data.status; + if ($scope.exportStatus === 'Successful' || $scope.exportStatus === 'Error' || $scope.exportStatus === 'unknown') { + stopStatusPolling(); + $scope.isExporting = false; + } + }); + }, 5000); + } + + startStatusPolling(); + + function stopStatusPolling() { + if (angular.isDefined(statusInterval)) { + $interval.cancel(statusInterval); + statusInterval = undefined; + } + } + + $scope.$on('$destroy', function () { + stopStatusPolling(); + }); + } + ]); Index: /branches/amp_3_7_2/extensions/auditing/webui/engine/export/export.html =================================================================== --- /branches/amp_3_7_2/extensions/auditing/webui/engine/export/export.html (nonexistent) +++ /branches/amp_3_7_2/extensions/auditing/webui/engine/export/export.html (working copy) @@ -0,0 +1,84 @@ +
+
+
+
+ {{ 'Export Logs' | T }} +
+
+
+
+ +
+
+ +
+
+ +
+
+ +
+
+
+ +
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ +
+
+
+ +
+ {{ 'Export in progress...' | T }} +
+
+ {{ 'Export completed successfully.' | T }} +
+
+ {{ 'Export failed.' | T }} + 
{{ error }}
+
+
+
+
+
\ No newline at end of file Index: /branches/amp_3_7_2/extensions/auditing/webui/engine/import/import.controller.js =================================================================== --- /branches/amp_3_7_2/extensions/auditing/webui/engine/import/import.controller.js (nonexistent) +++ /branches/amp_3_7_2/extensions/auditing/webui/engine/import/import.controller.js (working copy) @@ -0,0 +1,113 @@ +angular.module('cm.audit_engine') + .controller('auditImportCtrl', [ + '$scope', + '$rootScope', + 'engineService', + '$interval', + function ($scope, $rootScope, engineService, $interval) { + $rootScope.title = 'Import Logs'; + $scope.importData = { + type: 'amp', // 'amp' or 'remote' + location: 'primary', + ip: '', + username: '', + password: '', + path: '', + start_date: null, + end_date: null + }; + $scope.importStatus = null; + $scope.isImporting = false; + $scope.message = ''; + $scope.error = ''; + + var statusInterval; + + $scope.startImport = function () { + $scope.message = ''; + $scope.error = ''; + $scope.importStatus = 'unknown'; + + if ($scope.importData.end_date && !$scope.importData.start_date) { + $scope.error = "End date requires start date"; + return; + } + + $scope.isImporting = true; + + var payload = { + ip: $scope.importData.ip, + username: $scope.importData.username, + password: $scope.importData.password + }; + + if ($scope.importData.type === 'amp') { + payload.location = $scope.importData.location; + } else { + payload.location = 'custom'; + payload.path = $scope.importData.path; + } + + if ($scope.importData.start_date) { + payload.start_date = formatDate($scope.importData.start_date); + } + if ($scope.importData.end_date) { + payload.end_date = formatDate($scope.importData.end_date); + } + + engineService.importSnapshot(payload).then(function (response) { + var msg = response.data && response.data.message; + if (msg && (msg.indexOf("Error") !== -1 || msg.indexOf("ERROR") !== -1)) { + $scope.isImporting = false; + $scope.error = msg; + } else { + $scope.message = msg; + startStatusPolling(); + } + }, function (error) { + $scope.isImporting = false; + $scope.error = error.data && error.data.message ? error.data.message : ''; + }); + }; + + function formatDate(date) { + if (!date) return null; + var d = new Date(date), + month = '' + (d.getMonth() + 1), + day = '' + d.getDate(), + year = d.getFullYear(); + + if (month.length < 2) month = '0' + month; + if (day.length < 2) day = '0' + day; + + return [year, month, day].join('-'); + } + + function startStatusPolling() { + if (angular.isDefined(statusInterval)) return; + + statusInterval = $interval(function () { + engineService.getImportStatus().then(function (response) { + $scope.importStatus = response.data.status; + if ($scope.importStatus === 'Successful' || $scope.importStatus === 'unknown') { + stopStatusPolling(); + $scope.isImporting = false; + } + }); + }, 5000); + } + + startStatusPolling(); + + function stopStatusPolling() { + if (angular.isDefined(statusInterval)) { + $interval.cancel(statusInterval); + statusInterval = undefined; + } + } + + $scope.$on('$destroy', function () { + stopStatusPolling(); + }); + } + ]); Index: /branches/amp_3_7_2/extensions/auditing/webui/engine/import/import.html =================================================================== --- /branches/amp_3_7_2/extensions/auditing/webui/engine/import/import.html (nonexistent) +++ /branches/amp_3_7_2/extensions/auditing/webui/engine/import/import.html (working copy) @@ -0,0 +1,107 @@ +
+
+
+
+ {{ 'Import Logs' | T }} +
+
+
+
+ +
+
+ +
+
+ +
+
+
+ +
+
+ +
+ +
+
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+ +
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ +
+
+
+
+ +
+
+ +
+
+
+ +
+ {{ 'Import in progress...' | T }} +
+
+ {{ 'Import completed successfully.' | T }} +
+
+ {{ 'Import failed.' | T }} + 
{{ error }}
+
+
+
+
+
\ No newline at end of file Index: /branches/amp_3_7_2/src/webui/webui/htdocs/new/src/hive/controller/snapshot_controller.py =================================================================== --- /branches/amp_3_7_2/src/webui/webui/htdocs/new/src/hive/controller/snapshot_controller.py (revision 2797) +++ /branches/amp_3_7_2/src/webui/webui/htdocs/new/src/hive/controller/snapshot_controller.py (working copy) @@ -119,7 +119,7 @@ # ============================================================ def get_import_status(): if not os.path.exists(LOG_FILE_IMPORT): - return json_response({"error": "Import log not found"}, 404) + return json_response({"status": "unknown", "message": "Import log not found"}, 200) try: with open(LOG_FILE_IMPORT) as f: @@ -140,7 +140,7 @@ def get_export_status(): if not os.path.exists(LOG_FILE_EXPORT): - return json_response({"status": "unknown", "message": "Export log not found"}, 404) + return json_response({"status": "unknown", "message": "Export log not found"}, 200) try: with open(LOG_FILE_EXPORT, "r") as f: