diff --git a/client/cat3/main.html b/client/cat3/main.html index cbae61cdf..876f4b049 100644 --- a/client/cat3/main.html +++ b/client/cat3/main.html @@ -175,6 +175,7 @@ + diff --git a/client/cat3/src/factory/chefDataFormatterService.js b/client/cat3/src/factory/chefDataFormatterService.js index a95acf332..ac4874db4 100644 --- a/client/cat3/src/factory/chefDataFormatterService.js +++ b/client/cat3/src/factory/chefDataFormatterService.js @@ -101,6 +101,19 @@ } return list; }, + formatInstanceList: function (obj) { + var list = []; + for (var i = 0; i < obj.length; i++) { + if (obj[i].instanceState === "running" || obj[i].instanceState === "pending" || obj[i].instanceState === "unknown") { + list.push({ + className: 'chef', + value: obj[i].name, + data: obj[i]._id + }); + } + } + return list; + }, formatRunListFromComponent: function (nodesList) { var reqBody = { cookbooks: [], diff --git a/client/cat3/src/partials/global.scss b/client/cat3/src/partials/global.scss index fa856dad7..5b15ebc15 100644 --- a/client/cat3/src/partials/global.scss +++ b/client/cat3/src/partials/global.scss @@ -724,6 +724,10 @@ accordion .panel-heading { margin-top: 15px; } +.margintop10 { + margin-top: 10px; +} + .marginleft15 { margin-left: 15px; } @@ -1365,20 +1369,22 @@ label { line-height: 34; font-size: 13px !important; } - .btnDay{ - border-radius: 15px; - margin: 0 3px; - height: 24px; - width: 24px; - font-weight: 600; - padding: 1px 5px; - } - .activeDay { - background: #0B5475 !important; - } +} + +.btnDay{ + border-radius: 15px; + margin: 0 3px; + height: 24px; + width: 24px; + font-weight: 600; + padding: 1px 5px; } +.activeDay { + background: #0B5475 !important; +} + .form-control-date{ display: block; width: 100%; diff --git a/client/cat3/src/partials/sections/dashboard/bots/bots.scss b/client/cat3/src/partials/sections/dashboard/bots/bots.scss index e4177a055..8a1d84145 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/bots.scss +++ b/client/cat3/src/partials/sections/dashboard/bots/bots.scss @@ -20,16 +20,18 @@ height: 50px; } -#botLibraryPage { +#botAuditTrailPage { + .ui-grid-column-menu-button { + display: none; + } +} + +#botLibraryPage, #botAuditTrailPage { .page-name { font-size: 18px; margin: 5px 0 5px 10px; } - .borderTop { - border-top: 1px dashed #ddd; - } - .btn-xs { padding: 1px 5px; font-size: 12px; @@ -39,23 +41,44 @@ margin: 2px 10px 0 0; } + .borderTop { + border-top: 1px dashed #ddd; + } +} + +#botLibraryPage { .summary-container { width: 100%; } .selected { - border: 2px solid #000; - height: 94px !important; - margin-top: 13px !important; + height: 92px !important; + margin-top: 14px !important; + } + + .selected-blue { + color: #00c0ef !important; + border: 1px solid #00c0ef !important; + } + + .selected-green { + color: #00a65a !important; + border: 1px solid #00a65a !important; + } + + .selected-red { + color: #dd4b39 !important; + border: 1px solid #dd4b39 !important; } .info-box { display: block; min-height: 90px; - background: #ecf0f5; + background: #fff; width: 100%; box-shadow: 0 1px 1px rgba(0,0,0,0.1); margin: 15px 0; + border: 1px solid #ccc; } .info-box-content { @@ -84,8 +107,8 @@ .info-box-icon { display: block; float: left; - height: 90px; - width: 90px; + height: 88px; + width: 88px; text-align: center; font-size: 45px; line-height: 90px; diff --git a/client/cat3/src/partials/sections/dashboard/bots/botsCtrl.js b/client/cat3/src/partials/sections/dashboard/bots/botsCtrl.js index 8aa97d902..34b9e2b0a 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/botsCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/bots/botsCtrl.js @@ -48,8 +48,6 @@ }); }]) .controller('botsCtrl',['$scope', '$rootScope', '$state', function ($scope, $rootScope, $state) { - /*var treeNames = ['Bots']; - $rootScope.$emit('treeNameUpdate', treeNames);*/ $state.go('dashboard.bots.library'); $rootScope.stateItems = $state.params; }]); diff --git a/client/cat3/src/partials/sections/dashboard/bots/controller/audittrailCtrl.js b/client/cat3/src/partials/sections/dashboard/bots/controller/audittrailCtrl.js index 2237353a2..3ea895ba0 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/controller/audittrailCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/bots/controller/audittrailCtrl.js @@ -45,7 +45,7 @@ ], data:[] }; - var gridBottomSpace = 5; + var gridBottomSpace = 40; $scope.gridHeight = workzoneUIUtils.makeTabScrollable('botAuditTrailPage') - gridBottomSpace; $scope.botAuditTrailLogs=function(hist) { @@ -68,6 +68,10 @@ }); }; + $scope.RefreshBotsAuditTrail = function() { + audit.init(); + }; + audit.init =function(){ audit.gridOptions.data=[]; var param={ diff --git a/client/cat3/src/partials/sections/dashboard/bots/controller/botLogsCtrl.js b/client/cat3/src/partials/sections/dashboard/bots/controller/botLogsCtrl.js index 57d1ca9f3..b7ecc0482 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/controller/botLogsCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/bots/controller/botLogsCtrl.js @@ -33,8 +33,10 @@ } }; $scope.instanceChange =function(){ + $scope.isBotLogsLoading = true; $scope.botLogs=[]; var param={ + inlineLoader: true, url:'/audit-trail/' + $scope.selectedInstance.actionLogId + '/logs' }; genSevs.promiseGet(param).then(function (response) { @@ -65,14 +67,15 @@ }); if($scope.taskType === 'jenkins') { var param={ + inlineLoader: true, url:'/jenkins/' + $scope.jenkinsActionLogId + '/jobs/testmail/builds/' + $scope.jenkinsBuildNumber + '/output' }; genSevs.promiseGet(param).then(function (response) { - if (response.data) { - $scope.jenkinsLogs = helper.formatLogs(response.data.output); + if (response) { + $scope.jenkinsLogs = helper.formatLogs(response.output); $scope.isBotLogsLoading = false; } else { - $scope.jenkinsLogs = helper.formatLogs(response.output); + $scope.jenkinsLogs = helper.formatLogs(response.data.output); $scope.isBotLogsLoading = false; } }); diff --git a/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js b/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js index dd78cb560..86403d016 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js @@ -21,7 +21,7 @@ multiSelect :false, }, columnDefs: [ - { name:'Task Type', width:100,field:'taskType' ,cellTemplate:'row.entity.taskType'+ + { name:'Task Type', field:'taskType' ,cellTemplate:'row.entity.taskType'+ 'row.entity.taskType'+ 'row.entity.taskType'+ 'row.entity.botType',cellTooltip: true}, @@ -30,7 +30,7 @@ { name: 'Category',field:'botCategory'}, { name: 'description',field:'shortDesc'}, { name: 'BOT History',displayName: 'BOT History',cellTemplate:'NA'+ - ''}, + ''}, { name: 'BOT Action',displayName: 'BOT Action',cellTemplate:'' + '' + '' @@ -65,7 +65,16 @@ genSevs.promiseDelete(param).then(function (response) { if (response) { toastr.success('Successfully deleted'); - lib.init(); + if($scope.totalBotsSelected) { + lib.init(); + } else if($scope.runningBotsselected) { + $scope.showBotsRunning(); + } else if($scope.failedBotsselected) { + $scope.showFailedBots(); + } else { + lib.init(); + } + lib.summary(); } }, function(data) { toastr.error('error:: ' + data.toString()); @@ -87,7 +96,16 @@ genSevs.promiseDelete(param).then(function (response) { if (response) { toastr.success('Successfully deleted'); - lib.init(); + if($scope.totalBotsSelected) { + lib.init(); + } else if($scope.runningBotsselected) { + $scope.showBotsRunning(); + } else if($scope.failedBotsselected) { + $scope.showFailedBots(); + } else { + lib.init(); + } + lib.summary(); } }, function(data) { toastr.error('error:: ' + data.toString()); @@ -95,12 +113,14 @@ }); }; $rootScope.$on('BOTS_LIBRARY_REFRESH', function() { + lib.summary(); lib.init(); }); $scope.RefreshBotsLibrary = function() { $scope.totalBotsSelected = true; $scope.runningBotsselected = false; $scope.failedBotsselected = false; + lib.summary(); lib.init(); }; $scope.showBotsRunning = function() { diff --git a/client/cat3/src/partials/sections/dashboard/bots/view/audittrail.html b/client/cat3/src/partials/sections/dashboard/bots/view/audittrail.html index a63c7ce99..9941d03e9 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/view/audittrail.html +++ b/client/cat3/src/partials/sections/dashboard/bots/view/audittrail.html @@ -1,6 +1,14 @@
+
+ BOTs Audit Trail  + +
+
+
No data Available diff --git a/client/cat3/src/partials/sections/dashboard/bots/view/botLogs.html b/client/cat3/src/partials/sections/dashboard/bots/view/botLogs.html index 9c4f75a5e..3317ca531 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/view/botLogs.html +++ b/client/cat3/src/partials/sections/dashboard/bots/view/botLogs.html @@ -7,30 +7,32 @@

-
- -
-
-
- - - - -
-
- {{log.timestamp | timestampToLocaleTime}} - {{log.log}} -
-
-
-
-

-
+
+
+ +
+
+
+ + + + +
+
+ {{log.timestamp | timestampToLocaleTime}} + {{log.log}} +
+
+
+
+

+
+
-
+
diff --git a/client/cat3/src/partials/sections/dashboard/bots/view/library.html b/client/cat3/src/partials/sections/dashboard/bots/view/library.html index 460bf2417..7515fb9df 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/view/library.html +++ b/client/cat3/src/partials/sections/dashboard/bots/view/library.html @@ -11,9 +11,9 @@
-
+
- +
Total Number of BOTs @@ -22,9 +22,9 @@
-
+
- +
Number of BOTs running @@ -35,7 +35,7 @@
- +
Total Time saved @@ -44,9 +44,9 @@
-
+
- +
Number of failed runs diff --git a/client/cat3/src/partials/sections/dashboard/workzone/orchestration/orchestration.scss b/client/cat3/src/partials/sections/dashboard/workzone/orchestration/orchestration.scss index e4e5f05e9..2ffbc3e03 100644 --- a/client/cat3/src/partials/sections/dashboard/workzone/orchestration/orchestration.scss +++ b/client/cat3/src/partials/sections/dashboard/workzone/orchestration/orchestration.scss @@ -66,6 +66,12 @@ $imagePath : "../../../../../../images"; padding-right: 0px; } } + + .my-modal-popup { + .modal-lg { + width:1056px; + } + } } #orchestrationPage { @@ -187,7 +193,17 @@ $imagePath : "../../../../../../images"; .select-nodes { border: 1px solid #dddddd; list-style: none outside none; - height: 235px; + height: 150px; + overflow-y: auto; + margin-top: 5px; + margin-bottom: 10px; + padding: 5px; + } + + .select-nodeInstance { + border: 1px solid #dddddd; + list-style: none outside none; + height: 350px; overflow-y: auto; margin-top: 5px; margin-bottom: 10px; @@ -454,4 +470,8 @@ a.marginleft23 { float: right; margin-right: 14px !important; margin-top: 2px !important; +} + +.margintop7 { + margin-top: 7px; } \ No newline at end of file diff --git a/client/cat3/src/partials/sections/dashboard/workzone/orchestration/orchestrationCtrl.js b/client/cat3/src/partials/sections/dashboard/workzone/orchestration/orchestrationCtrl.js index 387ff5c6f..2a8119fad 100644 --- a/client/cat3/src/partials/sections/dashboard/workzone/orchestration/orchestrationCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/workzone/orchestration/orchestrationCtrl.js @@ -275,7 +275,8 @@ controller: 'newTaskCtrl', backdrop: 'static', keyboard: false, - size: 'lg', + size:'lg', + windowClass: 'my-modal-popup', resolve: { items: function() { return type; diff --git a/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/addChefJobEvent.html b/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/addChefJobEvent.html new file mode 100644 index 000000000..66c49b3b8 --- /dev/null +++ b/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/addChefJobEvent.html @@ -0,0 +1,165 @@ +
+
+
+ × +

 Schedule your Task

+
+
+ +
+ + +
+
+ + + Start Date should be less than End date ! +
+
+
+
+ Interval +
+ + +
+
+ + +
+ + + + +
+ + + +
+
+ + + +
+ +
+ + +
+ + +
+ + +
+ + + +
+
+
+ + +
+
+
+ + diff --git a/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/addChefJobEventCtrl.js b/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/addChefJobEventCtrl.js new file mode 100644 index 000000000..03d7ed88d --- /dev/null +++ b/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/addChefJobEventCtrl.js @@ -0,0 +1,117 @@ +/* Copyright (C) Relevance Lab Private Limited- All Rights Reserved + * Unauthorized copying of this file, via any medium is strictly prohibited + * Proprietary and confidential + * Written by Relevance UI Team, + * Aug 2015 + */ + +(function(angular){ + "use strict"; + angular.module('workzone.orchestration') + .controller('addChefJobEventCtrl',['$scope', '$modalInstance', 'items' ,'toastr',function($scope, $modalInstance , items , toastr){ + console.log(items); + $scope.checkFrequencyCheck=false; + $scope.defaultSelection = function() { + $scope.repeatsType = 'Minutes';//default selection. + $scope.schedulerStartOn=moment(new Date()).format('MM/DD/YYYY'); + $scope.schedulerEndOn=moment(new Date()).format('MM/DD/YYYY'); + }; + if(items.type !== 'new') { + if (items.chefJenkScriptTaskObj) { + if (items.chefJenkScriptTaskObj.cronStartOn && items.chefJenkScriptTaskObj.cronEndOn) { + var newStartOn = parseInt(items.chefJenkScriptTaskObj.cronStartOn); + var newDate = new Date(newStartOn).toLocaleDateString(); + var datearray = newDate.split("/"); + var newdate = datearray[1] + '/' + datearray[0] + '/' + datearray[2]; + $scope.schedulerStartOn = newdate; + var newEndOn = parseInt(items.chefJenkScriptTaskObj.cronEndOn); + var newEndData = new Date(newEndOn).toLocaleDateString(); + var datearrayNew = newEndData.split("/"); + var newdateEnd = datearrayNew[1] + '/' + datearrayNew[0] + '/' + datearrayNew[2]; + $scope.schedulerEndOn = newdateEnd; + } else { + $scope.schedulerStartOn = items.chefJenkScriptTaskObj.cronStart; + $scope.schedulerEndOn = items.chefJenkScriptTaskObj.cronEnd; + } + $scope.repeatBy = items.chefJenkScriptTaskObj.repeatBy || items.chefJenkScriptTaskObj.cronRepeatEvery.toString(); + $scope.repeatsType = items.chefJenkScriptTaskObj.repeats || items.chefJenkScriptTaskObj.cronFrequency; + $scope.timeEventHour = items.chefJenkScriptTaskObj.cronHour; + $scope.timeEventMinute = items.chefJenkScriptTaskObj.cronMinute; + $scope.weekOfTheDay = items.chefJenkScriptTaskObj.cronWeekDay; + $scope.currentDate = items.chefJenkScriptTaskObj.cronDate; + $scope.selectedDayOfTheMonth = items.chefJenkScriptTaskObj.cronMonth; + $scope.selectedMonth = items.chefJenkScriptTaskObj.cronYear; + if ($scope.repeatsType === 'Minutes' || $scope.repeatsType === 'Hourly') { + $scope.checkFrequencyCheck = false; + } else { + $scope.checkFrequencyCheck = true; + } + } else { + $scope.defaultSelection(); + } + } else { + $scope.defaultSelection(); + } + + $scope.dateChange= function () { + var startDate = Date.parse($scope.schedulerStartOn); + var endDate = Date.parse($scope.schedulerEndOn); + if(startDate > endDate){ + $scope.validDateRange=true; + } else { + $scope.validDateRange=false; + } + + }; + + $scope.checkFrequency = function(){ + if($scope.repeatsType === 'Minutes' || $scope.repeatsType === 'Hourly'){ + $scope.checkFrequencyCheck = false; + }else{ + $scope.checkFrequencyCheck = true; + } + }; + + $scope.repeatCount = function(max, step) { + step = step || 1; + var input = []; + for (var i = 1; i <= max; i += step) { + input.push(i); + } + return input; + }; + $scope.repeatHourCount = function(max, step) { + step = step || 1; + var input = []; + for (var i = 0; i <= max; i += step) { + input.push(i); + } + return input; + }; + $scope.isDaySelected = { + flag:true + } + + $scope.daysOfWeek = [ 'Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat' ]; + + $scope.monthOfYear = [ 'Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec' ]; + $scope.cancel = function() { + $modalInstance.dismiss('cancel'); + }; + $scope.ok=function(){ + $scope.eventParams = { + repeats: $scope.repeatsType, + repeatBy: $scope.repeatBy, + cronStart: $scope.schedulerStartOn, + cronEnd: $scope.schedulerEndOn, + startTime: $scope.timeEventHour, + startTimeMinute: $scope.timeEventMinute, + dayOfWeek: $scope.weekOfTheDay, + selectedDayOfTheMonth: $scope.selectedDayOfTheMonth, + monthOfYear: $scope.selectedMonth + }; + $modalInstance.close($scope.eventParams); + }; + } + ]); +})(angular); diff --git a/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/addScriptParams.html b/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/addScriptParams.html index 5d83c09b2..f5834fe6c 100644 --- a/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/addScriptParams.html +++ b/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/addScriptParams.html @@ -13,19 +13,21 @@

Add Script Params

Key Value - Delete + Description + - - + + +
- Add More +
diff --git a/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/addScriptParamsCtrl.js b/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/addScriptParamsCtrl.js index 68408183f..4da8650e2 100644 --- a/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/addScriptParamsCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/addScriptParamsCtrl.js @@ -8,11 +8,14 @@ (function(angular){ "use strict"; angular.module('workzone.orchestration') - .controller('addScriptParamsCtrl',['$scope', '$modalInstance', 'toastr',function($scope, $modalInstance, toastr){ + .controller('addScriptParamsCtrl',['$scope', '$modalInstance','items', 'toastr',function($scope, $modalInstance,$items, toastr){ //default selection type - $scope.params=['']; + $scope.params=[]; + for(var i =0; i < $items.noOfParams; i++){ + $scope.params.push({}); + } $scope.add = function() { - $scope.params.push(''); + $scope.params.push({}); }; $scope.removeScriptInputParams = function(paramInput) { if($scope.params.length > 1){ @@ -28,7 +31,7 @@ $scope.ok=function(){ var checkParam = false; for(var i =0; i<$scope.params.length; i++){ - if($scope.params[i] === '' || $scope.params[i] === null){ + if(Object.keys($scope.params[i]).length === 0){ checkParam = false; toastr.error('Please enter parameters'); return false; diff --git a/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/newTask.html b/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/newTask.html index 502f64228..e95231bc1 100644 --- a/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/newTask.html +++ b/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/newTask.html @@ -126,6 +126,21 @@
Job Details
+ +
+ + + +
+ + +
+
+ + +
+
+
@@ -169,7 +185,7 @@
Chef Server Details for - RLChefServer
-
+
@@ -187,11 +203,11 @@
Chef Server Details for - RLChefServer
-
+
-
-
    +
    + +
    +
    + Instance List +
    +
    + Assigned Instances +
    + +
    + +
    +
+ + + + + + + +
@@ -334,6 +372,16 @@
Jenkins
+ + + + + + + +
@@ -435,7 +483,7 @@
Script Details
-
+
@@ -447,15 +495,37 @@
Script Details
-
+
-
    + +
    +
    + Instance List +
    +
    + Assigned Instances +
    + +
    + +
    +
    + + + + + + + +
@@ -471,8 +541,8 @@
Script Details
@@ -492,13 +562,15 @@
Script Details
Parameter + Description Action - {{param}} - ..... + {{param.paramVal}} + ..... + {{param.paramDesc}} diff --git a/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/newTaskCtrl.js b/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/newTaskCtrl.js index 5b225948a..b370ef5d6 100644 --- a/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/newTaskCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/newTaskCtrl.js @@ -20,6 +20,10 @@ $scope.scriptParamShow = false; $scope.scriptSelectAll = false; $scope.scriptParamsObj = {}; + $scope.chefJenkScriptTaskObj = {}; + $scope.cronDetails = {}; + $scope.type = 'new'; + $scope.showAddTask = false; $scope.isSudo = false; $scope.botCategoryList = []; workzoneServices.getBotCategoryList().then(function (catList) { @@ -148,7 +152,12 @@ templateUrl: 'src/partials/sections/dashboard/workzone/orchestration/popups/addScriptParams.html', controller: 'addScriptParamsCtrl', backdrop: 'static', - keyboard: false + keyboard: false, + resolve: { + items: function () { + return scriptObject; + } + } }).result.then(function (addScriptParams) { $scope.scriptParamsObj[scriptObject._id] = $scope.scriptParamsObj[scriptObject._id].concat(addScriptParams); }, function () { @@ -231,6 +240,53 @@ $scope.scriptParamsObj[scriptObj._id] = []; } }, + selectTaskCheckbox: function(){ + $scope.showAddTask = true; + $scope.isEventAvailable = false; + }, + addTaskEvent : function() { + $modal.open({ + templateUrl: 'src/partials/sections/dashboard/workzone/orchestration/popups/addChefJobEvent.html', + controller: 'addChefJobEventCtrl', + backdrop: 'static', + keyboard: false, + resolve: { + items: function () { + return { + chefJenkScriptTaskObj:$scope.chefJenkScriptTaskObj, + type:$scope.type + } + } + } + }).result.then(function (chefEventDetails) { + $scope.isEventAvailable = true; + $scope.chefJenkScriptTaskObj = chefEventDetails; + var startTimeMinute,startTimeHour,dayOfWeek,selectedDayOfTheMonth,selectedMonth; + startTimeMinute = $scope.chefJenkScriptTaskObj.startTimeMinute; + startTimeHour = $scope.chefJenkScriptTaskObj.startTime; + dayOfWeek = $scope.chefJenkScriptTaskObj.dayOfWeek; + selectedDayOfTheMonth = $scope.chefJenkScriptTaskObj.selectedDayOfTheMonth; + selectedMonth = $scope.chefJenkScriptTaskObj.monthOfYear; + $scope.type = 'edit'; + $scope._isEventSelected = true; + + $scope.repeatPattern = 'Repeat Every -' + $scope.chefJenkScriptTaskObj.repeats; + $scope.cronDetails = { + cronStartOn : $scope.chefJenkScriptTaskObj.cronStart, + cronEndOn : $scope.chefJenkScriptTaskObj.cronEnd, + cronRepeatEvery : $scope.chefJenkScriptTaskObj.repeatBy, + cronFrequency: $scope.chefJenkScriptTaskObj.repeats, + cronMinute:startTimeMinute, + cronHour: startTimeHour, + cronWeekDay:dayOfWeek, + cronDate: selectedDayOfTheMonth, + cronMonth: selectedMonth, + cronYear: $scope.chefJenkScriptTaskObj.monthOfYear + } + }, function () { + console.log('Dismiss time is ' + new Date()); + }); + }, clearRoleSelection : function(){ $scope.role.name = ''; }, @@ -286,29 +342,24 @@ taskJSON.nodeIds = []; taskJSON.blueprintIds = []; taskJSON.role = $scope.role.name; - for (var ci = 0; ci < $scope.chefInstanceList.length; ci++) { - if ($scope.chefInstanceList[ci]._isNodeSelected) { - taskJSON.nodeIds.push($scope.chefInstanceList[ci]._id); - } - } for(var bi = 0; bi < $scope.chefBluePrintList.length; bi++){ if ($scope.chefBluePrintList[bi]._isBlueprintSelected) { taskJSON.blueprintIds.push($scope.chefBluePrintList[bi]._id); } } - if (!taskJSON.nodeIds.length && !taskJSON.blueprintIds.length && !taskJSON.role ) { + if (!taskJSON.nodeIds && !taskJSON.blueprintIds.length && !taskJSON.role ) { $scope.inputValidationMsg='Please select a node or blueprint or role'; $scope.taskSaving = false; return false; } - if (taskJSON.nodeIds.length && taskJSON.blueprintIds.length) { - $scope.inputValidationMsg='Please choose either nodes or blueprints or role, not all'; + if (taskJSON.blueprintIds.length) { + $scope.inputValidationMsg='Please choose either blueprints or role, not all'; $scope.taskSaving = false; return false; } - if (taskJSON.nodeIds.length && taskJSON.role) { - $scope.inputValidationMsg='Please choose either nodes or blueprints or role, not all'; + if (taskJSON.role) { + $scope.inputValidationMsg='Please choose blueprints or role, not all'; $scope.taskSaving = false; return false; } @@ -361,29 +412,22 @@ //first time execute will get result from jobResultURLPattern. taskJSON.jobResultURLPattern = taskJSON.jobResultURL; taskJSON.parameterized = $scope.jenkinsParamsList; + taskJSON.isTaskScheduled = $scope._isEventSelected; + //taskJSON.taskScheduler = $scope.cronPattern; + taskJSON.taskScheduler = $scope.cronDetails; } //if task type is script if ($scope.taskType === "script") { taskJSON.nodeIds = []; taskJSON.scriptDetails = []; taskJSON.isSudo = $scope.isSudo; - for (var si = 0; si < $scope.chefInstanceList.length; si++) { - if ($scope.chefInstanceList[si]._isNodeSelected) { - taskJSON.nodeIds.push($scope.chefInstanceList[si]._id); - } - } taskJSON.scriptTypeName = $scope.scriptTypeSelelct; if (!taskJSON.scriptTypeName.length) { $scope.inputValidationMsg='Please select one Script Type'; $scope.taskSaving = false; return false; } - if (!taskJSON.nodeIds.length) { - $scope.inputValidationMsg='Please select a node'; - $scope.taskSaving = false; - return false; - } - + for (var k = 0; k < $scope.scriptTaskList.length; k++) { if ($scope.scriptTaskList[k]._isScriptSelected) { var scriptId = $scope.scriptTaskList[k]._id; @@ -403,6 +447,21 @@ return false; } } + if($scope.taskType === "chef" || $scope.taskType === "script") { + taskJSON.executionOrder = $scope.isExecution.flag; + taskJSON.isTaskScheduled = $scope._isEventSelected; + //taskJSON.taskScheduler = $scope.cronPattern; + taskJSON.taskScheduler = $scope.cronDetails; + var selectedList = instanceSelector.getSelectorList(); + if (selectedList && selectedList.length) { + for (var i = 0; i < selectedList.length; i++) { + taskJSON.nodeIds.push(selectedList[i].data); + } + } else { + $scope.inputValidationMsg='Please select atleast one node'; + return false; + } + } //checking whether its a update or a new task creation if ($scope.isEditMode) { $scope.updateTask(taskJSON); @@ -429,6 +488,9 @@ $scope.isParameterized = { flag: false }; + $scope.isExecution = { + flag: 'PARALLEL' + }; /*in backend at the time of edit of task the jobResultUrlPattern was going as null. So there was in issue with the links disappearing.*/ $scope.jobResultURLPattern = []; @@ -445,10 +507,12 @@ $scope.editRunListAttributes = false; $rootScope.$on('WZ_ORCHESTRATION_REFRESH_CURRENT', function(event,reqParams) { - $scope.chefrunlist = reqParams.list; - $scope.cookbookAttributes = reqParams.cbAttributes; + if(reqParams) { + $scope.chefrunlist = reqParams.list; + $scope.cookbookAttributes = reqParams.cbAttributes; + } }); - var compositeSelector; + var compositeSelector,instanceSelector; workzoneServices.getEnvironmentTaskList().then(function (response) { var data, selectorList = [], optionList = []; @@ -485,6 +549,47 @@ $scope.isTargetTypesLoading = true; $scope.isScriptNodesLoading = true; var allInstances = workzoneServices.getCurrentEnvInstances(); + $scope.allInstances=function(){ + allInstances.then(function (response) { + var data, selectorList = [], + optionList = []; + if (response.data) { + data = response.data; + } else { + data = response; + } + + if (items.taskType && items.taskType === "chef" || items.taskType && items.taskType === "script") { + for (var j = 0; j < items.taskConfig.nodeIds.length; j++) { + for (var i = 0; i < data.length; i++) { + if (items.taskConfig.nodeIds[j] === data[i]._id) { + selectorList.push(data[i]); + } + } + } + } else { + selectorList = []; + } + optionList = data; + var factory = chefSelectorComponent.getComponent; + instanceSelector = new factory({ + scopeElement: '.component_for_instances', + optionList: responseFormatter.formatInstanceList(optionList), + selectorList: responseFormatter.formatInstanceList(selectorList), + isSortList: true, + isSearchBoxEnable: false, + isOverrideHtmlTemplate: true, + isExcludeDataFromOption: true + }); + $scope.isNewTaskPageLoading = false; + }); + } + $scope.$watch('taskType', function() { + if($scope.taskType === 'chef' || $scope.taskType === 'script'){ + $scope.allInstances(); + } + }); + var allBlueprints = workzoneServices.getBlueprints(); var allRunlist = workzoneServices.getCookBookListForOrg(); $q.all([allInstances,allBlueprints,allRunlist]).then(function(promiseObjs) { @@ -506,9 +611,7 @@ $scope.chefBluePrintList = responseFormatter.identifyAvailableBlueprint(responseFormatter.getBlueprintList(blueprints), items.blueprintIds); $scope.chefComponentSelectorList = responseFormatter.findDataForEditValue(items.taskConfig.runlist); $scope.cookbookAttributes = responseFormatter.formatSavedCookbookAttributes(items.taskConfig.attributes); - console.log($scope.chefComponentSelectorList); $scope.chefrunlist = responseFormatter.chefRunlistFormatter($scope.chefComponentSelectorList); - console.log($scope.chefrunlist); $scope.chefRoleList = roles; if (items.blueprintIds.length){ @@ -601,6 +704,18 @@ $scope.isNewTaskPageLoading = false; $scope.changeNodeScriptList(); } + if(items.taskType === "chef" || items.taskType === "script") { + $scope.isExecution.flag = items.executionOrder; + } + if(items.taskType === "chef" || items.taskType === "jenkins" || items.taskType === "script") { + //if(items.taskScheduler){ + $scope._isEventSelected = items.isTaskScheduled; + $scope.showAddTask = true; + $scope.isEventAvailable = true; + $scope.chefJenkScriptTaskObj = items.taskScheduler; + $scope.type = 'edit'; + //} + } } } ]); diff --git a/client/htmls/private/ajax/Settings/scriptList.html b/client/htmls/private/ajax/Settings/scriptList.html index 426cc4e7d..1e7d4c93c 100644 --- a/client/htmls/private/ajax/Settings/scriptList.html +++ b/client/htmls/private/ajax/Settings/scriptList.html @@ -77,6 +77,7 @@

@@ -84,7 +85,7 @@

-
+
@@ -94,6 +95,40 @@

+
+ +
+
+ +
+
+ +
+
+
+
+
+
+
+
+ +
+ +
+
+
diff --git a/client/htmls/private/js/scriptList.js b/client/htmls/private/js/scriptList.js index 649ede1dc..133118463 100644 --- a/client/htmls/private/js/scriptList.js +++ b/client/htmls/private/js/scriptList.js @@ -7,6 +7,8 @@ function setfilename(val){ //calling the global track functionality when track params are available.. $(document).ready(function(e) { getScriptList(); + $('#divParam').hide(); + $('#checkScriptParam').hide(); }); //when the user clicks on the new button the setting the value to 'new' for the hidden field to know that user is creating the new item.. @@ -23,6 +25,18 @@ $('.addScriptItem').click(function(e) { $('#scriptEditHiddenInput').val('new'); getOrganizationList(); }); + +$("input[name='isParametrized']:radio").change(function(){ + if($(this).val() === 'Yes') { + $('#noOfParams').addClass("required"); + $('#divParam').show(); + $('#checkScriptParam').show(); + } else { + $('#noOfParams').removeClass("required"); + $('#divParam').hide(); + $('#checkScriptParam').hide(); + } +}); //to list down the organization for creating the script item. function getOrganizationList() { $.get('/d4dMasters/readmasterjsonnew/1', function(data) { @@ -46,7 +60,7 @@ var validator = $('#scriptForm').validate({ ignore: [], rules: { scriptFile: { - extension: "sh" + extension: "sh|py" }, scriptName: { maxlength: 15 @@ -54,7 +68,7 @@ var validator = $('#scriptForm').validate({ }, messages: { scriptFile: { - extension: "Only .sh files can be uploaded" + extension: "Only .sh and .py files can be uploaded" }, scriptName: { maxlength: "Limited to 15 chars" @@ -84,7 +98,10 @@ function getScriptList() { "serverSide": true, "destroy":true, "createdRow": function( row, data ) { - $( row ).attr({"scriptId" : data.scriptId,"scriptName":data.name,"scriptType":data.type, "scriptDesc" : data.description, "orgId" : data.orgDetails.id ,"orgName" : data.orgDetails.name,"scriptFileName" : data.fileName,"scriptFileId" : data.fileId}); + $( row ).attr({"scriptId" : data.scriptId,"scriptName":data.name,"scriptType":data.type, + "scriptDesc" : data.description, "orgId" : data.orgDetails.id ,"orgName" : data.orgDetails.name, + "scriptFileName" : data.fileName,"scriptFileId" : data.fileId, + "isParametrized" : data.isParametrized,"noOfParams":data.noOfParams}); }, "ajax": '/scripts', "columns": [ @@ -143,6 +160,18 @@ $('#scriptListTable tbody').on( 'click', 'button.editRowScriptItem', function(){ $editModal.find('#scriptHiddenInputId').val($this.parents('tr').attr('scriptId')); $editModal.find('#fileHiddenInputId').val($this.parents('tr').attr('scriptFileId')); $editModal.find('#fileNameDisplay').append($this.parents('tr').attr('scriptFileName')); + if($this.parents('tr').attr('isParametrized') === true || $this.parents('tr').attr('isParametrized') === 'true'){ + $('input:radio[name="isParametrized"][value="Yes"]').prop('checked', true); + $('#noOfParams').addClass("required"); + $('#divParam').show(); + $('#checkScriptParam').show(); + $editModal.find('#noOfParams').val($this.parents('tr').attr('noOfParams')); + }else{ + $('input:radio[name="isParametrized"][value="No"]').prop('checked', true); + $('#noOfParams').removeClass("required"); + $('#divParam').hide(); + $('#checkScriptParam').hide(); + } $editModal.find('#scriptFileNameHidden').empty().append($this.parents('tr').attr('scriptFileName')); return false; }); @@ -224,6 +253,11 @@ $('#scriptForm').submit(function(e) { var $form = $('#scriptForm'); var scriptData = {}; var $this = $(this); + var isParametrized = false, noOfParams=0; + if($("input[name='isParametrized']:checked").val() === 'Yes'){ + isParametrized =true; + noOfParams=parseInt($('#noOfParams').find(":selected").val()); + } var name = $this.find('#scriptName').val().trim(); var description = $this.find('#scriptDescription').val().trim(); var type = $form.find('#scriptType').val(); @@ -263,7 +297,9 @@ $('#scriptForm').submit(function(e) { "type": type, "description": description, "orgDetails": orgDetails, - "fileId": data.fileId + "fileId": data.fileId, + "isParametrized":isParametrized, + "noOfParams":noOfParams }; } else { url = '../scripts/update/scriptData'; @@ -274,7 +310,9 @@ $('#scriptForm').submit(function(e) { "type": type, "description": description, "orgDetails": orgDetails, - "fileId": data.fileId + "fileId": data.fileId, + "isParametrized":isParametrized, + "noOfParams":noOfParams }; } formSave(methodName,url,reqBody); diff --git a/server/app/app.js b/server/app/app.js index e7206945c..0d5796431 100755 --- a/server/app/app.js +++ b/server/app/app.js @@ -217,7 +217,8 @@ io.sockets.on('connection', function(socket) { var cronTabManager = require('_pr/cronjobs'); cronTabManager.start(); catalystSync.executeScheduledInstances(); -catalystSync.executeScheduledTasks(); +catalystSync.executeSerialScheduledTasks(); +catalystSync.executeParallelScheduledTasks(); server.listen(app.get('port'), function() { logger.debug('Express server listening on port ' + app.get('port')); }); \ No newline at end of file diff --git a/server/app/cronjobs/catalyst-scheduler/catalystScheduler.js b/server/app/cronjobs/catalyst-scheduler/catalystScheduler.js index 24fc17c34..bedbc9be7 100644 --- a/server/app/cronjobs/catalyst-scheduler/catalystScheduler.js +++ b/server/app/cronjobs/catalyst-scheduler/catalystScheduler.js @@ -3,7 +3,7 @@ var instancesDao = require('_pr/model/classes/instance/instance'); var taskDao = require('_pr/model/classes/tasks/tasks.js'); var schedulerService = require('_pr/services/schedulerService'); var async = require('async'); - +var cronTab = require('node-crontab'); var catalystSync = module.exports = {}; catalystSync.executeScheduledInstances = function executeScheduledInstances() { @@ -16,6 +16,9 @@ catalystSync.executeScheduledInstances = function executeScheduledInstances() { var resultList =[]; for (var i = 0; i < instances.length; i++) { (function(instance) { + if(instance.cronJobIds && instance.cronJobIds !== null){ + cronTab.cancelJobIds(instance.cronJobIds); + } resultList.push(function(callback){schedulerService.executeSchedulerForInstances(instance,callback);}); if(resultList.length === instances.length){ async.parallel(resultList,function(err,results){ @@ -36,31 +39,88 @@ catalystSync.executeScheduledInstances = function executeScheduledInstances() { }); } -catalystSync.executeScheduledTasks = function executeScheduledTasks() { - taskDao.getScheduledTasks(function(err, tasks) { +catalystSync.executeParallelScheduledTasks = function executeParallelScheduledTasks() { + taskDao.getScheduledTasks('PARALLEL',function(err, tasks) { if (err) { logger.error("Failed to fetch tasks: ", err); return; } if (tasks && tasks.length) { - var resultList =[]; + var parallelTaskList=[]; for (var i = 0; i < tasks.length; i++) { (function(task) { - resultList.push(function(callback){schedulerService.executeSchedulerForTasks(task,callback);}); - if(resultList.length === tasks.length){ - async.parallel(resultList,function(err,results){ - if(err){ - logger.error(err); + if(task.cronJobId && task.cronJobId !== null){ + cronTab.cancelJob(task.cronJobId); + } + parallelTaskList.push(function(callback){schedulerService.executeParallelScheduledTasks(task,callback);}); + if(parallelTaskList.length === tasks.length){ + if(parallelTaskList.length > 0) { + async.parallel(parallelTaskList, function (err, results) { + if (err) { + logger.error(err); + return; + } + logger.debug("Task Scheduler Completed for Parallel"); return; - } - logger.debug("Task Scheduler Completed"); + }) + }else{ + logger.debug("There is no Parallel scheduled Task right now."); return; - }) + } + } + })(tasks[i]); + } + }else{ + logger.debug("There is no Parallel scheduled Task right now."); + return; + } + }); +} + +catalystSync.executeSerialScheduledTasks = function executeSerialScheduledTasks() { + taskDao.getScheduledTasks('SERIAL',function(err, tasks) { + if (err) { + logger.error("Failed to fetch tasks: ", err); + return; + } + if (tasks && tasks.length) { + var serialTaskList=[]; + for (var i = 0; i < tasks.length; i++) { + (function(task) { + if(task.cronJobId && task.cronJobId !== null){ + cronTab.cancelJob(task.cronJobId); + } + if(serialTaskList.length ===0) { + serialTaskList.push(function (next) {schedulerService.executeSerialScheduledTasks(task, next); + }); + }else{ + serialTaskList.push(function (cronJobId,next) { + cronTab.cancelJob(cronJobId); + schedulerService.executeSerialScheduledTasks(task, next); + }); + } + if(serialTaskList.length === tasks.length){ + if(serialTaskList.length > 0) { + async.waterfall(serialTaskList, function (err, data) { + if (err) { + logger.error(err); + return; + } + cronTab.cancelJob(data); + logger.debug("Serial Task Scheduler Completed"); + var catalystScheduler = require('_pr/cronjobs/catalyst-scheduler/catalystScheduler.js'); + catalystScheduler.executeSerialScheduledTasks(); + return; + }) + }else{ + logger.debug("There is no Serial scheduled Task right now."); + return; + } } })(tasks[i]); } }else{ - logger.debug("There is no scheduled Task right now."); + logger.debug("There is no Serial scheduled Task right now."); return; } }); diff --git a/server/app/lib/utils/apiUtil.js b/server/app/lib/utils/apiUtil.js index 0ac9e89cd..17ef5a022 100644 --- a/server/app/lib/utils/apiUtil.js +++ b/server/app/lib/utils/apiUtil.js @@ -34,62 +34,53 @@ var ApiUtil = function() { } this.createCronJobPattern= function(scheduler){ scheduler.cronRepeatEvery = parseInt(scheduler.cronRepeatEvery); + var startOn = null,endOn = null; + if(scheduler.cronStartOn === scheduler.cronEndOn){ + startOn = new Date(); + endOn = new Date() + endOn.setHours(23); + endOn.setMinutes(59); + }else{ + startOn = scheduler.cronStartOn; + endOn = scheduler.cronEndOn; + } if(scheduler.cronFrequency ==='Minutes'){ scheduler.pattern = '*/'+scheduler.cronRepeatEvery+' * * * *'; }else if(scheduler.cronFrequency ==='Hourly'){ scheduler.pattern = '0 */'+scheduler.cronRepeatEvery+' * * *'; }else if(scheduler.cronFrequency ==='Daily'){ - var startOn = Date.parse(scheduler.cronStartOn); - var startHours= startOn.getHours(); - var startMinutes= startOn.getMinutes(); - scheduler.pattern = startMinutes+' '+startHours+' */'+scheduler.cronRepeatEvery+' * *'; + scheduler.pattern = parseInt(scheduler.cronMinute)+' '+parseInt(scheduler.cronHour)+' */'+scheduler.cronRepeatEvery+' * *'; }else if(scheduler.cronFrequency ==='Weekly') { - var startOn = Date.parse(scheduler.cronStartOn); - var startDay= startOn.getDay(); - var startHours= startOn.getHours(); - var startMinutes= startOn.getMinutes(); if(scheduler.cronRepeatEvery === 2) { - scheduler.pattern = startMinutes+' '+startHours+' 8-14 * ' + startDay; + scheduler.pattern = parseInt(scheduler.cronMinute)+' '+parseInt(scheduler.cronHour)+' 8-14 * ' + parseInt(scheduler.cronWeekDay); }else if(scheduler.cronRepeatEvery === 3) { - scheduler.pattern = startMinutes+' '+startHours+' 15-21 * ' + startDay; + scheduler.pattern = parseInt(scheduler.cronMinute)+' '+parseInt(scheduler.cronHour)+' 15-21 * ' + parseInt(scheduler.cronWeekDay); }else if(scheduler.cronRepeatEvery === 4) { - scheduler.pattern = startMinutes+' '+startHours+' 22-28 * ' + startDay; + scheduler.pattern = parseInt(scheduler.cronMinute)+' '+parseInt(scheduler.cronHour)+' 22-28 * ' + parseInt(scheduler.cronWeekDay); }else{ - scheduler.pattern = startMinutes+' '+startHours+' * * ' + startDay; + scheduler.pattern = parseInt(scheduler.cronMinute)+' '+parseInt(scheduler.cronHour)+' * * ' + parseInt(scheduler.cronWeekDay); } - } - if(scheduler.cronFrequency ==='Monthly') { - var startOn = Date.parse(scheduler.cronStartOn); - var startDate= startOn.getDate(); - var startMonth= startOn.getMonth(); - var startDay= startOn.getDay(); - var startHours= startOn.getHours(); - var startMinutes= startOn.getMinutes(); + }else if(scheduler.cronFrequency ==='Monthly') { if(scheduler.cronRepeatEvery === 1) { - scheduler.pattern = startMinutes+' '+startHours+' '+startDate+' * *'; + scheduler.pattern = parseInt(scheduler.cronMinute)+' '+parseInt(scheduler.cronHour)+' '+parseInt(scheduler.cronDate)+' * *'; }else{ - scheduler.pattern = startMinutes+' '+startHours+' '+startDate+' */'+scheduler.cronRepeatEvery+' *'; + scheduler.pattern = parseInt(scheduler.cronMinute)+' '+parseInt(scheduler.cronHour)+' '+parseInt(scheduler.cronDate)+' */'+scheduler.cronRepeatEvery+' *'; } - } - if(scheduler.cronFrequency ==='Yearly') { - var startOn = Date.parse(scheduler.cronStartOn); - var startDate= startOn.getDate(); - var startYear= startOn.getFullYear(); - var startMonth= startOn.getMonth(); - var startHours= startOn.getHours(); - var startMinutes= startOn.getMinutes(); - scheduler.pattern ='0 '+startMinutes+' '+startHours+' '+startDate+' '+startMonth+' ? '+startYear/scheduler.cronRepeatEvery; + }else if(scheduler.cronFrequency ==='Yearly') { + scheduler.pattern ='0 '+parseInt(scheduler.cronMinute)+' '+parseInt(scheduler.cronHour)+' '+parseInt(scheduler.cronDate)+' '+parseInt(scheduler.cronMonth)+' ? '+parseInt(scheduler.cronYear)/scheduler.cronRepeatEvery; } var cronScheduler = { "cronFrequency": scheduler.cronFrequency, "cronRepeatEvery": scheduler.cronRepeatEvery, "cronPattern":scheduler.pattern, - "cronStartOn":Date.parse(scheduler.cronStartOn), - "cronEndOn":Date.parse(scheduler.cronEndOn), - "cronTime":scheduler.cronTime, - "cronDays":scheduler.cronDays, - "cronMonths":scheduler.cronMonths, - "cronYears":scheduler.cronYears + "cronStartOn":Date.parse(startOn), + "cronEndOn":Date.parse(endOn), + "cronHour":scheduler.cronHour, + "cronMinute":scheduler.cronMinute, + "cronDate":scheduler.cronDate, + "cronWeekDay":scheduler.cronWeekDay ? parseInt(scheduler.cronWeekDay):0, + "cronMonth":scheduler.cronMonth ? scheduler.cronMonth: null, + "cronYear":scheduler.cronYear ? scheduler.cronYear: null } return cronScheduler; } diff --git a/server/app/model/audit-trail/audit-trail.js b/server/app/model/audit-trail/audit-trail.js index 6e454bd8d..47debe2eb 100644 --- a/server/app/model/audit-trail/audit-trail.js +++ b/server/app/model/audit-trail/audit-trail.js @@ -47,6 +47,17 @@ AuditTrailSchema.statics.getAuditTrails = function(queryObj,callback){ }); }; +AuditTrailSchema.statics.removeAuditTrails = function(queryObj,callback){ + AuditTrail.remove(queryObj, function(err, deleteAuditTrail) { + if (err) { + logger.error(err); + var error = new Error('Internal server error'); + error.status = 500; + return callback(error); + } + return callback(null, deleteAuditTrail); + }); +}; var AuditTrail = mongoose.model('auditTrails', AuditTrailSchema); module.exports = AuditTrail; diff --git a/server/app/model/blueprint/blueprint.js b/server/app/model/blueprint/blueprint.js index b68228526..63c91ec4b 100755 --- a/server/app/model/blueprint/blueprint.js +++ b/server/app/model/blueprint/blueprint.js @@ -168,6 +168,16 @@ var BlueprintSchema = new Schema({ }, botCategory: { type: String + }, + executionCount:{ + type: Number, + required: false, + default:0 + }, + manualExecutionTime:{ + type: Number, + required: false, + default:10 } }); @@ -1465,6 +1475,23 @@ BlueprintSchema.statics.checkBPDependencyByFieldName = function(fieldName,id, ca callback(null, data); }); }; +BlueprintSchema.statics.updateBlueprintExecutionCount = function updateBlueprintExecutionCount(blueprintId,count,callback) { + Blueprints.update({ + "_id": new ObjectId(blueprintId), + }, { + $set: { + executeCount: count + } + }, { + upsert: false + }, function (err, data) { + if (err) { + callback(err, null); + return; + } + callback(null, data); + }); +}; var Blueprints = mongoose.model('blueprints', BlueprintSchema); diff --git a/server/app/model/classes/tasks/taskTypeScript.js b/server/app/model/classes/tasks/taskTypeScript.js index 8158dbc07..e8bf81c8c 100644 --- a/server/app/model/classes/tasks/taskTypeScript.js +++ b/server/app/model/classes/tasks/taskTypeScript.js @@ -42,9 +42,18 @@ var scriptTaskSchema = taskTypeSchema.extend({ scriptDetails: [{ scriptId: { type: String, - requred: true + required: true }, - scriptParameters: [String] + scriptParameters: [{ + paramVal:{ + type: String, + required: false + }, + paramDesc:{ + type: String, + required: false + } + }] }] }); @@ -62,7 +71,7 @@ scriptTaskSchema.methods.execute = function(userName, baseUrl, choiceParam, nexu function getInstances(instanceIds, tagServer, callback) { if (tagServer) { logger.debug('in tagServer', tagServer); - instancesDao.getInstancesByTagServer(tagServer, function(err, instances) { + instancesDao.getInstancesByTagServer(tagServer, function (err, instances) { if (err) { logger.error(err); if (typeof onExecute === 'function') { @@ -83,7 +92,7 @@ scriptTaskSchema.methods.execute = function(userName, baseUrl, choiceParam, nexu } return; } - instancesDao.getInstances(instanceIds, function(err, instances) { + instancesDao.getInstances(instanceIds, function (err, instances) { if (err) { logger.error(err); if (typeof onExecute === 'function') { @@ -97,13 +106,13 @@ scriptTaskSchema.methods.execute = function(userName, baseUrl, choiceParam, nexu } - getInstances(instanceIds, self.botTagServer, function(err, instances) { + getInstances(instanceIds, self.botTagServer, function (err, instances) { if (err) { logger.error(err); return; } for (var i = 0; i < instances.length; i++) { - (function(instance) { + (function (instance) { var timestampStarted = new Date().getTime(); var actionLog = instancesDao.insertOrchestrationActionLog(instance._id, null, userName, timestampStarted); instance.tempActionLogId = actionLog._id; @@ -146,7 +155,7 @@ scriptTaskSchema.methods.execute = function(userName, baseUrl, choiceParam, nexu log: "Instance IP is not defined. Chef Client run failed", timestamp: new Date().getTime() }; - instanceLogModel.createOrUpdate(actionLog._id, instance._id, instanceLog, function(err, logData) { + instanceLogModel.createOrUpdate(actionLog._id, instance._id, instanceLog, function (err, logData) { if (err) { logger.error("Failed to create or update instanceLog: ", err); } @@ -157,7 +166,7 @@ scriptTaskSchema.methods.execute = function(userName, baseUrl, choiceParam, nexu }, 1, instance._id, null, actionLog._id); return; } - credentialCryptography.decryptCredential(instance.credentials, function(err, decryptedCredentials) { + credentialCryptography.decryptCredential(instance.credentials, function (err, decryptedCredentials) { var sshOptions = { username: decryptedCredentials.username, host: instance.instanceIP, @@ -169,8 +178,8 @@ scriptTaskSchema.methods.execute = function(userName, baseUrl, choiceParam, nexu sshOptions.password = decryptedCredentials.password; } for (var j = 0; j < scriptDetails.length; j++) { - (function(script) { - scriptService.getScriptById(script.scriptId, function(err, scripts) { + (function (script) { + scriptService.getScriptById(script.scriptId, function (err, scripts) { if (err) { logger.error(err); return; @@ -183,7 +192,13 @@ scriptTaskSchema.methods.execute = function(userName, baseUrl, choiceParam, nexu if (self.botParams && self.botParams.scriptParams) { params = self.botParams.scriptParams; } - executeBashScript(scripts, sshOptions, logsReferenceIds, params, instanceLog); + executeScriptOnNode(scripts, sshOptions, logsReferenceIds, params, instanceLog,'bash'); + } else if (scripts.type === 'Python') { + var params = script.scriptParameters; + if (self.botParams && self.botParams.scriptParams) { + params = self.botParams.scriptParams; + } + executeScriptOnNode(scripts, sshOptions, logsReferenceIds, params, instanceLog,'python'); } else { return; } @@ -235,19 +250,19 @@ scriptTaskSchema.methods.execute = function(userName, baseUrl, choiceParam, nexu } } - function executeBashScript(script, sshOptions, logsReferenceIds, scriptParameters, instanceLog) { + function executeScriptOnNode(script, sshOptions, logsReferenceIds, scriptParameters, instanceLog,scriptType) { var fileName = uuid.v4() + '_' + script.fileName var desPath = appConfig.scriptDir + fileName; var sshExec = new SSHExec(sshOptions); var cryptoConfig = appConfig.cryptoSettings; var cryptography = new Cryptography(cryptoConfig.algorithm, cryptoConfig.password); - fileIo.writeFile(desPath, script.file, false, function(err) { + fileIo.writeFile(desPath, script.file, false, function (err) { if (err) { logger.error("Unable to write file"); return; } else { var scp = new SCP(sshOptions); - scp.upload(desPath, '/tmp', function(err) { + scp.upload(desPath, '/tmp', function (err) { if (err) { var timestampEnded = new Date().getTime(); logsDao.insertLog({ @@ -264,7 +279,7 @@ scriptTaskSchema.methods.execute = function(userName, baseUrl, choiceParam, nexu log: "Unable to upload script file " + script.name, timestamp: new Date().getTime() }; - instanceLogModel.createOrUpdate(logsReferenceIds[1], logsReferenceIds[0], instanceLog, function(err, logData) { + instanceLogModel.createOrUpdate(logsReferenceIds[1], logsReferenceIds[0], instanceLog, function (err, logData) { if (err) { logger.error("Failed to create or update instanceLog: ", err); } @@ -273,17 +288,17 @@ scriptTaskSchema.methods.execute = function(userName, baseUrl, choiceParam, nexu return; } if (sudoFlag === true) { - var cmdLine = 'sudo bash /tmp/' + fileName; + var cmdLine = 'sudo '+scriptType+' /tmp/' + fileName; } else { - var cmdLine = 'bash /tmp/' + fileName; + var cmdLine = scriptType +' /tmp/' + fileName; } - if (scriptParameters.length > 0) { + if (script.isParameterized === true) { for (var j = 0; j < scriptParameters.length; j++) { - var decryptedText = cryptography.decryptText(scriptParameters[j], cryptoConfig.decryptionEncoding, cryptoConfig.encryptionEncoding); + var decryptedText = cryptography.decryptText(scriptParameters[j].paramVal, cryptoConfig.decryptionEncoding, cryptoConfig.encryptionEncoding); cmdLine = cmdLine + ' "' + decryptedText + '"'; } } - sshExec.exec(cmdLine, function(err, retCode) { + sshExec.exec(cmdLine, function (err, retCode) { if (err) { var timestampEnded = new Date().getTime(); logsDao.insertLog({ @@ -300,7 +315,7 @@ scriptTaskSchema.methods.execute = function(userName, baseUrl, choiceParam, nexu log: 'Unable to run script ' + script.name, timestamp: new Date().getTime() }; - instanceLogModel.createOrUpdate(logsReferenceIds[1], logsReferenceIds[0], instanceLog, function(err, logData) { + instanceLogModel.createOrUpdate(logsReferenceIds[1], logsReferenceIds[0], instanceLog, function (err, logData) { if (err) { logger.error("Failed to create or update instanceLog: ", err); } @@ -325,7 +340,7 @@ scriptTaskSchema.methods.execute = function(userName, baseUrl, choiceParam, nexu log: 'Task execution success for script ' + script.name, timestamp: new Date().getTime() }; - instanceLogModel.createOrUpdate(logsReferenceIds[1], logsReferenceIds[0], instanceLog, function(err, logData) { + instanceLogModel.createOrUpdate(logsReferenceIds[1], logsReferenceIds[0], instanceLog, function (err, logData) { if (err) { logger.error("Failed to create or update instanceLog: ", err); } @@ -349,7 +364,7 @@ scriptTaskSchema.methods.execute = function(userName, baseUrl, choiceParam, nexu log: 'Host Unreachable', timestamp: new Date().getTime() }; - instanceLogModel.createOrUpdate(logsReferenceIds[1], logsReferenceIds[0], instanceLog, function(err, logData) { + instanceLogModel.createOrUpdate(logsReferenceIds[1], logsReferenceIds[0], instanceLog, function (err, logData) { if (err) { logger.error("Failed to create or update instanceLog: ", err); } @@ -370,7 +385,7 @@ scriptTaskSchema.methods.execute = function(userName, baseUrl, choiceParam, nexu log: 'Invalid credentials', timestamp: new Date().getTime() }; - instanceLogModel.createOrUpdate(logsReferenceIds[1], logsReferenceIds[0], instanceLog, function(err, logData) { + instanceLogModel.createOrUpdate(logsReferenceIds[1], logsReferenceIds[0], instanceLog, function (err, logData) { if (err) { logger.error("Failed to create or update instanceLog: ", err); } @@ -391,7 +406,7 @@ scriptTaskSchema.methods.execute = function(userName, baseUrl, choiceParam, nexu log: 'Unknown error occured. ret code = ' + retCode, timestamp: new Date().getTime() }; - instanceLogModel.createOrUpdate(logsReferenceIds[1], logsReferenceIds[0], instanceLog, function(err, logData) { + instanceLogModel.createOrUpdate(logsReferenceIds[1], logsReferenceIds[0], instanceLog, function (err, logData) { if (err) { logger.error("Failed to create or update instanceLog: ", err); } @@ -414,7 +429,7 @@ scriptTaskSchema.methods.execute = function(userName, baseUrl, choiceParam, nexu log: 'Error in running script ' + script.name, timestamp: new Date().getTime() }; - instanceLogModel.createOrUpdate(logsReferenceIds[1], logsReferenceIds[0], instanceLog, function(err, logData) { + instanceLogModel.createOrUpdate(logsReferenceIds[1], logsReferenceIds[0], instanceLog, function (err, logData) { if (err) { logger.error("Failed to create or update instanceLog: ", err); } @@ -422,7 +437,7 @@ scriptTaskSchema.methods.execute = function(userName, baseUrl, choiceParam, nexu removeScriptFile(desPath); return; } - }, function(stdOut) { + }, function (stdOut) { logsDao.insertLog({ referenceId: logsReferenceIds, err: false, @@ -434,12 +449,12 @@ scriptTaskSchema.methods.execute = function(userName, baseUrl, choiceParam, nexu log: stdOut.toString('ascii'), timestamp: new Date().getTime() }; - instanceLogModel.createOrUpdate(logsReferenceIds[1], logsReferenceIds[0], instanceLog, function(err, logData) { + instanceLogModel.createOrUpdate(logsReferenceIds[1], logsReferenceIds[0], instanceLog, function (err, logData) { if (err) { logger.error("Failed to create or update instanceLog: ", err); } }); - }, function(stdErr) { + }, function (stdErr) { logsDao.insertLog({ referenceId: logsReferenceIds, err: true, @@ -451,17 +466,19 @@ scriptTaskSchema.methods.execute = function(userName, baseUrl, choiceParam, nexu log: stdErr.toString('ascii'), timestamp: new Date().getTime() }; - instanceLogModel.createOrUpdate(logsReferenceIds[1], logsReferenceIds[0], instanceLog, function(err, logData) { + instanceLogModel.createOrUpdate(logsReferenceIds[1], logsReferenceIds[0], instanceLog, function (err, logData) { if (err) { logger.error("Failed to create or update instanceLog: ", err); } }); }); }) - }; + } + ; }); }; -}; +} + function removeScriptFile(filePath) { fileIo.removeFile(filePath, function(err, result) { diff --git a/server/app/model/classes/tasks/tasks.js b/server/app/model/classes/tasks/tasks.js index 2aedacc02..0e7c6329d 100755 --- a/server/app/model/classes/tasks/tasks.js +++ b/server/app/model/classes/tasks/tasks.js @@ -136,57 +136,77 @@ var taskSchema = new Schema({ required: false, default:false }, + executionOrder:{ + type: String, + required: false, + trim: true + }, taskScheduler:{ cronStartOn: { - type: Number, + type: String, required: false, trim: true }, cronEndOn: { - type: Number, + type: String, required: false, trim: true }, - cronPatten: { + cronPattern: { type: String, required: false, trim: true }, cronRepeatEvery: { type: Number, - required: false, - trim: true + required: false }, cronFrequency: { - type: Number, - required: false, - trim: true - }, - cronTime:{ type: String, required: false, trim: true }, - cronDays:{ - type: String, + cronMinute:{ + type: Number, required: false, trim: true }, + cronHour:{ + type: Number, + required: false + }, + cronWeekDay:{ + type: Number, + required: false + }, + cronDate:{ + type: Number, + required: false + }, cronMonth:{ type: String, required: false, trim: true }, cronYear:{ - type: String, - required: false, - trim: true + type: Number, + required: false } }, cronJobId:{ type: String, required: false, trim: true + }, + executionCount:{ + type: Number, + required: false, + default:0 + }, + manualExecutionTime:{ + type: Number, + required: false, + default:10 } }); taskSchema.plugin(mongoosePaginate); @@ -743,7 +763,11 @@ taskSchema.statics.updateTaskById = function(taskId, taskData, callback) { serviceDeliveryCheck:taskData.serviceDeliveryCheck, description: taskData.description, jobResultURLPattern: taskData.jobResultURL, - blueprintIds: taskData.blueprintIds + blueprintIds: taskData.blueprintIds, + executionOrder:taskData.executionOrder, + taskScheduler:taskData.taskScheduler, + isTaskScheduled:taskData.isTaskScheduled, + manualExecutionTime:taskData.manualExecutionTime } }, { upsert: false @@ -912,9 +936,10 @@ taskSchema.statics.updateTaskConfig = function updateTaskConfig(taskId, taskConf }); }; -taskSchema.statics.getScheduledTasks = function getScheduledTasks(callback) { +taskSchema.statics.getScheduledTasks = function getScheduledTasks(executionOrder,callback) { Tasks.find({ - isTaskScheduled: true + isTaskScheduled: true, + executionOrder:executionOrder }, function (err, tasks) { if (err) { logger.error(err); @@ -958,6 +983,23 @@ taskSchema.statics.updateTaskScheduler = function updateTaskScheduler(taskId, ca callback(null, data); }); }; +taskSchema.statics.updateTaskExecutionCount = function updateTaskExecutionCount(taskId,count,callback) { + Tasks.update({ + "_id": new ObjectId(taskId), + }, { + $set: { + executionCount: count + } + }, { + upsert: false + }, function (err, data) { + if (err) { + callback(err, null); + return; + } + callback(null, data); + }); +}; function filterScriptTaskData(data,callback){ var taskList = []; diff --git a/server/app/model/resource-costs/resource-costs.js b/server/app/model/resource-costs/resource-costs.js index 012c774f6..9a0761fd4 100644 --- a/server/app/model/resource-costs/resource-costs.js +++ b/server/app/model/resource-costs/resource-costs.js @@ -24,7 +24,7 @@ var Schema = mongoose.Schema // @TODO Date field types to be revised var ResourceCostsSchema = new Schema({ cost: { - type: SchemaTypes.Double, + type: Number, required: true }, currency: { @@ -70,6 +70,11 @@ var ResourceCostsSchema = new Schema({ required: false, trim: true }, + billIntervalId: { + type: String, + required: true, + trim: true + }, billLineItemId: { type: Number, required: true, @@ -132,38 +137,56 @@ var ResourceCostsSchema = new Schema({ }) ResourceCostsSchema.index({'platformDetails.serviceId' : 1}) -ResourceCostsSchema.index({'organizationId': 1, 'providerId': 1, 'billLineItemId': 1, - 'startTime': 1, 'interval': 1}, {'unique': true}) +ResourceCostsSchema.index({'organizationId': 1, 'providerId': 1, 'startTime': 1, + 'billIntervalId': 1, 'billLineItemId': 1, 'interval': 1}, {'unique': true}) -ResourceCostsSchema.statics.saveResourceCost = function saveResourceCost(resourceCostData, callback) { +ResourceCostsSchema.statics.save = function save(resourceCostData, callback) { var resourceCosts = new ResourceCosts(resourceCostData) - resourceCosts.save(function(err, data) { + resourceCosts.save(function(err, result) { if (err) { callback(err) } else { - callback(null) + callback(null, result) } }) } -ResourceCostsSchema.statics.upsertResourceCost = function upsertResourceCost(resourceCostData, callback) { +ResourceCostsSchema.statics.remove + = function remove(organizationId, providerId, billIntervalId, callback) { + var query = { + organizationId: organizationId, + providerId: providerId, + billIntervalId: billIntervalId + } + + this.find(query).remove(function(err, result) { + if (err) { + callback(err) + } else { + callback(null, result) + } + }) +} + +ResourceCostsSchema.statics.upsert = function upsert(resourceCostData, callback) { var query = { organizationId: resourceCostData.organizationId, providerId: resourceCostData.providerId, - billLineItemId: resourceCostData.billLineItemId, startTime: resourceCostData.startTime, + billIntervalId: resourceCostData.billIntervalId, + billLineItemId: resourceCostData.billLineItemId, interval: resourceCostData.interval } - this.findOneAndUpdate(query, resourceCostData, {upsert:true}, + this.findOneAndUpdate(query, resourceCostData, {upsert: true}, function(err, result){ if (err) { callback(null) } else { callback(null, result) } - }); + }) } var ResourceCosts = mongoose.model('ResourceCosts', ResourceCostsSchema) -module.exports = ResourceCosts +module.exports = ResourceCosts \ No newline at end of file diff --git a/server/app/model/scripts/scripts.js b/server/app/model/scripts/scripts.js index 01f91b714..6f562f0b5 100644 --- a/server/app/model/scripts/scripts.js +++ b/server/app/model/scripts/scripts.js @@ -55,6 +55,16 @@ var ScriptSchema = new Schema({ type:String, required:true, trim:true + }, + isParametrized:{ + type:Boolean, + required:false, + default:false + }, + noOfParams:{ + type:Number, + required:false, + default:0 } }); ScriptSchema.plugin(mongoosePaginate); @@ -88,7 +98,9 @@ ScriptSchema.statics.updateScript = function(scriptData, callback) { $set: { "name": scriptData.name, "description": scriptData.description, - "fileId": scriptData.fileId + "fileId": scriptData.fileId, + "isParametrized":scriptData.isParametrized, + "noOfParams":scriptData.noOfParams }, },{ upsert: false diff --git a/server/app/routes/v1.0/routes_audit_trails.js b/server/app/routes/v1.0/routes_audit_trails.js index 51b2d171d..4419edd8c 100644 --- a/server/app/routes/v1.0/routes_audit_trails.js +++ b/server/app/routes/v1.0/routes_audit_trails.js @@ -109,7 +109,7 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) { [ function(next) { - apiUtil.paginationRequest(req[0].query, 'taskLogs', next); + apiUtil.paginationRequest(req.query, 'taskLogs', next); }, function(paginationReq, next) { reqData = paginationReq; diff --git a/server/app/routes/v1.0/routes_blueprints.js b/server/app/routes/v1.0/routes_blueprints.js index 8130519c6..90b9d8d13 100755 --- a/server/app/routes/v1.0/routes_blueprints.js +++ b/server/app/routes/v1.0/routes_blueprints.js @@ -42,7 +42,7 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) { }) }); app.delete('/blueprints/serviceDelivery/:blueprintId', function(req, res) { - Blueprints.removeServiceDeliveryBlueprints(req.params.blueprintId, function(err, data) { + blueprintService.deleteServiceDeliveryBlueprint(req.params.blueprintId, function(err, data) { if (err) { logger.error("Failed to delete ", err); res.send(500, errorResponses.db.error); @@ -384,6 +384,17 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) { } var stackName = null; var domainName = null; + var blueprintLaunchCount = 0; + if(blueprint.executionCount) { + blueprintLaunchCount = blueprint.executionCount + 1; + }else{ + blueprintLaunchCount = 1; + } + Blueprints.updateBlueprintExecutionCount(blueprint._id,blueprintLaunchCount,function(err,data){ + if(err){ + logger.error("Error while updating Blueprint Execution Count"); + } + }); if (blueprint.blueprintType === 'aws_cf' || blueprint.blueprintType === 'azure_arm') { stackName = req.query.stackName; if (!stackName) { diff --git a/server/app/routes/v1.0/routes_organizations.js b/server/app/routes/v1.0/routes_organizations.js index 530cde351..3c458a04f 100755 --- a/server/app/routes/v1.0/routes_organizations.js +++ b/server/app/routes/v1.0/routes_organizations.js @@ -49,10 +49,10 @@ var Docker = require('_pr/model/docker.js'); var orgValidator = require('_pr/validators/organizationValidator'); var validate = require('express-validation'); var taskService = require('_pr/services/taskService'); -var schedulerService = require('_pr/services/schedulerService'); var instanceLogModel = require('_pr/model/log-trail/instanceLog.js'); var compositeBlueprintModel = require('_pr/model/composite-blueprints/composite-blueprints.js'); var Cryptography = require('_pr/lib/utils/cryptography'); +var catalystSync = require('_pr/cronjobs/catalyst-scheduler/catalystScheduler.js'); module.exports.setRoutes = function(app, sessionVerification) { /* @@ -434,6 +434,7 @@ module.exports.setRoutes = function(app, sessionVerification) { var category = 'blueprints'; var permissionto = 'create'; var domainNameCheck = false; + var manualExecutionTime = 10; var orgId = req.params.orgId; var bgId = req.params.bgId; var projectId = req.params.projectId; @@ -452,6 +453,9 @@ module.exports.setRoutes = function(app, sessionVerification) { var botType = req.body.blueprintData.botType; var botCategory = req.body.blueprintData.botCategory; var serviceDeliveryCheck = req.body.blueprintData.serviceDeliveryCheck; + if(req.body.blueprintData.manualExecutionTime && req.body.blueprintData.manualExecutionTime !== null){ + manualExecutionTime = req.body.blueprintData.manualExecutionTime; + } if(req.body.blueprintData.domainNameCheck === 'true'){ domainNameCheck = true; } @@ -502,7 +506,8 @@ module.exports.setRoutes = function(app, sessionVerification) { botType:botType, botCategory:botCategory, serviceDeliveryCheck:serviceDeliveryCheck, - domainNameCheck:domainNameCheck + domainNameCheck:domainNameCheck, + manualExecutionTime:manualExecutionTime }; //adding bluerpintID if present (edit mode) if (blueprintId) @@ -975,10 +980,13 @@ module.exports.setRoutes = function(app, sessionVerification) { taskData.orgName = project[0].orgname; taskData.bgName = project[0].productgroupname; taskData.projectName = project[0].projectname; - if(req.body.taskScheduler && req.body.taskScheduler !== null) { - taskData.taskScheduler = apiUtil.createCronJobPattern(req.body.taskScheduler); + if(taskData.taskScheduler && taskData.taskScheduler !== null && Object.keys(taskData.taskScheduler).length !== 0) { + taskData.taskScheduler = apiUtil.createCronJobPattern(taskData.taskScheduler); taskData.isTaskScheduled = true; } + if(taskData.taskType === 'jenkins'){ + taskData.executionOrder= 'PARALLEL'; + } configmgmtDao.getEnvNameFromEnvId(req.params.envId, function(err, envName) { if (err) { res.status(500).send("Failed to fetch ENV: ", err); @@ -1000,11 +1008,11 @@ module.exports.setRoutes = function(app, sessionVerification) { return; } if(task.isTaskScheduled === true){ - schedulerService.executeSchedulerForTasks(task,function(err,data){ - if(err){ - logger.error("Error in executing task scheduler"); - } - }) + if(task.executionOrder === 'PARALLEL'){ + catalystSync.executeParallelScheduledTasks(); + }else{ + catalystSync.executeSerialScheduledTasks(); + } }; res.send(task); logger.debug("Exit post() for /organizations/%s/businessGroups/%s/projects/%s/environments/%s/tasks", req.params.orgId, req.params.bgId, req.params.projectId, req.params.environments); @@ -1014,16 +1022,17 @@ module.exports.setRoutes = function(app, sessionVerification) { }else { Task.createNew(taskData, function (err, task) { if (err) { - logger.err(err); + logger.error(err); res.status(500).send("Failed to create task: ", err); return; } if(task.isTaskScheduled === true){ - schedulerService.executeSchedulerForTasks(task,function(err,data){ - if(err){ - logger.error("Error in executing task scheduler"); - } - }) + if(task.executionOrder === 'PARALLEL'){ + catalystSync.executeParallelScheduledTasks(); + }else{ + catalystSync.executeSerialScheduledTasks(); + } + }; res.send(task); logger.debug("Exit post() for /organizations/%s/businessGroups/%s/projects/%s/environments/%s/tasks", req.params.orgId, req.params.bgId, req.params.projectId, req.params.environments); @@ -1039,19 +1048,22 @@ module.exports.setRoutes = function(app, sessionVerification) { var count = 0; var encryptedList = []; for(var i = 0; i < paramDetails.length; i++){ - (function(param){ - if(param.scriptParameters.length > 0){ + (function(paramDetail){ + if(paramDetail.scriptParameters.length > 0){ count++; - for(var j = 0; j < param.scriptParameters.length; j++){ + for(var j = 0; j < paramDetail.scriptParameters.length; j++){ (function(scriptParameter){ - var encryptedText = cryptography.encryptText(scriptParameter, cryptoConfig.encryptionEncoding, + var encryptedText = cryptography.encryptText(scriptParameter.paramVal, cryptoConfig.encryptionEncoding, cryptoConfig.decryptionEncoding); - encryptedList.push(encryptedText); - if(encryptedList.length === param.scriptParameters.length){ - param.scriptParameters = encryptedList; + encryptedList.push({ + paramVal:encryptedText, + paramDesc:scriptParameter.paramDesc + }); + if(encryptedList.length === paramDetail.scriptParameters.length){ + paramDetail.scriptParameters = encryptedList; encryptedList = []; } - })(param.scriptParameters[j]); + })(paramDetail.scriptParameters[j]); } }else{ count++; diff --git a/server/app/routes/v1.0/routes_providercommon.js b/server/app/routes/v1.0/routes_providercommon.js index 081386118..c48cb371e 100644 --- a/server/app/routes/v1.0/routes_providercommon.js +++ b/server/app/routes/v1.0/routes_providercommon.js @@ -1013,6 +1013,7 @@ module.exports.setRoutes = function (app, sessionVerificationFunc) { * @apiSuccess {Object[]} tags List of tags * @apiSuccess {String} tags.name Tag name * @apiSuccess {String} tags.description Tag description + * @apiSuccess {String[]} tags.values Tag values * @apiSuccess {Number} count Number of tags in the result set * @apiSuccess {pageSize} pageSize Page size * @apiSuccess {pageIndex} pageIndex Page index @@ -1024,11 +1025,13 @@ module.exports.setRoutes = function (app, sessionVerificationFunc) { * "tags": [ * { * "name": "env", - * "description": "Deployment environment" + * "description": "Deployment environment", + * "values": ["value1", "value2"] * }, * { * "name": "application", - * "description": "Project name" + * "description": "Project name", + * "values": ["value1", "value2"] * } * ], * "count": 2, @@ -1052,12 +1055,14 @@ module.exports.setRoutes = function (app, sessionVerificationFunc) { * @apiSuccess {Object} tag Tag details * @apiSuccess {String} tag.name Tag name * @apiSuccess {String} tag.description Tag description + * @apiSuccess {String[]} tag.values Tag values * * @apiSuccessExample {json} Success-Response: * HTTP/1.1 200 OK * { * "name": "environment", - * "description": "Deployment environment" + * "description": "Deployment environment", + * "values": ["value1", "value2"] * } * */ @@ -1076,7 +1081,8 @@ module.exports.setRoutes = function (app, sessionVerificationFunc) { * @apiParamExample {json} Request-Example: * { * "name": "environment", - * "description": "Tag description" + * "description": "Tag description", + * "values": ["value1", "value2"] * } * * @apiSuccess {Object} tag Tag details @@ -1087,7 +1093,8 @@ module.exports.setRoutes = function (app, sessionVerificationFunc) { * HTTP/1.1 200 OK * { * "name": "environment", - * "description": "Deployment environment" + * "description": "Deployment environment", + * "values": ["value1", "value2"] * } */ // app.post('/providers/:providerId/tags', validate(tagsValidator.create), createTags); @@ -1114,7 +1121,8 @@ module.exports.setRoutes = function (app, sessionVerificationFunc) { * HTTP/1.1 200 OK * { * "name": "environment", - * "description": "Deployment environment" + * "description": "Deployment environment", + * "values": ["value1", "value2"] * } */ app.put('/providers/:providerId/tags/:tagName', validate(tagsValidator.update), updateTag); @@ -1148,41 +1156,36 @@ module.exports.setRoutes = function (app, sessionVerificationFunc) { * @apiSuccessExample {json} Success-Response: * HTTP/1.1 200 OK * { - * "tagMappings": [ - * { - * "tagName": "application", - * "tagValues": ["proj1", "proj2"], - * "catalystEntityType": "project", - * "catalystEntityMapping": [ - * { - * "catalystEntityId": "", - * "tagValue": "proj1" - * }, - * { - * "catalystEntityId": "", - * "tagValue": "proj2" - * } - * ] + * "project": { + * "tagName": "application", + * "tagValues": ["proj1", "proj2"], + * "catalystEntityType": "project", + * "catalystEntityMapping": { + * "": { + * "catalystEntityId": "", + * "tagValue": "proj1" * }, - * { - * "tagName": "environment", - * "tagValues": ["prod", "dev"], - * "catalystEntityType": "environment" - * "catalystEntityMapping": [ - * { - * "catalystEntityId": "", - * "tagValue": "dev" - * }, - * { - * "catalystEntityId": "", - * "tagValue": "prod" - * } - * ] + * "": { + * "catalystEntityId": "", + * "tagValue": "proj2" * } - * ], - * "count": 2, - * "pageSize": 10, - * "pageIndex": 1 + * } + * }, + * "environment": { + * "tagName": "environment", + * "tagValues": ["prod", "dev"], + * "catalystEntityType": "environment" + * "catalystEntityMapping": { + * "": { + * "catalystEntityId": "", + * "tagValue": "dev" + * }, + * "": { + * "catalystEntityId": "", + * "tagValue": "prod" + * } + * } + * } * } */ // @TODO Response should match doc @@ -1210,18 +1213,18 @@ module.exports.setRoutes = function (app, sessionVerificationFunc) { * HTTP/1.1 200 OK * { * "name": "application", - * "values": ["proj1", "proj2"] + * "values": ["proj1", "proj2"], * "catalystEntityType": "project", - * "catalystEntityMapping": [ - * { + * "catalystEntityMapping": { + * "": { * "catalystEntityId": "", * "tagValue": "proj1" * }, - * { + * "": { * "catalystEntityId": "", * "tagValue": "proj2" * } - * ] + * } * } */ app.get('/providers/:providerId/tag-mappings/:catalystEntityType', validate(tagsValidator.tagsMapping), @@ -1240,20 +1243,20 @@ module.exports.setRoutes = function (app, sessionVerificationFunc) { * @apiSuccess {String} tagNameMapping.catalystEntityMapping.catalystEntityId Catalyst entity id * @apiSuccess {String} tagNameMapping.catalystEntityMapping.tagValue Tag value * @apiParamExample {json} Request-Example: - * [ - * { + * { + * "project": { * "tagName": "application", * "tagValues": [], * "catalystEntityType": "project", - * "catalystEntityMapping": [] + * "catalystEntityMapping": {} * }, - * { + * "environment": { * "tagName": "env", * "tagValues": [], * "catalystEntityType": "environment", - * "catalystEntityMapping": [] + * "catalystEntityMapping": {} * } - * ] + * } * * @apiSuccess {Object[]} tags Tags * @apiSuccess {String} tagMappings Tag mappings @@ -1267,20 +1270,19 @@ module.exports.setRoutes = function (app, sessionVerificationFunc) { * @apiSuccessExample {json} Success-Response: * HTTP/1.1 201 OK * { - * "tagMappings": [ - * { - * "name": "application", - * "values": ["proj1", "proj2"], - * "catalystEntityType": "project", - * "catalystEntityMapping": [] - * }, - * { - * "name": "environment", - * "values": ["prod", "dev"], - * "catalystEntityType": "environment" - * "catalystEntityMapping": [] - * } - * ] + * "project": { + * "name": "application", + * "values": ["proj1", "proj2"], + * "catalystEntityType": "project", + * "catalystEntityMapping": {} + * }, + * "environment": { + * "name": "environment", + * "values": ["prod", "dev"], + * "catalystEntityType": "environment", + * "catalystEntityMapping": {} + * } + * * } */ app.post('/providers/:providerId/tag-mappings', validate(tagsValidator.list), addTagMappings); @@ -1299,19 +1301,19 @@ module.exports.setRoutes = function (app, sessionVerificationFunc) { * @apiSuccess {String} tagMapping.catalystEntityMapping.tagValue Tag value * @apiParamExample {json} Request-Example: * { - * "catalystEntityMapping": [ - * { + * "catalystEntityMapping": { + * "": { * "catalystEntityId": "", * "catalystEntityName": "project 1", * "tagValue": "proj1" * }, - * { + * "": { * "catalystEntityId": "", * "catalystEntityName": "project 2", * "tagValue": "proj2" * * } - * ] + * } * } * * @apiSuccess {Object} tagMapping Tag mapping @@ -1328,19 +1330,19 @@ module.exports.setRoutes = function (app, sessionVerificationFunc) { * "tagName": "application", * "tagValues": ["proj1", "proj2"], * "catalystEntityType": "project", - * "catalystEntityMapping": [ - * { + * "catalystEntityMapping": { + * "": { * "catalystEntityId": "", * "catalystEntityName": "project 1", * "tagValue": "proj1" * }, - * { + * "": { * "catalystEntityId": "", * "catalystEntityName": "project 2", * "tagValue": "proj2" * * } - * ] + * } * } */ app.patch('/providers/:providerId/tag-mappings/:catalystEntityType', validate(tagsValidator.tagsMapping), diff --git a/server/app/routes/v1.0/routes_tasks.js b/server/app/routes/v1.0/routes_tasks.js index 69b76cd2b..34298868b 100755 --- a/server/app/routes/v1.0/routes_tasks.js +++ b/server/app/routes/v1.0/routes_tasks.js @@ -28,6 +28,7 @@ var async = require('async'); var apiUtil = require('_pr/lib/utils/apiUtil.js'); var Cryptography = require('_pr/lib/utils/cryptography'); var schedulerService = require('_pr/services/schedulerService'); +var catalystSync = require('_pr/cronjobs/catalyst-scheduler/catalystScheduler.js'); @@ -39,6 +40,19 @@ var fileIo = require('_pr/lib/utils/fileio'); module.exports.setRoutes = function(app, sessionVerification) { app.all('/tasks/*', sessionVerification); + app.delete('/tasks/serviceDelivery/:taskId', function(req, res) { + taskService.deleteServiceDeliveryTask(req.params.taskId, function(err, data) { + if (err) { + logger.error("Failed to delete service delivery Task", err); + res.send(500, errorResponses.db.error); + return; + } + res.send(200, { + message: "deleted" + }); + }); + }); + app.get('/tasks/history/list/all', function(req, res) { TaskHistory.listHistory(function(err, tHistories) { if (err) { @@ -95,19 +109,6 @@ module.exports.setRoutes = function(app, sessionVerification) { }); }); - app.delete('/tasks/serviceDelivery/:taskId', function(req, res) { - Tasks.removeServiceDeliveryTask(req.params.taskId, function(err, data) { - if (err) { - logger.error("Failed to delete service delivery Task", err); - res.send(500, errorResponses.db.error); - return; - } - res.send(200, { - message: "deleted" - }); - }); - }); - app.post('/tasks/:taskId/run', function(req, res) { @@ -516,7 +517,7 @@ module.exports.setRoutes = function(app, sessionVerification) { app.post('/tasks/:taskId/update', function(req, res) { var taskData = req.body.taskData; - if(taskData.taskScheduler && taskData.taskScheduler !== null) { + if(taskData.taskScheduler && taskData.taskScheduler !== null && Object.keys(taskData.taskScheduler).length !== 0) { taskData.taskScheduler = apiUtil.createCronJobPattern(taskData.taskScheduler); taskData.isTaskScheduled = true; } @@ -542,11 +543,11 @@ module.exports.setRoutes = function(app, sessionVerification) { } if (updateCount) { if(taskData.isTaskScheduled === true){ - schedulerService.executeSchedulerForTasks(task,function(err,data){ - if(err){ - logger.error("Error in executing task scheduler"); - } - }) + if(taskData.executionOrder === 'PARALLEL'){ + catalystSync.executeParallelScheduledTasks(); + }else{ + catalystSync.executeSerialScheduledTasks(); + } }; res.send({ updateCount: updateCount @@ -559,6 +560,9 @@ module.exports.setRoutes = function(app, sessionVerification) { }) }); } else { + if(taskData.taskType === 'jenkins'){ + taskData.executionOrder= 'PARALLEL'; + } Tasks.updateTaskById(req.params.taskId, taskData, function(err, updateCount) { if (err) { logger.error(err); @@ -567,11 +571,11 @@ module.exports.setRoutes = function(app, sessionVerification) { } if (updateCount) { if(taskData.isTaskScheduled === true){ - schedulerService.executeSchedulerForTasks(task,function(err,data){ - if(err){ - logger.error("Error in executing task scheduler"); - } - }) + if(taskData.executionOrder === 'PARALLEL'){ + catalystSync.executeParallelScheduledTasks(); + }else{ + catalystSync.executeSerialScheduledTasks(); + } }; res.send({ updateCount: updateCount @@ -630,25 +634,28 @@ function encryptedParam(paramDetails, existingParams, callback) { var count = 0; var encryptedList = []; for (var i = 0; i < paramDetails.length; i++) { - (function(param) { - if (param.scriptParameters.length > 0) { + (function(paramDetail) { + if (paramDetail.scriptParameters.length > 0) { count++; - for (var j = 0; j < param.scriptParameters.length; j++) { + for (var j = 0; j < paramDetail.scriptParameters.length; j++) { (function(scriptParameter) { if (scriptParameter === '') { encryptedList.push(existingParams[i].scriptParameters[j]); - } else if (scriptParameter === existingParams[i].scriptParameters[j]) { + } else if (scriptParameter.paramVal === existingParams[i].scriptParameters[j].paramVal) { encryptedList.push(scriptParameter); } else { - var encryptedText = cryptography.encryptText(scriptParameter, cryptoConfig.encryptionEncoding, + var encryptedText = cryptography.encryptText(scriptParameter.paramVal, cryptoConfig.encryptionEncoding, cryptoConfig.decryptionEncoding); - encryptedList.push(encryptedText); + encryptedList.push({ + paramVal:encryptedText, + paramVal:scriptParameter.paramVal + }); } - if (encryptedList.length === param.scriptParameters.length) { - param.scriptParameters = encryptedList; + if (encryptedList.length === paramDetail.scriptParameters.length) { + paramDetail.scriptParameters = encryptedList; encryptedList = []; } - })(param.scriptParameters[j]); + })(paramDetail.scriptParameters[j]); } } else { count++; diff --git a/server/app/services/auditTrailService.js b/server/app/services/auditTrailService.js index 6d0210da4..bca9cdbac 100644 --- a/server/app/services/auditTrailService.js +++ b/server/app/services/auditTrailService.js @@ -235,7 +235,7 @@ auditTrailService.getBOTsSummary = function getBOTsSummary(callback){ for(var i = 0; i < botAuditTrail.length; i++){ (function(auditTrail){ count++; - if(auditTrail.endedOn && auditTrail.endedOn !== null) { + if(auditTrail.endedOn && auditTrail.endedOn !== null && auditTrail.actionStatus !== 'failed') { var executionTime = getExecutionTime(auditTrail.endedOn, auditTrail.startedOn); totalTimeInSeconds = totalTimeInSeconds + (600 - executionTime); } diff --git a/server/app/services/blueprintService.js b/server/app/services/blueprintService.js index 80c2b8df3..663b35315 100644 --- a/server/app/services/blueprintService.js +++ b/server/app/services/blueprintService.js @@ -71,6 +71,24 @@ blueprintService.getAllBlueprints = function getAllBlueprints(orgIds, callback) }); }; +blueprintService.deleteServiceDeliveryBlueprint = function deleteServiceDeliveryBlueprint(blueprintId, callback) { + async.waterfall([ + function (next) { + Blueprints.removeServiceDeliveryBlueprints(blueprintId, next); + }, + function (deleteTaskCheck, next) { + auditTrail.removeAuditTrails({auditId:blueprintId},next); + } + ],function (err, results) { + if (err) { + callback(err, null); + return; + } + callback(null, results); + return; + }); +}; + blueprintService.getAllServiceDeliveryBlueprint = function getAllServiceDeliveryBlueprint(queryObj, callback) { if(queryObj.serviceDeliveryCheck === true && queryObj.actionStatus && queryObj.actionStatus !== null) { var query = { diff --git a/server/app/services/instanceService.js b/server/app/services/instanceService.js index fe7a59a4d..c165911fc 100644 --- a/server/app/services/instanceService.js +++ b/server/app/services/instanceService.js @@ -46,7 +46,7 @@ var AppData = require('_pr/model/app-deploy/app-data'); var instancesDao = require('_pr/model/classes/instance/instance'); var providerService = require('_pr/services/providerService.js'); var schedulerService = require('_pr/services/schedulerService.js'); -var crontab = require('node-crontab'); +var catalystSync = require('_pr/cronjobs/catalyst-scheduler/catalystScheduler.js'); var instanceService = module.exports = {}; @@ -1473,34 +1473,13 @@ function updateScheduler(instanceScheduler, callback) { function(schedulerDetails,next){ schedulerDetails.interval = instanceScheduler.interval; instancesDao.updateScheduler(instanceScheduler.instanceIds, schedulerDetails,next); - }, - function(updateSchedulerDetails,next){ - instancesDao.getInstances(instanceScheduler.instanceIds,next); } ],function(err,results){ if(err){ return callback(err, null); }else{ callback(null, {"message": "Scheduler Updated."}); - var resultList =[]; - for (var i = 0; i < results.length; i++) { - (function(instance) { - if(instance.cronJobIds && instance.cronJobIds.length > 0){ - crontab.cancelJobIds(instance.cronJobIds); - } - resultList.push(function(callback){schedulerService.executeSchedulerForInstances(instance,callback);}); - if(resultList.length === results.length){ - async.parallel(resultList,function(err,results){ - if(err){ - logger.error(err); - return; - } - logger.debug("Instance Scheduler Results>>"+results); - return; - }) - } - })(results[i]); - } + catalystSync.executeScheduledInstances(); return; } }); @@ -1508,12 +1487,22 @@ function updateScheduler(instanceScheduler, callback) { function generateCronPattern(cronInterval,startDate,endDate,callback){ var startIntervalList =[],stopIntervalList=[],count = 0; + var startOn = null,endOn = null; + if(startDate === endDate){ + startOn = new Date(); + endOn = new Date() + endOn.setHours(23); + endOn.setMinutes(59); + }else{ + startOn = startDate; + endOn = endDate; + } if(cronInterval.length === 0){ var scheduler= { instanceStartScheduler: startIntervalList, instanceStopScheduler: stopIntervalList, - schedulerStartOn: Date.parse(startDate), - schedulerEndOn: Date.parse(endDate), + schedulerStartOn: Date.parse(startOn), + schedulerEndOn: Date.parse(endOn), isScheduled: false } callback(null,scheduler); @@ -1543,8 +1532,8 @@ function generateCronPattern(cronInterval,startDate,endDate,callback){ var scheduler= { instanceStartScheduler: startIntervalList, instanceStopScheduler: stopIntervalList, - schedulerStartOn: Date.parse(startDate), - schedulerEndOn: Date.parse(endDate), + schedulerStartOn: Date.parse(startOn), + schedulerEndOn: Date.parse(endOn), isScheduled: true } callback(null,scheduler); @@ -1572,8 +1561,8 @@ function generateCronPattern(cronInterval,startDate,endDate,callback){ var scheduler= { instanceStartScheduler: startIntervalList, instanceStopScheduler: stopIntervalList, - schedulerStartOn: Date.parse(startDate), - schedulerEndOn: Date.parse(endDate), + schedulerStartOn: Date.parse(startOn), + schedulerEndOn: Date.parse(endOn), isScheduled: true } callback(null,scheduler); diff --git a/server/app/services/providerService.js b/server/app/services/providerService.js index 6dcab6b74..a974f520a 100644 --- a/server/app/services/providerService.js +++ b/server/app/services/providerService.js @@ -617,14 +617,15 @@ providerService.createTagsList = function createTagsList(tags, callback) { providerService.createTagObject = function createTagObject(tag, callback) { var tagObject = { 'name': tag.name, - 'description': tag.description?tag.description:null + 'description': tag.description?tag.description:null, + 'values': tag.values?tag.values:[] }; return callback(null, tagObject); }; providerService.createTagMappingList = function createTagMappingList(tags, callback) { var tagMappingsListObject = {}; - var tagMappingsList = []; + var tagMappingsList = {}; tags.forEach(function(tag) { if(tag.catalystEntityType) { var tagMapping = { @@ -638,7 +639,7 @@ providerService.createTagMappingList = function createTagMappingList(tags, callb for (var i = 0; i < tagMapping.catalystEntityMapping.length; i++) { delete tagMapping.catalystEntityMapping[i]._id; } - tagMappingsList.push(tagMapping); + tagMappingsList[tagMapping.catalystEntityType] = tagMapping; } }); diff --git a/server/app/services/resourceService.js b/server/app/services/resourceService.js index f56a7f95c..20a38dafe 100644 --- a/server/app/services/resourceService.js +++ b/server/app/services/resourceService.js @@ -91,91 +91,112 @@ function updateAWSResourceCostsFromCSV(provider, resources, downlaodedCSVPath, u var awsZones = appConfig.aws.zones var lineNumber = 0 - var stream = fs.createReadStream(downlaodedCSVPath) - csv.fromStream(stream, {headers: false}).on('data', function(data) { - if(data[awsBillIndexes.totalCost] == 'LineItem') { - var resourceCostEntry = {platformDetails: {}} - - resourceCostEntry.organizationId = provider.orgId - resourceCostEntry.providerId = provider._id - resourceCostEntry.providerType = provider.providerType - resourceCostEntry.cost = data[awsBillIndexes.cost] - resourceCostEntry.startTime = Date.parse(data[awsBillIndexes.startDate]) - resourceCostEntry.endTime = Date.parse(data[awsBillIndexes.endDate]) - resourceCostEntry.lastUpdateTime = Date.parse(updateTime) - resourceCostEntry.interval = 3600 - resourceCostEntry.platformDetails.serviceName = data[awsBillIndexes.prod] - resourceCostEntry.billLineItemId = ++lineNumber - resourceCostEntry.platformDetails.billRecordId = data[awsBillIndexes.recordId] - - resourceCostEntry.platformDetails.serviceId - = (data[awsBillIndexes.prod] in awsServices)?awsServices[data[awsBillIndexes.prod]] - :resourceCostEntry.platformDetails.serviceId = 'Other' - - resourceCostEntry.platformDetails.zone = (data[awsBillIndexes.zone] == null) - ? 'Global' : data[awsBillIndexes.zone] - - resourceCostEntry.platformDetails.region = (data[awsBillIndexes.zone] in awsZones) - ? awsZones[data[awsBillIndexes.zone]] : 'Global' - - if (data[awsBillIndexes.instanceId] != null) { - resourceCostEntry.platformDetails.instanceId = data[awsBillIndexes.instanceId] - } + var date = new Date() + var billIntervalId = date.getFullYear() + '-' + (date.getMonth() + 1) - if(data[awsBillIndexes.usageType] != null) { - resourceCostEntry.platformDetails.usageType = data[awsBillIndexes.usageType] - } + async.waterfall([ + function(next) { + resourceCost.remove(provider.orgId, provider._id, billIntervalId, next) + }, + function(count, next) { + /*var lineNumber = (count == 0)?0:count + var startingLineNumber = (count == 0)?1:(count+2)*/ - if (data[awsBillIndexes.instanceId] in resources) { - var resource = resources[data[awsBillIndexes.instanceId]] + var stream = fs.createReadStream(downlaodedCSVPath) + csv.fromStream(stream).on('data', function(data) { + if(data[awsBillIndexes.totalCost] == 'LineItem') { + var resourceCostEntry = {platformDetails: {}} - resourceCostEntry.resourceId = resource._id + resourceCostEntry.organizationId = provider.orgId + resourceCostEntry.providerId = provider._id + resourceCostEntry.providerType = provider.providerType + resourceCostEntry.cost = data[awsBillIndexes.cost] + resourceCostEntry.startTime = Date.parse(data[awsBillIndexes.startDate]) + resourceCostEntry.endTime = Date.parse(data[awsBillIndexes.endDate]) + resourceCostEntry.lastUpdateTime = Date.parse(updateTime) + resourceCostEntry.interval = 3600 + resourceCostEntry.platformDetails.serviceName = data[awsBillIndexes.prod] + resourceCostEntry.billIntervalId = billIntervalId + resourceCostEntry.billLineItemId = ++lineNumber + resourceCostEntry.platformDetails.billRecordId = data[awsBillIndexes.recordId] - if (('bgId' in resource) && (resource.bgId != null)) { - resourceCostEntry.businessGroupId = resource['bgId'] - } + resourceCostEntry.platformDetails.serviceId + = (data[awsBillIndexes.prod] in awsServices)?awsServices[data[awsBillIndexes.prod]] + :resourceCostEntry.platformDetails.serviceId = 'Other' - if (('projectId' in resource) && (resource.projectId != null)) { - resourceCostEntry.projectId = resource['projectId'] - } + resourceCostEntry.platformDetails.zone = (data[awsBillIndexes.zone] == null) + ? 'Global' : data[awsBillIndexes.zone] - if (('environmentId' in resource) && (resource.environmentId != null)) { - resourceCostEntry.environmentId = resource['environmentId'] - } + resourceCostEntry.platformDetails.region = (data[awsBillIndexes.zone] in awsZones) + ? awsZones[data[awsBillIndexes.zone]] : 'Global' - if (('masterDetails.bgId' in resource) && (resource.masterDetails.bgId != null)) { - console.log("BG: " + resource['bgId']) - resourceCostEntry.businessGroupId = resource['bgId'] - } + if (data[awsBillIndexes.instanceId] != null) { + resourceCostEntry.platformDetails.instanceId = data[awsBillIndexes.instanceId] + } - if (('masterDetails.projectId' in resource) - && (resource.masterDetails.projectId != null)) { - resourceCostEntry.projectId = resource['projectId'] - } + if(data[awsBillIndexes.usageType] != null) { + resourceCostEntry.platformDetails.usageType = data[awsBillIndexes.usageType] + } - if (('masterDetails.environmentId' in resource) - && (resource.masterDetails.environmentId != null)) { - resourceCostEntry.environmentId = resource['environmentId'] - } - } + if (data[awsBillIndexes.instanceId] in resources) { + var resource = resources[data[awsBillIndexes.instanceId]] - resourceCostEntry.businessGroupId - = ('businessGroupId' in resourceCostEntry)?resourceCostEntry.businessGroupId:'Unassigned' - resourceCostEntry.projectId - = ('projectId' in resourceCostEntry)?resourceCostEntry.projectId:'Unassigned' - resourceCostEntry.environmentId - = ('environmentId' in resourceCostEntry)?resourceCostEntry.environmentId:'Unassigned' + resourceCostEntry.resourceId = resource._id - resourceCost.upsertResourceCost(resourceCostEntry, function (err, costEntry) { - if (err) { - logger.error(err) - return callback(new Error('Database Error')) + if (('bgId' in resource) && (resource.bgId != null)) { + resourceCostEntry.businessGroupId = resource['bgId'] + } + + if (('projectId' in resource) && (resource.projectId != null)) { + resourceCostEntry.projectId = resource['projectId'] + } + + if (('environmentId' in resource) && (resource.environmentId != null)) { + resourceCostEntry.environmentId = resource['environmentId'] + } + + if (('masterDetails.bgId' in resource) && (resource.masterDetails.bgId != null)) { + console.log("BG: " + resource['bgId']) + resourceCostEntry.businessGroupId = resource['bgId'] + } + + if (('masterDetails.projectId' in resource) + && (resource.masterDetails.projectId != null)) { + resourceCostEntry.projectId = resource['projectId'] + } + + if (('masterDetails.environmentId' in resource) + && (resource.masterDetails.environmentId != null)) { + resourceCostEntry.environmentId = resource['environmentId'] + } + } + + resourceCostEntry.businessGroupId + = ('businessGroupId' in resourceCostEntry)?resourceCostEntry.businessGroupId:'Unassigned' + resourceCostEntry.projectId + = ('projectId' in resourceCostEntry)?resourceCostEntry.projectId:'Unassigned' + resourceCostEntry.environmentId + = ('environmentId' in resourceCostEntry)?resourceCostEntry.environmentId:'Unassigned' + + resourceCost.save(resourceCostEntry, function (err, costEntry) { + if (err) { + logger.error(err) + return next(new Error('Database Error')) + } + }) } + }).on('end', function() { + next() }) } - }).on('end', function() { - callback(null) + ], function(err) { + if(err) { + callback(err) + } else { + callback() + } }) + } function getCostForServices_deprecated(provider,callback) { diff --git a/server/app/services/schedulerService.js b/server/app/services/schedulerService.js index c1a582748..7b10aefaf 100644 --- a/server/app/services/schedulerService.js +++ b/server/app/services/schedulerService.js @@ -30,7 +30,6 @@ var EC2 = require('_pr/lib/ec2.js'); var AWSKeyPair = require('_pr/model/classes/masters/cloudprovider/keyPair.js'); var appConfig = require('_pr/config'); var Cryptography = require('../lib/utils/cryptography'); -var catalystSync = null; var vmWareProvider = require('_pr/model/classes/masters/cloudprovider/vmwareCloudProvider.js'); var vmWare = require('_pr/lib/vmware'); var azureProvider = require('_pr/model/classes/masters/cloudprovider/azureCloudProvider.js'); @@ -99,8 +98,45 @@ schedulerService.executeSchedulerForInstances = function executeSchedulerForInst }) } -schedulerService.executeSchedulerForTasks = function executeSchedulerForTasks(task,callback) { - logger.debug("Task Scheduler is started for Task. "+task.name); +schedulerService.executeParallelScheduledTasks = function executeParallelScheduledTasks(task,callback) { + logger.debug("Task Scheduler is started for Parallel Task. "+task.name); + var currentDate = new Date(); + if(currentDate >= task.taskScheduler.cronEndOn){ + crontab.cancelJob(task.cronJobId); + taskDao.updateTaskScheduler(task._id,function(err, updatedData) { + if (err) { + logger.error("Failed to update Task Scheduler: ", err); + callback(err,null); + return; + } + logger.debug("Scheduler is ended on for Task. "+task.name); + callback(null,updatedData); + return; + }); + }else{ + var cronJobId = cronTab.scheduleJob(task.taskScheduler.cronPattern, function () { + taskDao.updateCronJobIdByTaskId(task._id,cronJobId,function(err,data){ + if(err){ + logger.error("Error in updating cron job Ids. "+err); + } + }) + taskService.executeTask(task._id, "superadmin", "", "", "","","",function(err, historyData) { + if (err === 404) { + logger.error("Task not found.", err); + return; + } else if (err) { + logger.error("Failed to execute task.", err); + return; + } + logger.debug("Task Execution Success: ", task.name); + return; + }); + }); + } +} + +schedulerService.executeSerialScheduledTasks = function executeSerialScheduledTasks(task,callback) { + logger.debug("Task Scheduler is started for Serial Task. "+task.name); var currentDate = new Date(); if(currentDate >= task.taskScheduler.cronEndOn){ crontab.cancelJob(task.cronJobId); @@ -115,7 +151,6 @@ schedulerService.executeSchedulerForTasks = function executeSchedulerForTasks(ta return; }); }else{ - var schedulerService = require('_pr/services/schedulerService'); var cronJobId = cronTab.scheduleJob(task.taskScheduler.cronPattern, function () { taskDao.updateCronJobIdByTaskId(task._id,cronJobId,function(err,data){ if(err){ @@ -133,7 +168,7 @@ schedulerService.executeSchedulerForTasks = function executeSchedulerForTasks(ta return; } logger.debug("Task Execution Success: ", task.name); - callback(null,historyData); + callback(null,cronJobId); return; }); }); @@ -154,7 +189,7 @@ schedulerService.startStopInstance= function startStopInstance(instanceId,catUse errMsg:"Instance is already in "+instanceDetails[0].instanceState+" state. So no need to do any action." }) return; - }else if (instanceDetails[0].isScheduled && instanceDetails[0].isScheduled === true && currentDate >= instanceDetails[0].schedulerEndOn) { + }else if (instanceDetails[0].isScheduled && instanceDetails[0].isScheduled === true && currentDate > instanceDetails[0].schedulerEndOn) { instancesDao.updateInstanceScheduler(instanceDetails[0]._id,function(err, updatedData) { if (err) { logger.error("Failed to update Instance Scheduler: ", err); diff --git a/server/app/services/scriptService.js b/server/app/services/scriptService.js index ce2e76910..3d65aea2d 100644 --- a/server/app/services/scriptService.js +++ b/server/app/services/scriptService.js @@ -98,14 +98,16 @@ scriptService.getScriptById=function getScriptById(scriptId,callback){ next(err,null); }else{ var scriptObj= { - scriptId: scripts[0]._id, - name: scripts[0].name, - type: scripts[0].type, - description: scripts[0].description, - orgDetails: scripts[0].orgDetails, - fileId: scripts[0].fileId, - fileName: file.fileName, - file: file.fileData + scriptId: scripts[0]._id, + name: scripts[0].name, + type: scripts[0].type, + description: scripts[0].description, + orgDetails: scripts[0].orgDetails, + isParametrized: scripts[0].isParametrized, + noOfParams: scripts[0].noOfParams, + fileId: scripts[0].fileId, + fileName: file.fileName, + file: file.fileData }; next(null,scriptObj); } @@ -208,13 +210,15 @@ function addFileDetailsForScripts(scripts,callback){ return callback(err,null); }else{ scriptObj = { - scriptId:script._id, - name:script.name, - type:script.type, - description:script.description, - orgDetails:script.orgDetails, - fileId:script.fileId, - fileName:file.filename + scriptId:script._id, + name:script.name, + type:script.type, + description:script.description, + orgDetails:script.orgDetails, + isParametrized: script.isParametrized, + noOfParams: script.noOfParams, + fileId:script.fileId, + fileName:file.filename } scriptList.push(scriptObj); scriptObj={}; diff --git a/server/app/services/taskService.js b/server/app/services/taskService.js index b0d377646..afb6f5c96 100644 --- a/server/app/services/taskService.js +++ b/server/app/services/taskService.js @@ -109,6 +109,24 @@ taskService.getAllServiceDeliveryTask = function getAllServiceDeliveryTask(query } }; +taskService.deleteServiceDeliveryTask = function deleteServiceDeliveryTask(taskId, callback) { + async.waterfall([ + function (next) { + taskDao.removeServiceDeliveryTask(taskId, next); + }, + function (deleteTaskCheck, next) { + auditTrail.removeAuditTrails({auditId:taskId},next); + } + ],function (err, results) { + if (err) { + callback(err, null); + return; + } + callback(null, results); + return; + }); +}; + taskService.executeTask = function executeTask(taskId, user, hostProtocol, choiceParam, appData, paramOptions, botTagServer, callback) { if (appData) { appData['taskId'] = taskId; @@ -133,6 +151,17 @@ taskService.executeTask = function executeTask(taskId, user, hostProtocol, choic task.botParams = paramOptions; task.botTagServer = botTagServer; var auditTrailId = null; + var taskExecutionCount = 0; + if(task.executionCount){ + taskExecutionCount = task.taskExecutionCount + 1 + }else{ + taskExecutionCount = 1; + } + taskDao.updateTaskExecutionCount(task._id,taskExecutionCount,function(err,data){ + if(err){ + logger.error("Error while updating Task Execution Count"); + } + }); if(task.serviceDeliveryCheck === true){ var actionObj={ auditType:'BOTs',