From 7738543e99641adbed61b770d2e0fcf962445db3 Mon Sep 17 00:00:00 2001 From: srikanthv02 Date: Tue, 25 Oct 2016 18:55:36 +0530 Subject: [PATCH 01/10] Monitoring server crud operations in settings --- .../ajax/Settings/monitoringServer.html | 538 ++++++++++++++++++ client/htmls/private/index.html | 15 + 2 files changed, 553 insertions(+) create mode 100644 client/htmls/private/ajax/Settings/monitoringServer.html diff --git a/client/htmls/private/ajax/Settings/monitoringServer.html b/client/htmls/private/ajax/Settings/monitoringServer.html new file mode 100644 index 000000000..dbddc5b47 --- /dev/null +++ b/client/htmls/private/ajax/Settings/monitoringServer.html @@ -0,0 +1,538 @@ + + +
+
+
+
+
+ List of Monitoring Servers +
+
+ +
+
+
+
+
+ + + + + + + + + + + + + + + + +
+
+ +
+ +
+ +
+ +
+ + + + + + + + \ No newline at end of file diff --git a/client/htmls/private/index.html b/client/htmls/private/index.html index 4b9725c2b..dc1ea74bf 100644 --- a/client/htmls/private/index.html +++ b/client/htmls/private/index.html @@ -1159,6 +1159,21 @@

"selectable": false, "href": "javascript:void(0);", "icon": "fa fa-lg fa-fw fa-database" + }, { + "name": "monitoring", + "text": "Monitoring", + "nodes": [{ + "name": "organizations", + "text": "Monitoring", + "borderColor": "#000", + "href": "#ajax/Settings/monitoringServer.html", + "selectable": true, + "icon": "fa fa-lg fa-fw fa fa-eye" + }], + "borderColor": "#000", + "selectable": false, + "href": "javascript:void(0);", + "icon": "fa fa-lg fa-fw fa fa-eye" } ]; From 2e15529679a3c6e833cfcef9cd65a59e7f9d3774 Mon Sep 17 00:00:00 2001 From: srikanthv02 Date: Wed, 26 Oct 2016 00:24:29 +0530 Subject: [PATCH 02/10] Monitoring Services in settings --- .../ajax/Settings/monitoringServer.html | 242 +++++++++++------- 1 file changed, 150 insertions(+), 92 deletions(-) diff --git a/client/htmls/private/ajax/Settings/monitoringServer.html b/client/htmls/private/ajax/Settings/monitoringServer.html index dbddc5b47..48a29f221 100644 --- a/client/htmls/private/ajax/Settings/monitoringServer.html +++ b/client/htmls/private/ajax/Settings/monitoringServer.html @@ -133,7 +133,7 @@

@@ -200,11 +202,16 @@

getGlobalMonitorServers(); }); -function setfilename(val){ +function setFileNameCertificate(val){ $('#certificateFileNameDisplay').empty(); + var fileNameCertificate = val.substr(val.lastIndexOf("\\")+1, val.length); + $("#certificateFileNameDisplay").append(fileNameCertificate); +} + +function setFileNamePrivate(val){ $('#privateFileNameDisplay').empty(); - var fileName = val.substr(val.lastIndexOf("\\")+1, val.length); - $("#certificateFileNameDisplay,#privateFileNameDisplay").append(fileName); + var fileNamePrivate = val.substr(val.lastIndexOf("\\")+1, val.length); + $("#privateFileNameDisplay").append(fileNamePrivate); } //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.. @@ -213,6 +220,8 @@

$('.modal-header').find('.modal-title').html('Create New Monitoring Server'); $('#monitorEditHiddenInput').val('new'); getOrganizationList(); + $('#orgName,#protocolType').removeAttr('disabled'); + $('#protocolType').change(); }); //to list down the organization for creating the monitoring server item. @@ -333,7 +342,7 @@

//creating a table for showcasing the list of track items on the dashboard page.. -function createTableForMonitorList(monitorData) { +function createTableForMonitorList(monitorData) { var $monitorList = $('#monitorTable tbody'); var $tr = $('').attr('data-monitorId', monitorData._id).attr('data-type', monitorData.type).attr('transportProtocol-type', monitorData.parameters.transportProtocol).attr('orgId',monitorData.organization.id).attr('orgName',monitorData.organization.name); $tr.data('monitorData', monitorData); @@ -420,7 +429,48 @@

$monitorDatatable.row.add($tr).draw(); }; - +function saveForm(methodName,url,reqBody,createNewEdit,monitorId,parameters) { + $.ajax({ + method: methodName, + url: url, + async:false, + data: reqBody, + success: function(data, success) { + $('#modalForTrackEdit').modal('hide'); + $('#saveItemSpinner').addClass('hidden'); + $('#saveBtnTrack').removeAttr('disabled'); + if (createNewEdit === 'new') { + $monitorDatatable.clear().draw(); + getGlobalMonitorServers(); + $('#saveBtnTrack').removeAttr('disabled'); + } else { + var $tr = $('tr[data-monitorId="' + monitorId + '"]'); + $tr.find('.monitorServerType').html(reqBody.type); + $tr.find('.monitorServerURL').html(reqBody.parameters.url); + $tr.find('.monitorProtocolHost').html(reqBody.parameters.transportProtocolParameters.host); + $tr.find('.monitorProtocolPort').html(reqBody.parameters.transportProtocolParameters.port); + $tr.data('monitorData', { + _id: monitorId, + type: serverType, + parameters:parameters + }); + } + }, + error: function(jxhr) { + console.log(jxhr); + var msg = "Server Behaved Unexpectedly"; + if (jxhr.responseJSON && jxhr.responseJSON.message) { + msg = jxhr.responseJSON.message; + } else if (jxhr.responseText) { + msg = jxhr.responseText; + } + bootbox.alert(msg); + + $('#saveItemSpinner').addClass('hidden'); + $('#saveBtnTrack').removeAttr('disabled'); + } +}); +} //save form for creating a new monitor item and updation of the monitor server details. $('#monitorServerForm').submit(function(e) { @@ -433,104 +483,112 @@

$('#saveItemSpinner').removeClass('hidden'); var $form = $('#monitorServerForm'); $this = $(this); - var name = $this.find('.monitorName').val().trim(); - var orgValue = $this.find('#orgName').val(); - var serverType = $this.find('#serverType').val(); - var serverUrl = $this.find('.serverUrl').val().trim(); - var protocolType = $this.find('#protocolType').val(); - var host = $this.find('.protocolHost').val().trim(); - var port = $this.find('.protocolPort').val().trim(); - var passwordName = $this.find('.protocolPassword').val().trim(); - var vhost = $this.find('.protocolVhost').val().trim(); - var user = $this.find('.protocolUser').val().trim(); + var name, orgValue, serverType, serverUrl, protocolType, host, port, passwordName, vhost, user, certChainFileId, privateKeyFileId; + + name = $this.find('.monitorName').val().trim(); + orgValue = $this.find('#orgName').val(); + serverType = $this.find('#serverType').val(); + serverUrl = $this.find('.serverUrl').val().trim(); + protocolType = $this.find('#protocolType').val(); + host = $this.find('.protocolHost').val().trim(); + port = $this.find('.protocolPort').val().trim(); + passwordName = $this.find('.protocolPassword').val().trim(); + vhost = $this.find('.protocolVhost').val().trim(); + user = $this.find('.protocolUser').val().trim(); + certChainFileId = $this.find('#monitorHiddenCertificateFile').val(); + privateKeyFileId = $this.find('#monitorHiddenPrivateFile').val(); + + var dashboardEditNew = $this.find('#monitorEditHiddenInput').val(); + var monitorId = $form.find('input#monitorEditHiddenInputId').val(); var parameters = {}; - if(protocolType === 'redis'){ - parameters = { - url:serverUrl, - transportProtocol:protocolType, - transportProtocolParameters: { - host:host, - port:port, - password:passwordName - } - }; - } else if (protocolType === 'rabbitmq') { - parameters = { - url:serverUrl, - transportProtocol:protocolType, - transportProtocolParameters: { - host:host, - port:port, - vhost:vhost, - user:user, - password:passwordName, - heartbeat: 30, - prefetch: 50, - ssl: { - certChainFileId:'1020', - privateKeyFileId:'4050' - } - } - }; - } - - var dashboardEditNew = $(this).find('#monitorEditHiddenInput').val(); - var monitorId = $form.find('#monitorEditHiddenInputId').val(); var url; - var reqBody = { - "orgId":orgValue, - "type":serverType, - "parameters":parameters - }; + var reqBody = {}; var methodName; //for edit of form. - if (dashboardEditNew === 'edit') { + var formData = new FormData(); + formData.append('file', $('input[type=file]')[0].files[0]); + if (dashboardEditNew === 'edit') { url = '../monitors/' + monitorId; methodName = 'PUT'; } else { methodName = 'POST'; url = '../monitors'; } - - $.ajax({ - method: methodName, - url: url, - data: reqBody, - success: function(data, success) { - $('#modalForTrackEdit').modal('hide'); - $('#saveItemSpinner').addClass('hidden'); - $('#saveBtnTrack').removeAttr('disabled'); - - if (dashboardEditNew === 'new') { - createTableForMonitorList(data); - $('#saveBtnTrack').removeAttr('disabled'); - } else { - var $tr = $('tr[data-monitorId="' + monitorId + '"]'); - $tr.find('.monitorServerType').html(reqBody.type); - $tr.find('.monitorServerURL').html(reqBody.parameters.url); - $tr.find('.monitorProtocolHost').html(reqBody.parameters.transportProtocolParameters.host); - $tr.find('.monitorProtocolPort').html(reqBody.parameters.transportProtocolParameters.port); - $tr.data('monitorData', { - _id: monitorId, - type:serverType, - parameters:parameters + if (protocolType === 'rabbitmq') { + $.ajax({ + method: "POST", + url: '../fileUpload?fileId=' + certChainFileId, + data: formData, + cache: false, + contentType: false, + processData: false, + success: function(dataCertificate, success) { + $.ajax({ + method: "POST", + url: '../fileUpload?fileId=' + privateKeyFileId, + data: formData, + cache: false, + contentType: false, + processData: false, + success: function(dataPrivate, success) { + parameters = { + url: serverUrl, + transportProtocol: protocolType, + transportProtocolParameters: { + host: host, + port: port, + vhost: vhost, + user: user, + password: passwordName, + heartbeat: 30, + prefetch: 50, + ssl: { + certChainFileId: dataCertificate.fileId, + privateKeyFileId: dataPrivate.fileId + } + } + }; + reqBody = { + "orgId": orgValue, + "type": serverType, + "parameters": parameters + } + saveForm(methodName,url,reqBody,dashboardEditNew,monitorId,parameters); + } }); } - }, - error: function(jxhr) { - console.log(jxhr); - var msg = "Server Behaved Unexpectedly"; - if (jxhr.responseJSON && jxhr.responseJSON.message) { - msg = jxhr.responseJSON.message; - } else if (jxhr.responseText) { - msg = jxhr.responseText; - } - bootbox.alert(msg); - - $('#saveItemSpinner').addClass('hidden'); - $('#saveBtnTrack').removeAttr('disabled'); + }); + } else if (protocolType === 'redis') { + if (passwordName !== '') { + parameters = { + url: serverUrl, + transportProtocol: protocolType, + transportProtocolParameters: { + host: host, + port: port, + password: passwordName + } + }; + } else { + parameters = { + url: serverUrl, + transportProtocol: protocolType, + transportProtocolParameters: { + host: host, + port: port + } + }; } - }); + reqBody = { + "orgId": orgValue, + "type": serverType, + "parameters": parameters + } + saveForm(methodName,url,reqBody,dashboardEditNew,monitorId,parameters); + } + + + return false; } }); From a4ab80d35d1a978f29e1321342b525b11590c4a4 Mon Sep 17 00:00:00 2001 From: srikanthv02 Date: Wed, 26 Oct 2016 12:12:57 +0530 Subject: [PATCH 03/10] name field added for monitoring server --- .../ajax/Settings/monitoringServer.html | 43 +++++++++++++++---- 1 file changed, 34 insertions(+), 9 deletions(-) diff --git a/client/htmls/private/ajax/Settings/monitoringServer.html b/client/htmls/private/ajax/Settings/monitoringServer.html index 48a29f221..43c2eae71 100644 --- a/client/htmls/private/ajax/Settings/monitoringServer.html +++ b/client/htmls/private/ajax/Settings/monitoringServer.html @@ -26,7 +26,7 @@
- + @@ -178,9 +178,9 @@

"bFilter": false, "aoColumns": [{ "bSortable": false - }, /*{ + }, { "bSortable": false - },*/ { + }, { "bSortable": false }, { "bSortable": false @@ -260,6 +260,26 @@

}, protocolPassword : { required: true + }, + certificateFile: { + extension: "pem" + }, + privateFile: { + extension: "pem" + }, + monitorName: { + maxlength: 15 + } + }, + messages: { + certificateFile: { + extension: "Only .pem files can be uploaded" + }, + privateFile: { + extension: "Only .pem files can be uploaded" + }, + scriptName: { + maxlength: "Limited to 15 chars" } }, onkeyup: false, @@ -344,9 +364,11 @@

//creating a table for showcasing the list of track items on the dashboard page.. function createTableForMonitorList(monitorData) { var $monitorList = $('#monitorTable tbody'); - var $tr = $('

').attr('data-monitorId', monitorData._id).attr('data-type', monitorData.type).attr('transportProtocol-type', monitorData.parameters.transportProtocol).attr('orgId',monitorData.organization.id).attr('orgName',monitorData.organization.name); + var $tr = $('').attr('data-name',monitorData.name).attr('data-monitorId', monitorData._id).attr('data-type', monitorData.type).attr('transportProtocol-type', monitorData.parameters.transportProtocol).attr('orgId',monitorData.organization.id).attr('orgName',monitorData.organization.name); $tr.data('monitorData', monitorData); + var $tdName = $(''); + var $tdOrganization = $(''); var $tdServerType = $(''); @@ -372,9 +394,9 @@

var $editModal = $('#modalForTrackEdit'); $editModal.modal('show'); $editModal.find('#monitorEditHiddenInput').val('edit'); - $editModal.find('h4.modal-title').html('Edit Monitor Item  -  '); - //$editModal.find('#orgName').val(monitorData.name); - $editModal.find('#orgName').append('').attr('disabled','disabled'); + $editModal.find('h4.modal-title').html('Edit Monitor Item  -  ' + monitorData.name); + $editModal.find('#monitorName').val(monitorData.name); + $editModal.find('#orgName').empty().append('').attr('disabled','disabled'); $editModal.find('#serverType').val(monitorData.type); $editModal.find('.serverUrl').val(monitorData.parameters.url); $editModal.find('#protocolType').val(monitorData.parameters.transportProtocol).change().attr('disabled','disabled'); @@ -394,7 +416,7 @@

var $tr = $this.parents('tr.monitorItemRow'); var monitorId = monitorData._id; bootbox.confirm({ - message: 'Are you sure you want to Delete Monitor Item - ', + message: 'Are you sure you want to Delete Monitor Item - ' + monitorData.name, title: "Warning", callback: function(result) { if (result) { @@ -424,7 +446,7 @@

return false; }); - $tr.append($tdOrganization).append($tdServerType).append($tdServerURL).append($tdProtocolType).append($tdProtocolHost).append($tdProtocolPort).append($tdAction); + $tr.append($tdName).append($tdOrganization).append($tdServerType).append($tdServerURL).append($tdProtocolType).append($tdProtocolHost).append($tdProtocolPort).append($tdAction); $monitorList.append($tr); $monitorDatatable.row.add($tr).draw(); }; @@ -445,6 +467,7 @@

$('#saveBtnTrack').removeAttr('disabled'); } else { var $tr = $('tr[data-monitorId="' + monitorId + '"]'); + $tr.find('.monitorName').html(reqBody.name); $tr.find('.monitorServerType').html(reqBody.type); $tr.find('.monitorServerURL').html(reqBody.parameters.url); $tr.find('.monitorProtocolHost').html(reqBody.parameters.transportProtocolParameters.host); @@ -549,6 +572,7 @@

} }; reqBody = { + "name": name, "orgId": orgValue, "type": serverType, "parameters": parameters @@ -580,6 +604,7 @@

}; } reqBody = { + "name": name, "orgId": orgValue, "type": serverType, "parameters": parameters From 55311a9f552a2ce793d1135dd2c1798aa0aac189 Mon Sep 17 00:00:00 2001 From: srikanthv02 Date: Wed, 26 Oct 2016 20:14:17 +0530 Subject: [PATCH 04/10] Monitoring server --- .../private/ajax/Settings/monitoringServer.html | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/client/htmls/private/ajax/Settings/monitoringServer.html b/client/htmls/private/ajax/Settings/monitoringServer.html index 43c2eae71..044daff47 100644 --- a/client/htmls/private/ajax/Settings/monitoringServer.html +++ b/client/htmls/private/ajax/Settings/monitoringServer.html @@ -278,7 +278,7 @@

privateFile: { extension: "Only .pem files can be uploaded" }, - scriptName: { + monitorName: { maxlength: "Limited to 15 chars" } }, @@ -364,7 +364,7 @@

//creating a table for showcasing the list of track items on the dashboard page.. function createTableForMonitorList(monitorData) { var $monitorList = $('#monitorTable tbody'); - var $tr = $('

').attr('data-name',monitorData.name).attr('data-monitorId', monitorData._id).attr('data-type', monitorData.type).attr('transportProtocol-type', monitorData.parameters.transportProtocol).attr('orgId',monitorData.organization.id).attr('orgName',monitorData.organization.name); + var $tr = $('').attr('data-monitorId', monitorData._id).attr('data-type', monitorData.type).attr('transportProtocol-type', monitorData.parameters.transportProtocol).attr('orgId',monitorData.organization.id).attr('orgName',monitorData.organization.name).attr('data-ssl',monitorData.parameters.transportProtocolParameters.ssl); $tr.data('monitorData', monitorData); var $tdName = $(''); @@ -406,6 +406,10 @@

$editModal.find('.protocolVhost').val(monitorData.parameters.transportProtocolParameters.vhost); $editModal.find('.protocolUser').val(monitorData.parameters.transportProtocolParameters.user); $editModal.find('#monitorEditHiddenInputId').val(monitorData._id); + if(monitorData.parameters.transportProtocol.ssl) { + $editModal.find('#monitorHiddenCertificateFile').val(monitorData.parameters.transportProtocolParameters.ssl.certChainFileId); + $editModal.find('#monitorHiddenPrivateFile').val(monitorData.parameters.transportProtocolParameters.ssl.privateKeyFileId); + } return false; }); @@ -451,7 +455,7 @@

$monitorDatatable.row.add($tr).draw(); }; -function saveForm(methodName,url,reqBody,createNewEdit,monitorId,parameters) { +function saveForm(methodName,url,reqBody,createNewEdit,monitorId,parameters,name,serverType) { $.ajax({ method: methodName, url: url, @@ -473,6 +477,7 @@

$tr.find('.monitorProtocolHost').html(reqBody.parameters.transportProtocolParameters.host); $tr.find('.monitorProtocolPort').html(reqBody.parameters.transportProtocolParameters.port); $tr.data('monitorData', { + name:name, _id: monitorId, type: serverType, parameters:parameters @@ -577,7 +582,7 @@

"type": serverType, "parameters": parameters } - saveForm(methodName,url,reqBody,dashboardEditNew,monitorId,parameters); + saveForm(methodName,url,reqBody,dashboardEditNew,monitorId,parameters,name,serverType); } }); } @@ -609,7 +614,7 @@

"type": serverType, "parameters": parameters } - saveForm(methodName,url,reqBody,dashboardEditNew,monitorId,parameters); + saveForm(methodName,url,reqBody,dashboardEditNew,monitorId,parameters,name,serverType); } From 16c63fbfd043c7479d2fc47c745c83a96ccfd2fb Mon Sep 17 00:00:00 2001 From: hrushikesh07 Date: Fri, 28 Oct 2016 11:14:31 +0530 Subject: [PATCH 05/10] Added schedule , start, stop, function for instance --- client/cat3/main.html | 2 + client/cat3/src/main.js | 3 +- .../sections/dashboard/genericServices.js | 32 +++++----- .../popups/controller/scheduleCtrl.js | 19 ++++++ .../dashboard/popups/view/schedule.html | 61 +++++++++++++++++++ .../dashboard/workzone/instance/instance.html | 15 ++++- .../workzone/instance/instanceCtrl.js | 42 ++++++++++++- 7 files changed, 151 insertions(+), 23 deletions(-) create mode 100644 client/cat3/src/partials/sections/dashboard/popups/controller/scheduleCtrl.js create mode 100644 client/cat3/src/partials/sections/dashboard/popups/view/schedule.html diff --git a/client/cat3/main.html b/client/cat3/main.html index 476a55985..ea1233cd7 100644 --- a/client/cat3/main.html +++ b/client/cat3/main.html @@ -22,6 +22,7 @@ + @@ -97,6 +98,7 @@ + diff --git a/client/cat3/src/main.js b/client/cat3/src/main.js index 429978e2e..ed33c0d92 100644 --- a/client/cat3/src/main.js +++ b/client/cat3/src/main.js @@ -27,7 +27,8 @@ var angularApp = angular.module('catapp', ['ui.router','ngTouch','toastr', 'ui.grid.autoResize','ui.grid.exporter', 'ui.grid.resizeColumns', 'global.uiGridOptions', - 'global.messages' + 'global.messages', + 'ui.grid.selection' ]); angularApp.run(['$rootScope', 'auth', '$state', '$stateParams','$http','$window', diff --git a/client/cat3/src/partials/sections/dashboard/genericServices.js b/client/cat3/src/partials/sections/dashboard/genericServices.js index 6f8dd7a03..c23cdddbd 100644 --- a/client/cat3/src/partials/sections/dashboard/genericServices.js +++ b/client/cat3/src/partials/sections/dashboard/genericServices.js @@ -255,27 +255,25 @@ }); }; - /*genericServices.editRunlist = function(chefRunlist, chefAttribute) { + genericServices.scheduleTime=function (ids) { $modal.open({ - templateUrl: 'src/partials/sections/dashboard/workzone/orchestration/popups/orchestrationUpdateChefRunlist.html', - controller: 'orchestrationUpdateChefRunlistCtrl', + animate: true, + templateUrl: "src/partials/sections/dashboard/popups/view/schedule.html", + controller: "scheduleCtrl as sch", backdrop: 'static', keyboard: false, - resolve : { - cookbookRunlistAttr: function(){ - return { - chefrunlist: chefRunlist, - attributes: chefAttribute - }; + resolve: { + items: function() { + return ids; } } - }).result.then(function (selectedCookBooks) { - //$rootScope.editRunListAttributes = false; - // $rootScope.chefrunlist = selectedCookBooks.list; - // $rootScope.cookbookAttributes = selectedCookBooks.cbAttributes; - }, function () { - console.log('Dismiss time is ' + new Date()); - }); - };*/ + }) + }; + genericServices.instanceStart=function (ids) { + + }; + genericServices.instanceStop=function () { + + }; }]); })(angular); \ No newline at end of file diff --git a/client/cat3/src/partials/sections/dashboard/popups/controller/scheduleCtrl.js b/client/cat3/src/partials/sections/dashboard/popups/controller/scheduleCtrl.js new file mode 100644 index 000000000..ca3657f70 --- /dev/null +++ b/client/cat3/src/partials/sections/dashboard/popups/controller/scheduleCtrl.js @@ -0,0 +1,19 @@ +(function(){ + "use strict"; + angular.module('dashboard') + .controller('scheduleCtrl', ['$scope', '$modalInstance', 'items','$filter',function($scope, $modalInstance, items,$filter) { + var sch=this; + sch.schedule={ + repeat:'Daily', + repeatTimes:'1', + startsOn:new Date(), + ends:'Never' + } + sch.cancel = function() { + $modalInstance.dismiss('cancel'); + }; + sch.ok=function(){ + + }; + }]); +})(); diff --git a/client/cat3/src/partials/sections/dashboard/popups/view/schedule.html b/client/cat3/src/partials/sections/dashboard/popups/view/schedule.html new file mode 100644 index 000000000..3bf5c0089 --- /dev/null +++ b/client/cat3/src/partials/sections/dashboard/popups/view/schedule.html @@ -0,0 +1,61 @@ +
+
+
+ × +

Manage Schedule

+
+ +
+ +
+ + +
+
+ + +
+
+ + +
+
+ + +
+ + +
+
+ +
+ + +
+ +
diff --git a/client/cat3/src/partials/sections/dashboard/workzone/instance/instance.html b/client/cat3/src/partials/sections/dashboard/workzone/instance/instance.html index c458a75ae..b80a47e3f 100644 --- a/client/cat3/src/partials/sections/dashboard/workzone/instance/instance.html +++ b/client/cat3/src/partials/sections/dashboard/workzone/instance/instance.html @@ -19,6 +19,17 @@ + + + + + {{chip.key}}: {{chip.value}} @@ -103,7 +114,7 @@

Filter By

-
+
@@ -242,7 +253,7 @@

Filter By

-
+
diff --git a/client/cat3/src/partials/sections/dashboard/workzone/instance/instanceCtrl.js b/client/cat3/src/partials/sections/dashboard/workzone/instance/instanceCtrl.js index feb725056..ca4917a9b 100644 --- a/client/cat3/src/partials/sections/dashboard/workzone/instance/instanceCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/workzone/instance/instanceCtrl.js @@ -8,8 +8,8 @@ "use strict"; angular.module('workzone.instance', ['ui.bootstrap', 'utility.validation', 'filter.currentTime', 'apis.workzone', 'utility.array', 'workzonePermission', 'instanceServices', 'chefDataFormatter', 'utility.pagination', 'ngFileUpload']) .controller('instanceCtrl', ['chefSelectorComponent', '$scope', '$rootScope', '$modal', '$q', 'workzoneServices', 'arrayUtil', 'instancePermission', - 'instanceActions', 'instanceOperations', 'workzoneEnvironment', '$timeout', 'workzoneUIUtils', 'uiGridOptionsService', 'confirmbox', - function(chefSelectorComponent, $scope, $rootScope, $modal, $q, workzoneServices, arrayUtil, instancePerms, instanceActions, instanceOperations, workzoneEnvironment, $timeout, workzoneUIUtils, uiGridOptionsService, confirmbox) { + 'instanceActions', 'instanceOperations', 'workzoneEnvironment', '$timeout', 'workzoneUIUtils', 'uiGridOptionsService', 'confirmbox','genericServices', + function(chefSelectorComponent, $scope, $rootScope, $modal, $q, workzoneServices, arrayUtil, instancePerms, instanceActions, instanceOperations, workzoneEnvironment, $timeout, workzoneUIUtils, uiGridOptionsService, confirmbox,genericServices) { var helper = { attachListOfTaskWithInstance: function(completeData) { var instanceList = completeData.instances; @@ -73,6 +73,7 @@ } } }; + $scope.selectedInstanceId=[]; $scope.instancePageLevelLoader = true; $scope.instStartStopFlag = false; $scope.isImportClickEnabled = true; @@ -91,7 +92,15 @@ $scope.filterChips = []; $scope.providerLoading = false; $scope.regionLoading = false; - + $scope.scheduleInt = function(){ + genericServices.scheduleTime($scope.selectedInstanceId); + }; + $scope.instanceStop=function () { + genericServices.instanceStop($scope.selectedInstanceId); + }; + $scope.instanceStart=function () { + genericServices.instanceStart($scope.selectedInstanceId); + }; $scope.openContainersTab = function() { $scope.$parent.$parent.activateTab('Containers'); }; @@ -112,6 +121,9 @@ $scope.isInstancePageLoading = true; var gridBottomSpace = 5; var instanceUIGridDefaults = uiGridOptionsService.options(); + angular.extend(instanceUIGridDefaults.gridOption, {enableRowSelection: true, + enableSelectAll: true, + selectionRowHeaderWidth: 35,multiSelect:true,enableRowHeaderSelection: true}); $scope.paginationParams = instanceUIGridDefaults.pagination; $scope.currentCardPage = instanceUIGridDefaults.pagination.page; $scope.cardsPerPage = instanceUIGridDefaults.pagination.pageSize; @@ -180,7 +192,23 @@ $scope.instancesGridOptions = angular.extend(instanceUIGridDefaults.gridOption, { onRegisterApi: function(gridApi) { $scope.gridApi = gridApi; + gridApi.selection.on.rowSelectionChanged($scope,function(row){ + if(row.isSelected){ + $scope.selectedInstanceId.push(row.entity._id); + } else { + $scope.selectedInstanceId.splice(row.entity._id,1); + } + }); + gridApi.selection.on.rowSelectionChangedBatch($scope,function(rows){ + angular.forEach(rows,function(row){ + if(row.isSelected){ + $scope.selectedInstanceId.push(row.entity._id); + } else { + $scope.selectedInstanceId.splice(row.entity._id,1); + } + }); + }); //Sorting for sortBy and sortOrder gridApi.core.on.sortChanged($scope, function(grid, sortColumns) { if (sortColumns[0] && sortColumns[0].field && sortColumns[0].sort && sortColumns[0].sort.direction) { @@ -545,8 +573,15 @@ }; $scope.selectCard = function(identi) { $scope.selectedCard = identi; + console.log($scope.selectedInstanceId.indexOf(identi)); + if($scope.selectedInstanceId.indexOf(identi) === -1){ + $scope.selectedInstanceId.push(identi); + } else { + $scope.selectedInstanceId.splice($scope.selectedInstanceId.indexOf(identi),1); + } }; $scope.setCardView = function() { + $scope.selectedInstanceId=[]; $scope.isCardViewActive = true; $scope.instanceCardViewSelection = "instance-tab-active"; $scope.instanceTableViewSelection = ""; @@ -581,6 +616,7 @@ }); }; $scope.instanceTableView = function() { + $scope.selectedInstanceId=[]; $scope.isCardViewActive = false; $scope.instanceTableViewSelection = "instance-tab-active"; $scope.instanceCardViewSelection = ""; From 5fa553a0b7e56e4de7ff9ad960eb6281c015b9e7 Mon Sep 17 00:00:00 2001 From: hrushikesh07 Date: Fri, 28 Oct 2016 11:24:07 +0530 Subject: [PATCH 06/10] Added schedule , start, stop, function for instance --- client/cat3/main.html | 1 - 1 file changed, 1 deletion(-) diff --git a/client/cat3/main.html b/client/cat3/main.html index ea1233cd7..d26af1ea6 100644 --- a/client/cat3/main.html +++ b/client/cat3/main.html @@ -22,7 +22,6 @@ - From 9c46da52eb0018a4fb673814be43ebf1f05925da Mon Sep 17 00:00:00 2001 From: VIJAYKUMARNINGANURE Date: Fri, 28 Oct 2016 13:09:52 +0530 Subject: [PATCH 07/10] Implemented the parameter passing for BOTS Library --- server/app/model/classes/tasks/tasks.js | 10 ++++++---- server/app/routes/v1.0/routes_tasks.js | 12 +++++++++++- server/app/services/taskService.js | 13 +++++++++++-- 3 files changed, 28 insertions(+), 7 deletions(-) diff --git a/server/app/model/classes/tasks/tasks.js b/server/app/model/classes/tasks/tasks.js index d723b484f..3774d381c 100755 --- a/server/app/model/classes/tasks/tasks.js +++ b/server/app/model/classes/tasks/tasks.js @@ -135,7 +135,7 @@ taskSchema.plugin(mongoosePaginate); // Executes a task -taskSchema.methods.execute = function(userName, baseUrl, choiceParam, appData, blueprintIds, envId, callback, onComplete) { +taskSchema.methods.execute = function(userName, baseUrl, choiceParam, appData, blueprintIds, envId, paramOptions, callback, onComplete) { logger.debug('Executing'); var task; var self = this; @@ -155,12 +155,13 @@ taskSchema.methods.execute = function(userName, baseUrl, choiceParam, appData, b taskHistoryData.nodeIds = this.taskConfig.nodeIds; taskHistoryData.runlist = this.taskConfig.runlist; - taskHistoryData.attributes = this.taskConfig.attributes; - + //taskHistoryData.attributes = this.taskConfig.attributes; + taskHistoryData.attributes = (!paramOptions) ? this.taskConfig.attributes : paramOptions; } else if (this.taskType === TASK_TYPE.JENKINS_TASK) { task = new JenkinsTask(this.taskConfig); taskHistoryData.jenkinsServerId = this.taskConfig.jenkinsServerId; taskHistoryData.jobName = this.taskConfig.jobName; + taskHistoryData.parameterized = (!paramOptions) ? this.taskConfig.parameterized : paramOptions; } else if (this.taskType === TASK_TYPE.PUPPET_TASK) { task = new PuppetTask(this.taskConfig); taskHistoryData.nodeIds = this.taskConfig.nodeIds; @@ -179,7 +180,8 @@ taskSchema.methods.execute = function(userName, baseUrl, choiceParam, appData, b } else if (this.taskType === TASK_TYPE.SCRIPT_TASK) { task = new ScriptTask(this.taskConfig); taskHistoryData.nodeIds = this.taskConfig.nodeIds; - taskHistoryData.scriptDetails = this.taskConfig.scriptDetails; + //taskHistoryData.scriptDetails = this.taskConfig.scriptDetails; + taskHistoryData.scriptDetails = (!paramOptions) ? this.taskConfig.scriptDetails : paramOptions; } else { callback({ message: "Invalid Task Type" diff --git a/server/app/routes/v1.0/routes_tasks.js b/server/app/routes/v1.0/routes_tasks.js index 007316c17..d9e766e97 100755 --- a/server/app/routes/v1.0/routes_tasks.js +++ b/server/app/routes/v1.0/routes_tasks.js @@ -157,7 +157,17 @@ module.exports.setRoutes = function(app, sessionVerification) { }); }); */ - taskService.executeTask(taskId, user, hostProtocol, choiceParam, appData, function(err, historyData) { + + var attributes = req.body.attributes; + var parameterized = req.body.parameterized; + var scriptDetails = req.body.scriptDetails; + var paramOptions = { + attributes : attributes, + parameterized : parameterized, + scriptDetails : scriptDetails + }; + + taskService.executeTask(taskId, user, hostProtocol, choiceParam, appData, paramOptions, function(err, historyData) { if (err === 404) { res.status(404).send("Task not found."); return; diff --git a/server/app/services/taskService.js b/server/app/services/taskService.js index ec79854cd..b3b6fcc77 100644 --- a/server/app/services/taskService.js +++ b/server/app/services/taskService.js @@ -78,7 +78,7 @@ taskService.getChefTasksByOrgBgProjectAndEnvId = function getChefTasksByOrgBgPro }); }; -taskService.executeTask = function executeTask(taskId, user, hostProtocol, choiceParam, appData, callback) { +taskService.executeTask = function executeTask(taskId, user, hostProtocol, choiceParam, appData, paramOptions, callback) { if (appData) { appData['taskId'] = taskId; } @@ -89,11 +89,20 @@ taskService.executeTask = function executeTask(taskId, user, hostProtocol, choic return callback(error, null); } if (task) { + + if(task.taskType.CHEF_TASK){ + paramOptions = paramOptions.attributes; + }else if(task.taskType.JENKINS_TASK){ + paramOptions = paramOptions.parameterized; + }else if(task.taskType.SCRIPT_TASK) { + paramOptions = paramOptions.scriptDetails; + } + var blueprintIds = []; if (task.blueprintIds && task.blueprintIds.length) { blueprintIds = task.blueprintIds; } - task.execute(user, hostProtocol, choiceParam, appData, blueprintIds, task.envId, function(err, taskRes, historyData) { + task.execute(user, hostProtocol, choiceParam, appData, blueprintIds, task.envId, paramOptions, function(err, taskRes, historyData) { if (err) { var error = new Error('Failed to execute task.'); error.status = 500; From 39d0ed62169834e8baf80246d14209062f0dae5d Mon Sep 17 00:00:00 2001 From: srikanthv02 Date: Wed, 2 Nov 2016 15:27:11 +0530 Subject: [PATCH 08/10] added check for file extension and monitoring type added while creating providers --- .../ajax/Settings/CreateProviders.html | 39 +++++++++++- .../ajax/Settings/monitoringServer.html | 60 ++++++++++++++++--- 2 files changed, 90 insertions(+), 9 deletions(-) diff --git a/client/htmls/private/ajax/Settings/CreateProviders.html b/client/htmls/private/ajax/Settings/CreateProviders.html index 810efca2f..06e1797b2 100755 --- a/client/htmls/private/ajax/Settings/CreateProviders.html +++ b/client/htmls/private/ajax/Settings/CreateProviders.html @@ -244,6 +244,13 @@

Select Organization

+
@@ -279,7 +286,32 @@