From bb92a100efef5f8a8f74fb4344a8113a2c35a347 Mon Sep 17 00:00:00 2001 From: Divakar Konakalla Date: Thu, 13 Oct 2016 16:19:51 +0530 Subject: [PATCH 01/32] Added usage icon for instannces which are not imported by ip, added graph to show usages for selected instance. --- client/cat3/main.html | 1 + .../dashboard/workzone/instance/instance.html | 49 ++++----- .../dashboard/workzone/instance/instance.scss | 13 +++ .../workzone/instance/instanceCtrl.js | 16 +++ .../instance/popups/instanceUsage.html | 36 +++++++ .../instance/popups/instanceUsageCtrl.js | 100 ++++++++++++++++++ .../dashboard/workzone/workzoneCtrl.js | 2 +- 7 files changed, 192 insertions(+), 25 deletions(-) create mode 100644 client/cat3/src/partials/sections/dashboard/workzone/instance/popups/instanceUsage.html create mode 100644 client/cat3/src/partials/sections/dashboard/workzone/instance/popups/instanceUsageCtrl.js diff --git a/client/cat3/main.html b/client/cat3/main.html index 310ebd6b4..ff6eeaad7 100644 --- a/client/cat3/main.html +++ b/client/cat3/main.html @@ -144,6 +144,7 @@ + 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 0efd2985a..c458a75ae 100644 --- a/client/cat3/src/partials/sections/dashboard/workzone/instance/instance.html +++ b/client/cat3/src/partials/sections/dashboard/workzone/instance/instance.html @@ -48,14 +48,14 @@

Filter By

-
- -
- -
-
+
+ +
+ +
+
@@ -64,13 +64,13 @@

Filter By

- -
- -
-
+ +
+ +
+
@@ -79,18 +79,18 @@

Filter By

- -
- -
-
+ +
+ +
+
+ +
@@ -129,6 +129,7 @@

Filter By

{{getPlatformId(inst.providerType,inst.platformId)}} +
diff --git a/client/cat3/src/partials/sections/dashboard/workzone/instance/instance.scss b/client/cat3/src/partials/sections/dashboard/workzone/instance/instance.scss index 756d953b2..0e8eda4c1 100644 --- a/client/cat3/src/partials/sections/dashboard/workzone/instance/instance.scss +++ b/client/cat3/src/partials/sections/dashboard/workzone/instance/instance.scss @@ -680,6 +680,12 @@ $imagePath: "../../../../../../images"; font-size: 13px; vertical-align: top; } + .marginleft5 { + margin-left: 5px; + } + .instanceSelection { + margin-left: 28%; + } #tableView { width: 100%; padding: 0px 0px 42px 0px; @@ -768,6 +774,13 @@ $imagePath: "../../../../../../images"; /*Common CSS which is used for all devices ends here*/ /*CSS for all Popups starts here*/ +#instanceUsagePage { + .usage-dropdown { + width: auto; + height: 31px; + display: table-cell; + } +} #deleteInstancePage { .font-normal { font-weight: normal; 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 916f886f4..feb725056 100644 --- a/client/cat3/src/partials/sections/dashboard/workzone/instance/instanceCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/workzone/instance/instanceCtrl.js @@ -217,6 +217,7 @@ so that it gets replaced with instanceIP*/ helper.setHostToIp(result.data.instances); $scope.tabData = $scope.instanceList; + console.log($scope.instanceList); if ($scope.totalCards > $scope.paginationParams.pageSize) { $scope.cardsAvailable = true; } else { @@ -515,6 +516,21 @@ console.log('Modal dismissed at: ' + new Date()); }); }; + $scope.showInstanceUsage = function(inst) { + var modalInstance = $modal.open({ + animation: true, + templateUrl: 'src/partials/sections/dashboard/workzone/instance/popups/instanceUsage.html', + controller: 'instanceUsageCtrl', + size: 'lg', + backdrop: 'static', + keyboard: false, + resolve: { + items: function() { + return inst; + } + } + }); + } $scope.rdpFileLink = function(instanceObj) { var fileLink = '/instances/rdp/' + instanceObj.instanceIP + '/3389'; return fileLink; diff --git a/client/cat3/src/partials/sections/dashboard/workzone/instance/popups/instanceUsage.html b/client/cat3/src/partials/sections/dashboard/workzone/instance/popups/instanceUsage.html new file mode 100644 index 000000000..f3ea5da58 --- /dev/null +++ b/client/cat3/src/partials/sections/dashboard/workzone/instance/popups/instanceUsage.html @@ -0,0 +1,36 @@ +
+
+ × +

+   + Usage Trends - {{instanceName}} +

+
+ +
+
+
+
+ +

{{splitUp}}

+ +
+
+ + Usage Type:  + + +
+ +
+
+
+ +
+ +
+
\ No newline at end of file diff --git a/client/cat3/src/partials/sections/dashboard/workzone/instance/popups/instanceUsageCtrl.js b/client/cat3/src/partials/sections/dashboard/workzone/instance/popups/instanceUsageCtrl.js new file mode 100644 index 000000000..148734eea --- /dev/null +++ b/client/cat3/src/partials/sections/dashboard/workzone/instance/popups/instanceUsageCtrl.js @@ -0,0 +1,100 @@ +/* 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, + * Oct 2016 + */ + +(function(angular){ + "use strict"; + angular.module('workzone.instance') + .controller('instanceUsageCtrl', ['$scope', '$rootScope', '$modalInstance', 'items', '$state','analyticsServices', 'genericServices','$timeout', function($scope, $rootScope, $modalInstance, items, $state,analyticsServices,genSevs,$timeout) { + console.log(items); + $scope.instanceName = items.name; + var resId = items.platformId; + $scope.trendLineChart={ + data:[] + }; + $scope.trendsChart=function(){ + $scope.trendLineChart.options = { + chart: { + type: 'lineChart', + height: 400, + margin: { + top: 20, + right: 20, + bottom:70, + left: 40 + }, + x: function (d) { + return d[0]; + }, + y: function (d) { + return d[1]; + }, + useVoronoi: false, + clipEdge: true, + duration: 10, + useInteractiveGuideline: true, + xAxis: { + axisLabel: 'Date', + showMaxMin: false, + tickFormat: function (d) { + return d3.time.format('%d/%m %H:%M')(new Date(d)) + } + }, + yAxis: { + tickFormat: function (d) { + return d3.format(',.2f')(d); + } + }, + zoom: { + enabled: true, + scaleExtent: [1, 10], + useFixedDomain: false, + useNiceScale: false, + horizontalOff: true, + verticalOff: true, + unzoomEventType: 'dblclick.zoom' + } + } + }; + $scope.trendLineChart.data = []; + $scope.legends=[]; + $scope.getData(); + }; + $scope.getData=function(){ + $scope.trendLineChart.data = []; + var $today = new Date(); + var $yesterday = new Date($today); + $yesterday.setDate($today.getDate() - 1); + var param = { + url: '/analytics/trend/usage?resource='+'resId'+'&fromTimeStamp='+$yesterday+'&toTimeStamp='+ $today+'&interval=3600' + }; + genSevs.promiseGet(param).then(function (result) { + var va = []; + if(result) { + angular.forEach(result[$scope.splitUp].dataPoints, function (value) { + va.push([Date.parse(value.fromTime), value.average]); + }); + $scope.trendLineChart.data.push({ + "key":resId, + "values": va + }); + } + }); + }; + $scope.trendsChart($rootScope.filterNewEnt); + $scope.splitChange=function() { + $scope.getData($rootScope.filterNewEnt); + }; + $scope.init =function(){ + $scope.splitUp='CPUUtilization'; + }; + $scope.init(); + $scope.cancel = function() { + $modalInstance.dismiss('cancel'); + }; + } + ]); +})(angular); \ No newline at end of file diff --git a/client/cat3/src/partials/sections/dashboard/workzone/workzoneCtrl.js b/client/cat3/src/partials/sections/dashboard/workzone/workzoneCtrl.js index 6764c38e7..44ae82106 100644 --- a/client/cat3/src/partials/sections/dashboard/workzone/workzoneCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/workzone/workzoneCtrl.js @@ -85,7 +85,7 @@ function workzoneFunct($scope, $rootScope) { }; }; } -angular.module('dashboard.workzone', ['angularTreeview', 'mgcrea.ngStrap', 'workzone.instance', 'workzone.blueprint', 'workzone.orchestration', 'workzone.container', 'workzone.cloudFormation', 'workzone.azureARM', 'workzone.application', 'apis.workzone', 'workzone.factories']) +angular.module('dashboard.workzone', ['angularTreeview', 'mgcrea.ngStrap', 'workzone.instance', 'workzone.blueprint', 'workzone.orchestration', 'workzone.container', 'workzone.cloudFormation', 'workzone.azureARM', 'workzone.application', 'apis.workzone', 'workzone.factories', 'nvd3']) .controller('workzoneCtrl', ['$scope', '$rootScope', workzoneFunct]) .controller('workzoneTreeCtrl', ['$rootScope', '$scope', 'workzoneServices', 'workzoneEnvironment', '$timeout', 'modulePermission', '$window', function ($rootScope, $scope, workzoneServices, workzoneEnvironment, $timeout, modulePerms, $window) { 'use strict'; From 8231ca4c7abec3f5934dfc4d1768016b88b8a317 Mon Sep 17 00:00:00 2001 From: Karthik K N Date: Fri, 14 Oct 2016 12:04:22 +0530 Subject: [PATCH 02/32] code update to generate weekly aggregate cost --- server/app/lib/utils/dateUtil.js | 13 +++++++++++++ server/app/services/analyticsService.js | 4 ++++ server/install.js | 23 +++++++++++++++-------- 3 files changed, 32 insertions(+), 8 deletions(-) diff --git a/server/app/lib/utils/dateUtil.js b/server/app/lib/utils/dateUtil.js index 41a78fc3f..c685efd95 100644 --- a/server/app/lib/utils/dateUtil.js +++ b/server/app/lib/utils/dateUtil.js @@ -49,6 +49,18 @@ function getStartOfAMonthInUTC(date) { } } +function getStartOfAWeekInUTC(date) { + if( typeof date === 'undefined' || date === null ) { + return null; + }else{ + var dateStartOfWeek = moment.utc(date).seconds(0); + dateStartOfWeek = moment.utc(dateStartOfWeek).minute(0); + dateStartOfWeek = moment.utc(dateStartOfWeek).hour(0); + dateStartOfWeek = moment.utc(dateStartOfWeek).day(0); + return dateStartOfWeek.format(); + } +} + function getStartOfADayInUTC(date) { if( typeof date === 'undefined' || date === null ){ var err = new Error("Invalid date"); @@ -186,3 +198,4 @@ momentDateUtil.getStartOfAYearInUTCAsync = getStartOfAYearInUTCAsync; momentDateUtil.getStartOfAMonthInUTC = getStartOfAMonthInUTC; momentDateUtil.getDateDifferenceInDays = getDateDifferenceInDays; momentDateUtil.getStartOfADayInUTC = getStartOfADayInUTC; +momentDateUtil.getStartOfAWeekInUTC = getStartOfAWeekInUTC; diff --git a/server/app/services/analyticsService.js b/server/app/services/analyticsService.js index fe9651ac5..22621d70a 100644 --- a/server/app/services/analyticsService.js +++ b/server/app/services/analyticsService.js @@ -42,6 +42,10 @@ analyticsService.aggregateEntityCosts startTime = dateUtil.getStartOfAMonthInUTC(endTime) interval = costAggregationPeriods.month.intervalInSeconds break + case 'week': + startTime = dateUtil.getStartOfAWeekInUTC(endTime) + interval = costAggregationPeriods.week.intervalInSeconds + break case 'day': startTime = dateUtil.getStartOfADayInUTC(endTime) interval = costAggregationPeriods.day.intervalInSeconds diff --git a/server/install.js b/server/install.js index 0596ff667..eeb4c37fe 100755 --- a/server/install.js +++ b/server/install.js @@ -443,7 +443,7 @@ function getDefaultsConfig() { catalystEntityHierarchy: { organization: { key: 'organizationId', - children: ['organization', 'businessGroup', 'provider', 'environment', 'region'] + children: ['organization', 'businessGroup', 'provider', 'environment', 'region', 'resource'] }, businessGroup: { key: 'businessGroupId', @@ -462,30 +462,37 @@ function getDefaultsConfig() { }, region: { key: 'platformDetails.region' + }, + resource: { + key: 'resourceId' } }, costAggregationPeriods: { - 'year': { + /*'year': { intervalInSeconds: null, childInterval: { name: 'monthly', intervalInSeconds: 2592000 } - }, + },*/ 'month': { intervalInSeconds: 2592000, childInterval: { - name: 'daily', + name: 'week', intervalInSeconds: 86400 } }, - day: { - intervalInSeconds: 86400, + week: { + intervalInSeconds: 604800, childInterval: { - name: 'hourly', - intervalInSeconds: 3600 + name: 'day', + intervalInSeconds: 86400 } }, + day: { + intervalInSeconds: 86400, + childInterval: null + }, }, costDefaultIds: { businessGroupId: 'Unassigned', From bbdec65f3239a39e2eddf8df2aff0bc835f228c0 Mon Sep 17 00:00:00 2001 From: VIJAYKUMARNINGANURE Date: Fri, 14 Oct 2016 13:26:15 +0530 Subject: [PATCH 03/32] Implemented serviceDeliveryCheck --- server/app/routes/v1.0/routes_blueprints.js | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/server/app/routes/v1.0/routes_blueprints.js b/server/app/routes/v1.0/routes_blueprints.js index d0d80b81d..4a28cd542 100755 --- a/server/app/routes/v1.0/routes_blueprints.js +++ b/server/app/routes/v1.0/routes_blueprints.js @@ -527,14 +527,25 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) { var orgId = req.params.orgId; var bgId = req.params.bgId; var projectId = req.params.projectId; + var serviceDeliveryCheck = false; + if(req.query.serviceDeliveryCheck){ + serviceDeliveryCheck = req.query.serviceDeliveryCheck; + } if (!orgId || !bgId || !projectId) { res.status(400).send("Either orgId or bgId or projectId missing."); return; } + var jsonData = {}; jsonData['orgId'] = orgId; jsonData['bgId'] = bgId; jsonData['projectId'] = projectId; + + if(serviceDeliveryCheck === 'true' || serviceDeliveryCheck === true){ + jsonData['botType'] = {$ne:null}; + jsonData['shortDesc'] = {$ne:null}; + } + Blueprints.getBlueprintsByOrgBgProject(jsonData, function(err, blueprints) { if (err) { res.status(500).send({ From f6d6d833e37ba913a6ad2187eebf74a16324fb1a Mon Sep 17 00:00:00 2001 From: Karthik K N Date: Fri, 14 Oct 2016 16:11:48 +0530 Subject: [PATCH 04/32] entity cost aggregation optimization --- .../model/resource-costs/resource-costs.js | 6 +- server/app/services/analyticsService.js | 61 +++++++++---------- server/app/services/resourceService.js | 6 +- server/install.js | 12 ++-- 4 files changed, 45 insertions(+), 40 deletions(-) diff --git a/server/app/model/resource-costs/resource-costs.js b/server/app/model/resource-costs/resource-costs.js index bcf24bdd5..1d6151d7c 100644 --- a/server/app/model/resource-costs/resource-costs.js +++ b/server/app/model/resource-costs/resource-costs.js @@ -71,7 +71,7 @@ var ResourceCostsSchema = new Schema({ trim: true }, billLineItemId: { - type: String, + type: Number, required: true, trim: true }, @@ -131,7 +131,8 @@ var ResourceCostsSchema = new Schema({ } }) -ResourceCostsSchema.index({'organizationId': 1, 'billLineItemId': 1, +ResourceCostsSchema.index({'platformDetails.serviceId' : 1}) +ResourceCostsSchema.index({'organizationId': 1, 'providerId': 1, 'billLineItemId': 1, 'startTime': 1, 'interval': 1}, {'unique': true}) ResourceCostsSchema.statics.saveResourceCost = function saveResourceCost(resourceCostData, callback) { @@ -148,6 +149,7 @@ ResourceCostsSchema.statics.saveResourceCost = function saveResourceCost(resourc ResourceCostsSchema.statics.upsertResourceCost = function upsertResourceCost(resourceCostData, callback) { var query = { organizationId: resourceCostData.organizationId, + providerId: resourceCostData.providerId, billLineItemId: resourceCostData.billLineItemId, startTime: resourceCostData.startTime, interval: resourceCostData.interval diff --git a/server/app/services/analyticsService.js b/server/app/services/analyticsService.js index 22621d70a..254d99c3f 100644 --- a/server/app/services/analyticsService.js +++ b/server/app/services/analyticsService.js @@ -66,36 +66,28 @@ analyticsService.aggregateEntityCosts ], next1) }, function(totalCosts, next1) { - var serviceCosts = [] - async.forEach(platformServices, - function(service, next2) { - query['platformDetails.serviceId'] = service - - resourceCostsModel.aggregate([ - {$match: query}, - {$group: {_id: "$" + catalystEntityHierarchy[childEntity].key, - totalCost: {$sum: "$cost"}, - service: {$first: "$platformDetails.serviceId"}}} - ], function(err, serviceCost) { - if(err) { - next2(err) - } else { - serviceCosts.push(serviceCost) - next2() - } - }) - }, - function(err) { - if(err) { - return next1(err) - } else { - var aggregatedCosts = {totalCosts: totalCosts} - aggregatedCosts.serviceCosts = serviceCosts - - next1(null, aggregatedCosts) + resourceCostsModel.aggregate([ + {$match: query}, + { + $group: { + _id: { + "entityId": "$" + catalystEntityHierarchy[childEntity].key, + "service": "$platformDetails.serviceId" + }, + totalCost: {$sum: "$cost"}, + service: {$first: "$platformDetails.serviceId"} } } - ) + ], function (err, serviceCosts) { + if (err) { + return next1(err) + } else { + var aggregatedCosts = {totalCosts: totalCosts} + aggregatedCosts.serviceCosts = serviceCosts + + next1(null, aggregatedCosts) + } + }) } ], function(err, aggregateCosts) { @@ -104,7 +96,6 @@ analyticsService.aggregateEntityCosts } else { //@TODO Blocking call to be avoided var entityCosts = {} - for(var i = 0; i < aggregateCosts.totalCosts.length; i++) { entityCosts[aggregateCosts.totalCosts[i]._id] = { entity: { @@ -129,8 +120,7 @@ analyticsService.aggregateEntityCosts } } - // @TODO Blocking call to be avoided - for(var i = 0; i < aggregateCosts.serviceCosts.length; i++) { + /*for(var i = 0; i < aggregateCosts.serviceCosts.length; i++) { for(var j = 0; j < aggregateCosts.serviceCosts[i].length; j++) { if(aggregateCosts.serviceCosts[i][j]._id in entityCosts) { entityCosts[aggregateCosts.serviceCosts[i][j]._id] @@ -138,6 +128,15 @@ analyticsService.aggregateEntityCosts = Math.round(aggregateCosts.serviceCosts[i][j].totalCost * 100) / 100 } } + }*/ + + // @TODO Blocking call to be avoided + for(var i = 0; i < aggregateCosts.serviceCosts.length; i++) { + if(aggregateCosts.serviceCosts[i]._id.entityId in entityCosts) { + entityCosts[aggregateCosts.serviceCosts[i]._id.entityId] + .costs.AWS.serviceCosts[aggregateCosts.serviceCosts[i]._id.service] + = aggregateCosts.serviceCosts[i].totalCost + } } if(Object.keys(entityCosts).length > 0) diff --git a/server/app/services/resourceService.js b/server/app/services/resourceService.js index 7c2e5851b..7feddace3 100644 --- a/server/app/services/resourceService.js +++ b/server/app/services/resourceService.js @@ -108,9 +108,9 @@ function updateAWSResourceCostsFromCSV(provider, resources, downlaodedCSVPath, u resourceCostEntry.billLineItemId = ++lineNumber resourceCostEntry.platformDetails.billRecordId = data[awsBillIndexes.recordId] - if (data[awsBillIndexes.prod] in awsServices) { - resourceCostEntry.platformDetails.serviceId = awsServices[data[awsBillIndexes.prod]] - } + 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] diff --git a/server/install.js b/server/install.js index eeb4c37fe..33995c1bd 100755 --- a/server/install.js +++ b/server/install.js @@ -404,7 +404,8 @@ function getDefaultsConfig() { 'Amazon Route 53': 'R53', 'Amazon Redshift': 'RedShift', 'Amazon ElastiCache': 'ElastiCache', - 'Amazon CloudFront': 'CloudFront' + 'Amazon CloudFront': 'CloudFront', + 'Other': 'Other' }, billIndexes: { @@ -443,7 +444,7 @@ function getDefaultsConfig() { catalystEntityHierarchy: { organization: { key: 'organizationId', - children: ['organization', 'businessGroup', 'provider', 'environment', 'region', 'resource'] + children: ['organization', 'businessGroup', 'provider', 'environment', 'region'] }, businessGroup: { key: 'businessGroupId', @@ -491,8 +492,11 @@ function getDefaultsConfig() { }, day: { intervalInSeconds: 86400, - childInterval: null - }, + childInterval: { + name: 'hour', + intervalInSeconds: 3600 + } + } }, costDefaultIds: { businessGroupId: 'Unassigned', From 8c6a1e79372ec7f94aeaa3c4e86c6fb1ad20d5ef Mon Sep 17 00:00:00 2001 From: VIJAYKUMARNINGANURE Date: Fri, 14 Oct 2016 17:40:07 +0530 Subject: [PATCH 05/32] Implementation of Tag servers --- .../arm-template-blueprint/arm-template-blueprint.js | 1 + .../instance-blueprint/aws-blueprint/aws-blueprint.js | 1 + .../instance-blueprint/azure-blueprint/azure-blueprint.js | 1 + .../openstack-blueprint/openstack-blueprint.js | 1 + .../instance-blueprint/vmware-blueprint/vmware-blueprint.js | 1 + server/app/model/classes/instance/instance.js | 5 +++++ server/app/routes/v1.0/routes_chef.js | 1 + server/app/routes/v1.0/routes_organizations.js | 1 + server/app/routes/v1.0/routes_providercommon.js | 1 + 9 files changed, 13 insertions(+) diff --git a/server/app/model/blueprint/blueprint-types/arm-template-blueprint/arm-template-blueprint.js b/server/app/model/blueprint/blueprint-types/arm-template-blueprint/arm-template-blueprint.js index fd668004f..54908803d 100755 --- a/server/app/model/blueprint/blueprint-types/arm-template-blueprint/arm-template-blueprint.js +++ b/server/app/model/blueprint/blueprint-types/arm-template-blueprint/arm-template-blueprint.js @@ -165,6 +165,7 @@ ARMTemplateBlueprintSchema.methods.launch = function(launchParams, callback) { environmentName: launchParams.envName, providerId: self.cloudProviderId, providerType: 'azure', + tagServer: launchParams.tagServer, keyPairId: 'azure', region: self.region, chefNodeName: instanceData.name, diff --git a/server/app/model/blueprint/blueprint-types/instance-blueprint/aws-blueprint/aws-blueprint.js b/server/app/model/blueprint/blueprint-types/instance-blueprint/aws-blueprint/aws-blueprint.js index 97493a7da..cd8aa5c0a 100755 --- a/server/app/model/blueprint/blueprint-types/instance-blueprint/aws-blueprint/aws-blueprint.js +++ b/server/app/model/blueprint/blueprint-types/instance-blueprint/aws-blueprint/aws-blueprint.js @@ -221,6 +221,7 @@ AWSInstanceBlueprintSchema.methods.launch = function(launchParams, callback) { keyPairId: self.keyPairId, region: aKeyPair.region, chefNodeName: instanceData.InstanceId, + tagServer: launchParams.tagServer, runlist: paramRunList, attributes: paramAttributes, platformId: instanceData.InstanceId, diff --git a/server/app/model/blueprint/blueprint-types/instance-blueprint/azure-blueprint/azure-blueprint.js b/server/app/model/blueprint/blueprint-types/instance-blueprint/azure-blueprint/azure-blueprint.js index 6bf1d2bdc..3b56d2414 100755 --- a/server/app/model/blueprint/blueprint-types/instance-blueprint/azure-blueprint/azure-blueprint.js +++ b/server/app/model/blueprint/blueprint-types/instance-blueprint/azure-blueprint/azure-blueprint.js @@ -276,6 +276,7 @@ azureInstanceBlueprintSchema.methods.launch = function(launchParams, callback) { environmentName: launchParams.envName, providerId: self.cloudProviderId, providerType: self.cloudProviderType, + tagServer: launchParams.tagServer, keyPairId: 'azure', region: self.region, chefNodeName: launchparamsazure.VMName, diff --git a/server/app/model/blueprint/blueprint-types/instance-blueprint/openstack-blueprint/openstack-blueprint.js b/server/app/model/blueprint/blueprint-types/instance-blueprint/openstack-blueprint/openstack-blueprint.js index 0f8c91402..65b26083a 100755 --- a/server/app/model/blueprint/blueprint-types/instance-blueprint/openstack-blueprint/openstack-blueprint.js +++ b/server/app/model/blueprint/blueprint-types/instance-blueprint/openstack-blueprint/openstack-blueprint.js @@ -223,6 +223,7 @@ openstackInstanceBlueprintSchema.methods.launch = function(launchParams, callbac environmentName: launchParams.envName, providerId: self.cloudProviderId, providerType: self.cloudProviderType, + tagServer: launchParams.tagServer, keyPairId: 'unknown', region: self.region, chefNodeName: instanceData.server.id, diff --git a/server/app/model/blueprint/blueprint-types/instance-blueprint/vmware-blueprint/vmware-blueprint.js b/server/app/model/blueprint/blueprint-types/instance-blueprint/vmware-blueprint/vmware-blueprint.js index 98db8101c..969017ab2 100755 --- a/server/app/model/blueprint/blueprint-types/instance-blueprint/vmware-blueprint/vmware-blueprint.js +++ b/server/app/model/blueprint/blueprint-types/instance-blueprint/vmware-blueprint/vmware-blueprint.js @@ -212,6 +212,7 @@ vmwareInstanceBlueprintSchema.methods.launch = function(launchParams, callback) environmentName: launchParams.envName, providerId: self.cloudProviderId, providerType: self.cloudProviderType, + tagServer: launchParams.tagServer, keyPairId: 'unknown', region: self.region, chefNodeName: createserverdata["vm_name"], diff --git a/server/app/model/classes/instance/instance.js b/server/app/model/classes/instance/instance.js index de7e3b9c0..f536505f7 100755 --- a/server/app/model/classes/instance/instance.js +++ b/server/app/model/classes/instance/instance.js @@ -341,6 +341,11 @@ var InstanceSchema = new Schema({ type: Boolean, required: false, default: false + }, + tagServer:{ + type: String, + required: false, + trim: true } }); diff --git a/server/app/routes/v1.0/routes_chef.js b/server/app/routes/v1.0/routes_chef.js index 9b89407e2..6ba19b57c 100755 --- a/server/app/routes/v1.0/routes_chef.js +++ b/server/app/routes/v1.0/routes_chef.js @@ -319,6 +319,7 @@ module.exports.setRoutes = function(app, verificationFunc) { instanceState: 'running', bootStrapStatus: 'success', hardware: hardwareData, + tagServer: reqBody.tagServer, credentials: encryptedCredentials, users: users, chef: { diff --git a/server/app/routes/v1.0/routes_organizations.js b/server/app/routes/v1.0/routes_organizations.js index 625c37286..8a1f32f80 100755 --- a/server/app/routes/v1.0/routes_organizations.js +++ b/server/app/routes/v1.0/routes_organizations.js @@ -1739,6 +1739,7 @@ module.exports.setRoutes = function(app, sessionVerification) { instanceIP: req.body.fqdn, instanceState: nodeAlive, bootStrapStatus: 'waiting', + tagServer: req.body.tagServer, runlist: [], appUrls: appUrls, users: [req.session.user.cn], //need to change this diff --git a/server/app/routes/v1.0/routes_providercommon.js b/server/app/routes/v1.0/routes_providercommon.js index 1396ae901..5317034c1 100644 --- a/server/app/routes/v1.0/routes_providercommon.js +++ b/server/app/routes/v1.0/routes_providercommon.js @@ -413,6 +413,7 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) { projectId: req.body.projectId, projectName: req.body.projectName, envId: req.body.envId, + tagServer: req.body.tagServer, providerId: provider._id, providerType: 'aws', providerData: { From dceb444e695397aa41f432f107416619a652861c Mon Sep 17 00:00:00 2001 From: Karthik K N Date: Mon, 17 Oct 2016 12:13:25 +0530 Subject: [PATCH 06/32] service cost precision and dateUtil changes --- server/app/lib/utils/dateUtil.js | 18 +++++++ server/app/services/analyticsService.js | 62 +++++-------------------- 2 files changed, 30 insertions(+), 50 deletions(-) diff --git a/server/app/lib/utils/dateUtil.js b/server/app/lib/utils/dateUtil.js index c685efd95..724d68b09 100644 --- a/server/app/lib/utils/dateUtil.js +++ b/server/app/lib/utils/dateUtil.js @@ -73,6 +73,23 @@ function getStartOfADayInUTC(date) { } } +function getStartOfPeriod(period, date) { + var startTime = null + switch(period) { + case 'month': + startTime = getStartOfAMonthInUTC(date); + break; + case 'week': + startTime = getStartOfAWeekInUTC(date); + break; + case 'day': + startTime = getStartOfADayInUTC(date); + break; + } + + return startTime; +} + /* * Get Date in UTC Format * date - JavaScript Date @@ -199,3 +216,4 @@ momentDateUtil.getStartOfAMonthInUTC = getStartOfAMonthInUTC; momentDateUtil.getDateDifferenceInDays = getDateDifferenceInDays; momentDateUtil.getStartOfADayInUTC = getStartOfADayInUTC; momentDateUtil.getStartOfAWeekInUTC = getStartOfAWeekInUTC; +momentDateUtil.getStartOfPeriod = getStartOfPeriod; diff --git a/server/app/services/analyticsService.js b/server/app/services/analyticsService.js index 254d99c3f..ae55cc55a 100644 --- a/server/app/services/analyticsService.js +++ b/server/app/services/analyticsService.js @@ -35,22 +35,8 @@ analyticsService.aggregateEntityCosts }) var offset = (new Date()).getTimezoneOffset()*60000 - var startTime - var interval - switch (period) { - case 'month': - startTime = dateUtil.getStartOfAMonthInUTC(endTime) - interval = costAggregationPeriods.month.intervalInSeconds - break - case 'week': - startTime = dateUtil.getStartOfAWeekInUTC(endTime) - interval = costAggregationPeriods.week.intervalInSeconds - break - case 'day': - startTime = dateUtil.getStartOfADayInUTC(endTime) - interval = costAggregationPeriods.day.intervalInSeconds - break - } + var interval = costAggregationPeriods[period].intervalInSeconds + var startTime = dateUtil.getStartOfPeriod(period, endTime) async.forEach(catalystEntityHierarchy[parentEntity].children, function (childEntity, next0) { var query = parentEntityQuery @@ -98,14 +84,8 @@ analyticsService.aggregateEntityCosts var entityCosts = {} for(var i = 0; i < aggregateCosts.totalCosts.length; i++) { entityCosts[aggregateCosts.totalCosts[i]._id] = { - entity: { - id: aggregateCosts.totalCosts[i]._id, - type: childEntity - }, - parentEntity: { - id: parentEntityId, - type: parentEntity - }, + entity: { id: aggregateCosts.totalCosts[i]._id, type: childEntity}, + parentEntity: {id: parentEntityId, type: parentEntity}, costs: { totalCost: Math.round(aggregateCosts.totalCosts[i].totalCost * 100) / 100, AWS: { @@ -120,22 +100,12 @@ analyticsService.aggregateEntityCosts } } - /*for(var i = 0; i < aggregateCosts.serviceCosts.length; i++) { - for(var j = 0; j < aggregateCosts.serviceCosts[i].length; j++) { - if(aggregateCosts.serviceCosts[i][j]._id in entityCosts) { - entityCosts[aggregateCosts.serviceCosts[i][j]._id] - .costs.AWS.serviceCosts[aggregateCosts.serviceCosts[i][j].service] - = Math.round(aggregateCosts.serviceCosts[i][j].totalCost * 100) / 100 - } - } - }*/ - // @TODO Blocking call to be avoided for(var i = 0; i < aggregateCosts.serviceCosts.length; i++) { if(aggregateCosts.serviceCosts[i]._id.entityId in entityCosts) { entityCosts[aggregateCosts.serviceCosts[i]._id.entityId] .costs.AWS.serviceCosts[aggregateCosts.serviceCosts[i]._id.service] - = aggregateCosts.serviceCosts[i].totalCost + = Math.round(aggregateCosts.serviceCosts[i].totalCost * 100) / 100 } } @@ -179,23 +149,15 @@ analyticsService.validateAndParseCostQuery var err = new Error('Invalid request') err.errors = [{messages: 'Mandatory fields missing'}] err.status = 400 - callback(err) + return callback(err) } - var startTime - switch (requestQuery.period) { - case 'month': - startTime = dateUtil.getStartOfAMonthInUTC(requestQuery.toTimeStamp) - break - /*case 'year': - startTime = dateUtil.getStartOfAMonthInUTC(requestQuery.toTimeStamp) - break*/ - default: - var err = new Error('Invalid request') - err.errors = [{messages: 'Period is invalid'}] - err.status = 400 - return callback(err) - break + var startTime = dateUtil.getStartOfPeriod(requestQuery.period, requestQuery.toTimeStamp) + if(startTime == null) { + var err = new Error('Invalid request') + err.errors = [{messages: 'Period is invalid'}] + err.status = 400 + return callback(err) } //@TODO Query object format to be changed From 9d04ab009496f62387676969e3addcd9dc94e5ca Mon Sep 17 00:00:00 2001 From: Divakar Konakalla Date: Mon, 17 Oct 2016 15:38:31 +0530 Subject: [PATCH 07/32] Added Service Delivery check while creating new blueprint. --- client/htmls/private/ajax/Aws-Production.html | 41 ++++++++++++++++++- client/htmls/private/js/dev/awsProduction.js | 13 ++++++ 2 files changed, 53 insertions(+), 1 deletion(-) diff --git a/client/htmls/private/ajax/Aws-Production.html b/client/htmls/private/ajax/Aws-Production.html index 510cca879..7d926a582 100644 --- a/client/htmls/private/ajax/Aws-Production.html +++ b/client/htmls/private/ajax/Aws-Production.html @@ -236,6 +236,35 @@

+
+
+ + +
+
+ + +
+ + + +
+
+ +
+ + + +
+
- \ No newline at end of file + + + \ No newline at end of file diff --git a/client/htmls/private/js/dev/awsProduction.js b/client/htmls/private/js/dev/awsProduction.js index eba798d0b..623bc56f2 100644 --- a/client/htmls/private/js/dev/awsProduction.js +++ b/client/htmls/private/js/dev/awsProduction.js @@ -12,6 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ + var checkandupdateRunlistTable = function() { if (!$.fn.dataTable.isDataTable('#tableRunlistForBlueprint')) { $tasksRunlist = $('#tableRunlistForBlueprint').DataTable({ @@ -1554,6 +1555,8 @@ var saveblueprint = function(tempType) { reqBody.orgId = $('#orgnameSelect').val(); reqBody.bgId = $('#bgListInput').val(); reqBody.projectId = $('#projectListInput').val(); + reqBody.botType = $('#botType').val(); + reqBody.shortDesc = $('#shortDesc').val(); var imageIdentifier = $('#imageId').val(); var imageId = $('#imageId').find('option:selected').attr('_id'); var securityGroupIds = getSecurityCheckedList(); @@ -3450,4 +3453,14 @@ $(".repoTypeSelectorRadioBtn").click(function() { var val = $(this).attr('data-repotype'); $('.repoTypeClass').hide(); $('#' + val).show(); +}); + +$(document).ready(function() { + $('#serviceDeliveryCheck').click(function() { + if ($('#serviceDeliveryCheck').prop("checked")) { + $('.sevice-delivery-section').addClass('showservice'); + } else { + $('.sevice-delivery-section').removeClass('showservice'); + } + }); }); \ No newline at end of file From 3e2b4fb6d847df504e6093b1402cf4a51693496a Mon Sep 17 00:00:00 2001 From: Divakar Konakalla Date: Mon, 17 Oct 2016 23:26:53 +0530 Subject: [PATCH 08/32] Added check before send bot type & description to API. --- client/htmls/private/js/dev/awsProduction.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/client/htmls/private/js/dev/awsProduction.js b/client/htmls/private/js/dev/awsProduction.js index 623bc56f2..a3df1df9e 100644 --- a/client/htmls/private/js/dev/awsProduction.js +++ b/client/htmls/private/js/dev/awsProduction.js @@ -1555,8 +1555,10 @@ var saveblueprint = function(tempType) { reqBody.orgId = $('#orgnameSelect').val(); reqBody.bgId = $('#bgListInput').val(); reqBody.projectId = $('#projectListInput').val(); - reqBody.botType = $('#botType').val(); - reqBody.shortDesc = $('#shortDesc').val(); + if ($('#serviceDeliveryCheck').prop("checked")) { + reqBody.botType = $('#botType').val(); + reqBody.shortDesc = $('#shortDesc').val(); + } var imageIdentifier = $('#imageId').val(); var imageId = $('#imageId').find('option:selected').attr('_id'); var securityGroupIds = getSecurityCheckedList(); From f15505e755e2ef603fb9e86f0720c9f71bda0a4a Mon Sep 17 00:00:00 2001 From: Divakar Konakalla Date: Tue, 18 Oct 2016 08:43:06 +0530 Subject: [PATCH 09/32] Added tag server check in chef import, import by ip pages. --- .../instance/popups/InstanceImportByIpCtrl.js | 1 + .../workzone/instance/popups/instanceImportByIp.html | 4 ++++ client/htmls/private/ajax/Settings/chefSync.html | 12 ++++++++++++ 3 files changed, 17 insertions(+) diff --git a/client/cat3/src/partials/sections/dashboard/workzone/instance/popups/InstanceImportByIpCtrl.js b/client/cat3/src/partials/sections/dashboard/workzone/instance/popups/InstanceImportByIpCtrl.js index 8538dd5c6..266f79611 100644 --- a/client/cat3/src/partials/sections/dashboard/workzone/instance/popups/InstanceImportByIpCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/workzone/instance/popups/InstanceImportByIpCtrl.js @@ -48,6 +48,7 @@ reqBody.fqdn = $scope.ipAddress; reqBody.os = $scope.os; reqBody.configManagmentId = $scope.selectedConfig; + reqBody.tagServer = $scope.tagServer; reqBody.credentials = { username: $scope.username }; diff --git a/client/cat3/src/partials/sections/dashboard/workzone/instance/popups/instanceImportByIp.html b/client/cat3/src/partials/sections/dashboard/workzone/instance/popups/instanceImportByIp.html index ea91f0a2f..eafafb8d2 100644 --- a/client/cat3/src/partials/sections/dashboard/workzone/instance/popups/instanceImportByIp.html +++ b/client/cat3/src/partials/sections/dashboard/workzone/instance/popups/instanceImportByIp.html @@ -133,6 +133,10 @@

Add Application URL +
+ + +
diff --git a/client/htmls/private/ajax/Settings/chefSync.html b/client/htmls/private/ajax/Settings/chefSync.html index 05b8f222f..10236f3b7 100755 --- a/client/htmls/private/ajax/Settings/chefSync.html +++ b/client/htmls/private/ajax/Settings/chefSync.html @@ -229,6 +229,13 @@

Import Nodes

+ +
+ + +
@@ -498,6 +505,11 @@

Importing Nodes

reqBody.projectId = $projectList.val(); reqBody.orgName = $orgListInput.find('option:selected').text(); reqBody.bgName = $bgList.find('option:selected').text(); + if ($('#tagServer').prop("checked")) { + reqBody.tagServer = true; + } else { + reqBody.tagServer = false; + } reqBody.projectName = $projectList.find('option:selected').text(); if (!((reqBody.bgId && reqBody.bgId.length) && (reqBody.projectId && reqBody.projectId.length) && reqBody.projectId !== 'choose' && reqBody.bgId !== 'choose')) { alert('Please Select a Business Group & Project'); From 1b1b38016c6c003492aa2ec65b66c35cd667dd50 Mon Sep 17 00:00:00 2001 From: Karthik K N Date: Tue, 18 Oct 2016 12:18:42 +0530 Subject: [PATCH 10/32] Deleted entities classified as Unknown in analytics --- server/app/services/analyticsService.js | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/server/app/services/analyticsService.js b/server/app/services/analyticsService.js index ae55cc55a..64a459b67 100644 --- a/server/app/services/analyticsService.js +++ b/server/app/services/analyticsService.js @@ -26,6 +26,7 @@ var AWSProvider = require('_pr/model/classes/masters/cloudprovider/awsCloudProvi var analyticsService = module.exports = {} +// @TODO To be re-factored analyticsService.aggregateEntityCosts = function aggregateEntityCosts(parentEntity, parentEntityId, parentEntityQuery, endTime, period, callback) { var catalystEntityHierarchy = appConfig.catalystEntityHierarchy @@ -80,7 +81,7 @@ analyticsService.aggregateEntityCosts if(err) { next0(err) } else { - //@TODO Blocking call to be avoided + // @TODO To be improved var entityCosts = {} for(var i = 0; i < aggregateCosts.totalCosts.length; i++) { entityCosts[aggregateCosts.totalCosts[i]._id] = { @@ -100,7 +101,7 @@ analyticsService.aggregateEntityCosts } } - // @TODO Blocking call to be avoided + // @TODO To be improved for(var i = 0; i < aggregateCosts.serviceCosts.length; i++) { if(aggregateCosts.serviceCosts[i]._id.entityId in entityCosts) { entityCosts[aggregateCosts.serviceCosts[i]._id.entityId] @@ -410,9 +411,6 @@ analyticsService.formatCostTrend = function formatCostTrend(entityCosts, callbac //@TODO To be optimized. Better abstractions and attribute naming conventions will guarantee less code duplication //@TODO Centralized error handling to reduce code duplication analyticsService.getEntityDetails = function getEntityDetails(entityType, entityId, callback) { - var notFoundError = new Error('Invalid entity id') - notFoundError.status = 404 - var internalServerError = new Error('Internal Server Error') internalServerError.status = 500 @@ -427,7 +425,7 @@ analyticsService.getEntityDetails = function getEntityDetails(entityType, entity } else if (organizations.length > 0) { callback(null, {'name': organizations[0].orgname}) } else { - callback(notFoundError) + callback(null, {'name': 'Unknown'}) } } ) @@ -440,7 +438,7 @@ analyticsService.getEntityDetails = function getEntityDetails(entityType, entity logger.error(err) callback(internalServerError) } else if(provider == null) { - callback(notFoundError) + callback(null, {'name': 'Unknown'}) } else { callback(null, {'name': provider.providerName}) } @@ -457,7 +455,7 @@ analyticsService.getEntityDetails = function getEntityDetails(entityType, entity } else if(businessGroups.length > 0) { callback(null, {'name': businessGroups[0].productgroupname}) } else { - callback(notFoundError) + callback(null, {'name': 'Unknown'}) } } ) @@ -472,7 +470,7 @@ analyticsService.getEntityDetails = function getEntityDetails(entityType, entity } else if(projects.length > 0) { callback(null, {'name': projects[0].projectname}) } else { - callback(notFoundError) + callback(null, {'name': 'Unknown'}) } } ) @@ -487,7 +485,7 @@ analyticsService.getEntityDetails = function getEntityDetails(entityType, entity } else if (environments.length > 0) { callback(null, {'name': environments[0].environmentname}) } else { - callback(notFoundError) + callback(null, {'name': 'Unknown'}) } } ) From 8f53558faf13fbfa86f2d0ed10fb6fd23e692696 Mon Sep 17 00:00:00 2001 From: Divakar Konakalla Date: Tue, 18 Oct 2016 13:24:43 +0530 Subject: [PATCH 11/32] Added tag server check, added dropdown to select a server to tag. --- client/cat3/src/factory/workzoneServices.js | 4 +- .../blueprint/popups/blueprintLaunchCtrl.js | 3 +- .../popups/blueprintLaunchParams.html | 59 +++++++++++++------ .../popups/blueprintLaunchParamsCtrl.js | 12 +++- .../instance/popups/InstanceImportByIpCtrl.js | 14 ++++- .../instance/popups/instanceImportByIp.html | 20 +++++-- .../htmls/private/ajax/Settings/chefSync.html | 44 ++++++++++++-- 7 files changed, 123 insertions(+), 33 deletions(-) diff --git a/client/cat3/src/factory/workzoneServices.js b/client/cat3/src/factory/workzoneServices.js index c3bca326a..598ee2bbc 100644 --- a/client/cat3/src/factory/workzoneServices.js +++ b/client/cat3/src/factory/workzoneServices.js @@ -99,9 +99,9 @@ var url = '/blueprints/' + blueprintID; return $http.delete(fullUrl(url), Auth.getHeaderObject()); }, - launchBlueprint: function (blueprintID, version, envId, stackName,domainName) { + launchBlueprint: function (blueprintID, version, envId, stackName,domainName, tagServer) { var url = '/blueprints/' + blueprintID + '/launch?version=' + version + - '&envId=' + envId + '&stackName=' + stackName + '&domainName=' + domainName; + '&envId=' + envId + '&stackName=' + stackName + '&domainName=' + domainName + '&tagServer=' + tagServer; return $http.get(fullUrl(url), Auth.getHeaderObject()); }, getBlueprintById: function(blueprintId) { diff --git a/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchCtrl.js b/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchCtrl.js index 6527ef150..505484c33 100644 --- a/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchCtrl.js @@ -9,6 +9,7 @@ "use strict"; angular.module('workzone.blueprint') .controller('blueprintLaunchCtrl', ['$scope', '$rootScope', '$modalInstance', 'bpItem', 'workzoneServices', 'workzoneEnvironment', 'instanceLogs', function($scope, $rootScope, $modalInstance, bpItem, workzoneServices, workzoneEnvironment, instanceLogs) { + console.log(bpItem); $scope.isBPLogsLoading = true; $scope.isNewInstanceLogsPromise = false; var helper = { @@ -79,7 +80,7 @@ versionOptional = versionsList[versionsList.length-1].ver; } var selectedVersionBpId = bpItem.bp.selectedVersionBpId; - workzoneServices.launchBlueprint(selectedVersionBpId, versionOptional, envParams.env, bpItem.stackName,bpItem.domainName).then(function(bpLaunchResponse) { + workzoneServices.launchBlueprint(selectedVersionBpId, versionOptional, envParams.env, bpItem.stackName,bpItem.domainName,bpItem.tagServer).then(function(bpLaunchResponse) { $scope.isBPLogsLoading = false; var launchingInstance; if(bpLaunchResponse.data.id && bpLaunchResponse.data.id.length>0){ diff --git a/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchParams.html b/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchParams.html index 1e9c339da..9f7775c77 100644 --- a/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchParams.html +++ b/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchParams.html @@ -9,27 +9,48 @@

Enter ARM Deployment Name

-
Are you sure you want to launch the Blueprint? Press Ok To continue
-
- (Only numbers,letters allowed. No spaces and underscores) - - -
-
-
- -
- -
- (Only numbers,letters allowed. No spaces and underscores) - - -
+
+
+ Are you sure you want to launch the Blueprint? Press Ok To continue
+
+ + +
+ + + + + + +
+
+
+
+ (Only numbers,letters allowed. No spaces and underscores) + + +
-
- -
+
+ +
+
+ (Only numbers,letters allowed. No spaces and underscores) + + +
+
+
+ +
+
diff --git a/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchParamsCtrl.js b/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchParamsCtrl.js index 7feb5917e..72a6c9efe 100644 --- a/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchParamsCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchParamsCtrl.js @@ -9,16 +9,26 @@ "use strict"; angular.module('workzone.blueprint') .controller('blueprintLaunchParamsCtrl', ['$scope', '$modalInstance', 'items', function($scope, $modalInstance, items) { + console.log(items); var launchHelper = { launch : function(){ - $modalInstance.close({bp:items,stackName:$scope.stackName,domainName:$scope.domainName}); + $modalInstance.close({bp:items,stackName:$scope.stackName,domainName:$scope.domainName,tagServer:$scope.tagServer}); } }; $scope.stackName=''; $scope.domainName=''; + $scope.tagServer = "Monitoring"; $scope.cancel = function() { $modalInstance.dismiss('cancel'); }; + $scope.tagServerChecking = function() { + if($scope.tagServerCheck){ + $scope.tagServerStatus = true; + }else{ + $scope.tagServerStatus = false; + $scope.tagServer = ''; + } + }; $scope.launchBP = function() { if(items.blueprintType === "aws_cf") { $scope.showCFTInputs = true; diff --git a/client/cat3/src/partials/sections/dashboard/workzone/instance/popups/InstanceImportByIpCtrl.js b/client/cat3/src/partials/sections/dashboard/workzone/instance/popups/InstanceImportByIpCtrl.js index 266f79611..a64a1c551 100644 --- a/client/cat3/src/partials/sections/dashboard/workzone/instance/popups/InstanceImportByIpCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/workzone/instance/popups/InstanceImportByIpCtrl.js @@ -13,11 +13,19 @@ var osList = items[1].data; var configList = items[2].data; var reqBody = {}; + $scope.tagServer = 'Monitoring'; if (!configAvailable.length) { $scope.cancel(); toastr.error('Chef Or Puppet is not Available'); return false; } + $scope.tagServerChecking = function() { + if($scope.tagServerCheck){ + $scope.tagServerStatus = true; + }else{ + $scope.tagServerStatus = false; + } + }; angular.extend($scope, { osList: osList, configList: configList, @@ -48,7 +56,11 @@ reqBody.fqdn = $scope.ipAddress; reqBody.os = $scope.os; reqBody.configManagmentId = $scope.selectedConfig; - reqBody.tagServer = $scope.tagServer; + if($scope.tagServerCheck) { + reqBody.tagServer = $scope.tagServer; + } else { + reqBody.tagServer = ''; + } reqBody.credentials = { username: $scope.username }; diff --git a/client/cat3/src/partials/sections/dashboard/workzone/instance/popups/instanceImportByIp.html b/client/cat3/src/partials/sections/dashboard/workzone/instance/popups/instanceImportByIp.html index eafafb8d2..0980c5271 100644 --- a/client/cat3/src/partials/sections/dashboard/workzone/instance/popups/instanceImportByIp.html +++ b/client/cat3/src/partials/sections/dashboard/workzone/instance/popups/instanceImportByIp.html @@ -133,10 +133,22 @@

Add Application URL -
- - -
+
+ + +
+
+ +
+ +
+
diff --git a/client/htmls/private/ajax/Settings/chefSync.html b/client/htmls/private/ajax/Settings/chefSync.html index 10236f3b7..35d07e690 100755 --- a/client/htmls/private/ajax/Settings/chefSync.html +++ b/client/htmls/private/ajax/Settings/chefSync.html @@ -232,9 +232,24 @@

Import Nodes

-
+
+
- + +
+
+ + +
+ + + +
@@ -505,10 +520,10 @@

Importing Nodes

reqBody.projectId = $projectList.val(); reqBody.orgName = $orgListInput.find('option:selected').text(); reqBody.bgName = $bgList.find('option:selected').text(); - if ($('#tagServer').prop("checked")) { - reqBody.tagServer = true; + if ($('#tagServerCheck').prop("checked")) { + reqBody.tagServer = $('#tagServer').val(); } else { - reqBody.tagServer = false; + reqBody.tagServer = ''; } reqBody.projectName = $projectList.find('option:selected').text(); if (!((reqBody.bgId && reqBody.bgId.length) && (reqBody.projectId && reqBody.projectId.length) && reqBody.projectId !== 'choose' && reqBody.bgId !== 'choose')) { @@ -623,4 +638,23 @@

Importing Nodes

} }); }); + $(document).ready(function() { + $('#tagServerCheck').click(function() { + if ($('#tagServerCheck').prop("checked")) { + $('.sevice-delivery-section').addClass('showservice'); + } else { + $('.sevice-delivery-section').removeClass('showservice'); + } + }); + }); + + From e43018d5cdb93cf8f8c2f4b9530345ea4dd40a2e Mon Sep 17 00:00:00 2001 From: VIJAYKUMARNINGANURE Date: Tue, 18 Oct 2016 15:50:06 +0530 Subject: [PATCH 12/32] Implemented the Tagging Server List --- server/app/routes/v1.0/routes_d4dMasters.js | 6 ++++++ server/install.js | 1 + 2 files changed, 7 insertions(+) diff --git a/server/app/routes/v1.0/routes_d4dMasters.js b/server/app/routes/v1.0/routes_d4dMasters.js index c994d9849..6a28e0fb6 100755 --- a/server/app/routes/v1.0/routes_d4dMasters.js +++ b/server/app/routes/v1.0/routes_d4dMasters.js @@ -4020,4 +4020,10 @@ module.exports.setRoutes = function(app, sessionVerification) { }); }); + // Tagging Server List + app.get('/d4dMasters/taggingServerList', function(req, res) { + var serverList = appConfig.taggingServerList; + res.send(serverList); + }); + } \ No newline at end of file diff --git a/server/install.js b/server/install.js index 0596ff667..22696dc2d 100755 --- a/server/install.js +++ b/server/install.js @@ -128,6 +128,7 @@ function getDefaultsConfig() { return config.catalystHome + this.puppetReposDirName + '/'; } }, + taggingServerList: ['Sensu Server','LDAP Server','AD Server'], aws: { pemFileLocation: __dirname + '/app/config/', s3BucketDownloadFileLocation: currentDirectory + '/catdata/catalyst/temp/', From 6698f4869509df960415d90fa9ebfb3cc0467ec9 Mon Sep 17 00:00:00 2001 From: Karthik K N Date: Tue, 18 Oct 2016 16:18:37 +0530 Subject: [PATCH 13/32] cost trend aggregation for previous dates disabled --- .../aws-cost-aggregation/AWSResourceCostsAggregation.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/app/cronjobs/aws-cost-aggregation/AWSResourceCostsAggregation.js b/server/app/cronjobs/aws-cost-aggregation/AWSResourceCostsAggregation.js index 293dd2943..257661091 100644 --- a/server/app/cronjobs/aws-cost-aggregation/AWSResourceCostsAggregation.js +++ b/server/app/cronjobs/aws-cost-aggregation/AWSResourceCostsAggregation.js @@ -95,7 +95,7 @@ function aggregateAWSResourceCosts() { next(null, orgs, providers) } }) - }, + }/*, function(orgs, providers, next) { async.parallel([ function(next1) { @@ -112,7 +112,7 @@ function aggregateAWSResourceCosts() { next() } }) - } + }*/ ], function(err) { if (err) { logger.error(err) From 698b9b5cac4255ead2105519348053b858c5b8a7 Mon Sep 17 00:00:00 2001 From: Udesh Date: Tue, 18 Oct 2016 17:35:57 +0530 Subject: [PATCH 14/32] Monitor API changes --- server/app/model/monitors/monitors.js | 140 ++++++++ server/app/model/monitors/package.json | 3 + server/app/routes/v1.0/routes.js | 3 + server/app/routes/v1.0/routes_monitors.js | 376 +++++++++++++++++++++ server/app/services/monitorsService.js | 160 +++++++++ server/app/validators/monitorsValidator.js | 87 +++++ 6 files changed, 769 insertions(+) create mode 100644 server/app/model/monitors/monitors.js create mode 100644 server/app/model/monitors/package.json create mode 100644 server/app/routes/v1.0/routes_monitors.js create mode 100644 server/app/services/monitorsService.js create mode 100644 server/app/validators/monitorsValidator.js diff --git a/server/app/model/monitors/monitors.js b/server/app/model/monitors/monitors.js new file mode 100644 index 000000000..54cf3e0cb --- /dev/null +++ b/server/app/model/monitors/monitors.js @@ -0,0 +1,140 @@ +/* + Copyright [2016] [Relevance Lab] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + +var mongoose = require('mongoose'); +var ObjectId = require('mongoose').Types.ObjectId; +var logger = require('_pr/logger')(module); +var Schema = mongoose.Schema; +var MonitorsSchema = new Schema({ + orgId: { + type: String, + required: true, + trim: true + }, + serverType: { + type: String, + trim: true, + required: true + }, + serverParameters: { + type: Schema.Types.Mixed + }, + isDeleted: { + type: Boolean, + required: true, + default: false + } +}); + +var hiddenFields = { '_id': 0, 'isDeleted': 0 }; + +MonitorsSchema.statics.createNew = function createNew(data, callback) { + var self = this; + var monitors = new self(data); + monitors.save(function(err, data) { + if (err) { + logger.error(err); + if (typeof callback === 'function') { + return callback(err, null); + } + } else { + if (typeof callback === 'function') { + return callback(null, monitors); + } + } + }); +}; + +MonitorsSchema.statics.getMonitors = function(params, callback) { + params.isDeleted = false; + + this.aggregate([{ + $match: params + }, { + $lookup: { + from: "d4dmastersnew", + localField: "orgId", + foreignField: "rowid", + as: "organization" + } + }], function(err, monitors) { + if (err) { + callback(err, null); + return; + } else if (monitors.length === 0) { + callback(null, monitors); + return; + } else { + return callback(null, monitors); + } + }); + +}; + +MonitorsSchema.statics.getById = function(monitorId, callback) { + this.aggregate([{ + $match: { '_id': ObjectId(monitorId), 'isDeleted': false } + }, { + $lookup: { + from: "d4dmastersnew", + localField: "orgId", + foreignField: "rowid", + as: "organization" + } + }], function(err, monitors) { + if (err) { + callback(err, null); + return; + } else if (monitors.length === 0) { + callback(null, monitors); + return; + } else { + return callback(null, monitors[0]); + } + }); +}; + +MonitorsSchema.statics.updateMonitors = function(monitorId, fields, callback) { + this.update({ '_id': monitorId }, { $set: fields }, + function(err, result) { + if (err) { + logger.error(err); + if (typeof callback == 'function') { + return callback(err, null); + } + } else if ((result.ok == 1 && result.n == 1) && (typeof callback == 'function')) { + return callback(null, true); + } else if (typeof callback == 'function') { + return callback(null, null); + } + } + ); +}; + +MonitorsSchema.statics.deleteMonitors = function(monitorId, callback) { + this.update({ '_id': monitorId }, { $set: { isDeleted: true } }, + function(err, monitors) { + if (err) { + logger.error(err); + return callback(err, null); + } else { + return callback(null, true); + } + } + ); +}; +var Monitors = mongoose.model('Monitors', MonitorsSchema); +module.exports = Monitors; diff --git a/server/app/model/monitors/package.json b/server/app/model/monitors/package.json new file mode 100644 index 000000000..ad5ef5756 --- /dev/null +++ b/server/app/model/monitors/package.json @@ -0,0 +1,3 @@ +{ + "main":"monitors.js" +} \ No newline at end of file diff --git a/server/app/routes/v1.0/routes.js b/server/app/routes/v1.0/routes.js index ee2f00cd0..3489b3972 100755 --- a/server/app/routes/v1.0/routes.js +++ b/server/app/routes/v1.0/routes.js @@ -73,6 +73,7 @@ var auditTrail = require('./routes_audit_trails'); var scripts = require('./routes_scripts'); var fileUpload = require('./routes_fileUpload'); var settingWizard = require('./routes_setting_wizard'); +var monitors = require('./routes_monitors'); /* * @TODO * Change app to router in internal routes files @@ -180,6 +181,8 @@ module.exports.setRoutes = function(app) { fileUpload.setRoutes(app, sessionVerificationFunc); settingWizard.setRoutes(app, sessionVerificationFunc); + + monitors.setRoutes(app, sessionVerificationFunc); app.get('/', function(req, res) { diff --git a/server/app/routes/v1.0/routes_monitors.js b/server/app/routes/v1.0/routes_monitors.js new file mode 100644 index 000000000..450e81db2 --- /dev/null +++ b/server/app/routes/v1.0/routes_monitors.js @@ -0,0 +1,376 @@ +/* + Copyright [2016] [Relevance Lab] + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ +const json2csv = require('json2csv'); +const monitorsService = require('_pr/services/monitorsService'); +const async = require('async'); +var validate = require('express-validation'); +var monitorsValidator = require('_pr/validators/monitorsValidator'); + +module.exports.setRoutes = function(app, sessionVerificationFunc) { + + app.all('/monitors/*', sessionVerificationFunc); + /** + * @api {get} /monitors/filterBy=orgId: + * Get aggregate cost + * @apiName getMonitors + * @apiGroup reports + * @apiVersion 1.0.0 + * + * @apiParam {String} filterBy Catalyst entity. Multiple entities can be specified using + + * + * @apiExample Sample_Request_1 + * /monitors?filterBy=orgId:5790c31edff2c49223fd6efa + * + * @apiSuccess {Object[]} monitors List of monitors + * @apiSuccess {String} monitors.id Monitor id + * @apiSuccess {Object} monitors.organization Monitor Organization + * @apiSuccess {String} monitors.organization.id Monitor organization id + * @apiSuccess {String} monitors.organization.name Monitor organization name + * @apiSuccess {String} monitors.serverType Monitor Server type + * @apiSuccess {Object} monitors.serverParameters Monitor Server Parameters + * @apiSuccess {String} monitors.serverParameters.url Monitor Server Url + * @apiSuccess {String} monitors.serverParameters.transportProtocolName Monitor Server Transport Protocols + * @apiSuccess {Object} monitors.serverParameters.transportProtocolParameters Monitor Server Transport Protocols + * @apiSuccess {String} monitors.serverParameters.transportProtocolParameters.host Monitor Server Transport Protocols + * @apiSuccessExample {json} Monitor-Success-Response: + * HTTP/1.1 200 OK + * {[ + * "_id": "", + * "organization": { + * "id": "", + * "name": "Organization name" + * }, + * "serverType": "Sensu", + * "serverParameters": { + * "url": "Server Url", + * "transportProtocol": { + * "name": "rabbitmq", + * "parameters": { + * "host": "10.0.0.6", + * "port": 5671, + * "vhost": "/sensu", + * "user": "sensu", + * "password": "secret", + * "heartbeat": 30, + * "prefetch": 50, + * "ssl": { + * "certChainFile": "/etc/sensu/ssl/cert.pem", + * "privateKeyFile": "/etc/sensu/ssl/key.pem" + * } + * } + * } + * } + * ]} + * + * + * HTTP/1.1 200 OK + * {[ + * "id": "", + * "organization": { + * "id": "", + * "name": "Organization name" + * }, + * "serverType": "Sensu", + * "serverParameters": { + * "url": "Server Url", + * "transportProtocol": { + * "name": "redis", + * "parameters": { + * "host": "10.0.0.6", + * "port": 5671, + * "password": "secret" + * } + * } + * } + * ]} + */ + app.get("/monitors/", getMonitors); + + function getMonitors(req, res, next) { + + //@TODO Authorization to be implemented after fixing provider schema + async.waterfall([ + function(next) { + monitorsService.getMonitors(req.query, next); + } + ], function(err, monitors) { + if (err) { + next(err); + } else { + res.status(200).send(monitors); + } + }); + } + + + /** + * @api {get} /monitors/:monitorId Get monitor details + * @apiName getMonitor + * @apiGroup monitors + * + * @apiSuccess {Object[]} monitors List of monitors + * @apiSuccess {String} monitors.organization Monitor Organization + * @apiSuccess {String} monitors.organization.id Monitor organization id + * @apiSuccess {String} monitors.organization.name Monitor organization name + * @apiSuccess {String} monitors.serverType Monitor Server type + * @apiSuccess {String} monitors.serverParameters Monitor Server Parameters + * @apiSuccess {String} monitors.serverParameters.url Monitor Server Url + * @apiSuccess {String} monitors.serverParameters.transportProtocol Monitor Server Transport Protocols + * @apiSuccessExample {json} Monitor-Success-Response: + * HTTP/1.1 200 OK + * { + * "_id": "", + * "organization": { + * "id": "", + * "name": "Organization name" + * }, + * "serverType": "Sensu", + * "serverParameters": { + * "url": "Server Url", + * "transportProtocol": { + * "name": "rabbitmq", + * "parameters": { + * "host": "10.0.0.6", + * "port": 5671, + * "vhost": "/sensu", + * "user": "sensu", + * "password": "secret", + * "heartbeat": 30, + * "prefetch": 50, + * "ssl": { + * "certChainFile": "/etc/sensu/ssl/cert.pem", + * "privateKeyFile": "/etc/sensu/ssl/key.pem" + * } + * } + * } + * } + * } + * + * + * HTTP/1.1 200 OK + * { + * "id": "", + * "organization": { + * "id": "", + * "name": "Organization name" + * }, + * "serverType": "Sensu", + * "serverParameters": { + * "url": "Server Url", + * "transportProtocol": { + * "name": "redis", + * "parameters": { + * "host": "10.0.0.6", + * "port": 5671, + * "password": "secret" + * } + * } + * } + * } + */ + app.get('/monitors/:monitorId', getMonitor); + + function getMonitor(req, res, next) { + async.waterfall( + [ + function(next) { + monitorsService.getMonitor(req.params.monitorId, next); + } + ], + function(err, results) { + if (err) { + next(err); + } else { + return res.status(200).send(results); + } + } + ); + } + + /** + * @api {post} /monitors/:monitorId/monitors Add tag + * @apiName addTag + * @apiGroup monitors + * + * @apiParam {Number} monitorId Provider ID + * @apiParam {String} tagName Tags name + * @apiParam {Object} tag Tag object in request body + * @apiParam {String} tag.name Tag name + * @apiParam {String} tag.description Tag description + * @apiParamExample {json} Request-Example: + * HTTP/1.1 200 OK + * { + * "orgId": "46d1da9a-d927-41dc-8e9e-7e926d927535", + * "serverType": "sensu", + * "serverParameters": { + * "url": "Server Url", + * "transportProtocolName": "rabbitmq", + * "transportProtocolParameters":{ + * "host": "10.0.0.6", + * "port": 5671, + * "vhost": "/sensu", + * "user": "sensu", + * "password": "secret", + * "heartbeat": 30, + * "prefetch": 50, + * "ssl": { + * "certChainFileId": "SomeId", + * "privateKeyFileId": "SomeId" + * } + * } + * } + * } + * + * { + * "orgId": "46d1da9a-d927-41dc-8e9e-7e926d927535", + * "serverType": "sensu", + * "serverParameters": { + * "url": "Server Url", + * "transportProtocolName": "redis", + * "transportProtocolParameters":{ + * "host": "10.0.0.6", + * "port": 5671, + * "password": "secret", + * } + * } + * } + * + * @apiSuccess {Object} tag Tag details + * @apiSuccess {String} monitors.name Tag name + * @apiSuccess {String} monitors.description Tag description + * + * @apiSuccessExample {json} Success-Response: + * HTTP/1.1 200 OK + * { + * "orgId": "46d1da9a-d927-41dc-8e9e-7e926d927535", + * "serverType": "sensu", + * "serverParameters": { + * "url": "Server Url", + * "transportProtocolName": "rabbitmq", + * "transportProtocolParameters":{ + * "host": "10.0.0.6", + * "port": 5671, + * "vhost": "/sensu", + * "user": "sensu", + * "password": "secret", + * "heartbeat": 30, + * "prefetch": 50, + * "ssl": { + * "certChainFileId": "SomeId", + * "privateKeyFileId": "SomeId" + * } + * } + * } + * } + */ + app.post('/monitors', validate(monitorsValidator.create), createMonitors); + + function createMonitors(req, res, next) { + async.waterfall( + [ + function(next) { + monitorsService.createMonitor(req.body, next); + } + ], + function(err, results) { + if (err) { + next(err); + } else { + return res.status(201).send(results); + } + } + ); + } + + + /** + * @api {put} /monitors/:monitorId Update monitor + * @apiName updateMonitor + * @apiGroup monitors + * + * @apiParam {Number} monitorId Provider ID + * @apiParam {String} tagName Tags name + * @apiParam {Object[]} tag Tag object in request body + * @apiParam {String} tag.description Tag description + * @apiParamExample {json} Request-Example: + * { + * "description": "Tag description" + * } + * + * @apiSuccess {Object} tag Tag details + * @apiSuccess {String} monitors.name Tag name + * @apiSuccess {String} monitors.description Tag description + * + * @apiSuccessExample {json} Success-Response: + * HTTP/1.1 200 OK + * { + * "name": "environment", + * "description": "Deployment environment" + * } + */ + app.put('/monitors/:monitorId', validate(monitorsValidator.update), updateMonitor); + + function updateMonitor(req, res, next) { + async.waterfall( + [ + function(next) { + monitorsService.checkIfProviderExists(req.params.monitorId, next); + }, + function(provider, next) { + var tagDetails = { + 'name': req.params.tagName, + 'description': req.body.description + }; + monitorsService.updateTag(provider, tagDetails, next); + } + ], + function(err, results) { + if (err) { + next(err); + } else { + return res.status(200).send(results); + } + } + ); + } + + + /** + * @api {delete} /monitors/:monitorId Delete Monitor + * @apiName deleteMonitor + * @apiGroup monitors + * + * @apiParam {Number} monitorId Monitor ID + * + * @apiSuccess {Object} response Empty response object + * + */ + app.delete('/monitors/:monitorId', validate(monitorsValidator.update), deleteMonitor); + + function deleteMonitor(req, res, next) { + async.waterfall( + [ + function(next) { + monitorsService.deleteMonitors(req.params.monitorId, next); + } + ], + function(err, results) { + if (err) { + next(err); + } else { + return res.status(200).send(results); + } + } + ); + } +}; diff --git a/server/app/services/monitorsService.js b/server/app/services/monitorsService.js new file mode 100644 index 000000000..87be7b05f --- /dev/null +++ b/server/app/services/monitorsService.js @@ -0,0 +1,160 @@ +/* + Copyright [2016] [Relevance Lab] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + +const logger = require('_pr/logger')(module); +const dateUtil = require('_pr/lib/utils/dateUtil'); +const monitorsModel = require('_pr/model/monitors'); +const appConfig = require('_pr/config'); + +var monitorsService = module.exports = {}; + +monitorsService.createMonitor = function(monitor, callback) { + + switch (monitor.serverType) { + case 'sensu': + case 'Sensu': + monitorsModel.createNew(monitor, function(err, monitor) { + //@TODO To be generalized + if (err && err.name === 'ValidationError') { + var err = new Error('Bad Request'); + err.status = 400; + callback(err); + } else if (err) { + var err = new Error('Internal Server Error'); + err.status = 500; + callback(err); + } else { + callback(null, monitor); + } + }); + break; + default: + var err = new Error('Bad request'); + err.status = 400; + return callback(err); + break; + } + +}; + +monitorsService.updateMonitor = function updateMonitor(monitor, updateFields, callback) { + var fields = {}; + if ('name' in updateFields) { + fields.name = updateFields.name; + monitor.name = updateFields.name; + } + + switch (monitor.type) { + case 'gcp': + if ('monitorDetails' in updateFields) { + if ('projectId' in updateFields.monitorDetails) { + fields['monitorDetails.projectId'] = updateFields.monitorDetails.projectId; + monitor.monitorDetails.projectId = updateFields.monitorDetails.projectId; + } + + if ('keyFile' in updateFields.monitorDetails) + fields['monitorDetails.keyFile'] = updateFields.monitorDetails.keyFile; + + if ('sshPrivateKey' in updateFields.monitorDetails) + fields['monitorDetails.sshPrivateKey'] = updateFields.monitorDetails.sshPrivateKey; + + if ('sshPublicKey' in updateFields.monitorDetails) + fields['monitorDetails.sshPrivateKey'] = updateFields.monitorDetails.sshPublicKey; + } + gcpMonitorModel.updateById(monitor._id, fields, function(err, result) { + if (err || !result) { + var err = new Error('Internal Server Error'); + err.status = 500; + callback(err); + } else if (result) { + callback(null, monitor); + } + }); + break; + default: + var err = new Error('Bad request'); + err.status = 400; + return callback(err); + break; + } +}; + +monitorsService.deleteMonitors = function(monitorId, callback) { + monitorsModel.deleteMonitors(monitorId, function(err, monitor) { + if (err) { + var err = new Error('Internal server error'); + err.status = 500; + return callback(err); + } else if (!monitor) { + var err = new Error('Monitor not found'); + err.status = 404; + return callback(err); + } else { + // @TODO response to be decided + return callback(null, {}); + } + }); +}; + +monitorsService.getMonitors = function(query, callback) { + var params = {}; + logger.debug('get monitors'); + if ('filterBy' in query) { + params = monitorsService.parseFilterBy(query.filterBy); + logger.debug(JSON.stringify(params)); + } + monitorsModel.getMonitors(params, function(err, monitors) { + if (err) { + logger.error(err); + var err = new Error('Internal Server Error'); + err.status = 500; + callback(err); + } else { + callback(null, monitors); + } + }); +}; + +monitorsService.getMonitor = function(monitorId, callback) { + monitorsModel.getById(monitorId, function(err, monitor) { + if (err) { + var err = new Error('Internal Server Error'); + err.status = 500; + return callback(err); + } else if (!monitor) { + var err = new Error('Monitor not found'); + err.status = 404; + return callback(err); + } else if (monitor) { + callback(null, monitor); + } + }); +}; + +// @TODO Query builder to be made generic and reused in analytics after schema changes +monitorsService.parseFilterBy = function parseFilterBy(filterByString) { + var filterQuery = {}; + + var filters = filterByString.split('+') + for (var i = 0; i < filters.length; i++) { + var filter = filters[i].split(':') + var filterQueryValues = filter[1].split(",") + + filterQuery[filter[0]] = { '$in': filterQueryValues } + } + + return filterQuery; +} diff --git a/server/app/validators/monitorsValidator.js b/server/app/validators/monitorsValidator.js new file mode 100644 index 000000000..6b1f02c9a --- /dev/null +++ b/server/app/validators/monitorsValidator.js @@ -0,0 +1,87 @@ +/* + Copyright [2016] [Relevance Lab] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ +var Joi = require('joi'); + +var monitorsValidator = module.exports = {}; + +monitorsValidator.create = { + body: { + "orgId": Joi.string().max(40).required(), + "serverType": Joi.valid('sensu', 'other'), + "serverParameters": Joi.object() + .keys({ + "url": Joi.string(), + "transportProtocolName": Joi.valid('rabbitmq', 'redis'), + "transportProtocolParameters": Joi.object().keys({ + "host": Joi.string().required(), + "port": Joi.number().required(), + "vhost": Joi.string(), + "user": Joi.string(), + "password": Joi.string().required(), + "heartbeat": Joi.number(), + "prefetch": Joi.number(), + "ssl": Joi.object().keys({ + "certChainFileId": Joi.string().required(), + "privateKeyFileId": Joi.string().required() + }), + }) + .when('transportProtocolName', { + is: 'rabbitmq', + then: Joi.object({ 'vhost': Joi.required(), 'user': Joi.required(), 'heartbeat': Joi.required(), 'prefetch': Joi.required() }) + }) + }) + .required() + .when('serverType', { + is: 'sensu', + then: Joi.object({ 'url': Joi.required(), 'transportProtocolName': Joi.required(), 'transportProtocolParameters': Joi.required() }) + }) + } +}; + +monitorsValidator.update = { + body: { + "orgId": Joi.string().max(40).required(), + "serverType": Joi.valid('sensu', 'other'), + "serverParameters": Joi.object() + .keys({ + "url": Joi.string(), + "transportProtocolName": Joi.valid('rabbitmq', 'redis'), + "transportProtocolParameters": Joi.object().keys({ + "host": Joi.string().required(), + "port": Joi.number().required(), + "vhost": Joi.string(), + "user": Joi.string(), + "password": Joi.string().required(), + "heartbeat": Joi.number(), + "prefetch": Joi.number(), + "ssl": Joi.object().keys({ + "certChainFileId": Joi.string().required(), + "privateKeyFileId": Joi.string().required() + }), + }) + .when('transportProtocolName', { + is: 'rabbitmq', + then: Joi.object({ 'vhost': Joi.required(), 'user': Joi.required(), 'heartbeat': Joi.required(), 'prefetch': Joi.required() }) + }) + }) + .required() + .when('serverType', { + is: 'sensu', + then: Joi.object({ 'url': Joi.required(), 'transportProtocolName': Joi.required(), 'transportProtocolParameters': Joi.required() }) + }) + } +}; From eb25118b8f51f99cb6990b5e34e31ff4ad4f62f0 Mon Sep 17 00:00:00 2001 From: Divakar Konakalla Date: Tue, 18 Oct 2016 21:32:57 +0530 Subject: [PATCH 15/32] moved help & logout header menu items inside dropdown to allocate space for menu clickable items. --- .../src/partials/globals/header/header.scss | 24 ++++++++++ .../globals/header/headerDashboard.html | 44 ++++++++++++++----- 2 files changed, 56 insertions(+), 12 deletions(-) diff --git a/client/cat3/src/partials/globals/header/header.scss b/client/cat3/src/partials/globals/header/header.scss index 208df0beb..481632dd3 100755 --- a/client/cat3/src/partials/globals/header/header.scss +++ b/client/cat3/src/partials/globals/header/header.scss @@ -176,6 +176,30 @@ } } +.header-right { + .dropdown { + margin: 11px 0px 0 10px; + } + + .dropdown-toggle { + font-size: 18px; + margin-top: 5px; + } + + .dropdown-menu { + color: #000; + background: #fff; + padding: 6px; + min-width: 100px; + line-height: 2; + } + + a { + color: #000; + text-decoration: none; + } +} + /*Styles for Logout Confirmation starts here*/ .divMessageBox { width: 100%; diff --git a/client/cat3/src/partials/globals/header/headerDashboard.html b/client/cat3/src/partials/globals/header/headerDashboard.html index 382f778c3..fecd8808b 100644 --- a/client/cat3/src/partials/globals/header/headerDashboard.html +++ b/client/cat3/src/partials/globals/header/headerDashboard.html @@ -39,6 +39,18 @@ ANALYTICS
+
  • +
    + SERVICE +
    +
    • +
  • + +
  • @@ -46,18 +58,26 @@ {{appDetails.cn | uppercase}} [{{appDetails.roleId}}]
    - - -
    - +
    + +
    • From 04c83d4862449945196f9655e2e59828c11d7c74 Mon Sep 17 00:00:00 2001 From: Divakar Konakalla Date: Tue, 18 Oct 2016 21:41:42 +0530 Subject: [PATCH 16/32] UI changes. --- client/cat3/src/partials/globals/header/headerDashboard.html | 5 ----- 1 file changed, 5 deletions(-) diff --git a/client/cat3/src/partials/globals/header/headerDashboard.html b/client/cat3/src/partials/globals/header/headerDashboard.html index fecd8808b..12f3720b7 100644 --- a/client/cat3/src/partials/globals/header/headerDashboard.html +++ b/client/cat3/src/partials/globals/header/headerDashboard.html @@ -39,11 +39,6 @@ ANALYTICS -
  • -
    - SERVICE -
    -
  • From 63bb599871f7c6f27624c6d620100631dadb54c6 Mon Sep 17 00:00:00 2001 From: Divakar Konakalla Date: Tue, 18 Oct 2016 23:55:47 +0530 Subject: [PATCH 17/32] Created basic folder structure for service delivery, added menu item in header, added htmls & controllers, added left tree menu, added left tree menu items clicks for navigation. --- client/cat3/Gruntfile.js | 1 + client/cat3/main.html | 1 + client/cat3/src/clientRoutes.js | 17 + .../cat3/src/factory/appPermissionServices.js | 5 + client/cat3/src/main.js | 6 +- .../globals/header/headerDashboard.html | 5 + .../sections/dashboard/dashboardCtrl.js | 46 +-- .../sections/dashboard/service/service.html | 13 + .../sections/dashboard/service/service.js | 7 + .../sections/dashboard/service/service.scss | 311 ++++++++++++++++++ .../service/view/serviceTreeMenu.html | 59 ++++ 11 files changed, 448 insertions(+), 23 deletions(-) create mode 100644 client/cat3/src/partials/sections/dashboard/service/service.html create mode 100644 client/cat3/src/partials/sections/dashboard/service/service.js create mode 100644 client/cat3/src/partials/sections/dashboard/service/service.scss create mode 100644 client/cat3/src/partials/sections/dashboard/service/view/serviceTreeMenu.html diff --git a/client/cat3/Gruntfile.js b/client/cat3/Gruntfile.js index 8619729ba..8028c9b59 100644 --- a/client/cat3/Gruntfile.js +++ b/client/cat3/Gruntfile.js @@ -89,6 +89,7 @@ module.exports = function(grunt) { {'catalyst/partials/sections/dashboard/workzone/orchestration/orchestration.css':'src/partials/sections/dashboard/workzone/orchestration/orchestration.scss'}, {'catalyst/partials/sections/dashboard/workzone/application/application.css':'src/partials/sections/dashboard/workzone/application/application.scss'}, {'catalyst/partials/sections/dashboard/analytics/analytics.css':'src/partials/sections/dashboard/analytics/analytics.scss'}, + {'catalyst/partials/sections/dashboard/service/service.css':'src/partials/sections/dashboard/service/service.scss'}, {'catalyst/partials/sections/dashboard/setting/setting.css':'src/partials/sections/dashboard/setting/setting.scss'} ] } diff --git a/client/cat3/main.html b/client/cat3/main.html index ff6eeaad7..928f4c73a 100644 --- a/client/cat3/main.html +++ b/client/cat3/main.html @@ -102,6 +102,7 @@ + diff --git a/client/cat3/src/clientRoutes.js b/client/cat3/src/clientRoutes.js index 131f202c3..9d2e187d3 100644 --- a/client/cat3/src/clientRoutes.js +++ b/client/cat3/src/clientRoutes.js @@ -88,6 +88,23 @@ function routeConfig($stateProvider, $urlRouterProvider, $httpProvider, modulePe }] } + }).state('dashboard.service', { + url: "/service/", + templateUrl: "src/partials/sections/dashboard/service/service.html", + controller: "serviceCtrl", + resolve: { + auth: ["$q", function ($q) { + var deferred = $q.defer(); + // instead, go to a different page + if (modulePerms.serviceBool()) { + // everything is fine, proceed + deferred.resolve(); + } else { + deferred.reject({redirectTo: 'dashboard'}); + } + return deferred.promise; + }] + } }).state('dashboard.settings', { url: "/settings", templateUrl: "src/partials/sections/dashboard/setting/setting.html", diff --git a/client/cat3/src/factory/appPermissionServices.js b/client/cat3/src/factory/appPermissionServices.js index f7430023e..747b9e66c 100755 --- a/client/cat3/src/factory/appPermissionServices.js +++ b/client/cat3/src/factory/appPermissionServices.js @@ -27,5 +27,10 @@ //return uac.hasPermission('track','read','module'); return true; }; + this.serviceBool = function() { + //permission response not available in the api response. + //return uac.hasPermission('track','read','module'); + return true; + }; }]); })(angular); \ No newline at end of file diff --git a/client/cat3/src/main.js b/client/cat3/src/main.js index e8a2bf542..d1ee21288 100644 --- a/client/cat3/src/main.js +++ b/client/cat3/src/main.js @@ -84,13 +84,15 @@ angularApp.controller('HeadNavigatorCtrl', ['$scope', '$rootScope', '$http', '$l design: modulePerms.designAccess(), settings: modulePerms.settingsAccess(), track: modulePerms.trackAccess(), - analyticsBool: modulePerms.analyticsBool() + analyticsBool: modulePerms.analyticsBool(), + serviceBool: modulePerms.serviceBool() }; $rootScope.workZoneBool = _permSet.workzone; $rootScope.designBool = _permSet.design; $rootScope.settingsBool = _permSet.settings; $rootScope.trackBool = _permSet.track; $rootScope.analyticsBool = _permSet.analyticsBool; + $rootScope.serviceBool = _permSet.serviceBool; }); $rootScope.$emit('SET_HEADER', $rootScope.appDetails); $scope.showLogoutConfirmationSection = false; @@ -111,4 +113,4 @@ angularApp.controller('HeadNavigatorCtrl', ['$scope', '$rootScope', '$http', '$l $rootScope.$on('USER_LOGOUT', function () { $scope.doLogout(); }); -}]); +}]); \ No newline at end of file diff --git a/client/cat3/src/partials/globals/header/headerDashboard.html b/client/cat3/src/partials/globals/header/headerDashboard.html index 382f778c3..d6244e8d5 100644 --- a/client/cat3/src/partials/globals/header/headerDashboard.html +++ b/client/cat3/src/partials/globals/header/headerDashboard.html @@ -39,6 +39,11 @@ ANALYTICS
    • +
  • +
    + BOTS +
    +
  • diff --git a/client/cat3/src/partials/sections/dashboard/dashboardCtrl.js b/client/cat3/src/partials/sections/dashboard/dashboardCtrl.js index 5b9d187e9..bca69a726 100644 --- a/client/cat3/src/partials/sections/dashboard/dashboardCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/dashboardCtrl.js @@ -8,28 +8,32 @@ 'dashboard.track', 'dashboard.settings', 'dashboard.design', + 'dashboard.service', 'apis.workzone','dashboard.genericServices']) .controller('dashboardCtrl', ['$rootScope', '$scope', '$http', 'uac', '$location', '$state', function ($rootScope, $scope, $http, uac, $location, $state) { - $rootScope.isBreadCrumbAvailable = true; - $rootScope.app.isDashboard = true; - if($state.current && $state.current.data && $state.current.data.menuName){ - $rootScope.dashboardChild = $state.current.data.menuName; - } else { - $rootScope.dashboardChild =''; - } - $rootScope.showTreeMenu = true; - /*State will be dashboard if coming via login flow. So check permission and do default landing logic*/ - /*Otherwise dont enable default landing logic. This is so that user can land on url directly*/ - if ($state.current.name === 'dashboard') { - if ($rootScope.workZoneBool) { - $state.go('dashboard.workzone'); - } else if ($rootScope.designBool) { - $state.go('dashboard.design'); - } else if ($rootScope.trackBool) { - $state.go('dashboard.track'); - } else if ($rootScope.settingsBool) { - $state.go('dashboard.settings'); + $rootScope.isBreadCrumbAvailable = true; + $rootScope.app.isDashboard = true; + if($state.current && $state.current.data && $state.current.data.menuName){ + $rootScope.dashboardChild = $state.current.data.menuName; + } else { + $rootScope.dashboardChild =''; + } + $rootScope.showTreeMenu = true; + /*State will be dashboard if coming via login flow. So check permission and do default landing logic*/ + /*Otherwise dont enable default landing logic. This is so that user can land on url directly*/ + if ($state.current.name === 'dashboard') { + if ($rootScope.workZoneBool) { + $state.go('dashboard.workzone'); + } else if ($rootScope.designBool) { + $state.go('dashboard.design'); + } else if ($rootScope.trackBool) { + $state.go('dashboard.track'); + } else if ($rootScope.settingsBool) { + $state.go('dashboard.settings'); + } else if ($rootScope.serviceBool) { + $state.go('dashboard.service'); + } + } } - } -}]); + ]); })(angular); \ No newline at end of file diff --git a/client/cat3/src/partials/sections/dashboard/service/service.html b/client/cat3/src/partials/sections/dashboard/service/service.html new file mode 100644 index 000000000..31e898ca6 --- /dev/null +++ b/client/cat3/src/partials/sections/dashboard/service/service.html @@ -0,0 +1,13 @@ + + +
    +
    +
    +
    + +
    +
    + +
    +
    +
    \ No newline at end of file diff --git a/client/cat3/src/partials/sections/dashboard/service/service.js b/client/cat3/src/partials/sections/dashboard/service/service.js new file mode 100644 index 000000000..929e302a1 --- /dev/null +++ b/client/cat3/src/partials/sections/dashboard/service/service.js @@ -0,0 +1,7 @@ +(function (angular) { + "use strict"; + angular.module('dashboard.service', ['ngTouch', 'ui.grid']) + .controller('serviceCtrl',['$scope', '$rootScope', 'uiGridOptionsClient', 'uiGridConstants', 'workzoneServices', function ($scope, $rootScope, uiGridOptionsClient, uiGridConstants, workzoneServices) { + + }]); +})(angular); \ No newline at end of file diff --git a/client/cat3/src/partials/sections/dashboard/service/service.scss b/client/cat3/src/partials/sections/dashboard/service/service.scss new file mode 100644 index 000000000..cf8c2d7cf --- /dev/null +++ b/client/cat3/src/partials/sections/dashboard/service/service.scss @@ -0,0 +1,311 @@ +@import '../../../theme'; + +/*==== OVERRIDINGS (angular-strap-docs.css) ===========*/ +@media (max-width: 320px) { + #analyticsPage { + .panelRight { + padding-left: 1px; + + #rightPanel { + padding-top: 2px; + + .nav-tabs { + font-size: 10px; + } + + .nav>li>a { + padding: 10px 8px; + } + } + } + } +} + +@media (min-width: 321px) and (max-width : 480px) { + #analyticsPage { + .panelRight { + #rightPanel { + padding-top: 2px; + + .nav-tabs { + font-size: 12px; + } + + .nav>li>a { + padding: 4px 8px; + } + } + } + } +} + +@media (min-width : 0px) and (max-width: 767px) { + #analyticsPage { + .panelLeft { + width: 100%; + padding-left: 0px; + position: absolute; + } + + .panelRight { + width: 100%; + padding-left: 5px; + padding-right: 0px; + } + } +} + +@media (min-width : 767px) { + .panelRight { + padding-left: 5px; + } +} + +@media (min-width : 768px) and (max-width: 991px) { + #analyticsPage { + .panelLeft { + width: 254px; + } + + .panelRight { + padding-left: 5px; + padding-right: 0px; + float: right; + } + } +} + +@media (min-width:1500px){ + #section-name { + width: 11.2%; + } +} +#analyticsPage .nvd3 .nv-groups path.nv-line { + stroke-width: 3px !important; +} +.usage{ + .top-stats{ + text-align: right; + } +} + +.top-stats{ + margin: 0px 0px 15px; + .box-title{ + font-size: 16px; + .red{ + font-size: 22px; + } + } + .badge{ + margin-right: 2px; + background: #40baf1; + padding: 3px 10px; + margin-top: -5px; + } + .select2{ + width: auto; + height: 31px; + display: table-cell; + } +} + +#analyticsPage { + background: #fff; + .panelLeft { + width: 100%; + padding-left: 0px; + } + + .panelRight { + width: 100%; + background: linear-gradient(to right, #ffffff 99%, #ffffff 100%) repeat scroll 0 0 rgba(0, 0, 0, 0); + padding-right: 10px; + height: 571px; + overflow-y: auto; + } + + #rightPanel { + padding-top: 0px; + + .nav-tabs { + .dropdown-menu { + li { + a:hover { + background: #3276b1; + color: #fff; + } + } + li.active { + a { + background: #3276b1; + } + } + .active>a>.fa { + color: #fff; + } + li>a>.fa { + color: #333; + } + } + } + } + + #myTab3, .dropdown-menu { + font-size: 12px; + } + + .nav-tabs .dropdown-menu { + left: 0px; + } + + #mytab3 .InfrastructureLocalStorage .dropdown-menu .nav-tabs>li.active>a { + margin-bottom: -1px; + cursor: pointer; + background: #40BAF1; + } + + .nav-tabs>li.active>a:first-child { + color: #337ab7; + } + + .nav-tabs { + border-bottom-width: 1px; + @include theme-border-color; + + li { + margin-bottom: -1px; + cursor: pointer; + } + + li.active { + a, a:hover { + border-bottom-width: 0px; + border-top-width: 3px; + @include theme-border-color; + background: #fcfcfc; + } + } + } + + /*===== end of overridings =====*/ + .tab-pane { + .am-fade { + animation-duration: .3s; + animation-timing-function: ease; + animation-fill-mode: backwards; + opacity: 1; + + .active-remove { + display: none; + } + + .active-add { + animation-name: fadeIn; + } + } + } +} + + +#analyticsPage { + .filter-btn { + margin: 9px 10px 0 0; + } + + #sidebar-wrapper { + padding: 10px 7px 0 7px; + min-height: 80%; + top: 121px; + + .repo-job-details-wrapper { + padding: 0.05em 0.625em 0.25em; + } + + .marginbottom5 { + margin-bottom: 5px; + } + + .search { + width: 100%; + position: relative; + font-size: 18px; + padding-top: 0px; + label { + position: absolute; + left: 10px; + top: 4px; + } + } + + .search .search-input, .search .hint { + padding-left: 23px; + padding-right: -5px; + border-radius: 23px; + height: 28px; + outline: none; + font-size: 11px; + } + + .bp-select { + font-size: 11px; + height: 28px; + display: inline; + width: auto; + } + + .bp-panel-body { + max-height: 105px; + min-height: 80px; + overflow-y: auto; + } + + .activeLi { + background: #E2E2E2; + } + + .list-resources{ + padding: 0px; + ul li { + white-space: nowrap; + text-overflow: ellipsis; + overflow: hidden; + padding: 3px 15px; + } + } + + .panel-heading { + height: 40px; + } + } + + .nav>li>a { + padding: 10px 7px; + font-size: 13px; + } + + .filter-title { + margin-top: -13px; + font-size: 12px; + } + + .filter-name { + margin-top: -21px; + } + + .selected { + background: #E49C25; + } +} +.nv-axislabel{ + font-size: 14px !important; +} +.nvd3 text { + font: normal 10px Arial; +} +.font-size-15{ + font-size: 15px !important; +} +.marginbottom10{ + margin-bottom: 10px !important; +} \ No newline at end of file diff --git a/client/cat3/src/partials/sections/dashboard/service/view/serviceTreeMenu.html b/client/cat3/src/partials/sections/dashboard/service/view/serviceTreeMenu.html new file mode 100644 index 000000000..3d1f51af9 --- /dev/null +++ b/client/cat3/src/partials/sections/dashboard/service/view/serviceTreeMenu.html @@ -0,0 +1,59 @@ + + + +
    + +
    + + + From a078c20433d8c4a0ffef3e0fde2f5c8bc70fe342 Mon Sep 17 00:00:00 2001 From: VIJAYKUMARNINGANURE Date: Wed, 19 Oct 2016 15:26:36 +0530 Subject: [PATCH 18/32] Implemnetd the Bot type lists and Tagging server list --- client/cat3/src/factory/workzoneServices.js | 4 +++ .../orchestration/popups/newTaskCtrl.js | 34 +++++++++++------- client/htmls/private/js/dev/awsProduction.js | 1 + server/app/model/blueprint/blueprint.js | 20 ++++++++++- server/app/model/classes/tasks/tasks.js | 17 +++++++++ server/app/routes/v1.0/routes.js | 3 ++ server/app/routes/v1.0/routes_blueprints.js | 31 ++++++++++------ server/app/routes/v1.0/routes_config_data.js | 36 +++++++++++++++++++ server/app/routes/v1.0/routes_d4dMasters.js | 7 ---- .../app/routes/v1.0/routes_organizations.js | 2 ++ server/app/routes/v1.0/routes_tasks.js | 22 ++++++++++++ server/install.js | 1 + 12 files changed, 148 insertions(+), 30 deletions(-) create mode 100644 server/app/routes/v1.0/routes_config_data.js diff --git a/client/cat3/src/factory/workzoneServices.js b/client/cat3/src/factory/workzoneServices.js index c3bca326a..5c4f01bcb 100644 --- a/client/cat3/src/factory/workzoneServices.js +++ b/client/cat3/src/factory/workzoneServices.js @@ -527,6 +527,10 @@ getUnassignedInstances:function (providerId) { var url ='/providers/'+providerId+'/unassigned-instances'; return $http.get(fullUrl(url),Auth.getHeaderObject()); + }, + getBotTypeList:function () { + var url ='/config-data/bot-type'; + return $http.get(fullUrl(url),Auth.getHeaderObject()); } }; return serviceInterface; 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 2c1b5ddec..88d673ae0 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 @@ -176,6 +176,11 @@ var idx = $scope.jenkinsParamsList.indexOf(params); $scope.jenkinsParamsList.splice(idx,1); }, + botTypeList : function() { + workzoneServices.getBotTypeList().then(function (response) { + $scope.botTypeList = response; + }); + }, removeScriptParams: function (scriptObject,params) { var idx = $scope.scriptParamsObj[scriptObject].indexOf(params); $scope.scriptParamsObj[scriptObject].splice(idx,1); @@ -253,18 +258,23 @@ }, ok: function () { //these values are common across all task types - var taskJSON = { - taskType: $scope.taskType, - name: $scope.name, - botType: $scope.botType, - shortDesc: $scope.shortDesc, - description: $scope.description - }; + var taskJSON={} if($scope.checkBotType){ - taskJSON.botType = $scope.botType; - taskJSON.shortDesc= $scope.shortDesc; + taskJSON = { + taskType: $scope.taskType, + name: $scope.name, + description: $scope.description, + botType:$scope.botType, + shortDesc:$scope.shortDesc, + serviceDeliveryCheck:$scope.checkBotType + }; $scope.taskSaving = true; }else{ + taskJSON = { + taskType: $scope.taskType, + name: $scope.name, + description: $scope.description + }; $scope.taskSaving = true; } //checking for name of the task @@ -580,12 +590,12 @@ $scope.description = items.description; $scope.taskType = items.taskType; $scope.name = items.name; - if(items.shortDesc && (items.shortDesc !== '' || items.shortDesc !== null)){ + if(items.serviceDeliveryCheck && items.serviceDeliveryCheck === true){ $scope.checkBotStatus = true; $scope.checkBotType = true; + $scope.botType = items.botType; + $scope.shortDesc = items.shortDesc; } - $scope.botType = items.botType; - $scope.shortDesc = items.shortDesc; //properties specific to jenkins if (items.taskType === "jenkins") { $scope.jobUrl = items.taskConfig.jobURL; diff --git a/client/htmls/private/js/dev/awsProduction.js b/client/htmls/private/js/dev/awsProduction.js index a3df1df9e..9105be6ae 100644 --- a/client/htmls/private/js/dev/awsProduction.js +++ b/client/htmls/private/js/dev/awsProduction.js @@ -1558,6 +1558,7 @@ var saveblueprint = function(tempType) { if ($('#serviceDeliveryCheck').prop("checked")) { reqBody.botType = $('#botType').val(); reqBody.shortDesc = $('#shortDesc').val(); + reqBody.serviceDeliveryCheck = true; } var imageIdentifier = $('#imageId').val(); var imageId = $('#imageId').find('option:selected').attr('_id'); diff --git a/server/app/model/blueprint/blueprint.js b/server/app/model/blueprint/blueprint.js index f894cd8c2..bb068a25f 100755 --- a/server/app/model/blueprint/blueprint.js +++ b/server/app/model/blueprint/blueprint.js @@ -161,6 +161,10 @@ var BlueprintSchema = new Schema({ }, botType: { type: String + }, + serviceDeliveryCheck: { + type: Boolean, + default:false } }); @@ -442,7 +446,8 @@ BlueprintSchema.statics.createNew = function(blueprintData, callback) { parentId: blueprintData.id, domainNameCheck: blueprintData.domainNameCheck, shortDesc:blueprintData.shortDesc, - botType:blueprintData.botType + botType:blueprintData.botType, + serviceDeliveryCheck:blueprintData.serviceDeliveryCheck }; var blueprint = new Blueprints(blueprintObj); logger.debug(blueprint); @@ -974,6 +979,19 @@ BlueprintSchema.statics.getBlueprintsByOrgBgProject = function(jsonData, callbac }; + +BlueprintSchema.statics.getBlueprintsServiceDeliveryCheck = function(serviceDeliveryCheck, callback) { + this.find({serviceDeliveryCheck:serviceDeliveryCheck}, function(err, blueprints) { + if (err) { + callback(err, null); + return; + } + callback(null, blueprints); + return; + }); + +}; + BlueprintSchema.statics.getBlueprintsByOrgBgProjectProvider = function(jsonData, callback) { var queryObj = { orgId: jsonData.orgId, diff --git a/server/app/model/classes/tasks/tasks.js b/server/app/model/classes/tasks/tasks.js index 829c08d20..85ded6e7b 100755 --- a/server/app/model/classes/tasks/tasks.js +++ b/server/app/model/classes/tasks/tasks.js @@ -91,6 +91,10 @@ var taskSchema = new Schema({ description: { type: String }, + serviceDeliveryCheck: { + type: Boolean, + default:false + }, jobResultURLPattern: { type: [String] }, @@ -565,6 +569,18 @@ taskSchema.statics.getScriptTypeTask = function(callback){ }); }; +taskSchema.statics.getTasksServiceDeliveryCheck = function(serviceDeliveryCheck, callback) { + this.find({serviceDeliveryCheck:serviceDeliveryCheck}, function(err, tasks) { + if (err) { + callback(err, null); + return; + } + callback(null, tasks); + return; + }); +}; + + taskSchema.statics.getTaskById = function(taskId, callback) { this.find({ "_id": new ObjectId(taskId) @@ -680,6 +696,7 @@ taskSchema.statics.updateTaskById = function(taskId, taskData, callback) { taskType: taskData.taskType, shortDesc: taskData.shortDesc, botType: taskData.botType, + serviceDeliveryCheck:taskData.serviceDeliveryCheck, description: taskData.description, jobResultURLPattern: taskData.jobResultURL, blueprintIds: taskData.blueprintIds diff --git a/server/app/routes/v1.0/routes.js b/server/app/routes/v1.0/routes.js index ee2f00cd0..7b8bf7057 100755 --- a/server/app/routes/v1.0/routes.js +++ b/server/app/routes/v1.0/routes.js @@ -73,6 +73,7 @@ var auditTrail = require('./routes_audit_trails'); var scripts = require('./routes_scripts'); var fileUpload = require('./routes_fileUpload'); var settingWizard = require('./routes_setting_wizard'); +var configData = require('./routes_config_data'); /* * @TODO * Change app to router in internal routes files @@ -181,6 +182,8 @@ module.exports.setRoutes = function(app) { settingWizard.setRoutes(app, sessionVerificationFunc); + configData.setRoutes(app, sessionVerificationFunc); + app.get('/', function(req, res) { res.redirect('/cat3'); diff --git a/server/app/routes/v1.0/routes_blueprints.js b/server/app/routes/v1.0/routes_blueprints.js index 4a28cd542..ef193cb6d 100755 --- a/server/app/routes/v1.0/routes_blueprints.js +++ b/server/app/routes/v1.0/routes_blueprints.js @@ -55,6 +55,25 @@ var blueprintService = require('_pr/services/blueprintService.js'); module.exports.setRoutes = function(app, sessionVerificationFunc) { app.all('/blueprints/*', sessionVerificationFunc); + app.get('/blueprints/serviceDelivery', function(req, res) { + var serviceDeliveryCheck = false; + if(req.query.serviceDeliveryCheck && + (req.query.serviceDeliveryCheck === 'true' || req.query.serviceDeliveryCheck === true)) { + serviceDeliveryCheck = true; + } + + Blueprints.getBlueprintsServiceDeliveryCheck(serviceDeliveryCheck, function(err, blueprints) { + if (err) { + res.status(500).send({ + code: 500, + errMessage: "Blueprints fetch failed." + }); + return; + } + res.status(200).send(blueprints); + }); + }); + // This post() Not in use app.post('/blueprints', function(req, res) { logger.debug("Enter post() for /blueprints"); @@ -527,10 +546,7 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) { var orgId = req.params.orgId; var bgId = req.params.bgId; var projectId = req.params.projectId; - var serviceDeliveryCheck = false; - if(req.query.serviceDeliveryCheck){ - serviceDeliveryCheck = req.query.serviceDeliveryCheck; - } + if (!orgId || !bgId || !projectId) { res.status(400).send("Either orgId or bgId or projectId missing."); return; @@ -541,11 +557,6 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) { jsonData['bgId'] = bgId; jsonData['projectId'] = projectId; - if(serviceDeliveryCheck === 'true' || serviceDeliveryCheck === true){ - jsonData['botType'] = {$ne:null}; - jsonData['shortDesc'] = {$ne:null}; - } - Blueprints.getBlueprintsByOrgBgProject(jsonData, function(err, blueprints) { if (err) { res.status(500).send({ @@ -557,4 +568,4 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) { res.status(200).send(blueprints); }); }); -}; \ No newline at end of file +}; diff --git a/server/app/routes/v1.0/routes_config_data.js b/server/app/routes/v1.0/routes_config_data.js new file mode 100644 index 000000000..8c09d31b1 --- /dev/null +++ b/server/app/routes/v1.0/routes_config_data.js @@ -0,0 +1,36 @@ +/* + Copyright [2016] [Relevance Lab] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + +var appConfig = require('_pr/config'); +var logger = require('_pr/logger')(module); + + +module.exports.setRoutes = function(app, sessionVerification) { + + app.all('/config-data/*', sessionVerification); + + // Tagging Server List + app.get('/config-data/tagging-server', function(req, res) { + var serverList = appConfig.taggingServerList; + res.send(serverList); + }); + + // Bot Type List + app.get('/config-data/bot-type', function(req, res) { + var botTypeList = appConfig.botTypeList; + res.send(botTypeList); + }); +} \ No newline at end of file diff --git a/server/app/routes/v1.0/routes_d4dMasters.js b/server/app/routes/v1.0/routes_d4dMasters.js index 6a28e0fb6..c31e50ef2 100755 --- a/server/app/routes/v1.0/routes_d4dMasters.js +++ b/server/app/routes/v1.0/routes_d4dMasters.js @@ -4019,11 +4019,4 @@ module.exports.setRoutes = function(app, sessionVerification) { } }); }); - - // Tagging Server List - app.get('/d4dMasters/taggingServerList', function(req, res) { - var serverList = appConfig.taggingServerList; - res.send(serverList); - }); - } \ No newline at end of file diff --git a/server/app/routes/v1.0/routes_organizations.js b/server/app/routes/v1.0/routes_organizations.js index 8a1f32f80..9492bd8a5 100755 --- a/server/app/routes/v1.0/routes_organizations.js +++ b/server/app/routes/v1.0/routes_organizations.js @@ -681,6 +681,7 @@ module.exports.setRoutes = function(app, sessionVerification) { var blueprintId = req.body.blueprintData.blueprintId; var shortDesc = req.body.blueprintData.shortDesc; var botType = req.body.blueprintData.botType; + var serviceDeliveryCheck = req.body.blueprintData.serviceDeliveryCheck; if(req.body.blueprintData.domainNameCheck === 'true'){ domainNameCheck = true; } @@ -729,6 +730,7 @@ module.exports.setRoutes = function(app, sessionVerification) { docker: docker, shortDesc:shortDesc, botType:botType, + serviceDeliveryCheck:serviceDeliveryCheck, domainNameCheck:domainNameCheck }; //adding bluerpintID if present (edit mode) diff --git a/server/app/routes/v1.0/routes_tasks.js b/server/app/routes/v1.0/routes_tasks.js index bb1eab464..ed43ab567 100755 --- a/server/app/routes/v1.0/routes_tasks.js +++ b/server/app/routes/v1.0/routes_tasks.js @@ -38,6 +38,24 @@ var fileIo = require('_pr/lib/utils/fileio'); module.exports.setRoutes = function(app, sessionVerification) { app.all('/tasks/*', sessionVerification); + app.get('/tasks/serviceDelivery', function(req, res) { + var serviceDeliveryCheck = false; + if(req.query.serviceDeliveryCheck && + (req.query.serviceDeliveryCheck === 'true' || req.query.serviceDeliveryCheck === true)) { + serviceDeliveryCheck = true; + } + Tasks.getTasksServiceDeliveryCheck(serviceDeliveryCheck, function(err, tasks) { + if (err) { + res.status(500).send({ + code: 500, + errMessage: "Task fetch failed." + }); + return; + } + res.status(200).send(tasks); + }); + }); + app.get('/tasks/history/list/all', function(req, res) { logger.debug("------------------ ",JSON.stringify(TaskHistory)); TaskHistory.listHistory(function(err, tHistories) { @@ -574,6 +592,8 @@ module.exports.setRoutes = function(app, sessionVerification) { }); }); + + }; function encryptedParam(paramDetails,existingParams,callback){ @@ -612,3 +632,5 @@ function encryptedParam(paramDetails,existingParams,callback){ })(paramDetails[i]); } } + + diff --git a/server/install.js b/server/install.js index 446fc3e16..3096afe21 100755 --- a/server/install.js +++ b/server/install.js @@ -129,6 +129,7 @@ function getDefaultsConfig() { } }, taggingServerList: ['Sensu Server','LDAP Server','AD Server'], + botTypeList: ['Task','Check','Learning', 'Composite','Built with other'], aws: { pemFileLocation: __dirname + '/app/config/', s3BucketDownloadFileLocation: currentDirectory + '/catdata/catalyst/temp/', From 9f484276821bb846e5295a63065336bb7ffc43f5 Mon Sep 17 00:00:00 2001 From: hrushikesh07 Date: Wed, 19 Oct 2016 18:05:17 +0530 Subject: [PATCH 19/32] New base and pages for bots --- client/cat3/Gruntfile.js | 2 +- client/cat3/main.html | 3 +- client/cat3/src/clientRoutes.js | 8 ++-- client/cat3/src/partials/global.scss | 2 + .../sections/dashboard/bots/bots.html | 14 +++++++ .../{service/service.scss => bots/bots.scss} | 0 .../sections/dashboard/bots/botsCtrl.js | 29 ++++++++++++++ .../dashboard/bots/controller/libraryCtrl.js | 38 ++++++++++++++++++ .../view/botsTreeMenu.html} | 40 +++++-------------- .../sections/dashboard/bots/view/library.html | 2 + .../sections/dashboard/dashboardCtrl.js | 2 +- .../sections/dashboard/service/service.html | 13 ------ .../sections/dashboard/service/service.js | 7 ---- client/htmls/private/index.html | 25 +++++++++++- 14 files changed, 128 insertions(+), 57 deletions(-) create mode 100644 client/cat3/src/partials/sections/dashboard/bots/bots.html rename client/cat3/src/partials/sections/dashboard/{service/service.scss => bots/bots.scss} (100%) create mode 100644 client/cat3/src/partials/sections/dashboard/bots/botsCtrl.js create mode 100644 client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js rename client/cat3/src/partials/sections/dashboard/{service/view/serviceTreeMenu.html => bots/view/botsTreeMenu.html} (50%) create mode 100644 client/cat3/src/partials/sections/dashboard/bots/view/library.html delete mode 100644 client/cat3/src/partials/sections/dashboard/service/service.html delete mode 100644 client/cat3/src/partials/sections/dashboard/service/service.js diff --git a/client/cat3/Gruntfile.js b/client/cat3/Gruntfile.js index 8028c9b59..06a759423 100644 --- a/client/cat3/Gruntfile.js +++ b/client/cat3/Gruntfile.js @@ -89,7 +89,7 @@ module.exports = function(grunt) { {'catalyst/partials/sections/dashboard/workzone/orchestration/orchestration.css':'src/partials/sections/dashboard/workzone/orchestration/orchestration.scss'}, {'catalyst/partials/sections/dashboard/workzone/application/application.css':'src/partials/sections/dashboard/workzone/application/application.scss'}, {'catalyst/partials/sections/dashboard/analytics/analytics.css':'src/partials/sections/dashboard/analytics/analytics.scss'}, - {'catalyst/partials/sections/dashboard/service/service.css':'src/partials/sections/dashboard/service/service.scss'}, + {'catalyst/partials/sections/dashboard/bots/bots.css':'src/partials/sections/dashboard/bots/bots.scss'}, {'catalyst/partials/sections/dashboard/setting/setting.css':'src/partials/sections/dashboard/setting/setting.scss'} ] } diff --git a/client/cat3/main.html b/client/cat3/main.html index 928f4c73a..476a55985 100644 --- a/client/cat3/main.html +++ b/client/cat3/main.html @@ -102,7 +102,8 @@ - + + diff --git a/client/cat3/src/clientRoutes.js b/client/cat3/src/clientRoutes.js index 9d2e187d3..d9a6198b2 100644 --- a/client/cat3/src/clientRoutes.js +++ b/client/cat3/src/clientRoutes.js @@ -88,10 +88,10 @@ function routeConfig($stateProvider, $urlRouterProvider, $httpProvider, modulePe }] } - }).state('dashboard.service', { - url: "/service/", - templateUrl: "src/partials/sections/dashboard/service/service.html", - controller: "serviceCtrl", + }).state('dashboard.bots', { + url: "/bots", + templateUrl: "src/partials/sections/dashboard/bots/bots.html", + controller: "botsCtrl as bts", resolve: { auth: ["$q", function ($q) { var deferred = $q.defer(); diff --git a/client/cat3/src/partials/global.scss b/client/cat3/src/partials/global.scss index 7a29b39c0..d5b0a1221 100644 --- a/client/cat3/src/partials/global.scss +++ b/client/cat3/src/partials/global.scss @@ -112,6 +112,7 @@ $imagePath : "../../../../../../cat3/images"; z-index: 10; transition: all .4s ease 0s; left: -254px; + height: 100%; &.show-left-tree { left: 0px; @@ -121,6 +122,7 @@ $imagePath : "../../../../../../cat3/images"; background: linear-gradient(to right, #2c3638 99%, #2c3638 100%); color: #fff; overflow-y: auto; + height: 100%; } div[data-angular-treeview] { diff --git a/client/cat3/src/partials/sections/dashboard/bots/bots.html b/client/cat3/src/partials/sections/dashboard/bots/bots.html new file mode 100644 index 000000000..f2dec4d06 --- /dev/null +++ b/client/cat3/src/partials/sections/dashboard/bots/bots.html @@ -0,0 +1,14 @@ + + +
    +
    +
    +
    + + +
    +
    +
    +
    +
    +
    \ No newline at end of file diff --git a/client/cat3/src/partials/sections/dashboard/service/service.scss b/client/cat3/src/partials/sections/dashboard/bots/bots.scss similarity index 100% rename from client/cat3/src/partials/sections/dashboard/service/service.scss rename to client/cat3/src/partials/sections/dashboard/bots/bots.scss diff --git a/client/cat3/src/partials/sections/dashboard/bots/botsCtrl.js b/client/cat3/src/partials/sections/dashboard/bots/botsCtrl.js new file mode 100644 index 000000000..fb1542003 --- /dev/null +++ b/client/cat3/src/partials/sections/dashboard/bots/botsCtrl.js @@ -0,0 +1,29 @@ +(function (angular) { + "use strict"; + angular.module('dashboard.bots', ['library.bots']).config(['$stateProvider', '$urlRouterProvider', '$httpProvider', 'modulePermissionProvider', function($stateProvider, $urlRouterProvider, $httpProvider, modulePermissionProvider) { + var modulePerms = modulePermissionProvider.$get(); + $stateProvider.state('dashboard.bots.library', { + url: "/library", + templateUrl: "src/partials/sections/dashboard/bots/view/library.html", + controller: "libraryCtrl as libr", + resolve: { + auth: ["$q", function ($q) { + var deferred = $q.defer(); + // instead, go to a different page + if (modulePerms.analyticsBool()) { + // everything is fine, proceed + deferred.resolve(); + } else { + deferred.reject({redirectTo: 'dashboard'}); + } + return deferred.promise; + }] + } + }) + }]) + .controller('botsCtrl',['$scope', '$rootScope','$state', function ($scope, $rootScope,$state) { + var treeNames = ['Bots']; + $rootScope.$emit('treeNameUpdate', treeNames); + $state.go('dashboard.bots.library'); + }]); +})(angular); \ No newline at end of file diff --git a/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js b/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js new file mode 100644 index 000000000..e28d40b6d --- /dev/null +++ b/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js @@ -0,0 +1,38 @@ +(function (angular) { + "use strict"; + angular.module('library.bots', []) + .controller('libraryCtrl',['$scope', '$rootScope','$state','genericServices', function ($scope, $rootScope,$state,genSevs) { + var treeNames = ['Bots','Library']; + $rootScope.$emit('treeNameUpdate', treeNames); + var lib=this; + lib.gridOptions={ + gridOption:{ + paginationPageSizes: [25, 50, 75], + paginationPageSize: 25, + enableColumnMenus:false, + multiSelect :false, + }, + columnDefs: [ + { name: 'type'}, + { name: 'name'}, + { name: 'description'}, + { name: 'run Bot' }, + { name: 'history' }, + { name: 'last run'}, + { name: 'bot Action'} + ], + data:[{},{}] + }; + + lib.int =function(){ + var param={ + url:'/config-data/bot-type' + }; + genSevs.promiseGet(param).then(function (result) { + + }); + }; + lib.int(); + + }]); +})(angular); \ No newline at end of file diff --git a/client/cat3/src/partials/sections/dashboard/service/view/serviceTreeMenu.html b/client/cat3/src/partials/sections/dashboard/bots/view/botsTreeMenu.html similarity index 50% rename from client/cat3/src/partials/sections/dashboard/service/view/serviceTreeMenu.html rename to client/cat3/src/partials/sections/dashboard/bots/view/botsTreeMenu.html index 3d1f51af9..b796404bd 100644 --- a/client/cat3/src/partials/sections/dashboard/service/view/serviceTreeMenu.html +++ b/client/cat3/src/partials/sections/dashboard/bots/view/botsTreeMenu.html @@ -1,7 +1,7 @@ -
    +
    - - - diff --git a/client/cat3/src/partials/sections/dashboard/bots/view/library.html b/client/cat3/src/partials/sections/dashboard/bots/view/library.html new file mode 100644 index 000000000..32fc54891 --- /dev/null +++ b/client/cat3/src/partials/sections/dashboard/bots/view/library.html @@ -0,0 +1,2 @@ +
    +
    \ No newline at end of file diff --git a/client/cat3/src/partials/sections/dashboard/dashboardCtrl.js b/client/cat3/src/partials/sections/dashboard/dashboardCtrl.js index bca69a726..972322e1a 100644 --- a/client/cat3/src/partials/sections/dashboard/dashboardCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/dashboardCtrl.js @@ -8,7 +8,7 @@ 'dashboard.track', 'dashboard.settings', 'dashboard.design', - 'dashboard.service', + 'dashboard.bots', 'apis.workzone','dashboard.genericServices']) .controller('dashboardCtrl', ['$rootScope', '$scope', '$http', 'uac', '$location', '$state', function ($rootScope, $scope, $http, uac, $location, $state) { $rootScope.isBreadCrumbAvailable = true; diff --git a/client/cat3/src/partials/sections/dashboard/service/service.html b/client/cat3/src/partials/sections/dashboard/service/service.html deleted file mode 100644 index 31e898ca6..000000000 --- a/client/cat3/src/partials/sections/dashboard/service/service.html +++ /dev/null @@ -1,13 +0,0 @@ - - -
    -
    -
    -
    - -
    -
    - -
    -
    -
    \ No newline at end of file diff --git a/client/cat3/src/partials/sections/dashboard/service/service.js b/client/cat3/src/partials/sections/dashboard/service/service.js deleted file mode 100644 index 929e302a1..000000000 --- a/client/cat3/src/partials/sections/dashboard/service/service.js +++ /dev/null @@ -1,7 +0,0 @@ -(function (angular) { - "use strict"; - angular.module('dashboard.service', ['ngTouch', 'ui.grid']) - .controller('serviceCtrl',['$scope', '$rootScope', 'uiGridOptionsClient', 'uiGridConstants', 'workzoneServices', function ($scope, $rootScope, uiGridOptionsClient, uiGridConstants, workzoneServices) { - - }]); -})(angular); \ No newline at end of file diff --git a/client/htmls/private/index.html b/client/htmls/private/index.html index 6844429b9..c6ef0f064 100644 --- a/client/htmls/private/index.html +++ b/client/htmls/private/index.html @@ -53,6 +53,13 @@   ANALYTICS
    • + + + @@ -799,7 +806,23 @@

    function setleftnavigation(toplink, breadcrumbHeader) { var TabID = $(toplink).attr('id'); - if (TabID === "analytics") { +if (TabID === "bots") { + + if(isAngularIntegration){ + var checkUrl = window.location.href; + if(checkUrl.indexOf('ajax/Dev.html') !==-1){ + console.log('here'); + }else{ + window.location.href = "../../cat3/#/dashboard/bots/library"; + return false; + } + } + $('#Settings_nav').hide(); + $('#Workspace1').show(); + $('#trackShow').hide(); + + } + else if (TabID === "analytics") { if(isAngularIntegration){ var checkUrl = window.location.href; From 87961f21adb1689af4bd19792010ea1fb88aeff9 Mon Sep 17 00:00:00 2001 From: hrushikesh07 Date: Thu, 20 Oct 2016 14:24:42 +0530 Subject: [PATCH 20/32] Added API with launch --- client/cat3/src/partials/global.scss | 6 + .../sections/dashboard/bots/bots.html | 2 +- .../dashboard/bots/controller/libraryCtrl.js | 28 +++- .../sections/dashboard/bots/view/library.html | 5 +- .../sections/dashboard/genericServices.js | 125 ++++++++++++++++++ 5 files changed, 157 insertions(+), 9 deletions(-) diff --git a/client/cat3/src/partials/global.scss b/client/cat3/src/partials/global.scss index d5b0a1221..c47e73659 100644 --- a/client/cat3/src/partials/global.scss +++ b/client/cat3/src/partials/global.scss @@ -1163,4 +1163,10 @@ option.script { } .loading-body{ opacity: 0.4; +} +#bots .control-panel-button { + border-radius: 11px; + padding: 2px 5px; + width: 25px; + height: 25px; } \ No newline at end of file diff --git a/client/cat3/src/partials/sections/dashboard/bots/bots.html b/client/cat3/src/partials/sections/dashboard/bots/bots.html index f2dec4d06..a98ad80e9 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/bots.html +++ b/client/cat3/src/partials/sections/dashboard/bots/bots.html @@ -6,7 +6,7 @@ -
    +
    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 e28d40b6d..2a41dd92a 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js @@ -13,23 +13,37 @@ multiSelect :false, }, columnDefs: [ - { name: 'type'}, - { name: 'name'}, - { name: 'description'}, + { name: 'type',field:'botType'}, + { name: 'name',field:'name'}, + { name: 'description',field:'shortDesc'}, { name: 'run Bot' }, { name: 'history' }, { name: 'last run'}, - { name: 'bot Action'} + { name: 'bot Action',cellTemplate:''} ], - data:[{},{}] + data:[] }; + $scope.launchInstance = function(lunch){ + if(lunch.botType === 'Task'){ + genSevs.executeTask(lunch); + } else if(lunch.botType === 'blueprint') { + genSevs.lunchBlueprint(lunch); + } + }; lib.int =function(){ + lib.gridOptions.data=[]; var param={ - url:'/config-data/bot-type' + url:'/blueprints/serviceDelivery' }; genSevs.promiseGet(param).then(function (result) { - + angular.extend(lib.gridOptions.data,result); + }); + var param2={ + url:'/tasks/serviceDelivery' + }; + genSevs.promiseGet(param2).then(function (resultTask) { + angular.extend(lib.gridOptions.data,resultTask); }); }; lib.int(); 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 32fc54891..0e6c80888 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/view/library.html +++ b/client/cat3/src/partials/sections/dashboard/bots/view/library.html @@ -1,2 +1,5 @@
    -
    \ No newline at end of file +
    +
    + No data Available +
    \ No newline at end of file diff --git a/client/cat3/src/partials/sections/dashboard/genericServices.js b/client/cat3/src/partials/sections/dashboard/genericServices.js index 82401b9f7..767fe9470 100644 --- a/client/cat3/src/partials/sections/dashboard/genericServices.js +++ b/client/cat3/src/partials/sections/dashboard/genericServices.js @@ -102,6 +102,24 @@ } }; + genericServices.log=function(id,historyId,taskType) { + $modal.open({ + animation: true, + templateUrl: 'src/partials/sections/dashboard/workzone/orchestration/popups/orchestrationLog.html', + controller: 'orchestrationLogCtrl as orchLogCtrl', + backdrop: 'static', + keyboard: false, + resolve: { + items: function() { + return { + taskId: id, + historyId: historyId, + taskType: taskType + }; + } + } + }); + }; genericServices.removeBlueprint= function(blueprintObj, bpType) { var modalOptions = { closeButtonText: 'Cancel', @@ -130,6 +148,113 @@ }); } }; + + genericServices.executeTask =function(task) { + if (task.taskConfig.parameterized && task.taskConfig.parameterized.length) { + $modal.open({ + animation: true, + templateUrl: 'src/partials/sections/dashboard/workzone/orchestration/popups/runParamConfig.html', + controller: 'runParamConfigCtrl', + backdrop: 'static', + keyboard: false, + resolve: { + items: function() { + return angular.extend([], task.taskConfig.parameterized); + } + } + }).result.then(function(selectedItems) { + var choiceParam = {}; + var p = selectedItems; + for (var i = 0; i < p.length; i++) { + choiceParam[p[i].name] = p[i].defaultValue[0]; + } + workSvs.runTask(task._id, { + "choiceParam": choiceParam + }).then(function(response) { + helper.orchestrationLogModal(task._id, response.data.historyId, task.taskType); + $rootScope.$emit('WZ_ORCHESTRATION_REFRESH_CURRENT'); + }); + }, function() { + console.log("Dismiss at " + new Date()); + }); + } else { + $modal.open({ + animation: true, + templateUrl: 'src/partials/sections/dashboard/workzone/orchestration/popups/confirmJobRun.html', + controller: 'confirmJobRunCtrl', + backdrop: 'static', + keyboard: false, + resolve: { + items: function() { + return task._id; + } + } + }).result.then(function(response) { + genericServices.log(task._id,response.historyId,task.taskType); + if(response.blueprintMessage){ + $rootScope.$emit('WZ_INSTANCES_SHOW_LATEST'); + } + $rootScope.$emit('WZ_ORCHESTRATION_REFRESH_CURRENT'); + }, function() { + $rootScope.$emit('WZ_ORCHESTRATION_REFRESH_CURRENT'); + }); + } + } + genericServices.lunchBlueprint=function(blueprintObj) { + $modal.open({ + animate: true, + templateUrl: "src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchParams.html", + controller: "blueprintLaunchParamsCtrl", + backdrop : 'static', + keyboard: false, + resolve: { + items: function() { + return blueprintObj; + } + } + }) + .result.then(function(bpObj) { + if (bpObj.bp.blueprintType === "docker") { + $modal.open({ + animate: true, + templateUrl: "src/partials/sections/dashboard/workzone/blueprint/popups/dockerLaunchParams.html", + controller: "dockerLaunchParamsCtrl", + backdrop: 'static', + keyboard: false, + size: 'lg', + resolve: { + items: function() { + return bpObj.bp; + } + } + }).result.then(function() { + console.log('The modal close is not getting invoked currently. Goes to cancel handler'); + }, function() { + console.log('Cancel Handler getting invoked'); + }); + }else{ + $modal.open({ + animate: true, + templateUrl: "src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunch.html", + controller: "blueprintLaunchCtrl", + backdrop: 'static', + keyboard: false, + resolve: { + bpItem: function() { + return bpObj; + } + } + }) + .result.then(function(selectedItem) { + $scope.selected = selectedItem; + }, function() { + + }); + } + }, function() { + + }); + }; /*genericServices.editRunlist = function(chefRunlist, chefAttribute) { $modal.open({ templateUrl: 'src/partials/sections/dashboard/workzone/orchestration/popups/orchestrationUpdateChefRunlist.html', From 64fa1c235edb7728ddc9267689783e83db7d1fd3 Mon Sep 17 00:00:00 2001 From: hrushikesh07 Date: Thu, 20 Oct 2016 15:25:30 +0530 Subject: [PATCH 21/32] Changed the icon --- client/cat3/src/partials/globals/header/headerDashboard.html | 2 +- .../sections/dashboard/bots/controller/libraryCtrl.js | 4 ++-- .../partials/sections/dashboard/bots/view/botsTreeMenu.html | 2 +- client/htmls/private/index.html | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/client/cat3/src/partials/globals/header/headerDashboard.html b/client/cat3/src/partials/globals/header/headerDashboard.html index b62130a64..ee4fd54a6 100644 --- a/client/cat3/src/partials/globals/header/headerDashboard.html +++ b/client/cat3/src/partials/globals/header/headerDashboard.html @@ -41,7 +41,7 @@
  • - BOTS + BOTS
  • 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 2a41dd92a..f0297f007 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js @@ -34,13 +34,13 @@ lib.int =function(){ lib.gridOptions.data=[]; var param={ - url:'/blueprints/serviceDelivery' + url:'/blueprints/serviceDelivery/?serviceDeliveryCheck=true' }; genSevs.promiseGet(param).then(function (result) { angular.extend(lib.gridOptions.data,result); }); var param2={ - url:'/tasks/serviceDelivery' + url:'/tasks/serviceDelivery/?serviceDeliveryCheck=true' }; genSevs.promiseGet(param2).then(function (resultTask) { angular.extend(lib.gridOptions.data,resultTask); diff --git a/client/cat3/src/partials/sections/dashboard/bots/view/botsTreeMenu.html b/client/cat3/src/partials/sections/dashboard/bots/view/botsTreeMenu.html index b796404bd..5f24cf945 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/view/botsTreeMenu.html +++ b/client/cat3/src/partials/sections/dashboard/bots/view/botsTreeMenu.html @@ -9,7 +9,7 @@
  • - Services + Bots
    • diff --git a/client/htmls/private/index.html b/client/htmls/private/index.html index c6ef0f064..4b9725c2b 100644 --- a/client/htmls/private/index.html +++ b/client/htmls/private/index.html @@ -56,7 +56,7 @@
      • From 7951871fde9e16b462cb08f13110d217f142a5f6 Mon Sep 17 00:00:00 2001 From: Udesh Date: Thu, 20 Oct 2016 15:54:15 +0530 Subject: [PATCH 22/32] monitor api changes --- server/app/model/monitors/monitors.js | 106 +++--- server/app/routes/v1.0/routes_monitors.js | 401 +++++++++++++--------- server/app/services/monitorsService.js | 119 ++++--- 3 files changed, 384 insertions(+), 242 deletions(-) diff --git a/server/app/model/monitors/monitors.js b/server/app/model/monitors/monitors.js index 54cf3e0cb..a443d7861 100644 --- a/server/app/model/monitors/monitors.js +++ b/server/app/model/monitors/monitors.js @@ -39,12 +39,12 @@ var MonitorsSchema = new Schema({ } }); -var hiddenFields = { '_id': 0, 'isDeleted': 0 }; +var hiddenFields = {'_id': 0, 'isDeleted': 0}; MonitorsSchema.statics.createNew = function createNew(data, callback) { var self = this; var monitors = new self(data); - monitors.save(function(err, data) { + monitors.save(function (err, data) { if (err) { logger.error(err); if (typeof callback === 'function') { @@ -58,19 +58,19 @@ MonitorsSchema.statics.createNew = function createNew(data, callback) { }); }; -MonitorsSchema.statics.getMonitors = function(params, callback) { +MonitorsSchema.statics.getMonitors = function (params, callback) { params.isDeleted = false; this.aggregate([{ - $match: params - }, { - $lookup: { - from: "d4dmastersnew", - localField: "orgId", - foreignField: "rowid", - as: "organization" - } - }], function(err, monitors) { + $match: params + }, { + $lookup: { + from: "d4dmastersnew", + localField: "orgId", + foreignField: "rowid", + as: "organization" + } + }], function (err, monitors) { if (err) { callback(err, null); return; @@ -84,22 +84,40 @@ MonitorsSchema.statics.getMonitors = function(params, callback) { }; -MonitorsSchema.statics.getById = function(monitorId, callback) { +MonitorsSchema.statics.getById = function (monitorId, callback) { + this.find( + {'_id': monitorId, 'isDeleted': false}, + hiddenFields, + function (err, monitors) { + if (err) { + logger.error(err); + return callback(err, null); + } else if (monitors.length === 0) { + callback(null, null); + return; + } else { + return callback(null, monitors); + } + } + ); +}; + +MonitorsSchema.statics.getMonitor = function (monitorId, callback) { this.aggregate([{ - $match: { '_id': ObjectId(monitorId), 'isDeleted': false } - }, { - $lookup: { - from: "d4dmastersnew", - localField: "orgId", - foreignField: "rowid", - as: "organization" - } - }], function(err, monitors) { + $match: {'_id': ObjectId(monitorId), 'isDeleted': false} + }, { + $lookup: { + from: "d4dmastersnew", + localField: "orgId", + foreignField: "rowid", + as: "organization" + } + }], function (err, monitors) { if (err) { callback(err, null); return; } else if (monitors.length === 0) { - callback(null, monitors); + callback(null, null); return; } else { return callback(null, monitors[0]); @@ -107,33 +125,33 @@ MonitorsSchema.statics.getById = function(monitorId, callback) { }); }; -MonitorsSchema.statics.updateMonitors = function(monitorId, fields, callback) { - this.update({ '_id': monitorId }, { $set: fields }, - function(err, result) { - if (err) { - logger.error(err); - if (typeof callback == 'function') { - return callback(err, null); +MonitorsSchema.statics.updateMonitors = function (monitorId, fields, callback) { + this.update({'_id': monitorId}, {$set: fields}, + function (err, result) { + if (err) { + logger.error(err); + if (typeof callback === 'function') { + return callback(err, null); + } + } else if ((result.ok === 1 && result.n == 1) && (typeof callback == 'function')) { + return callback(null, true); + } else if (typeof callback === 'function') { + return callback(null, null); } - } else if ((result.ok == 1 && result.n == 1) && (typeof callback == 'function')) { - return callback(null, true); - } else if (typeof callback == 'function') { - return callback(null, null); } - } ); }; -MonitorsSchema.statics.deleteMonitors = function(monitorId, callback) { - this.update({ '_id': monitorId }, { $set: { isDeleted: true } }, - function(err, monitors) { - if (err) { - logger.error(err); - return callback(err, null); - } else { - return callback(null, true); +MonitorsSchema.statics.deleteMonitors = function (monitorId, callback) { + this.update({'_id': monitorId}, {$set: {isDeleted: true}}, + function (err, monitors) { + if (err) { + logger.error(err); + return callback(err, null); + } else { + return callback(null, true); + } } - } ); }; var Monitors = mongoose.model('Monitors', MonitorsSchema); diff --git a/server/app/routes/v1.0/routes_monitors.js b/server/app/routes/v1.0/routes_monitors.js index 450e81db2..e365577b1 100644 --- a/server/app/routes/v1.0/routes_monitors.js +++ b/server/app/routes/v1.0/routes_monitors.js @@ -13,17 +13,20 @@ const json2csv = require('json2csv'); const monitorsService = require('_pr/services/monitorsService'); const async = require('async'); +var logger = require('_pr/logger')(module); var validate = require('express-validation'); +var appConfig = require('_pr/config'); +var Cryptography = require('_pr/lib/utils/cryptography'); var monitorsValidator = require('_pr/validators/monitorsValidator'); -module.exports.setRoutes = function(app, sessionVerificationFunc) { +module.exports.setRoutes = function (app, sessionVerificationFunc) { app.all('/monitors/*', sessionVerificationFunc); /** - * @api {get} /monitors/filterBy=orgId: - * Get aggregate cost + * @api {get} /monitors/filterBy=orgId: + * Get monitors list * @apiName getMonitors - * @apiGroup reports + * @apiGroup monitors * @apiVersion 1.0.0 * * @apiParam {String} filterBy Catalyst entity. Multiple entities can be specified using + @@ -32,16 +35,15 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) { * /monitors?filterBy=orgId:5790c31edff2c49223fd6efa * * @apiSuccess {Object[]} monitors List of monitors - * @apiSuccess {String} monitors.id Monitor id - * @apiSuccess {Object} monitors.organization Monitor Organization - * @apiSuccess {String} monitors.organization.id Monitor organization id - * @apiSuccess {String} monitors.organization.name Monitor organization name - * @apiSuccess {String} monitors.serverType Monitor Server type - * @apiSuccess {Object} monitors.serverParameters Monitor Server Parameters - * @apiSuccess {String} monitors.serverParameters.url Monitor Server Url - * @apiSuccess {String} monitors.serverParameters.transportProtocolName Monitor Server Transport Protocols - * @apiSuccess {Object} monitors.serverParameters.transportProtocolParameters Monitor Server Transport Protocols - * @apiSuccess {String} monitors.serverParameters.transportProtocolParameters.host Monitor Server Transport Protocols + * @apiSuccess {String} id Monitor id + * @apiSuccess {Object} organization Monitor Organization + * @apiSuccess {String} organization.id Monitor organization id + * @apiSuccess {String} organization.name Monitor organization name + * @apiSuccess {String} serverType Monitor Server type + * @apiSuccess {Object} serverParameters Monitor Server Parameters + * @apiSuccess {String} serverParameters.url Monitor Server Url + * @apiSuccess {String} serverParameters.transportProtocolName Monitor Server Transport Protocols Name + * @apiSuccess {Object} serverParameters.transportProtocolParameters Monitor Server Transport Protocols Parameters * @apiSuccessExample {json} Monitor-Success-Response: * HTTP/1.1 200 OK * {[ @@ -60,13 +62,8 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) { * "port": 5671, * "vhost": "/sensu", * "user": "sensu", - * "password": "secret", * "heartbeat": 30, - * "prefetch": 50, - * "ssl": { - * "certChainFile": "/etc/sensu/ssl/cert.pem", - * "privateKeyFile": "/etc/sensu/ssl/key.pem" - * } + * "prefetch": 50 * } * } * } @@ -75,7 +72,7 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) { * * HTTP/1.1 200 OK * {[ - * "id": "", + * "_id": "", * "organization": { * "id": "", * "name": "Organization name" @@ -87,8 +84,7 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) { * "name": "redis", * "parameters": { * "host": "10.0.0.6", - * "port": 5671, - * "password": "secret" + * "port": 5671 * } * } * } @@ -100,10 +96,10 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) { //@TODO Authorization to be implemented after fixing provider schema async.waterfall([ - function(next) { + function (next) { monitorsService.getMonitors(req.query, next); } - ], function(err, monitors) { + ], function (err, monitors) { if (err) { next(err); } else { @@ -118,14 +114,16 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) { * @apiName getMonitor * @apiGroup monitors * - * @apiSuccess {Object[]} monitors List of monitors - * @apiSuccess {String} monitors.organization Monitor Organization - * @apiSuccess {String} monitors.organization.id Monitor organization id - * @apiSuccess {String} monitors.organization.name Monitor organization name - * @apiSuccess {String} monitors.serverType Monitor Server type - * @apiSuccess {String} monitors.serverParameters Monitor Server Parameters - * @apiSuccess {String} monitors.serverParameters.url Monitor Server Url - * @apiSuccess {String} monitors.serverParameters.transportProtocol Monitor Server Transport Protocols + * @apiSuccess {Object} monitor monitor data + * @apiSuccess {String} id Monitor id + * @apiSuccess {Object} organization Monitor Organization + * @apiSuccess {String} organization.id Monitor organization id + * @apiSuccess {String} organization.name Monitor organization name + * @apiSuccess {String} serverType Monitor Server type + * @apiSuccess {Object} serverParameters Monitor Server Parameters + * @apiSuccess {String} serverParameters.url Monitor Server Url + * @apiSuccess {String} serverParameters.transportProtocolName Monitor Server Transport Protocols Name + * @apiSuccess {Object} serverParameters.transportProtocolParameters Monitor Server Transport Protocols Parameters * @apiSuccessExample {json} Monitor-Success-Response: * HTTP/1.1 200 OK * { @@ -143,14 +141,9 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) { * "host": "10.0.0.6", * "port": 5671, * "vhost": "/sensu", - * "user": "sensu", - * "password": "secret", + * "user": "sensu" * "heartbeat": 30, - * "prefetch": 50, - * "ssl": { - * "certChainFile": "/etc/sensu/ssl/cert.pem", - * "privateKeyFile": "/etc/sensu/ssl/key.pem" - * } + * "prefetch": 50 * } * } * } @@ -159,7 +152,7 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) { * * HTTP/1.1 200 OK * { - * "id": "", + * "_id": "", * "organization": { * "id": "", * "name": "Organization name" @@ -171,8 +164,7 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) { * "name": "redis", * "parameters": { * "host": "10.0.0.6", - * "port": 5671, - * "password": "secret" + * "port": 5671 * } * } * } @@ -182,52 +174,47 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) { function getMonitor(req, res, next) { async.waterfall( - [ - function(next) { - monitorsService.getMonitor(req.params.monitorId, next); + [ + function (next) { + monitorsService.getMonitor(req.params.monitorId, next); + } + ], + function (err, results) { + if (err) { + next(err); + } else { + return res.status(200).send(results); + } } - ], - function(err, results) { - if (err) { - next(err); - } else { - return res.status(200).send(results); - } - } ); } /** - * @api {post} /monitors/:monitorId/monitors Add tag - * @apiName addTag + * @api {post} /monitors/ Add Monitor + * @apiName createMonitors * @apiGroup monitors * - * @apiParam {Number} monitorId Provider ID - * @apiParam {String} tagName Tags name - * @apiParam {Object} tag Tag object in request body - * @apiParam {String} tag.name Tag name - * @apiParam {String} tag.description Tag description + * @apiSuccess {Object} monitor monitor data + * @apiSuccess {String} orgId Organization Id + * @apiSuccess {String} serverType Monitor Server type + * @apiSuccess {Object} serverParameters Monitor Server Parameters + * @apiSuccess {String} serverParameters.url Monitor Server Url + * @apiSuccess {String} serverParameters.transportProtocolName Monitor Server Transport Protocols Name + * @apiSuccess {Object} serverParameters.transportProtocolParameters Monitor Server Transport Protocols Parameters * @apiParamExample {json} Request-Example: * HTTP/1.1 200 OK * { * "orgId": "46d1da9a-d927-41dc-8e9e-7e926d927535", * "serverType": "sensu", * "serverParameters": { - * "url": "Server Url", - * "transportProtocolName": "rabbitmq", - * "transportProtocolParameters":{ - * "host": "10.0.0.6", - * "port": 5671, - * "vhost": "/sensu", - * "user": "sensu", - * "password": "secret", - * "heartbeat": 30, - * "prefetch": 50, - * "ssl": { - * "certChainFileId": "SomeId", - * "privateKeyFileId": "SomeId" - * } - * } + * "url": "Server Url", + * "transportProtocolName": "redis", + * "transportProtocolParameters":{ + * "host": "10.0.0.6", + * "port": 5671, + * "password": "secret", + * + * } * } * } * @@ -235,112 +222,215 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) { * "orgId": "46d1da9a-d927-41dc-8e9e-7e926d927535", * "serverType": "sensu", * "serverParameters": { - * "url": "Server Url", - * "transportProtocolName": "redis", - * "transportProtocolParameters":{ - * "host": "10.0.0.6", - * "port": 5671, - * "password": "secret", - * } + * "url": "Server Url", + * "transportProtocolName": "rabbitmq", + * "transportProtocolParameters":{ + * "host": "10.0.0.6", + * "port": 5671, + * "vhost": "/sensu", + * "user": "sensu", + * "password": "secret", + * "heartbeat": 30, + * "prefetch": 50, + * "ssl": { + * "certChainFileId": "SomeId", + * "privateKeyFileId": "SomeId" + * } + * } * } * } * - * @apiSuccess {Object} tag Tag details - * @apiSuccess {String} monitors.name Tag name - * @apiSuccess {String} monitors.description Tag description * * @apiSuccessExample {json} Success-Response: * HTTP/1.1 200 OK * { + * "__v": 0, * "orgId": "46d1da9a-d927-41dc-8e9e-7e926d927535", * "serverType": "sensu", * "serverParameters": { - * "url": "Server Url", - * "transportProtocolName": "rabbitmq", - * "transportProtocolParameters":{ - * "host": "10.0.0.6", - * "port": 5671, - * "vhost": "/sensu", - * "user": "sensu", - * "password": "secret", - * "heartbeat": 30, - * "prefetch": 50, - * "ssl": { - * "certChainFileId": "SomeId", - * "privateKeyFileId": "SomeId" - * } - * } - * } + * "transportProtocolParameters": { + * "password": "iEhK5+u/dBHRNbilkF7f7Q==", + * "port": 5671, + * "host": "10.0.0.6" + * }, + * "transportProtocolName": "redis", + * "url": "Server Url" + * }, + * "_id": "58071046efa15bb50b7ccdf8", + * "isDeleted": false + * } + * + * { + * "__v": 0, + * "orgId": "46d1da9a-d927-41dc-8e9e-7e926d927535", + * "serverType": "sensu", + * "serverParameters": { + * "transportProtocolParameters": { + * "ssl": { + * "privateKeyFileId": "SomeId", + * "certChainFileId": "SomeId" + * }, + * "prefetch": 50, + * "heartbeat": 30, + * "password": "iEhK5+u/dBHRNbilkF7f7Q==", + * "user": "sensu", + * "vhost": "/sensu", + * "port": 5671, + * "host": "10.0.0.6" + * }, + * "transportProtocolName": "rabbitmq", + * "url": "Server Url" + * }, + * "_id": "58071104efa15bb50b7cce41", + * "isDeleted": false * } */ app.post('/monitors', validate(monitorsValidator.create), createMonitors); function createMonitors(req, res, next) { async.waterfall( - [ - function(next) { - monitorsService.createMonitor(req.body, next); - } - ], - function(err, results) { - if (err) { - next(err); - } else { - return res.status(201).send(results); + [ + function (next) { + if (req.body.serverType === 'sensu' && req.body.serverParameters.transportProtocolParameters['password']) { + var cryptoConfig = appConfig.cryptoSettings; + var cryptography = new Cryptography(cryptoConfig.algorithm, cryptoConfig.password); + var encryptedPassword = cryptography.encryptText(req.body.serverParameters.transportProtocolParameters['password'], cryptoConfig.encryptionEncoding, cryptoConfig.decryptionEncoding); + req.body.serverParameters.transportProtocolParameters['password'] = encryptedPassword; + } + monitorsService.createMonitor(req.body, next); + } + ], + function (err, results) { + if (err) { + next(err); + } else { + return res.status(201).send(results); + } } - } ); } /** - * @api {put} /monitors/:monitorId Update monitor + * @api {post} /monitors/:monitorId Update Monitor * @apiName updateMonitor * @apiGroup monitors * - * @apiParam {Number} monitorId Provider ID - * @apiParam {String} tagName Tags name - * @apiParam {Object[]} tag Tag object in request body - * @apiParam {String} tag.description Tag description + * @apiSuccess {Object} monitor monitor data + * @apiSuccess {String} orgId Organization Id + * @apiSuccess {String} serverType Monitor Server type + * @apiSuccess {Object} serverParameters Monitor Server Parameters + * @apiSuccess {String} serverParameters.url Monitor Server Url + * @apiSuccess {String} serverParameters.transportProtocolName Monitor Server Transport Protocols Name + * @apiSuccess {Object} serverParameters.transportProtocolParameters Monitor Server Transport Protocols Parameters * @apiParamExample {json} Request-Example: + * HTTP/1.1 200 OK + * { + * "orgId": "46d1da9a-d927-41dc-8e9e-7e926d927535", + * "serverType": "sensu", + * "serverParameters": { + * "url": "Server Url", + * "transportProtocolName": "redis", + * "transportProtocolParameters":{ + * "host": "10.0.0.6", + * "port": 5671, + * "password": "secret", + * } + * } + * } + * * { - * "description": "Tag description" + * "orgId": "46d1da9a-d927-41dc-8e9e-7e926d927535", + * "serverType": "sensu", + * "serverParameters": { + * "url": "Server Url", + * "transportProtocolName": "rabbitmq", + * "transportProtocolParameters":{ + * "host": "10.0.0.6", + * "port": 5671, + * "vhost": "/sensu", + * "user": "sensu", + * "password": "secret", + * "heartbeat": 30, + * "prefetch": 50, + * "ssl": { + * "certChainFileId": "SomeId", + * "privateKeyFileId": "SomeId" + * } + * } + * } * } * - * @apiSuccess {Object} tag Tag details - * @apiSuccess {String} monitors.name Tag name - * @apiSuccess {String} monitors.description Tag description * * @apiSuccessExample {json} Success-Response: * HTTP/1.1 200 OK * { - * "name": "environment", - * "description": "Deployment environment" + * "__v": 0, + * "orgId": "46d1da9a-d927-41dc-8e9e-7e926d927535", + * "serverType": "sensu", + * "serverParameters": { + * "transportProtocolParameters": { + * "password": "iEhK5+u/dBHRNbilkF7f7Q==", + * "port": 5671, + * "host": "10.0.0.6" + * }, + * "transportProtocolName": "redis", + * "url": "Server Url" + * }, + * "_id": "58071046efa15bb50b7ccdf8", + * "isDeleted": false + * } + * + * { + * "__v": 0, + * "orgId": "46d1da9a-d927-41dc-8e9e-7e926d927535", + * "serverType": "sensu", + * "serverParameters": { + * "transportProtocolParameters": { + * "ssl": { + * "privateKeyFileId": "SomeId", + * "certChainFileId": "SomeId" + * }, + * "prefetch": 50, + * "heartbeat": 30, + * "password": "iEhK5+u/dBHRNbilkF7f7Q==", + * "user": "sensu", + * "vhost": "/sensu", + * "port": 5671, + * "host": "10.0.0.6" + * }, + * "transportProtocolName": "rabbitmq", + * "url": "Server Url" + * }, + * "_id": "58071104efa15bb50b7cce41", + * "isDeleted": false * } */ app.put('/monitors/:monitorId', validate(monitorsValidator.update), updateMonitor); function updateMonitor(req, res, next) { async.waterfall( - [ - function(next) { - monitorsService.checkIfProviderExists(req.params.monitorId, next); - }, - function(provider, next) { - var tagDetails = { - 'name': req.params.tagName, - 'description': req.body.description - }; - monitorsService.updateTag(provider, tagDetails, next); - } - ], - function(err, results) { - if (err) { - next(err); - } else { - return res.status(200).send(results); + [ + function (next) { + monitorsService.checkIfMonitorExists(req.params.monitorId, next); + }, + function (monitor, next) { + if (req.body.serverType === 'sensu' && req.body.serverParameters.transportProtocolParameters['password']) { + var cryptoConfig = appConfig.cryptoSettings; + var cryptography = new Cryptography(cryptoConfig.algorithm, cryptoConfig.password); + var encryptedPassword = cryptography.encryptText(req.body.serverParameters.transportProtocolParameters['password'], cryptoConfig.encryptionEncoding, cryptoConfig.decryptionEncoding); + req.body.serverParameters.transportProtocolParameters['password'] = encryptedPassword; + } + monitorsService.updateMonitor(req.params.monitorId,req.body, next); + } + ], + function (err, results) { + if (err) { + next(err); + } else { + return res.status(200).send(results); + } } - } ); } @@ -355,22 +445,25 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) { * @apiSuccess {Object} response Empty response object * */ - app.delete('/monitors/:monitorId', validate(monitorsValidator.update), deleteMonitor); + app.delete('/monitors/:monitorId', deleteMonitor); function deleteMonitor(req, res, next) { async.waterfall( - [ - function(next) { - monitorsService.deleteMonitors(req.params.monitorId, next); - } - ], - function(err, results) { - if (err) { - next(err); - } else { - return res.status(200).send(results); + [ + function (next) { + monitorsService.checkIfMonitorExists(req.params.monitorId, next); + }, + function (monitor, next) { + monitorsService.deleteMonitors(req.params.monitorId, next); + } + ], + function (err, results) { + if (err) { + next(err); + } else { + return res.status(200).send(results); + } } - } ); } }; diff --git a/server/app/services/monitorsService.js b/server/app/services/monitorsService.js index 87be7b05f..4a00014a5 100644 --- a/server/app/services/monitorsService.js +++ b/server/app/services/monitorsService.js @@ -21,12 +21,52 @@ const appConfig = require('_pr/config'); var monitorsService = module.exports = {}; -monitorsService.createMonitor = function(monitor, callback) { +monitorsService.checkIfMonitorExists = function (monitorId, callback) { + monitorsModel.getById(monitorId, function (err, monitor) { + if (err) { + var err = new Error('Internal server error'); + err.status = 500; + return callback(err); + } else if (!monitor) { + var err = new Error('Monitor not found'); + err.status = 404; + return callback(err); + } else { + return callback(null, monitor); + } + }); +}; + +monitorsService.responseFormatter = function (monitor) { + var formatted = {}; switch (monitor.serverType) { case 'sensu': case 'Sensu': - monitorsModel.createNew(monitor, function(err, monitor) { + formatted._id = monitor._id; + formatted.serverType = monitor.serverType; + if (monitor.organization.length) { + formatted.organization = { + id: monitor.organization[0].rowid, + name: monitor.organization[0].orgname + }; + } + formatted.serverParameters = monitor.serverParameters; + if (formatted.serverParameters.transportProtocolParameters['password']) { + delete formatted.serverParameters.transportProtocolParameters['password']; + } + break; + } + return formatted; +}; + + +monitorsService.createMonitor = function (monitor, callback) { + + switch (monitor.serverType) { + case 'sensu': + case 'Sensu': + monitorsModel.createNew(monitor, function (err, monitor) { //@TODO To be generalized if (err && err.name === 'ValidationError') { var err = new Error('Bad Request'); @@ -50,36 +90,21 @@ monitorsService.createMonitor = function(monitor, callback) { }; -monitorsService.updateMonitor = function updateMonitor(monitor, updateFields, callback) { - var fields = {}; - if ('name' in updateFields) { - fields.name = updateFields.name; - monitor.name = updateFields.name; - } - - switch (monitor.type) { - case 'gcp': - if ('monitorDetails' in updateFields) { - if ('projectId' in updateFields.monitorDetails) { - fields['monitorDetails.projectId'] = updateFields.monitorDetails.projectId; - monitor.monitorDetails.projectId = updateFields.monitorDetails.projectId; - } - - if ('keyFile' in updateFields.monitorDetails) - fields['monitorDetails.keyFile'] = updateFields.monitorDetails.keyFile; - - if ('sshPrivateKey' in updateFields.monitorDetails) - fields['monitorDetails.sshPrivateKey'] = updateFields.monitorDetails.sshPrivateKey; - - if ('sshPublicKey' in updateFields.monitorDetails) - fields['monitorDetails.sshPrivateKey'] = updateFields.monitorDetails.sshPublicKey; - } - gcpMonitorModel.updateById(monitor._id, fields, function(err, result) { - if (err || !result) { +monitorsService.updateMonitor = function updateMonitor(monitorId, updateFields, callback) { + switch (updateFields.serverType) { + case 'sensu': + case 'Sensu': + monitorsModel.updateMonitors(monitorId, updateFields, function (err, monitor) { + //@TODO To be generalized + if (err && err.name === 'ValidationError') { + var err = new Error('Bad Request'); + err.status = 400; + callback(err); + } else if (err) { var err = new Error('Internal Server Error'); err.status = 500; callback(err); - } else if (result) { + } else { callback(null, monitor); } }); @@ -92,8 +117,8 @@ monitorsService.updateMonitor = function updateMonitor(monitor, updateFields, ca } }; -monitorsService.deleteMonitors = function(monitorId, callback) { - monitorsModel.deleteMonitors(monitorId, function(err, monitor) { +monitorsService.deleteMonitors = function (monitorId, callback) { + monitorsModel.deleteMonitors(monitorId, function (err, monitor) { if (err) { var err = new Error('Internal server error'); err.status = 500; @@ -109,27 +134,32 @@ monitorsService.deleteMonitors = function(monitorId, callback) { }); }; -monitorsService.getMonitors = function(query, callback) { +monitorsService.getMonitors = function (query, callback) { var params = {}; logger.debug('get monitors'); if ('filterBy' in query) { params = monitorsService.parseFilterBy(query.filterBy); - logger.debug(JSON.stringify(params)); } - monitorsModel.getMonitors(params, function(err, monitors) { + monitorsModel.getMonitors(params, function (err, monitors) { if (err) { logger.error(err); var err = new Error('Internal Server Error'); err.status = 500; callback(err); } else { - callback(null, monitors); + var res = []; + if (monitors.length > 0) { + for (i = 0; i < monitors.length; i++) { + res[i] = monitorsService.responseFormatter(monitors[i]); + } + } + callback(null, res); } }); }; -monitorsService.getMonitor = function(monitorId, callback) { - monitorsModel.getById(monitorId, function(err, monitor) { +monitorsService.getMonitor = function (monitorId, callback) { + monitorsModel.getMonitor(monitorId, function (err, monitor) { if (err) { var err = new Error('Internal Server Error'); err.status = 500; @@ -139,22 +169,23 @@ monitorsService.getMonitor = function(monitorId, callback) { err.status = 404; return callback(err); } else if (monitor) { + monitor = monitorsService.responseFormatter(monitor); callback(null, monitor); } }); }; -// @TODO Query builder to be made generic and reused in analytics after schema changes -monitorsService.parseFilterBy = function parseFilterBy(filterByString) { +// @TODO Query builder to be made generic +monitorsService.parseFilterBy = function (filterByString) { var filterQuery = {}; - var filters = filterByString.split('+') + var filters = filterByString.split('+'); for (var i = 0; i < filters.length; i++) { - var filter = filters[i].split(':') - var filterQueryValues = filter[1].split(",") + var filter = filters[i].split(':'); + var filterQueryValues = filter[1].split(","); - filterQuery[filter[0]] = { '$in': filterQueryValues } + filterQuery[filter[0]] = {'$in': filterQueryValues}; } return filterQuery; -} +}; From 9300fdcff8ffc839f8ddd33f859cac40bf4a8ce0 Mon Sep 17 00:00:00 2001 From: hrushikesh07 Date: Thu, 20 Oct 2016 16:27:21 +0530 Subject: [PATCH 23/32] Changed the launch type --- .../dashboard/bots/controller/libraryCtrl.js | 27 ++++++++++++------- 1 file changed, 17 insertions(+), 10 deletions(-) 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 f0297f007..9e90257bd 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js @@ -13,37 +13,44 @@ multiSelect :false, }, columnDefs: [ - { name: 'type',field:'botType'}, - { name: 'name',field:'name'}, + { name: 'bots type',field:'botType'}, + { name: 'bots name',field:'name'}, { name: 'description',field:'shortDesc'}, - { name: 'run Bot' }, { name: 'history' }, { name: 'last run'}, - { name: 'bot Action',cellTemplate:''} + { name: 'bot Action',cellTemplate:''} ], data:[] }; $scope.launchInstance = function(lunch){ - if(lunch.botType === 'Task'){ + if(lunch.launcType === 'task'){ genSevs.executeTask(lunch); - } else if(lunch.botType === 'blueprint') { + } else if(lunch.launcType === 'bp') { genSevs.lunchBlueprint(lunch); } }; lib.int =function(){ lib.gridOptions.data=[]; var param={ - url:'/blueprints/serviceDelivery/?serviceDeliveryCheck=true' + //url:'/blueprints/serviceDelivery/?serviceDeliveryCheck=true' + url:'src/partials/sections/dashboard/bots/data/bp.json' }; genSevs.promiseGet(param).then(function (result) { - angular.extend(lib.gridOptions.data,result); + angular.forEach(result,function (val) { + angular.extend(val,{launcType:'bp'}); + lib.gridOptions.data.push(val); + }); }); var param2={ - url:'/tasks/serviceDelivery/?serviceDeliveryCheck=true' + // url:'/tasks/serviceDelivery/?serviceDeliveryCheck=true' + url:'src/partials/sections/dashboard/bots/data/t.json' }; genSevs.promiseGet(param2).then(function (resultTask) { - angular.extend(lib.gridOptions.data,resultTask); + angular.forEach(resultTask,function (val) { + angular.extend(val,{launcType:'task'}); + lib.gridOptions.data.push(val); + }); }); }; lib.int(); From 1139f195fd9b2b0b2ff0a36eaa49c9e859cb5445 Mon Sep 17 00:00:00 2001 From: hrushikesh07 Date: Thu, 20 Oct 2016 16:32:41 +0530 Subject: [PATCH 24/32] Changed the launch type --- .../sections/dashboard/bots/controller/libraryCtrl.js | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) 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 9e90257bd..34c92ce8b 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js @@ -16,8 +16,6 @@ { name: 'bots type',field:'botType'}, { name: 'bots name',field:'name'}, { name: 'description',field:'shortDesc'}, - { name: 'history' }, - { name: 'last run'}, { name: 'bot Action',cellTemplate:''} ], data:[] @@ -33,8 +31,8 @@ lib.int =function(){ lib.gridOptions.data=[]; var param={ - //url:'/blueprints/serviceDelivery/?serviceDeliveryCheck=true' - url:'src/partials/sections/dashboard/bots/data/bp.json' + url:'/blueprints/serviceDelivery/?serviceDeliveryCheck=true' + //url:'src/partials/sections/dashboard/bots/data/bp.json' }; genSevs.promiseGet(param).then(function (result) { angular.forEach(result,function (val) { @@ -43,8 +41,8 @@ }); }); var param2={ - // url:'/tasks/serviceDelivery/?serviceDeliveryCheck=true' - url:'src/partials/sections/dashboard/bots/data/t.json' + url:'/tasks/serviceDelivery/?serviceDeliveryCheck=true' + // url:'src/partials/sections/dashboard/bots/data/t.json' }; genSevs.promiseGet(param2).then(function (resultTask) { angular.forEach(resultTask,function (val) { From 0f1380077dcf46477338e78a133d75eb871761e1 Mon Sep 17 00:00:00 2001 From: hrushikesh07 Date: Thu, 20 Oct 2016 17:28:51 +0530 Subject: [PATCH 25/32] BP id added --- .../dashboard/workzone/blueprint/popups/blueprintLaunchCtrl.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchCtrl.js b/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchCtrl.js index 505484c33..eb3f7df3a 100644 --- a/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchCtrl.js @@ -79,7 +79,7 @@ versionsList = bpItem.bp.blueprintConfig.infraManagerData.versionsList; versionOptional = versionsList[versionsList.length-1].ver; } - var selectedVersionBpId = bpItem.bp.selectedVersionBpId; + var selectedVersionBpId = bpItem.bp.selectedVersionBpId || bpItem._id; workzoneServices.launchBlueprint(selectedVersionBpId, versionOptional, envParams.env, bpItem.stackName,bpItem.domainName,bpItem.tagServer).then(function(bpLaunchResponse) { $scope.isBPLogsLoading = false; var launchingInstance; From f529cf7a18e21d0f6155f9c0509b9dec704f782e Mon Sep 17 00:00:00 2001 From: hrushikesh07 Date: Fri, 21 Oct 2016 14:08:57 +0530 Subject: [PATCH 26/32] Added env for launch blueprint --- client/cat3/src/factory/workzoneServices.js | 4 ++ .../dashboard/bots/controller/libraryCtrl.js | 8 +-- .../sections/dashboard/genericServices.js | 2 +- .../blueprint/popups/blueprintLaunchCtrl.js | 16 +++++- .../popups/blueprintLaunchParams.html | 56 ++++++++++++------- .../popups/blueprintLaunchParamsCtrl.js | 41 ++++++++++---- 6 files changed, 90 insertions(+), 37 deletions(-) diff --git a/client/cat3/src/factory/workzoneServices.js b/client/cat3/src/factory/workzoneServices.js index 2ee297eb5..d69a6bcb8 100644 --- a/client/cat3/src/factory/workzoneServices.js +++ b/client/cat3/src/factory/workzoneServices.js @@ -531,6 +531,10 @@ getBotTypeList:function () { var url ='/config-data/bot-type'; return $http.get(fullUrl(url),Auth.getHeaderObject()); + }, + getTaggingServer:function () { + var url ='/config-data/tagging-server'; + return $http.get(fullUrl(url),Auth.getHeaderObject()); } }; return serviceInterface; 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 34c92ce8b..38552350f 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js @@ -31,8 +31,8 @@ lib.int =function(){ lib.gridOptions.data=[]; var param={ - url:'/blueprints/serviceDelivery/?serviceDeliveryCheck=true' - //url:'src/partials/sections/dashboard/bots/data/bp.json' + //url:'/blueprints/serviceDelivery/?serviceDeliveryCheck=true' + url:'src/partials/sections/dashboard/bots/data/bp.json' }; genSevs.promiseGet(param).then(function (result) { angular.forEach(result,function (val) { @@ -41,8 +41,8 @@ }); }); var param2={ - url:'/tasks/serviceDelivery/?serviceDeliveryCheck=true' - // url:'src/partials/sections/dashboard/bots/data/t.json' + //url:'/tasks/serviceDelivery/?serviceDeliveryCheck=true' + url:'src/partials/sections/dashboard/bots/data/t.json' }; genSevs.promiseGet(param2).then(function (resultTask) { angular.forEach(resultTask,function (val) { diff --git a/client/cat3/src/partials/sections/dashboard/genericServices.js b/client/cat3/src/partials/sections/dashboard/genericServices.js index 767fe9470..6f8dd7a03 100644 --- a/client/cat3/src/partials/sections/dashboard/genericServices.js +++ b/client/cat3/src/partials/sections/dashboard/genericServices.js @@ -204,7 +204,7 @@ $modal.open({ animate: true, templateUrl: "src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchParams.html", - controller: "blueprintLaunchParamsCtrl", + controller: "blueprintLaunchParamsCtrl as bPLP", backdrop : 'static', keyboard: false, resolve: { diff --git a/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchCtrl.js b/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchCtrl.js index eb3f7df3a..a2fdf4c12 100644 --- a/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchCtrl.js @@ -79,8 +79,20 @@ versionsList = bpItem.bp.blueprintConfig.infraManagerData.versionsList; versionOptional = versionsList[versionsList.length-1].ver; } - var selectedVersionBpId = bpItem.bp.selectedVersionBpId || bpItem._id; - workzoneServices.launchBlueprint(selectedVersionBpId, versionOptional, envParams.env, bpItem.stackName,bpItem.domainName,bpItem.tagServer).then(function(bpLaunchResponse) { + var selectedVersionBpId = bpItem.bp.selectedVersionBpId; + if(bpItem && bpItem.bp && bpItem.bp.selectedVersionBpId){ + selectedVersionBpId = bpItem.bp.selectedVersionBpId; + } else { + selectedVersionBpId = bpItem.bp._id; + } + var lEnv=null; + if(envParams && envParams.env){ + lEnv=envParams.env; + } + if(bpItem.launchEnv){ + lEnv=bpItem.launchEnv; + } + workzoneServices.launchBlueprint(selectedVersionBpId, versionOptional, lEnv, bpItem.stackName,bpItem.domainName,bpItem.tagServer).then(function(bpLaunchResponse) { $scope.isBPLogsLoading = false; var launchingInstance; if(bpLaunchResponse.data.id && bpLaunchResponse.data.id.length>0){ diff --git a/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchParams.html b/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchParams.html index 9f7775c77..cbc76d845 100644 --- a/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchParams.html +++ b/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchParams.html @@ -10,26 +10,44 @@

      Enter ARM Deployment Name

      +
      - Are you sure you want to launch the Blueprint? Press Ok To continue
      -
      - - -
      - - - - - - -
      -
      + Are you sure you want to launch the Blueprint? Press Ok To continue

      + +
      + + +
      + +
      + + + +
      + +
      + + + +
      + +
      + + + +
      + +
      + + + +
      (Only numbers,letters allowed. No spaces and underscores) diff --git a/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchParamsCtrl.js b/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchParamsCtrl.js index 72a6c9efe..e04a86be2 100644 --- a/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchParamsCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchParamsCtrl.js @@ -8,27 +8,46 @@ (function(angular){ "use strict"; angular.module('workzone.blueprint') - .controller('blueprintLaunchParamsCtrl', ['$scope', '$modalInstance', 'items', function($scope, $modalInstance, items) { + .controller('blueprintLaunchParamsCtrl', ['$scope', '$modalInstance', 'items','workzoneServices','genericServices', function($scope, $modalInstance, items,workzoneServices,genericServices) { console.log(items); var launchHelper = { launch : function(){ - $modalInstance.close({bp:items,stackName:$scope.stackName,domainName:$scope.domainName,tagServer:$scope.tagServer}); + $modalInstance.close({bp:items,stackName:$scope.stackName,domainName:$scope.domainName,tagServer:$scope.tagSerSelected,launchEnv:$scope.envSeleted}); } }; + var bPLP=this; + $scope.taggingServerList=[]; + $scope.envOptions=[] + workzoneServices.getTaggingServer().then(function (topSer) { + $scope.taggingServerList=topSer.data; + }); + genericServices.getTreeNew().then(function (envData) { + angular.forEach(envData,function(val){ + if(val.rowid === items.orgId){ + $scope.orgSeleted=val.name; + angular.forEach(val.businessGroups,function(busval){ + if(busval.rowid === items.bgId){ + $scope.busSeleted=busval.name; + angular.forEach(busval.projects,function(projval){ + if(projval.rowId === items.projectId){ + $scope.projSeleted=projval.name; + $scope.envOptions=projval.environments; + $scope.envSeleted=projval.environments[0].rowid; + } + }); + } + }); + } + + }); + + }); $scope.stackName=''; $scope.domainName=''; - $scope.tagServer = "Monitoring"; + $scope.tagSerSelected = ""; $scope.cancel = function() { $modalInstance.dismiss('cancel'); }; - $scope.tagServerChecking = function() { - if($scope.tagServerCheck){ - $scope.tagServerStatus = true; - }else{ - $scope.tagServerStatus = false; - $scope.tagServer = ''; - } - }; $scope.launchBP = function() { if(items.blueprintType === "aws_cf") { $scope.showCFTInputs = true; From 1f36ab0310bfadf9f96e713e3470bcc24d7f4d4b Mon Sep 17 00:00:00 2001 From: hrushikesh07 Date: Fri, 21 Oct 2016 14:10:50 +0530 Subject: [PATCH 27/32] Added env for launch blueprint --- .../sections/dashboard/bots/controller/libraryCtrl.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 38552350f..356e4e5df 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js @@ -31,8 +31,8 @@ lib.int =function(){ lib.gridOptions.data=[]; var param={ - //url:'/blueprints/serviceDelivery/?serviceDeliveryCheck=true' - url:'src/partials/sections/dashboard/bots/data/bp.json' + url:'/blueprints/serviceDelivery/?serviceDeliveryCheck=true' + //url:'src/partials/sections/dashboard/bots/data/bp.json' }; genSevs.promiseGet(param).then(function (result) { angular.forEach(result,function (val) { @@ -41,8 +41,8 @@ }); }); var param2={ - //url:'/tasks/serviceDelivery/?serviceDeliveryCheck=true' - url:'src/partials/sections/dashboard/bots/data/t.json' + url:'/tasks/serviceDelivery/?serviceDeliveryCheck=true' + //url:'src/partials/sections/dashboard/bots/data/t.json' }; genSevs.promiseGet(param2).then(function (resultTask) { angular.forEach(resultTask,function (val) { From c4084dc6685837970bbe234215e4ae410f4d7e08 Mon Sep 17 00:00:00 2001 From: hrushikesh07 Date: Fri, 21 Oct 2016 15:39:19 +0530 Subject: [PATCH 28/32] Changed the icon --- client/cat3/src/partials/global.scss | 19 ++++++++++++++++--- .../dashboard/bots/controller/libraryCtrl.js | 5 +++-- .../popups/blueprintLaunchParams.html | 16 +++++++++------- 3 files changed, 28 insertions(+), 12 deletions(-) diff --git a/client/cat3/src/partials/global.scss b/client/cat3/src/partials/global.scss index c47e73659..0cdca8e50 100644 --- a/client/cat3/src/partials/global.scss +++ b/client/cat3/src/partials/global.scss @@ -1104,7 +1104,7 @@ option.script { background-color: #E49C25 !important; } .ui-grid-menu-button{ - height: 28px !important; + height: 36px !important; background-color: #5bc0de !important; border-color: #46b8da !important; display: inline-block; @@ -1165,8 +1165,21 @@ option.script { opacity: 0.4; } #bots .control-panel-button { - border-radius: 11px; - padding: 2px 5px; + border-radius: 17px; + padding: 2px 0px 0 5px; width: 25px; height: 25px; +} + +// ui grid style +.ui-grid-header-cell-row{ + background: #636363 !important; + color: #FBFBFB !important; +} +.ui-grid-cell-contents.ui-grid-header-cell-primary-focus{ + min-height: 36px; + line-height: 25px; +} +.ui-grid-column-menu-button{ + top:5px !important; } \ No newline at end of file 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 356e4e5df..2b967eb1d 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js @@ -13,10 +13,11 @@ multiSelect :false, }, columnDefs: [ + { name: 'Icon',field:'',width:100}, { name: 'bots type',field:'botType'}, { name: 'bots name',field:'name'}, { name: 'description',field:'shortDesc'}, - { name: 'bot Action',cellTemplate:''} + { name: 'bot Action',cellTemplate:''} ], data:[] }; @@ -42,7 +43,7 @@ }); var param2={ url:'/tasks/serviceDelivery/?serviceDeliveryCheck=true' - //url:'src/partials/sections/dashboard/bots/data/t.json' + // url:'src/partials/sections/dashboard/bots/data/t.json' }; genSevs.promiseGet(param2).then(function (resultTask) { angular.forEach(resultTask,function (val) { diff --git a/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchParams.html b/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchParams.html index cbc76d845..d5a0a9447 100644 --- a/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchParams.html +++ b/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchParams.html @@ -14,13 +14,6 @@

      Enter ARM Deployment Name

      Are you sure you want to launch the Blueprint? Press Ok To continue

      -
      - - -
      @@ -48,6 +41,15 @@

      Enter ARM Deployment Name

      + +
      + + +
      +
      (Only numbers,letters allowed. No spaces and underscores) From 4ec870b4b5fd8663cef9207db7fbd8b12b0cd09b Mon Sep 17 00:00:00 2001 From: hrushikesh07 Date: Fri, 21 Oct 2016 15:53:56 +0530 Subject: [PATCH 29/32] Changed the icon --- client/cat3/src/partials/sections/dashboard/bots/bots.scss | 3 ++- .../workzone/blueprint/popups/blueprintLaunchParamsCtrl.js | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/client/cat3/src/partials/sections/dashboard/bots/bots.scss b/client/cat3/src/partials/sections/dashboard/bots/bots.scss index cf8c2d7cf..909bf268a 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/bots.scss +++ b/client/cat3/src/partials/sections/dashboard/bots/bots.scss @@ -308,4 +308,5 @@ } .marginbottom10{ margin-bottom: 10px !important; -} \ No newline at end of file +} + diff --git a/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchParamsCtrl.js b/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchParamsCtrl.js index e04a86be2..77be98832 100644 --- a/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchParamsCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchParamsCtrl.js @@ -32,7 +32,11 @@ if(projval.rowId === items.projectId){ $scope.projSeleted=projval.name; $scope.envOptions=projval.environments; - $scope.envSeleted=projval.environments[0].rowid; + if(workzoneEnvironment.getEnvParams() && workzoneEnvironment.getEnvParams().env){ + $scope.envSeleted=workzoneEnvironment.getEnvParams().env; + } else { + $scope.envSeleted=projval.environments[0].rowid; + } } }); } From 89626380b2cb771867b570abcea08c6e057d5d84 Mon Sep 17 00:00:00 2001 From: hrushikesh07 Date: Fri, 21 Oct 2016 16:06:21 +0530 Subject: [PATCH 30/32] Added default select env for launch --- .../workzone/blueprint/popups/blueprintLaunchParams.html | 1 - .../workzone/blueprint/popups/blueprintLaunchParamsCtrl.js | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchParams.html b/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchParams.html index d5a0a9447..8a2322f10 100644 --- a/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchParams.html +++ b/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchParams.html @@ -37,7 +37,6 @@

      Enter ARM Deployment Name

      diff --git a/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchParamsCtrl.js b/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchParamsCtrl.js index 77be98832..dadebe8a5 100644 --- a/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchParamsCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchParamsCtrl.js @@ -8,7 +8,7 @@ (function(angular){ "use strict"; angular.module('workzone.blueprint') - .controller('blueprintLaunchParamsCtrl', ['$scope', '$modalInstance', 'items','workzoneServices','genericServices', function($scope, $modalInstance, items,workzoneServices,genericServices) { + .controller('blueprintLaunchParamsCtrl', ['$scope', '$modalInstance', 'items','workzoneServices','genericServices','workzoneEnvironment', function($scope, $modalInstance, items,workzoneServices,genericServices,workzoneEnvironment) { console.log(items); var launchHelper = { launch : function(){ From 62a4a1c72ca10a26af8f49ca6f80ba29bda2364f Mon Sep 17 00:00:00 2001 From: Udesh Date: Mon, 24 Oct 2016 16:13:00 +0530 Subject: [PATCH 31/32] response format changes --- server/app/model/monitors/monitors.js | 117 ++++---- server/app/routes/v1.0/routes_monitors.js | 302 ++++++++++----------- server/app/services/monitorsService.js | 14 +- server/app/validators/monitorsValidator.js | 24 +- 4 files changed, 228 insertions(+), 229 deletions(-) diff --git a/server/app/model/monitors/monitors.js b/server/app/model/monitors/monitors.js index a443d7861..3c23e2bdb 100644 --- a/server/app/model/monitors/monitors.js +++ b/server/app/model/monitors/monitors.js @@ -24,12 +24,12 @@ var MonitorsSchema = new Schema({ required: true, trim: true }, - serverType: { + type: { type: String, trim: true, required: true }, - serverParameters: { + parameters: { type: Schema.Types.Mixed }, isDeleted: { @@ -39,12 +39,12 @@ var MonitorsSchema = new Schema({ } }); -var hiddenFields = {'_id': 0, 'isDeleted': 0}; +var hiddenFields = { '_id': 0, 'isDeleted': 0 }; MonitorsSchema.statics.createNew = function createNew(data, callback) { var self = this; var monitors = new self(data); - monitors.save(function (err, data) { + monitors.save(function(err, data) { if (err) { logger.error(err); if (typeof callback === 'function') { @@ -58,19 +58,19 @@ MonitorsSchema.statics.createNew = function createNew(data, callback) { }); }; -MonitorsSchema.statics.getMonitors = function (params, callback) { +MonitorsSchema.statics.getMonitors = function(params, callback) { params.isDeleted = false; this.aggregate([{ - $match: params - }, { - $lookup: { - from: "d4dmastersnew", - localField: "orgId", - foreignField: "rowid", - as: "organization" - } - }], function (err, monitors) { + $match: params + }, { + $lookup: { + from: "d4dmastersnew", + localField: "orgId", + foreignField: "rowid", + as: "organization" + } + }], function(err, monitors) { if (err) { callback(err, null); return; @@ -84,35 +84,34 @@ MonitorsSchema.statics.getMonitors = function (params, callback) { }; -MonitorsSchema.statics.getById = function (monitorId, callback) { - this.find( - {'_id': monitorId, 'isDeleted': false}, - hiddenFields, - function (err, monitors) { - if (err) { - logger.error(err); - return callback(err, null); - } else if (monitors.length === 0) { - callback(null, null); - return; - } else { - return callback(null, monitors); - } +MonitorsSchema.statics.getById = function(monitorId, callback) { + this.find({ '_id': monitorId, 'isDeleted': false }, + hiddenFields, + function(err, monitors) { + if (err) { + logger.error(err); + return callback(err, null); + } else if (monitors.length === 0) { + callback(null, null); + return; + } else { + return callback(null, monitors); } + } ); }; -MonitorsSchema.statics.getMonitor = function (monitorId, callback) { +MonitorsSchema.statics.getMonitor = function(monitorId, callback) { this.aggregate([{ - $match: {'_id': ObjectId(monitorId), 'isDeleted': false} - }, { - $lookup: { - from: "d4dmastersnew", - localField: "orgId", - foreignField: "rowid", - as: "organization" - } - }], function (err, monitors) { + $match: { '_id': ObjectId(monitorId), 'isDeleted': false } + }, { + $lookup: { + from: "d4dmastersnew", + localField: "orgId", + foreignField: "rowid", + as: "organization" + } + }], function(err, monitors) { if (err) { callback(err, null); return; @@ -125,33 +124,33 @@ MonitorsSchema.statics.getMonitor = function (monitorId, callback) { }); }; -MonitorsSchema.statics.updateMonitors = function (monitorId, fields, callback) { - this.update({'_id': monitorId}, {$set: fields}, - function (err, result) { - if (err) { - logger.error(err); - if (typeof callback === 'function') { - return callback(err, null); - } - } else if ((result.ok === 1 && result.n == 1) && (typeof callback == 'function')) { - return callback(null, true); - } else if (typeof callback === 'function') { - return callback(null, null); +MonitorsSchema.statics.updateMonitors = function(monitorId, fields, callback) { + this.update({ '_id': monitorId }, { $set: fields }, + function(err, result) { + if (err) { + logger.error(err); + if (typeof callback === 'function') { + return callback(err, null); } + } else if ((result.ok === 1 && result.n == 1) && (typeof callback == 'function')) { + return callback(null, true); + } else if (typeof callback === 'function') { + return callback(null, null); } + } ); }; -MonitorsSchema.statics.deleteMonitors = function (monitorId, callback) { - this.update({'_id': monitorId}, {$set: {isDeleted: true}}, - function (err, monitors) { - if (err) { - logger.error(err); - return callback(err, null); - } else { - return callback(null, true); - } +MonitorsSchema.statics.deleteMonitors = function(monitorId, callback) { + this.update({ '_id': monitorId }, { $set: { isDeleted: true } }, + function(err, monitors) { + if (err) { + logger.error(err); + return callback(err, null); + } else { + return callback(null, true); } + } ); }; var Monitors = mongoose.model('Monitors', MonitorsSchema); diff --git a/server/app/routes/v1.0/routes_monitors.js b/server/app/routes/v1.0/routes_monitors.js index e365577b1..82c4eafe4 100644 --- a/server/app/routes/v1.0/routes_monitors.js +++ b/server/app/routes/v1.0/routes_monitors.js @@ -19,7 +19,7 @@ var appConfig = require('_pr/config'); var Cryptography = require('_pr/lib/utils/cryptography'); var monitorsValidator = require('_pr/validators/monitorsValidator'); -module.exports.setRoutes = function (app, sessionVerificationFunc) { +module.exports.setRoutes = function(app, sessionVerificationFunc) { app.all('/monitors/*', sessionVerificationFunc); /** @@ -39,11 +39,11 @@ module.exports.setRoutes = function (app, sessionVerificationFunc) { * @apiSuccess {Object} organization Monitor Organization * @apiSuccess {String} organization.id Monitor organization id * @apiSuccess {String} organization.name Monitor organization name - * @apiSuccess {String} serverType Monitor Server type - * @apiSuccess {Object} serverParameters Monitor Server Parameters - * @apiSuccess {String} serverParameters.url Monitor Server Url - * @apiSuccess {String} serverParameters.transportProtocolName Monitor Server Transport Protocols Name - * @apiSuccess {Object} serverParameters.transportProtocolParameters Monitor Server Transport Protocols Parameters + * @apiSuccess {String} type Monitor Server type + * @apiSuccess {Object} parameters Monitor Server Parameters + * @apiSuccess {String} parameters.url Monitor Server Url + * @apiSuccess {String} parameters.transportProtocol Monitor Server Transport Protocols Name + * @apiSuccess {Object} parameters.transportProtocolParameters Monitor Server Transport Protocols Parameters * @apiSuccessExample {json} Monitor-Success-Response: * HTTP/1.1 200 OK * {[ @@ -52,8 +52,8 @@ module.exports.setRoutes = function (app, sessionVerificationFunc) { * "id": "", * "name": "Organization name" * }, - * "serverType": "Sensu", - * "serverParameters": { + * "type": "Sensu", + * "parameters": { * "url": "Server Url", * "transportProtocol": { * "name": "rabbitmq", @@ -77,8 +77,8 @@ module.exports.setRoutes = function (app, sessionVerificationFunc) { * "id": "", * "name": "Organization name" * }, - * "serverType": "Sensu", - * "serverParameters": { + * "type": "Sensu", + * "parameters": { * "url": "Server Url", * "transportProtocol": { * "name": "redis", @@ -96,10 +96,10 @@ module.exports.setRoutes = function (app, sessionVerificationFunc) { //@TODO Authorization to be implemented after fixing provider schema async.waterfall([ - function (next) { + function(next) { monitorsService.getMonitors(req.query, next); } - ], function (err, monitors) { + ], function(err, monitors) { if (err) { next(err); } else { @@ -119,11 +119,11 @@ module.exports.setRoutes = function (app, sessionVerificationFunc) { * @apiSuccess {Object} organization Monitor Organization * @apiSuccess {String} organization.id Monitor organization id * @apiSuccess {String} organization.name Monitor organization name - * @apiSuccess {String} serverType Monitor Server type - * @apiSuccess {Object} serverParameters Monitor Server Parameters - * @apiSuccess {String} serverParameters.url Monitor Server Url - * @apiSuccess {String} serverParameters.transportProtocolName Monitor Server Transport Protocols Name - * @apiSuccess {Object} serverParameters.transportProtocolParameters Monitor Server Transport Protocols Parameters + * @apiSuccess {String} type Monitor Server type + * @apiSuccess {Object} parameters Monitor Server Parameters + * @apiSuccess {String} parameters.url Monitor Server Url + * @apiSuccess {String} parameters.transportProtocol Monitor Server Transport Protocols Name + * @apiSuccess {Object} parameters.transportProtocolParameters Monitor Server Transport Protocols Parameters * @apiSuccessExample {json} Monitor-Success-Response: * HTTP/1.1 200 OK * { @@ -132,8 +132,8 @@ module.exports.setRoutes = function (app, sessionVerificationFunc) { * "id": "", * "name": "Organization name" * }, - * "serverType": "Sensu", - * "serverParameters": { + * "type": "Sensu", + * "parameters": { * "url": "Server Url", * "transportProtocol": { * "name": "rabbitmq", @@ -157,8 +157,8 @@ module.exports.setRoutes = function (app, sessionVerificationFunc) { * "id": "", * "name": "Organization name" * }, - * "serverType": "Sensu", - * "serverParameters": { + * "type": "Sensu", + * "parameters": { * "url": "Server Url", * "transportProtocol": { * "name": "redis", @@ -174,18 +174,18 @@ module.exports.setRoutes = function (app, sessionVerificationFunc) { function getMonitor(req, res, next) { async.waterfall( - [ - function (next) { - monitorsService.getMonitor(req.params.monitorId, next); - } - ], - function (err, results) { - if (err) { - next(err); - } else { - return res.status(200).send(results); - } + [ + function(next) { + monitorsService.getMonitor(req.params.monitorId, next); } + ], + function(err, results) { + if (err) { + next(err); + } else { + return res.status(200).send(results); + } + } ); } @@ -196,47 +196,47 @@ module.exports.setRoutes = function (app, sessionVerificationFunc) { * * @apiSuccess {Object} monitor monitor data * @apiSuccess {String} orgId Organization Id - * @apiSuccess {String} serverType Monitor Server type - * @apiSuccess {Object} serverParameters Monitor Server Parameters - * @apiSuccess {String} serverParameters.url Monitor Server Url - * @apiSuccess {String} serverParameters.transportProtocolName Monitor Server Transport Protocols Name - * @apiSuccess {Object} serverParameters.transportProtocolParameters Monitor Server Transport Protocols Parameters + * @apiSuccess {String} type Monitor Server type + * @apiSuccess {Object} parameters Monitor Server Parameters + * @apiSuccess {String} parameters.url Monitor Server Url + * @apiSuccess {String} parameters.transportProtocol Monitor Server Transport Protocols Name + * @apiSuccess {Object} parameters.transportProtocolParameters Monitor Server Transport Protocols Parameters * @apiParamExample {json} Request-Example: * HTTP/1.1 200 OK * { * "orgId": "46d1da9a-d927-41dc-8e9e-7e926d927535", - * "serverType": "sensu", - * "serverParameters": { - * "url": "Server Url", - * "transportProtocolName": "redis", - * "transportProtocolParameters":{ - * "host": "10.0.0.6", - * "port": 5671, - * "password": "secret", - * - * } + * "type": "sensu", + * "parameters": { + * "url": "Server Url", + * "transportProtocol": "redis", + * "transportProtocolParameters":{ + * "host": "10.0.0.6", + * "port": 5671, + * "password": "secret", + * + * } * } * } * * { * "orgId": "46d1da9a-d927-41dc-8e9e-7e926d927535", - * "serverType": "sensu", - * "serverParameters": { - * "url": "Server Url", - * "transportProtocolName": "rabbitmq", - * "transportProtocolParameters":{ - * "host": "10.0.0.6", - * "port": 5671, - * "vhost": "/sensu", - * "user": "sensu", - * "password": "secret", - * "heartbeat": 30, - * "prefetch": 50, - * "ssl": { - * "certChainFileId": "SomeId", - * "privateKeyFileId": "SomeId" - * } - * } + * "type": "sensu", + * "parameters": { + * "url": "Server Url", + * "transportProtocol": "rabbitmq", + * "transportProtocolParameters":{ + * "host": "10.0.0.6", + * "port": 5671, + * "vhost": "/sensu", + * "user": "sensu", + * "password": "secret", + * "heartbeat": 30, + * "prefetch": 50, + * "ssl": { + * "certChainFileId": "SomeId", + * "privateKeyFileId": "SomeId" + * } + * } * } * } * @@ -246,14 +246,14 @@ module.exports.setRoutes = function (app, sessionVerificationFunc) { * { * "__v": 0, * "orgId": "46d1da9a-d927-41dc-8e9e-7e926d927535", - * "serverType": "sensu", - * "serverParameters": { + * "type": "sensu", + * "parameters": { * "transportProtocolParameters": { * "password": "iEhK5+u/dBHRNbilkF7f7Q==", * "port": 5671, * "host": "10.0.0.6" * }, - * "transportProtocolName": "redis", + * "transportProtocol": "redis", * "url": "Server Url" * }, * "_id": "58071046efa15bb50b7ccdf8", @@ -263,8 +263,8 @@ module.exports.setRoutes = function (app, sessionVerificationFunc) { * { * "__v": 0, * "orgId": "46d1da9a-d927-41dc-8e9e-7e926d927535", - * "serverType": "sensu", - * "serverParameters": { + * "type": "sensu", + * "parameters": { * "transportProtocolParameters": { * "ssl": { * "privateKeyFileId": "SomeId", @@ -278,7 +278,7 @@ module.exports.setRoutes = function (app, sessionVerificationFunc) { * "port": 5671, * "host": "10.0.0.6" * }, - * "transportProtocolName": "rabbitmq", + * "transportProtocol": "rabbitmq", * "url": "Server Url" * }, * "_id": "58071104efa15bb50b7cce41", @@ -289,24 +289,24 @@ module.exports.setRoutes = function (app, sessionVerificationFunc) { function createMonitors(req, res, next) { async.waterfall( - [ - function (next) { - if (req.body.serverType === 'sensu' && req.body.serverParameters.transportProtocolParameters['password']) { - var cryptoConfig = appConfig.cryptoSettings; - var cryptography = new Cryptography(cryptoConfig.algorithm, cryptoConfig.password); - var encryptedPassword = cryptography.encryptText(req.body.serverParameters.transportProtocolParameters['password'], cryptoConfig.encryptionEncoding, cryptoConfig.decryptionEncoding); - req.body.serverParameters.transportProtocolParameters['password'] = encryptedPassword; - } - monitorsService.createMonitor(req.body, next); - } - ], - function (err, results) { - if (err) { - next(err); - } else { - return res.status(201).send(results); + [ + function(next) { + if (req.body.type === 'sensu' && req.body.parameters.transportProtocolParameters['password']) { + var cryptoConfig = appConfig.cryptoSettings; + var cryptography = new Cryptography(cryptoConfig.algorithm, cryptoConfig.password); + var encryptedPassword = cryptography.encryptText(req.body.parameters.transportProtocolParameters['password'], cryptoConfig.encryptionEncoding, cryptoConfig.decryptionEncoding); + req.body.parameters.transportProtocolParameters['password'] = encryptedPassword; } + monitorsService.createMonitor(req.body, next); } + ], + function(err, results) { + if (err) { + next(err); + } else { + return res.status(201).send(results); + } + } ); } @@ -318,46 +318,46 @@ module.exports.setRoutes = function (app, sessionVerificationFunc) { * * @apiSuccess {Object} monitor monitor data * @apiSuccess {String} orgId Organization Id - * @apiSuccess {String} serverType Monitor Server type - * @apiSuccess {Object} serverParameters Monitor Server Parameters - * @apiSuccess {String} serverParameters.url Monitor Server Url - * @apiSuccess {String} serverParameters.transportProtocolName Monitor Server Transport Protocols Name - * @apiSuccess {Object} serverParameters.transportProtocolParameters Monitor Server Transport Protocols Parameters + * @apiSuccess {String} type Monitor Server type + * @apiSuccess {Object} parameters Monitor Server Parameters + * @apiSuccess {String} parameters.url Monitor Server Url + * @apiSuccess {String} parameters.transportProtocol Monitor Server Transport Protocols Name + * @apiSuccess {Object} parameters.transportProtocolParameters Monitor Server Transport Protocols Parameters * @apiParamExample {json} Request-Example: * HTTP/1.1 200 OK * { * "orgId": "46d1da9a-d927-41dc-8e9e-7e926d927535", - * "serverType": "sensu", - * "serverParameters": { + * "type": "sensu", + * "parameters": { * "url": "Server Url", - * "transportProtocolName": "redis", + * "transportProtocol": "redis", * "transportProtocolParameters":{ * "host": "10.0.0.6", * "port": 5671, * "password": "secret", - * } + * } * } * } * * { * "orgId": "46d1da9a-d927-41dc-8e9e-7e926d927535", - * "serverType": "sensu", - * "serverParameters": { - * "url": "Server Url", - * "transportProtocolName": "rabbitmq", - * "transportProtocolParameters":{ - * "host": "10.0.0.6", - * "port": 5671, - * "vhost": "/sensu", - * "user": "sensu", - * "password": "secret", - * "heartbeat": 30, - * "prefetch": 50, - * "ssl": { - * "certChainFileId": "SomeId", - * "privateKeyFileId": "SomeId" - * } - * } + * "type": "sensu", + * "parameters": { + * "url": "Server Url", + * "transportProtocol": "rabbitmq", + * "transportProtocolParameters":{ + * "host": "10.0.0.6", + * "port": 5671, + * "vhost": "/sensu", + * "user": "sensu", + * "password": "secret", + * "heartbeat": 30, + * "prefetch": 50, + * "ssl": { + * "certChainFileId": "SomeId", + * "privateKeyFileId": "SomeId" + * } + * } * } * } * @@ -367,14 +367,14 @@ module.exports.setRoutes = function (app, sessionVerificationFunc) { * { * "__v": 0, * "orgId": "46d1da9a-d927-41dc-8e9e-7e926d927535", - * "serverType": "sensu", - * "serverParameters": { + * "type": "sensu", + * "parameters": { * "transportProtocolParameters": { * "password": "iEhK5+u/dBHRNbilkF7f7Q==", * "port": 5671, * "host": "10.0.0.6" * }, - * "transportProtocolName": "redis", + * "transportProtocol": "redis", * "url": "Server Url" * }, * "_id": "58071046efa15bb50b7ccdf8", @@ -384,8 +384,8 @@ module.exports.setRoutes = function (app, sessionVerificationFunc) { * { * "__v": 0, * "orgId": "46d1da9a-d927-41dc-8e9e-7e926d927535", - * "serverType": "sensu", - * "serverParameters": { + * "type": "sensu", + * "parameters": { * "transportProtocolParameters": { * "ssl": { * "privateKeyFileId": "SomeId", @@ -399,7 +399,7 @@ module.exports.setRoutes = function (app, sessionVerificationFunc) { * "port": 5671, * "host": "10.0.0.6" * }, - * "transportProtocolName": "rabbitmq", + * "transportProtocol": "rabbitmq", * "url": "Server Url" * }, * "_id": "58071104efa15bb50b7cce41", @@ -410,27 +410,27 @@ module.exports.setRoutes = function (app, sessionVerificationFunc) { function updateMonitor(req, res, next) { async.waterfall( - [ - function (next) { - monitorsService.checkIfMonitorExists(req.params.monitorId, next); - }, - function (monitor, next) { - if (req.body.serverType === 'sensu' && req.body.serverParameters.transportProtocolParameters['password']) { - var cryptoConfig = appConfig.cryptoSettings; - var cryptography = new Cryptography(cryptoConfig.algorithm, cryptoConfig.password); - var encryptedPassword = cryptography.encryptText(req.body.serverParameters.transportProtocolParameters['password'], cryptoConfig.encryptionEncoding, cryptoConfig.decryptionEncoding); - req.body.serverParameters.transportProtocolParameters['password'] = encryptedPassword; - } - monitorsService.updateMonitor(req.params.monitorId,req.body, next); - } - ], - function (err, results) { - if (err) { - next(err); - } else { - return res.status(200).send(results); + [ + function(next) { + monitorsService.checkIfMonitorExists(req.params.monitorId, next); + }, + function(monitor, next) { + if (req.body.type === 'sensu' && req.body.parameters.transportProtocolParameters['password']) { + var cryptoConfig = appConfig.cryptoSettings; + var cryptography = new Cryptography(cryptoConfig.algorithm, cryptoConfig.password); + var encryptedPassword = cryptography.encryptText(req.body.parameters.transportProtocolParameters['password'], cryptoConfig.encryptionEncoding, cryptoConfig.decryptionEncoding); + req.body.parameters.transportProtocolParameters['password'] = encryptedPassword; } + monitorsService.updateMonitor(req.params.monitorId, req.body, next); } + ], + function(err, results) { + if (err) { + next(err); + } else { + return res.status(200).send(results); + } + } ); } @@ -449,21 +449,21 @@ module.exports.setRoutes = function (app, sessionVerificationFunc) { function deleteMonitor(req, res, next) { async.waterfall( - [ - function (next) { - monitorsService.checkIfMonitorExists(req.params.monitorId, next); - }, - function (monitor, next) { - monitorsService.deleteMonitors(req.params.monitorId, next); - } - ], - function (err, results) { - if (err) { - next(err); - } else { - return res.status(200).send(results); - } + [ + function(next) { + monitorsService.checkIfMonitorExists(req.params.monitorId, next); + }, + function(monitor, next) { + monitorsService.deleteMonitors(req.params.monitorId, next); + } + ], + function(err, results) { + if (err) { + next(err); + } else { + return res.status(200).send(results); } + } ); } }; diff --git a/server/app/services/monitorsService.js b/server/app/services/monitorsService.js index 4a00014a5..8d93e448f 100644 --- a/server/app/services/monitorsService.js +++ b/server/app/services/monitorsService.js @@ -40,20 +40,20 @@ monitorsService.checkIfMonitorExists = function (monitorId, callback) { monitorsService.responseFormatter = function (monitor) { var formatted = {}; - switch (monitor.serverType) { + switch (monitor.type) { case 'sensu': case 'Sensu': formatted._id = monitor._id; - formatted.serverType = monitor.serverType; + formatted.type = monitor.type; if (monitor.organization.length) { formatted.organization = { id: monitor.organization[0].rowid, name: monitor.organization[0].orgname }; } - formatted.serverParameters = monitor.serverParameters; - if (formatted.serverParameters.transportProtocolParameters['password']) { - delete formatted.serverParameters.transportProtocolParameters['password']; + formatted.parameters = monitor.parameters; + if (formatted.parameters.transportProtocolParameters['password']) { + delete formatted.parameters.transportProtocolParameters['password']; } break; } @@ -63,7 +63,7 @@ monitorsService.responseFormatter = function (monitor) { monitorsService.createMonitor = function (monitor, callback) { - switch (monitor.serverType) { + switch (monitor.type) { case 'sensu': case 'Sensu': monitorsModel.createNew(monitor, function (err, monitor) { @@ -91,7 +91,7 @@ monitorsService.createMonitor = function (monitor, callback) { }; monitorsService.updateMonitor = function updateMonitor(monitorId, updateFields, callback) { - switch (updateFields.serverType) { + switch (updateFields.type) { case 'sensu': case 'Sensu': monitorsModel.updateMonitors(monitorId, updateFields, function (err, monitor) { diff --git a/server/app/validators/monitorsValidator.js b/server/app/validators/monitorsValidator.js index 6b1f02c9a..86c159b91 100644 --- a/server/app/validators/monitorsValidator.js +++ b/server/app/validators/monitorsValidator.js @@ -21,11 +21,11 @@ var monitorsValidator = module.exports = {}; monitorsValidator.create = { body: { "orgId": Joi.string().max(40).required(), - "serverType": Joi.valid('sensu', 'other'), - "serverParameters": Joi.object() + "type": Joi.valid('sensu', 'other'), + "parameters": Joi.object() .keys({ "url": Joi.string(), - "transportProtocolName": Joi.valid('rabbitmq', 'redis'), + "transportProtocol": Joi.valid('rabbitmq', 'redis'), "transportProtocolParameters": Joi.object().keys({ "host": Joi.string().required(), "port": Joi.number().required(), @@ -39,15 +39,15 @@ monitorsValidator.create = { "privateKeyFileId": Joi.string().required() }), }) - .when('transportProtocolName', { + .when('transportProtocol', { is: 'rabbitmq', then: Joi.object({ 'vhost': Joi.required(), 'user': Joi.required(), 'heartbeat': Joi.required(), 'prefetch': Joi.required() }) }) }) .required() - .when('serverType', { + .when('type', { is: 'sensu', - then: Joi.object({ 'url': Joi.required(), 'transportProtocolName': Joi.required(), 'transportProtocolParameters': Joi.required() }) + then: Joi.object({ 'url': Joi.required(), 'transportProtocol': Joi.required(), 'transportProtocolParameters': Joi.required() }) }) } }; @@ -55,11 +55,11 @@ monitorsValidator.create = { monitorsValidator.update = { body: { "orgId": Joi.string().max(40).required(), - "serverType": Joi.valid('sensu', 'other'), - "serverParameters": Joi.object() + "type": Joi.valid('sensu', 'other'), + "parameters": Joi.object() .keys({ "url": Joi.string(), - "transportProtocolName": Joi.valid('rabbitmq', 'redis'), + "transportProtocol": Joi.valid('rabbitmq', 'redis'), "transportProtocolParameters": Joi.object().keys({ "host": Joi.string().required(), "port": Joi.number().required(), @@ -73,15 +73,15 @@ monitorsValidator.update = { "privateKeyFileId": Joi.string().required() }), }) - .when('transportProtocolName', { + .when('transportProtocol', { is: 'rabbitmq', then: Joi.object({ 'vhost': Joi.required(), 'user': Joi.required(), 'heartbeat': Joi.required(), 'prefetch': Joi.required() }) }) }) .required() - .when('serverType', { + .when('type', { is: 'sensu', - then: Joi.object({ 'url': Joi.required(), 'transportProtocolName': Joi.required(), 'transportProtocolParameters': Joi.required() }) + then: Joi.object({ 'url': Joi.required(), 'transportProtocol': Joi.required(), 'transportProtocolParameters': Joi.required() }) }) } }; From 09e09be4ca657a46088e840cadfba1233953edf1 Mon Sep 17 00:00:00 2001 From: Udesh Date: Mon, 24 Oct 2016 17:44:23 +0530 Subject: [PATCH 32/32] changed function name --- server/app/services/monitorsService.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/server/app/services/monitorsService.js b/server/app/services/monitorsService.js index 8d93e448f..b494aa17a 100644 --- a/server/app/services/monitorsService.js +++ b/server/app/services/monitorsService.js @@ -38,7 +38,7 @@ monitorsService.checkIfMonitorExists = function (monitorId, callback) { }); }; -monitorsService.responseFormatter = function (monitor) { +monitorsService.formatResponse = function (monitor) { var formatted = {}; switch (monitor.type) { case 'sensu': @@ -150,7 +150,7 @@ monitorsService.getMonitors = function (query, callback) { var res = []; if (monitors.length > 0) { for (i = 0; i < monitors.length; i++) { - res[i] = monitorsService.responseFormatter(monitors[i]); + res[i] = monitorsService.formatResponse(monitors[i]); } } callback(null, res); @@ -169,7 +169,7 @@ monitorsService.getMonitor = function (monitorId, callback) { err.status = 404; return callback(err); } else if (monitor) { - monitor = monitorsService.responseFormatter(monitor); + monitor = monitorsService.formatResponse(monitor); callback(null, monitor); } });