From 6c9743ea1dbfa8366b1fa6c424b9824c728be770 Mon Sep 17 00:00:00 2001 From: srikanthv02 Date: Fri, 23 Dec 2016 15:58:22 +0530 Subject: [PATCH 01/81] New sections added under Devops --- .../ajax/Settings/CreateBitbucketConfig.html | 161 +++++++++++++++++ .../Settings/CreateFunctionalTestConfig.html | 161 +++++++++++++++++ .../ajax/Settings/CreateJiraConfig.html | 162 +++++++++++++++++ .../ajax/Settings/CreateOctopusConfig.html | 167 ++++++++++++++++++ .../ajax/Settings/bitBucketConfigList.html | 120 +++++++++++++ .../Settings/functionalTestConfigList.html | 120 +++++++++++++ .../private/ajax/Settings/jiraConfigList.html | 117 ++++++++++++ .../ajax/Settings/octopusConfigList.html | 120 +++++++++++++ client/htmls/private/index.html | 32 ++++ 9 files changed, 1160 insertions(+) create mode 100644 client/htmls/private/ajax/Settings/CreateBitbucketConfig.html create mode 100644 client/htmls/private/ajax/Settings/CreateFunctionalTestConfig.html create mode 100644 client/htmls/private/ajax/Settings/CreateJiraConfig.html create mode 100644 client/htmls/private/ajax/Settings/CreateOctopusConfig.html create mode 100644 client/htmls/private/ajax/Settings/bitBucketConfigList.html create mode 100644 client/htmls/private/ajax/Settings/functionalTestConfigList.html create mode 100644 client/htmls/private/ajax/Settings/jiraConfigList.html create mode 100644 client/htmls/private/ajax/Settings/octopusConfigList.html diff --git a/client/htmls/private/ajax/Settings/CreateBitbucketConfig.html b/client/htmls/private/ajax/Settings/CreateBitbucketConfig.html new file mode 100644 index 000000000..40c784fe1 --- /dev/null +++ b/client/htmls/private/ajax/Settings/CreateBitbucketConfig.html @@ -0,0 +1,161 @@ +
+
+
+
+
+

New Bitbucket Config

+
+
+
+
+
+ +
+ +
+ +
+ +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ +
+ +
+ +
+ +
+ +
+
+
+
+
+ + + Cancel + + +
+
+
+
+
+
+ + + + + \ No newline at end of file diff --git a/client/htmls/private/ajax/Settings/CreateFunctionalTestConfig.html b/client/htmls/private/ajax/Settings/CreateFunctionalTestConfig.html new file mode 100644 index 000000000..456c3136d --- /dev/null +++ b/client/htmls/private/ajax/Settings/CreateFunctionalTestConfig.html @@ -0,0 +1,161 @@ +
+
+
+
+
+

New QA Portal

+
+
+
+
+
+ +
+ +
+ +
+ +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+ +
+ +
+ +
+ +
+ +
+ +
+
+
+
+
+ + + Cancel + + +
+
+
+
+
+
+ + + + + \ No newline at end of file diff --git a/client/htmls/private/ajax/Settings/CreateJiraConfig.html b/client/htmls/private/ajax/Settings/CreateJiraConfig.html new file mode 100644 index 000000000..fc73c523c --- /dev/null +++ b/client/htmls/private/ajax/Settings/CreateJiraConfig.html @@ -0,0 +1,162 @@ +
+
+
+
+
+

New Jira Config

+
+
+
+
+
+ +
+ +
+ +
+ +
+
+ + +
+
+ + +
+
+ + +
+
+ + + This command will make this for you: echo -n username:password | base64 +
+ +
+ +
+ +
+ +
+ +
+ +
+
+
+
+
+ + + Cancel + + +
+
+
+
+
+
+ + + + + \ No newline at end of file diff --git a/client/htmls/private/ajax/Settings/CreateOctopusConfig.html b/client/htmls/private/ajax/Settings/CreateOctopusConfig.html new file mode 100644 index 000000000..f6ba4fc35 --- /dev/null +++ b/client/htmls/private/ajax/Settings/CreateOctopusConfig.html @@ -0,0 +1,167 @@ +
+
+
+
+
+

New Octopus Config

+
+
+
+
+
+ +
+ +
+ +
+ +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + + A comma seperated list of environments. Leave it blank to include all. +
+ +
+ +
+ +
+ +
+ +
+ +
+
+
+
+
+ + + Cancel + + +
+
+
+
+
+
+ + + + + \ No newline at end of file diff --git a/client/htmls/private/ajax/Settings/bitBucketConfigList.html b/client/htmls/private/ajax/Settings/bitBucketConfigList.html new file mode 100644 index 000000000..cc75f11dd --- /dev/null +++ b/client/htmls/private/ajax/Settings/bitBucketConfigList.html @@ -0,0 +1,120 @@ +
+
+
+
+
+
+ Bitbucket +
+
+ +
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file diff --git a/client/htmls/private/ajax/Settings/functionalTestConfigList.html b/client/htmls/private/ajax/Settings/functionalTestConfigList.html new file mode 100644 index 000000000..e1d77175c --- /dev/null +++ b/client/htmls/private/ajax/Settings/functionalTestConfigList.html @@ -0,0 +1,120 @@ +
+
+
+
+
+
+ QA Portals +
+
+ +
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file diff --git a/client/htmls/private/ajax/Settings/jiraConfigList.html b/client/htmls/private/ajax/Settings/jiraConfigList.html new file mode 100644 index 000000000..e8d2e4d06 --- /dev/null +++ b/client/htmls/private/ajax/Settings/jiraConfigList.html @@ -0,0 +1,117 @@ +
+
+
+
+
+
+ Jira +
+
+ +
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file diff --git a/client/htmls/private/ajax/Settings/octopusConfigList.html b/client/htmls/private/ajax/Settings/octopusConfigList.html new file mode 100644 index 000000000..a38cfcade --- /dev/null +++ b/client/htmls/private/ajax/Settings/octopusConfigList.html @@ -0,0 +1,120 @@ +
+
+
+
+
+
+ Octopus Deploy +
+
+ +
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file diff --git a/client/htmls/private/index.html b/client/htmls/private/index.html index 0648ff0c7..ee9273702 100644 --- a/client/htmls/private/index.html +++ b/client/htmls/private/index.html @@ -1135,6 +1135,38 @@

"selectable": true, "icon": "fa fa-lg fa-fw fa-link" + },{ + "name": "organizations", + "text": "Bitbucket", + "borderColor": "#000", + "href": "#ajax/Settings/bitBucketConfigList.html", + "selectable": true, + "icon": "fa fa-lg fa-fw fa-bitbucket" + + },{ + "name": "organizations", + "text": "Octopus", + "borderColor": "#000", + "href": "#ajax/Settings/octopusConfigList.html", + "selectable": true, + "icon": "fa fa-lg fa-fw fa-code" + + },{ + "name": "organizations", + "text": "Jira", + "borderColor": "#000", + "href": "#ajax/Settings/jiraConfigList.html", + "selectable": true, + "icon": "fa fa-lg fa-fw fa-ticket" + + },{ + "name": "organizations", + "text": "QA Portal", + "borderColor": "#000", + "href": "#ajax/Settings/functionalTestConfigList.html", + "selectable": true, + "icon": "fa fa-lg fa-fw fa-check" + }], "borderColor": "#000", "selectable": false, From e96a2fe11260ea4702079a68e4a4bc59e49d66ea Mon Sep 17 00:00:00 2001 From: srikanthv02 Date: Mon, 26 Dec 2016 13:30:35 +0530 Subject: [PATCH 02/81] Changes for settings --- server/app/lib/utils/masterUtil.js | 136 ++++- server/app/model/d4dmasters/configmgmt.js | 24 + .../model/d4dmasters/d4dmastersmodelnew.js | 160 ++++++ .../app/routes/v1.0/routes_d4dMastersCICD.js | 524 ++++++++++++++++++ 4 files changed, 842 insertions(+), 2 deletions(-) create mode 100644 server/app/routes/v1.0/routes_d4dMastersCICD.js diff --git a/server/app/lib/utils/masterUtil.js b/server/app/lib/utils/masterUtil.js index 3fa0b1b02..8836989ad 100755 --- a/server/app/lib/utils/masterUtil.js +++ b/server/app/lib/utils/masterUtil.js @@ -515,6 +515,138 @@ var MasterUtil = function () { }); } + // Return all Bitbucket + this.getBitbucket = function(orgList, callback) { + var bitbucketList = []; + var rowIds = []; + for (var x = 0; x < orgList.length; x++) { + rowIds.push(orgList[x].rowid); + } + logger.debug("org rowids: ", rowIds); + d4dModelNew.d4dModelBitbucketConfig.find({ + orgname_rowid: { + $in: rowIds + } + }, function(err, bitbucket) { + if (bitbucket) { + configmgmtDao.getRowids(function(err, rowidlist) { + for (var i = 0; i < bitbucket.length; i++) { + if (bitbucket[i].id === '27') { + names = configmgmtDao.convertRowIDToValue(bitbucket[i].orgname_rowid, rowidlist) + bitbucket[i].orgname = names; + bitbucketList.push(bitbucket[i]); + } + } + callback(null, bitbucketList); + return; + }); + } else { + callback(err, null); + return; + } + + }); + } + + this.getOctopus = function(orgList, callback) { + var octopusList = []; + var rowIds = []; + for (var x = 0; x < orgList.length; x++) { + rowIds.push(orgList[x].rowid); + } + logger.debug("org rowids: ", rowIds); + d4dModelNew.d4dModelOctopusConfig.find({ + orgname_rowid: { + $in: rowIds + } + }, function(err, octopus) { + if (octopus) { + configmgmtDao.getRowids(function(err, rowidlist) { + for (var i = 0; i < octopus.length; i++) { + if (octopus[i].id === '28') { + names = configmgmtDao.convertRowIDToValue(octopus[i].orgname_rowid, rowidlist) + octopus[i].orgname = names; + octopusList.push(octopus[i]); + } + } + callback(null, octopusList); + return; + }); + } else { + callback(err, null); + return; + } + + }); + } + + this.getFunctionalTest = function(orgList, callback) { + var functionaltestList = []; + var rowIds = []; + for (var x = 0; x < orgList.length; x++) { + rowIds.push(orgList[x].rowid); + } + logger.debug("org rowids: ", rowIds); + d4dModelNew.d4dModelFunctionalTestConfig.find({ + orgname_rowid: { + $in: rowIds + } + }, function(err, functionaltest) { + if (functionaltest) { + configmgmtDao.getRowids(function(err, rowidlist) { + for (var i = 0; i < functionaltest.length; i++) { + if (functionaltest[i].id === '29') { + names = configmgmtDao.convertRowIDToValue(functionaltest[i].orgname_rowid, rowidlist) + functionaltest[i].orgname = names; + functionaltestList.push(functionaltest[i]); + } + } + callback(null, functionaltestList); + return; + }); + } else { + callback(err, null); + return; + } + + }); + } + + this.getJira = function(orgList, callback) { + var jiraList = []; + var rowIds = []; + for (var x = 0; x < orgList.length; x++) { + rowIds.push(orgList[x].rowid); + } + logger.debug("org rowids: ", rowIds); + d4dModelNew.d4dModelMastersJira.find({ + orgname_rowid: { + $in: rowIds + } + }, function(err, jira) { + if (jira) { + + configmgmtDao.getRowids(function(err, rowidlist) { + for (var i = 0; i < jira.length; i++) { + logger.debug(jira[i].id); + if (jira[i].id === '23') { + + names = configmgmtDao.convertRowIDToValue(jira[i].orgname_rowid, rowidlist) + jira[i].orgname = names; + jiraList.push(jira[i]); + } + } + callback(null, jiraList); + return; + }); + } else { + callback(err, null); + return; + } + + }); + } + // Return All Orgs specific to User this.getActiveOrgs = function (loggedInUser, callback) { var orgList = []; @@ -795,12 +927,12 @@ var MasterUtil = function () { }); } - this.getOrgById = function (orgId, callback) { + this.getOrgById = function(orgId, callback) { var orgList = []; logger.debug("Incomming orgid: ", orgId); d4dModelNew.d4dModelMastersOrg.find({ _id: new ObjectId(orgId) - }, function (err, orgs) { + }, function(err, orgs) { if (orgs) { for (var i = 0; i < orgs.length; i++) { if (orgs[i].id === '1') { diff --git a/server/app/model/d4dmasters/configmgmt.js b/server/app/model/d4dmasters/configmgmt.js index 2ae034284..f37afa8bc 100755 --- a/server/app/model/d4dmasters/configmgmt.js +++ b/server/app/model/d4dmasters/configmgmt.js @@ -109,6 +109,18 @@ function Configmgmt() { logger.log('Exting getDBModelFromID ' + id.toString()); callback(null, 'd4dModelMastersNexusServer'); break; + case "27": + logger.log('Exting getDBModelFromID ' + id.toString()); + callback(null, 'd4dModelBitbucketConfig'); + break; + case "28": + logger.log('Exting getDBModelFromID ' + id.toString()); + callback(null, 'd4dModelOctopusConfig'); + break; + case "29": + logger.log('Exting getDBModelFromID ' + id.toString()); + callback(null, 'd4dModelFunctionalTestConfig'); + break; } }; @@ -183,6 +195,18 @@ function Configmgmt() { logger.log('Exting getDBModelFromID ' + id.toString()); return ('nexusserver'); break; + case "27": + logger.log('Exting getDBModelFromID ' + id.toString()); + return ('bitbucketserver'); + break; + case "28": + logger.log('Exting getDBModelFromID ' + id.toString()); + return ('octopusserver'); + break; + case "29": + logger.log('Exting getDBModelFromID ' + id.toString()); + return ('fuctionaltestserver'); + break; }; }; diff --git a/server/app/model/d4dmasters/d4dmastersmodelnew.js b/server/app/model/d4dmasters/d4dmastersmodelnew.js index 5a19ff56b..6162f0873 100755 --- a/server/app/model/d4dmasters/d4dmastersmodelnew.js +++ b/server/app/model/d4dmasters/d4dmastersmodelnew.js @@ -960,6 +960,163 @@ var d4dMastersJenkinsConfig = new mongoose.Schema({ }); var d4dModelJenkinsConfig = mongoose.model('d4dModelJenkinsConfig', d4dMastersJenkinsConfig, 'd4dmastersnew'); +var d4dMastersBitbucketConfig = new mongoose.Schema({ + id: { + type: String, + required: true, + trim: true + }, + bitbucketname: { + type: String, + required: true, + trim: true, + validate: nameValidator + }, + bitbucketurl: { + type: String, + required: false, + trim: true + }, + bitbucketusername: { + type: String, + required: true, + trim: true, + validate: nameValidator + }, + bitbucketpassword: { + type: String, + required: true, + trim: true + }, + orgname: { + type: [String], + required: true, + trim: true, + validate: nameValidator + }, + orgname_rowid: { + type: [String], + trim: true + }, + active: { + type: Boolean, + trim: true, + default: true + }, + rowid: { + type: String, + required: true, + trim: true + } +}, { + collection: 'd4dmastersnew' +}); +var d4dModelBitbucketConfig = mongoose.model('d4dModelBitbucketConfig', d4dMastersBitbucketConfig, 'd4dmastersnew'); + +var d4dMastersFunctionalTestConfig = new mongoose.Schema({ + id: { + type: String, + required: true, + trim: true + }, + functionaltestname: { + type: String, + required: true, + trim: true, + validate: nameValidator + }, + functionaltesturl: { + type: String, + required: true, + trim: true + }, + functionaltestdays: { + type: String, + required: true, + trim: true, + validate: nameValidator + }, + orgname: { + type: [String], + required: true, + trim: true, + validate: nameValidator + }, + orgname_rowid: { + type: [String], + trim: true + }, + active: { + type: Boolean, + trim: true, + default: true + }, + rowid: { + type: String, + required: true, + trim: true + } +}, { + collection: 'd4dmastersnew' +}); +var d4dModelFunctionalTestConfig = mongoose.model('d4dModelFunctionalTestConfig', d4dMastersFunctionalTestConfig, 'd4dmastersnew'); + + +var d4dMastersOctopusConfig = new mongoose.Schema({ + id: { + type: String, + required: true, + trim: true + }, + octopusname: { + type: String, + required: true, + trim: true, + validate: nameValidator + }, + octopusurl: { + type: String, + required: true, + trim: true + }, + octopuskey: { + type: String, + required: true, + trim: true + + }, + octopusenvs: { + type: String, + required: false, + trim: true + + }, + + orgname: { + type: [String], + required: true, + trim: true, + validate: nameValidator + }, + orgname_rowid: { + type: [String], + trim: true + }, + active: { + type: Boolean, + trim: true, + default: true + }, + rowid: { + type: String, + required: true, + trim: true + } +}, { + collection: 'd4dmastersnew' +}); +var d4dModelOctopusConfig = mongoose.model('d4dModelOctopusConfig', d4dMastersOctopusConfig, 'd4dmastersnew'); + var d4dMastersProviders = new mongoose.Schema({ id: { type: String, @@ -1353,3 +1510,6 @@ module.exports.d4dModelMastersImages = d4dModelMastersImages; module.exports.d4dModelMastersJira = d4dModelMastersJira; module.exports.d4dModelMastersPuppetServer = d4dModelMastersPuppetServer; module.exports.d4dModelMastersNexusServer = d4dModelMastersNexusServer; +module.exports.d4dModelBitbucketConfig = d4dModelBitbucketConfig; +module.exports.d4dModelOctopusConfig = d4dModelOctopusConfig; +module.exports.d4dModelFunctionalTestConfig = d4dModelFunctionalTestConfig; diff --git a/server/app/routes/v1.0/routes_d4dMastersCICD.js b/server/app/routes/v1.0/routes_d4dMastersCICD.js new file mode 100644 index 000000000..54a244dc6 --- /dev/null +++ b/server/app/routes/v1.0/routes_d4dMastersCICD.js @@ -0,0 +1,524 @@ +/* +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. +*/ + + +// This file act as a Controller which contains Settings related all end points. + +var d4dModel = require('_pr/model/d4dmasters/d4dmastersmodel.js'); +var d4dModelNew = require('_pr/model/d4dmasters/d4dmastersmodelnew.js'); +var usersDao = require('_pr/model/users.js'); +var fileIo = require('_pr/lib/utils/fileio'); +var uuid = require('node-uuid'); +var configmgmtDao = require('_pr/model/d4dmasters/configmgmt.js'); +var Chef = require('_pr/lib/chef'); +var Curl = require('_pr/lib/utils/curl.js'); +var appConfig = require('_pr/config'); +var logger = require('_pr/logger')(module); +var childProcess = require('child_process'); +var exec = childProcess.exec; +var masterUtil = require('_pr/lib/utils/masterUtil.js'); +var blueprintsDao = require('_pr/model/dao/blueprints'); +var errorResponses = require('./error_responses.js'); +var bcrypt = require('bcryptjs'); +var authUtil = require('_pr/lib/utils/authUtil.js'); +var Cryptography = require('_pr/lib/utils/cryptography'); +var Client = require('node-rest-client').Client; +var cryptoConfig = appConfig.cryptoSettings; +var cryptography = new Cryptography(cryptoConfig.algorithm, cryptoConfig.password); +var waitForPort = require('wait-for-port'); +var parser = require('xml2json'); +var util = require('util'); +var Task = require('_pr/model/classes/tasks/tasks.js'); +var async = require('async'); +var appDeployPipelineService = require('_pr/services/appDeployPipelineService'); + + +module.exports.setRoutes = function(app) { + + //app.all('/d4dMasters/*', sessionVerification); + + + + app.get('/d4dMastersCICD/readmasterjsonnew/:id', function(req, res) { + logger.debug("Enter get() for /d4dMastersCICD/readmasterjsonnew/%s", req.params.id); +// logger.debug("Logged in user: ", ); + logger.debug("incomming id: ", req.params.id); + var loggedInUser = 'superadmin'; + masterUtil.getLoggedInUser(loggedInUser, function(err, anUser) { + if (err) { + res.status(500).send("Failed to fetch User."); + return; + } + if (!anUser) { + res.status(500).send("Invalid User."); + return; + } + if (anUser.orgname_rowid[0] === "") { + // For Org + masterUtil.getAllActiveOrg(function(err, orgList) { + logger.debug("got org list ==>", JSON.stringify(orgList)); + if (err) { + res.status(500).send('Not able to fetch Orgs.'); + return; + } + if (orgList.length === 0 && req.params.id === '21') { + d4dModelNew.d4dModelMastersTeams.find({ + id: "21" + }, function(err, data) { + if (err) { + logger.error("Failed to fetch Team."); + } + res.send(data); + }); + } else if (req.params.id === '1') { + res.send(orgList); + return; + } else if (req.params.id === '2') { + // For BusinessGroup + masterUtil.getBusinessGroups(orgList, function(err, bgList) { + if (err) { + res.status(500).send('Not able to fetch BG.'); + } + res.send(bgList); + return; + }); + } else if (req.params.id === '3') { + // For Environment + masterUtil.getEnvironments(orgList, function(err, envList) { + if (err) { + res.status(500).send('Not able to fetch ENV.'); + } + res.send(envList); + return; + }); + } else if (req.params.id === '4') { + // For Projects + masterUtil.getProjects(orgList, function(err, projectList) { + if (err) { + res.status(500).send('Not able to fetch Project.'); + } + res.send(projectList); + return; + }) + } else if (req.params.id === '10') { + // For ConfigManagement + masterUtil.getCongifMgmts(orgList, function(err, configMgmtList) { + if (err) { + res.status(500).send('Not able to fetch ConfigManagement.'); + } + res.send(configMgmtList); + return; + }); + + } else if (req.params.id === '18') { + // For Docker + logger.debug("Id for docker: ", req.params.id); + masterUtil.getDockers(orgList, function(err, dockerList) { + if (err) { + res.status(500).send('Not able to fetch Dockers.'); + } + res.send(dockerList); + return; + }); + + } else if (req.params.id === '17') { + // For Template + logger.debug("Id for template: ", req.params.id); + masterUtil.getTemplates(orgList, function(err, templateList) { + if (err) { + res.status(500).send('Not able to fetch Template.'); + } + res.send(templateList); + return; + }); + + } else if (req.params.id === '16') { + // For Template + logger.debug("Id for templateType: ", req.params.id); + masterUtil.getTemplateTypes(orgList, function(err, templateList) { + if (err) { + res.status(500).send('Not able to fetch TemplateType.'); + } + res.send(JSON.stringify(templateList)); + return; + }); + } else if (req.params.id === '19') { + // For ServiceCommand + masterUtil.getServiceCommands(orgList, function(err, serviceCommandList) { + if (err) { + res.status(500).send('Not able to fetch ServiceCommand.'); + } + res.send(serviceCommandList); + return; + }); + + } else if (req.params.id === '20') { + // For Jenkins + masterUtil.getJenkins(orgList, function(err, jenkinList) { + if (err) { + res.status(500).send('Not able to fetch Jenkins.'); + } + //res.send(jenkinList); + var hygProp = ''; + if(jenkinList[0]){ + hygProp += 'jenkins.servers[0]=' + jenkinList[0].jenkinsurl + '\n'; + hygProp += 'jenkins.username=' + jenkinList[0].jenkinsusername + '\n'; + hygProp += 'jenkins.apiKey=' + jenkinList[0].jenkinspassword + '\n'; + } + res.send(hygProp); + return; + }); + + } else if (req.params.id === '27') { + // For Jenkins + masterUtil.getBitbucket(orgList, function(err, bitbucketList) { + if (err) { + res.status(500).send('Not able to fetch Bitbucket.'); + } + //res.send("test\ntest"); + var hygProp = ''; + if(bitbucketList[0]){ + hygProp += 'git.username=' + bitbucketList[0].bitbucketusername + '\n'; + hygProp += 'git.password=' + bitbucketList[0].bitbucketpassword + '\n'; + } + res.send(hygProp); + //res.send(bitbucketList); + return; + }); + + } else if (req.params.id === '28') { + // For Octopus + masterUtil.getOctopus(orgList, function(err, octopusList) { + if (err) { + res.status(500).send('Not able to fetch Octopus.'); + } + var hygProp = ''; + // if(octopusList[0]){ + // hygProp += 'octopus.url=' + octopusList[0].octopusurl + '\n'; + // hygProp += 'octopus.apiKey=' + octopusList[0].octopuskey + '\n'; + // } + if(octopusList){ + for(var oi = 0; oi < octopusList.length;oi++){ + hygProp += 'octopus.url[' + oi + ']=' + octopusList[oi].octopusurl + '\n'; + hygProp += 'octopus.apiKey[' + oi + ']=' + octopusList[oi].octopuskey + '\n'; + hygProp += 'octopus.environments[' + oi + ']=' + octopusList[oi].octopusenvs + '\n'; + } + } + res.send(hygProp); + //res.send(octopusList); + return; + }); + + } else if (req.params.id === '29') { + // For Functional Test + logger.debug('Yippeee....'); + masterUtil.getFunctionalTest(orgList, function(err, functionaltestList) { + if (err) { + res.status(500).send('Not able to fetch Functional Test.'); + } + logger.debug(functionaltestList); + var functionalProp = ''; + if(functionaltestList[0]){ + functionalProp += 'sbux.url=' + functionaltestList[0].functionaltesturl + '\n'; + functionalProp += 'sbux.days=' + functionaltestList[0].functionaltestdays + '\n'; + } + res.send(functionalProp); + //res.send(octopusList); + return; + }); + + } + else if (req.params.id === '23') { + // For Jira + logger.debug("Entering getJira"); + masterUtil.getJira(orgList, function(err, jiraList) { + if (err) { + res.status(500).send('Not able to fetch Jira.'); + } + var hygProp = ''; + if(jiraList[0]){ + hygProp += 'feature.jiraBaseUrl=' + jiraList[0].jiraurl + '\n'; + hygProp += 'feature.jiraCredentials=' + jiraList[0].jirakey + '\n'; + } + res.send(hygProp); + return; + }); + + } + else if (req.params.id === '6') { + // For User Role + masterUtil.getUserRoles(function(err, userRoleList) { + if (err) { + res.status(500).send('Not able to fetch UserRole.'); + } + res.send(userRoleList); + return; + }); + + } else if (req.params.id === '7') { + // For User + masterUtil.getUsersForOrgOrAll(orgList, function(err, userList) { + if (err) { + res.status(500).send('Not able to fetch User.'); + } + res.send(userList); + return; + }); + + } else if (req.params.id === '21') { + // For Team + masterUtil.getTeams(orgList, function(err, teamList) { + if (err) { + res.status(500).send('Not able to fetch Team.'); + } + res.send(teamList); + return; + }); + } else if (req.params.id === '25') { + // For Puppet Server + masterUtil.getPuppetServers(orgList, function(err, pList) { + if (err) { + res.status(500).send('Not able to fetch Puppet Server.'); + } + res.send(pList); + return; + }); + + } else if (req.params.id === '26') { + // For Puppet Server + masterUtil.getNexusServers(orgList, function(err, pList) { + if (err) { + res.status(500).send('Not able to fetch Nexus Server.'); + } + res.send(pList); + return; + }); + } else { + logger.debug('nothin here'); + res.send([]); + } + }); + + // For non-catalystadmin + } else { + logger.debug("incomming id: ", req.params.id); + // For Org + masterUtil.getOrgs(loggedInUser, function(err, orgList) { + logger.debug("got org list: ", JSON.stringify(orgList)); + if (err) { + res.status(500).send('Not able to fetch Orgs.'); + return; + } else if (req.params.id === '1') { + res.send(orgList); + return; + } else if (req.params.id === '2') { + // For BusinessGroup + masterUtil.getBusinessGroups(orgList, function(err, bgList) { + if (err) { + res.status(500).send('Not able to fetch BG.'); + } + res.send(bgList); + return; + }); + } else if (req.params.id === '3') { + // For Environment + masterUtil.getEnvironments(orgList, function(err, envList) { + if (err) { + res.status(500).send('Not able to fetch ENV.'); + } + res.send(envList); + return; + }); + } else if (req.params.id === '4') { + // For Projects + masterUtil.getProjects(orgList, function(err, projectList) { + if (err) { + res.status(500).send('Not able to fetch Project.'); + } + res.send(projectList); + return; + }) + } else if (req.params.id === '10') { + // For ConfigManagement + masterUtil.getCongifMgmts(orgList, function(err, configMgmtList) { + if (err) { + res.status(500).send('Not able to fetch ConfigManagement.'); + } + res.send(configMgmtList); + return; + }); + + } else if (req.params.id === '18') { + // For Docker + logger.debug("Id for docker: ", req.params.id); + masterUtil.getDockers(orgList, function(err, dockerList) { + if (err) { + res.status(500).send('Not able to fetch Dockers.'); + } + res.send(dockerList); + return; + }); + + } else if (req.params.id === '17') { + // For Template + logger.debug("Id for template: ", req.params.id); + masterUtil.getTemplates(orgList, function(err, templateList) { + if (err) { + res.status(500).send('Not able to fetch Template.'); + } + res.send(templateList); + return; + }); + + } else if (req.params.id === '16') { + // For Template + logger.debug("Id for templateType: ", req.params.id); + masterUtil.getTemplateTypes(orgList, function(err, templateList) { + if (err) { + res.status(500).send('Not able to fetch TemplateType.'); + } + res.send(JSON.stringify(templateList)); + return; + }); + + } else if (req.params.id === '19') { + // For ServiceCommand + masterUtil.getServiceCommands(orgList, function(err, serviceCommandList) { + if (err) { + res.status(500).send('Not able to fetch ServiceCommand.'); + } + res.send(serviceCommandList); + return; + }); + + } else if (req.params.id === '20') { + // For Jenkins + masterUtil.getJenkins(orgList, function(err, jenkinList) { + if (err) { + res.status(500).send('Not able to fetch Jenkins.'); + } + res.send(jenkinList); + return; + }); + + } else if (req.params.id === '27') { + // For Bitbucket + masterUtil.getBitbucket(orgList, function(err, bitbucketList) { + if (err) { + res.status(500).send('Not able to fetch bitbucket.'); + } + res.send(bitbucketList); + return; + }); + + }else if (req.params.id === '28') { + // For Octopus + masterUtil.getOctopus(orgList, function(err, octopusList) { + if (err) { + res.status(500).send('Not able to fetch Octopus.'); + } + res.send(octopusList); + return; + }); + + }else if (req.params.id === '29') { + // For Functional Test + masterUtil.getFunctionalTest(orgList, function(err, functionaltestList) { + if (err) { + res.status(500).send('Not able to fetch Functional Test.'); + } + var functionalProp = ''; + if(functionaltestList[0]){ + functionalProp += 'sbux.url=' + functionaltestList[0].functionaltesturl + '\n'; + functionalProp += 'sbux.days=' + functionaltestList[0].functionaltestdays + '\n'; + } + res.send(functionalProp); + //res.send(octopusList); + return; + }); + + } + else if (req.params.id === '23') { + // For Jira + masterUtil.getJira(orgList, function(err, jiraList) { + if (err) { + res.status(500).send('Not able to fetch Jira.'); + } + res.send(jiraList); + return; + }); + + }else if (req.params.id === '6') { + // For User Role + masterUtil.getUserRoles(function(err, userRoleList) { + if (err) { + res.status(500).send('Not able to fetch UserRole.'); + } + res.send(userRoleList); + return; + }); + + } else if (req.params.id === '7') { + // For User + masterUtil.getUsersForOrg(orgList, function(err, userList) { + if (err) { + res.status(500).send('Not able to fetch User.'); + } + res.send(userList); + return; + }); + + } else if (req.params.id === '21') { + // For Team + masterUtil.getTeams(orgList, function(err, teamList) { + if (err) { + res.status(500).send('Not able to fetch Team.'); + } + res.send(teamList); + return; + }); + } else if (req.params.id === '25') { + // For Puppet Server + masterUtil.getPuppetServers(orgList, function(err, pList) { + if (err) { + res.status(500).send('Not able to fetch Puppet Server.'); + } + res.send(pList); + return; + }); + } else if (req.params.id === '26') { + // For Puppet Server + masterUtil.getNexusServers(orgList, function(err, pList) { + if (err) { + res.status(500).send('Not able to fetch Nexus Server.'); + } + res.send(pList); + return; + }); + } else { + logger.debug('nothin here'); + res.send([]); + } + }); + } + }); + + }); + + + +} + From 217b10889e5069e507516caa695365e8e2cd7de5 Mon Sep 17 00:00:00 2001 From: srikanthv02 Date: Mon, 26 Dec 2016 15:00:01 +0530 Subject: [PATCH 03/81] Removed one value attribute --- client/htmls/private/ajax/Settings/CreateBitbucketConfig.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/htmls/private/ajax/Settings/CreateBitbucketConfig.html b/client/htmls/private/ajax/Settings/CreateBitbucketConfig.html index 40c784fe1..dc82a147d 100644 --- a/client/htmls/private/ajax/Settings/CreateBitbucketConfig.html +++ b/client/htmls/private/ajax/Settings/CreateBitbucketConfig.html @@ -39,7 +39,7 @@

New Bitbucket Config - + From 61af360cb0c5becfe7466c43155c6fdeaed4725a Mon Sep 17 00:00:00 2001 From: hrushikesh07 Date: Fri, 6 Jan 2017 16:45:19 +0530 Subject: [PATCH 04/81] new capacity --- .../sections/dashboard/analytics/analytics.js | 2 +- .../dashboard/analytics/analytics.scss | 3 + .../analytics/controller/capacityCtrl.js | 165 +++++++++++++++++- .../dashboard/analytics/view/capacity.html | 32 ++-- .../analytics/view/capacityChart.html | 36 ++++ 5 files changed, 214 insertions(+), 24 deletions(-) create mode 100644 client/cat3/src/partials/sections/dashboard/analytics/view/capacityChart.html diff --git a/client/cat3/src/partials/sections/dashboard/analytics/analytics.js b/client/cat3/src/partials/sections/dashboard/analytics/analytics.js index f25220e0e..df8bec568 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/analytics.js +++ b/client/cat3/src/partials/sections/dashboard/analytics/analytics.js @@ -25,7 +25,7 @@ url: "analytics/capacity/", templateUrl: "src/partials/sections/dashboard/analytics/view/capacity.html", controller: "capacityCtrl as capaCtr", - params:{filterView:{period:true,cost:true,viewBy:true,splitUpType:true,org:true}}, + params:{filterView:{usage:true,org:true,provi:true,instanceType:true}}, resolve: { auth: ["$q", function ($q) { var deferred = $q.defer(); diff --git a/client/cat3/src/partials/sections/dashboard/analytics/analytics.scss b/client/cat3/src/partials/sections/dashboard/analytics/analytics.scss index 4335ee085..c490e441c 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/analytics.scss +++ b/client/cat3/src/partials/sections/dashboard/analytics/analytics.scss @@ -364,4 +364,7 @@ } label { font-weight: 400 !important; +} +.ui-grid-viewport { + overflow-x: hidden !important; } \ No newline at end of file diff --git a/client/cat3/src/partials/sections/dashboard/analytics/controller/capacityCtrl.js b/client/cat3/src/partials/sections/dashboard/analytics/controller/capacityCtrl.js index 500014e5a..53aed8740 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/controller/capacityCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/analytics/controller/capacityCtrl.js @@ -1,9 +1,18 @@ (function (angular) { "use strict"; angular.module('dashboard.analytics') - .controller('capacityCtrl', ['$scope', '$rootScope', '$state','analyticsServices', 'genericServices','$timeout', function ($scope,$rootScope,$state,analyticsServices,genSevs,$timeout){ - $rootScope.stateItems = $state.params; + .controller('capacityCtrl', ['$scope', '$rootScope', '$state','analyticsServices', 'genericServices','$timeout','$location', '$anchorScroll','$modal',function ($scope,$rootScope,$state,analyticsServices,genSevs,$timeout,$location, $anchorScroll,$modal){ + + $rootScope.organNewEnt.provider='0'; //analyticsServices.initFilter(); + $scope.gototab = function(id) { + // set the location.hash to the id of + // the element you wish to scroll to. + $location.hash(id); + + // call $anchorScroll() + $anchorScroll(); + }; var capaCtr =this; capaCtr.chartData=[]; capaCtr.splitUp=null; @@ -167,6 +176,7 @@ } if(result.capacity && result.capacity.AWS && result.capacity.AWS.services) { capaCtr.serviceCapacity = result.capacity.AWS.services; + capaCtr.createList(); angular.forEach(result.capacity.AWS.services, function (valueChild, keyChild) { var va = []; capaCtr.capaGridOptions.columnDefs.push({ @@ -321,7 +331,156 @@ $rootScope.$emit('treeNameUpdate', treeNames); },500); }; + // new e################################### + $scope.openChart=function (id) { + $modal.open({ + animation: true, + templateUrl: 'src/partials/sections/dashboard/analytics/view/capacityChart.html', + controller: 'capacityChartCtrl as capChat', + backdrop : 'static', + keyboard: false, + resolve: { + items: function() { + return id; + } + } + }). + result.then(function() { + + }, function() { + + }); + }; + $scope.chefConfig=function (id) { + var promise = genSevs.editRunlist(id); + }; + capaCtr.createList = function () { + capaCtr.listGrid=[]; + var fltrObj=$rootScope.filterNewEnt; + + // for(var value in capaCtr.serviceCapacity) { + var value='RDS'; + capaCtr.listGrid[value]=[]; + capaCtr.listGrid[value].data=[]; + capaCtr.listGrid[value].paginationPageSizes= [25, 50, 100]; + capaCtr.listGrid[value].paginationPageSize=25; + capaCtr.listGrid[value].columnDefs=[ + {name: 'platformId', field: 'platformId', cellTooltip: true}, + {name: 'os', enableFiltering: true,displayName: 'os', field:'os',cellTooltip: true}, + {name: 'privateIpAddress', displayName: 'IP Address',cellTooltip: true}, + {name: 'state', displayName: 'Status',cellTooltip: true}, + {name: 'Region',displayName: 'Region', + field: 'providerData.region', + cellTooltip: true + }, + {name: 'cost', displayName: 'cost',cellTemplate: '12'}, + {name: 'Usage', cellTooltip: true,cellTemplate:""}, + {name: 'Chef', cellTooltip: true,cellTemplate:""} + ]; + if(fltrObj && fltrObj.provider && fltrObj.provider.id) { + var param = { + url: '/providers/' + fltrObj.provider.id + '/unassigned-instances' + // url:'src/partials/sections/dashboard/analytics/data/ins.json' + }; + genSevs.promiseGet(param).then(function (instResult) { + capaCtr.listGrid[value].data=instResult.data; + }); + } + + //} + }; + capaCtr.init(); - }]); + + }]).controller('capacityChartCtrl',['$scope','$rootScope','items','genericServices','$modalInstance',function($scope,$rootScope,items,genSevs,$modalInstance){ + var capChat=this; + capChat.items=items; + capChat.trendLineChart={ + options:{}, + data:[] + }; + capChat.splitUp='CPUUtilization'; + capChat.trendLineChart.options = { + chart: { + //type: 'stackedAreaChart', + type: 'lineChart', + height: 200, + 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' + } + } + }; + capChat.legends=[]; + + capChat.getData=function(fltObj){ + capChat.trendLineChart.data = []; + var $today = new Date(); + var $yesterday = new Date($today); + $yesterday.setDate($today.getDate() - 1); + if(fltObj && fltObj.resources && fltObj.resources.length >0) { + var $today = new Date(); + var $yesterday = new Date($today); + $yesterday.setDate($today.getDate() - 1); + var param = { + url: '/analytics/trend/usage?resource=' + items._id + '&fromTimeStamp=' + $yesterday + '&toTimeStamp=' + $today + '&interval=3600' + //url:'src/partials/sections/dashboard/analytics/data/usage.json' + }; + genSevs.promiseGet(param).then(function (result) { + var va = []; + if (result) { + angular.forEach(result[capChat.splitUp].dataPoints, function (value) { + va.push([Date.parse(value.fromTime), value.average]); + }); + capChat.trendLineChart.data.push({ + "key": items.platformId, + "values": va + }); + } + // } + }); + } + }; + capChat.splitChange=function() { + capChat.getData($rootScope.filterNewEnt); + }; + capChat.getData($rootScope.filterNewEnt); + $scope.cancel = function() { + $modalInstance.dismiss('cancel'); + }; + }]); })(angular); diff --git a/client/cat3/src/partials/sections/dashboard/analytics/view/capacity.html b/client/cat3/src/partials/sections/dashboard/analytics/view/capacity.html index a47c3948b..dc23322cc 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/view/capacity.html +++ b/client/cat3/src/partials/sections/dashboard/analytics/view/capacity.html @@ -4,7 +4,7 @@
Total Capacity: {{capaCtr.pieChat.totalCoust}}           Services - {{value}} : {{key}} + {{value}} : {{key}}
@@ -19,30 +19,22 @@
-
+ +
-
-

Aggregate Capacity

+

Instnce

-
-
-
-
-
-

Distribution of all services across {{capaCtr.splitUp}}

- -
-
-
-
-
-
-

Daily trends of cost across organization

+
+
+
+
+ No Data Available. +
+
-
-
+
diff --git a/client/cat3/src/partials/sections/dashboard/analytics/view/capacityChart.html b/client/cat3/src/partials/sections/dashboard/analytics/view/capacityChart.html new file mode 100644 index 000000000..3aed50ff3 --- /dev/null +++ b/client/cat3/src/partials/sections/dashboard/analytics/view/capacityChart.html @@ -0,0 +1,36 @@ +
+

+ × + +   + Daily trends of usage + +

+
+ +
+
+ + Usage Type + + +
+
+ + +
+ + +
+ +
+ +
\ No newline at end of file From 5b7d6e55960244e10d5bfd6aeabab3ca6c03e984 Mon Sep 17 00:00:00 2001 From: Udesh Date: Fri, 6 Jan 2017 17:31:47 +0530 Subject: [PATCH 05/81] monitor migration --- server/app/db-script/monitor-update.js | 72 +++++++++++++++++++ server/app/model/classes/instance/instance.js | 18 +++++ 2 files changed, 90 insertions(+) create mode 100644 server/app/db-script/monitor-update.js diff --git a/server/app/db-script/monitor-update.js b/server/app/db-script/monitor-update.js new file mode 100644 index 000000000..5cb9ab4b5 --- /dev/null +++ b/server/app/db-script/monitor-update.js @@ -0,0 +1,72 @@ +/* + 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. +*/ + +// This script will update task history with org details and create action log. + +var logger = require('_pr/logger')(module); +var mongoDbConnect = require('_pr/lib/mongodb'); +var appConfig = require('_pr/config'); +var instancesDao = require('_pr/model/classes/instance/instance'); +var instanceLogModel = require('_pr/model/log-trail/instanceLog.js'); +var logsDao = require('_pr/model/dao/logsdao.js'); +var monitorsModel = require('_pr/model/monitors/monitors.js'); + +var dboptions = { + host: appConfig.db.host, + port: appConfig.db.port, + dbName: appConfig.db.dbName +}; +mongoDbConnect(dboptions, function(err) { + if (err) { + logger.error("Unable to connect to mongo db >>" + err); + process.exit(); + } else { + logger.debug('connected to mongodb - host = %s, port = %s, database = %s', dboptions.host, dboptions.port, dboptions.dbName); + } +}); + +var instaces = ['i-5c03de9f','i-7bc992b9','i-ca1f6d01', 'i-ce4c3105', 'i-d3411313']; + +monitorsModel.getMonitors({}, function(err, monitors) { + if (err) { + logger.error("Failed to fetch tasks: ", err); + process.exit(); + } + if (monitors && monitors.length) { + var monitorDetails = monitors[0]; + var countr = 1; + for (var i = 0; i < instaces.length; i++) { + (function(instacesId) { + instancesDao.updateInstanceMonitor(instacesId,monitorDetails, function(err,data) { + countr++; + if (err) { + logger.error("Failed to update instance: "+instacesId, err); + }else{ + logger.debug("updated instance: "+instacesId); + logger.debug("log---->> ",JSON.stringify(data)); + } + if(countr ===instaces.length){ + logger.debug("All instance updated."); + process.exit(); + } + }); + })(instaces[i]); + } + } else { + logger.debug("No Task to update."); + process.exit(); + } +}); \ No newline at end of file diff --git a/server/app/model/classes/instance/instance.js b/server/app/model/classes/instance/instance.js index 075bd3400..70be91ca6 100755 --- a/server/app/model/classes/instance/instance.js +++ b/server/app/model/classes/instance/instance.js @@ -2069,6 +2069,24 @@ var InstancesDao = function () { } }); }; + + this.updateInstanceMonitor = function (instanceAWSId, monitor, callback) { + Instances.update({ + platformId: instanceAWSId + }, { + $set: { + monitor: monitor + } + }, { + upsert: false + }, function (err, data) { + if (err) { + return callback(err, null); + } else { + callback(null, data); + } + }); + }; this.NormalizedInstances = function (jsonData, fieldName, callback) { var queryObj = {}; From c394aeba9d045059fe82e3791c02c91065fe3a9e Mon Sep 17 00:00:00 2001 From: Udesh Date: Fri, 6 Jan 2017 17:36:13 +0530 Subject: [PATCH 06/81] update script message --- server/app/db-script/monitor-update.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/app/db-script/monitor-update.js b/server/app/db-script/monitor-update.js index 5cb9ab4b5..43110994c 100644 --- a/server/app/db-script/monitor-update.js +++ b/server/app/db-script/monitor-update.js @@ -14,7 +14,7 @@ limitations under the License. */ -// This script will update task history with org details and create action log. +// This script will update the monitor details for some instances var logger = require('_pr/logger')(module); var mongoDbConnect = require('_pr/lib/mongodb'); From 3c0b42a74278a6d9b0d26a2e3d97d123d4f04025 Mon Sep 17 00:00:00 2001 From: Udesh Date: Fri, 6 Jan 2017 17:53:05 +0530 Subject: [PATCH 07/81] monitor migration --- server/app/db-script/monitor-update.js | 72 +++++++++++++++++++ server/app/model/classes/instance/instance.js | 18 +++++ 2 files changed, 90 insertions(+) create mode 100644 server/app/db-script/monitor-update.js diff --git a/server/app/db-script/monitor-update.js b/server/app/db-script/monitor-update.js new file mode 100644 index 000000000..43110994c --- /dev/null +++ b/server/app/db-script/monitor-update.js @@ -0,0 +1,72 @@ +/* + 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. +*/ + +// This script will update the monitor details for some instances + +var logger = require('_pr/logger')(module); +var mongoDbConnect = require('_pr/lib/mongodb'); +var appConfig = require('_pr/config'); +var instancesDao = require('_pr/model/classes/instance/instance'); +var instanceLogModel = require('_pr/model/log-trail/instanceLog.js'); +var logsDao = require('_pr/model/dao/logsdao.js'); +var monitorsModel = require('_pr/model/monitors/monitors.js'); + +var dboptions = { + host: appConfig.db.host, + port: appConfig.db.port, + dbName: appConfig.db.dbName +}; +mongoDbConnect(dboptions, function(err) { + if (err) { + logger.error("Unable to connect to mongo db >>" + err); + process.exit(); + } else { + logger.debug('connected to mongodb - host = %s, port = %s, database = %s', dboptions.host, dboptions.port, dboptions.dbName); + } +}); + +var instaces = ['i-5c03de9f','i-7bc992b9','i-ca1f6d01', 'i-ce4c3105', 'i-d3411313']; + +monitorsModel.getMonitors({}, function(err, monitors) { + if (err) { + logger.error("Failed to fetch tasks: ", err); + process.exit(); + } + if (monitors && monitors.length) { + var monitorDetails = monitors[0]; + var countr = 1; + for (var i = 0; i < instaces.length; i++) { + (function(instacesId) { + instancesDao.updateInstanceMonitor(instacesId,monitorDetails, function(err,data) { + countr++; + if (err) { + logger.error("Failed to update instance: "+instacesId, err); + }else{ + logger.debug("updated instance: "+instacesId); + logger.debug("log---->> ",JSON.stringify(data)); + } + if(countr ===instaces.length){ + logger.debug("All instance updated."); + process.exit(); + } + }); + })(instaces[i]); + } + } else { + logger.debug("No Task to update."); + process.exit(); + } +}); \ No newline at end of file diff --git a/server/app/model/classes/instance/instance.js b/server/app/model/classes/instance/instance.js index 075bd3400..70be91ca6 100755 --- a/server/app/model/classes/instance/instance.js +++ b/server/app/model/classes/instance/instance.js @@ -2069,6 +2069,24 @@ var InstancesDao = function () { } }); }; + + this.updateInstanceMonitor = function (instanceAWSId, monitor, callback) { + Instances.update({ + platformId: instanceAWSId + }, { + $set: { + monitor: monitor + } + }, { + upsert: false + }, function (err, data) { + if (err) { + return callback(err, null); + } else { + callback(null, data); + } + }); + }; this.NormalizedInstances = function (jsonData, fieldName, callback) { var queryObj = {}; From 179cf738b45e183f59308535a1114127254a4c10 Mon Sep 17 00:00:00 2001 From: Karthik K N Date: Mon, 9 Jan 2017 11:59:03 +0530 Subject: [PATCH 08/81] Monthly resource cost aggregation enabled --- .../AWSResourceCostsAggregation.js | 13 +++-- .../model/resource-costs/resource-costs.js | 4 +- server/app/services/resourceService.js | 49 ++++++++++++++++++- server/install.js | 2 +- 4 files changed, 60 insertions(+), 8 deletions(-) diff --git a/server/app/cronjobs/aws-cost-aggregation/AWSResourceCostsAggregation.js b/server/app/cronjobs/aws-cost-aggregation/AWSResourceCostsAggregation.js index 257661091..997103ab4 100644 --- a/server/app/cronjobs/aws-cost-aggregation/AWSResourceCostsAggregation.js +++ b/server/app/cronjobs/aws-cost-aggregation/AWSResourceCostsAggregation.js @@ -50,8 +50,9 @@ AWSResourceCostsAggregation.aggregateEntityCostsByOrg = aggregateEntityCostsByOr AWSResourceCostsAggregation.aggregateEntityCostsByProvider = aggregateEntityCostsByProvider AWSResourceCostsAggregation.aggregateEntityCostTrendByOrg = aggregateEntityCostTrendByOrg AWSResourceCostsAggregation.aggregateEntityCostTrendByProvider = aggregateEntityCostTrendByProvider +AWSResourceCostsAggregation.aggregateResourceCostsForAllPeriods = aggregateResourceCostsForAllPeriods -// AWSResourceCostsAggregation.execute() +AWSResourceCostsAggregation.execute() module.exports = AWSResourceCostsAggregation @@ -206,8 +207,7 @@ function updateResourceCosts(provider, downloadedCSVPath, callback) { resourceService.getAllResourcesForProvider(provider, next) }, function(resources, next) { - resourceService.updateAWSResourceCostsFromCSV(provider, resources, downloadedCSVPath, - AWSResourceCostsAggregation.currentCronRunTime, next) + AWSResourceCostsAggregation.aggregateResourceCostsForAllPeriods(provider, resources, next) }, function(next) { AWSProvider.updateLastBillUpdateTime(provider._id, @@ -223,6 +223,13 @@ function updateResourceCosts(provider, downloadedCSVPath, callback) { }) } +// Only aggregates monthly cost as of now and updates resource/instance collections +// @TODO To be aggregated for all periods +function aggregateResourceCostsForAllPeriods(provider, resources, callback) { + resourceService.aggregateResourceCostsForPeriod(provider, resources, 'month', + AWSResourceCostsAggregation.currentCronRunTime, callback) +} + function aggregateEntityCostsByOrg(orgs, callback) { // var catalystEntityHierarchy = appConfig.catalystEntityHierarchy var costAggregationPeriods = appConfig.costAggregationPeriods diff --git a/server/app/model/resource-costs/resource-costs.js b/server/app/model/resource-costs/resource-costs.js index 9a0761fd4..2c8f9a306 100644 --- a/server/app/model/resource-costs/resource-costs.js +++ b/server/app/model/resource-costs/resource-costs.js @@ -77,7 +77,7 @@ var ResourceCostsSchema = new Schema({ }, billLineItemId: { type: Number, - required: true, + required: false, trim: true }, platformDetails: { @@ -137,8 +137,6 @@ var ResourceCostsSchema = new Schema({ }) ResourceCostsSchema.index({'platformDetails.serviceId' : 1}) -ResourceCostsSchema.index({'organizationId': 1, 'providerId': 1, 'startTime': 1, - 'billIntervalId': 1, 'billLineItemId': 1, 'interval': 1}, {'unique': true}) ResourceCostsSchema.statics.save = function save(resourceCostData, callback) { var resourceCosts = new ResourceCosts(resourceCostData) diff --git a/server/app/services/resourceService.js b/server/app/services/resourceService.js index 20a38dafe..e9a54edc6 100644 --- a/server/app/services/resourceService.js +++ b/server/app/services/resourceService.js @@ -47,6 +47,7 @@ resourceService.getEC2InstancesInfo=getEC2InstancesInfo; resourceService.getAllResourcesForProvider = getAllResourcesForProvider; resourceService.updateAWSResourceCostsFromCSV = updateAWSResourceCostsFromCSV resourceService.updateDomainNameForInstance = updateDomainNameForInstance +resourceService.aggregateResourceCostsForPeriod = aggregateResourceCostsForPeriod // @TODO To be cached if needed. In memory data will not exceed 200MB for upto 2000 instances. function getAllResourcesForProvider(provider, next) { @@ -193,10 +194,56 @@ function updateAWSResourceCostsFromCSV(provider, resources, downlaodedCSVPath, u if(err) { callback(err) } else { - callback() + callback(null, resources) } }) +} + +function aggregateResourceCostsForPeriod(provider, resources, period, endTime, callback) { + var catalystEntityHierarchy = appConfig.catalystEntityHierarchy + var date = new Date() + var billIntervalId = date.getFullYear() + '-' + (date.getMonth() + 1) + + var offset = (new Date()).getTimezoneOffset()*60000 + var startTime = dateUtil.getStartOfPeriod(period, endTime) + var query = { 'providerId': provider._id.toString() } + query.startTime = {$gte: Date.parse(startTime) + offset} + query.endTime = {$lte: Date.parse(endTime) + offset} + + async.waterfall([ + function(next) { + resourceCost.aggregate([ + {$match: query}, + {$group: {_id: "$" + catalystEntityHierarchy['resource'].key, + totalCost: {$sum: "$cost"}}} + ],next) + }, + function(resourceCosts, next) { + async.forEach(resourceCosts, function(resourceCost, next1) { + if(resourceCost._id in resources) { + resources[resourceCost._id].cost = { + aggregateInstanceCost: Math.round(resourceCost.totalCost * 100) / 100, + currency:'USD', + symbol:"$" + } + resources[resourceCost._id].save(next1) + } + }, function(err) { + if(err) { + next(err) + } else { + next() + } + }) + } + ], function(err) { + if(err) { + callback(err) + } else { + callback() + } + }) } function getCostForServices_deprecated(provider,callback) { diff --git a/server/install.js b/server/install.js index 06b7d6b7b..4e15ebef8 100755 --- a/server/install.js +++ b/server/install.js @@ -471,7 +471,7 @@ function getDefaultsConfig() { key: 'platformDetails.region' }, resource: { - key: 'resourceId' + key: 'platformDetails.instanceId' } }, costAggregationPeriods: { From 5122b902d89a1cb5c94cfd14243e96c3fd4e9cf1 Mon Sep 17 00:00:00 2001 From: Karthik K N Date: Mon, 9 Jan 2017 11:59:42 +0530 Subject: [PATCH 09/81] Cost aggregation on startup disabled --- .../aws-cost-aggregation/AWSResourceCostsAggregation.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/app/cronjobs/aws-cost-aggregation/AWSResourceCostsAggregation.js b/server/app/cronjobs/aws-cost-aggregation/AWSResourceCostsAggregation.js index 997103ab4..8fe204bc3 100644 --- a/server/app/cronjobs/aws-cost-aggregation/AWSResourceCostsAggregation.js +++ b/server/app/cronjobs/aws-cost-aggregation/AWSResourceCostsAggregation.js @@ -52,7 +52,7 @@ AWSResourceCostsAggregation.aggregateEntityCostTrendByOrg = aggregateEntityCostT AWSResourceCostsAggregation.aggregateEntityCostTrendByProvider = aggregateEntityCostTrendByProvider AWSResourceCostsAggregation.aggregateResourceCostsForAllPeriods = aggregateResourceCostsForAllPeriods -AWSResourceCostsAggregation.execute() +// AWSResourceCostsAggregation.execute() module.exports = AWSResourceCostsAggregation From c951a7e8bb589d1d24b5a8b47df8fdac42eb53bf Mon Sep 17 00:00:00 2001 From: Karthik K N Date: Mon, 9 Jan 2017 14:31:52 +0530 Subject: [PATCH 10/81] Resource cost aggregation from CSV updated --- .../aws-cost-aggregation/AWSResourceCostsAggregation.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/server/app/cronjobs/aws-cost-aggregation/AWSResourceCostsAggregation.js b/server/app/cronjobs/aws-cost-aggregation/AWSResourceCostsAggregation.js index 8fe204bc3..844de2c4f 100644 --- a/server/app/cronjobs/aws-cost-aggregation/AWSResourceCostsAggregation.js +++ b/server/app/cronjobs/aws-cost-aggregation/AWSResourceCostsAggregation.js @@ -206,6 +206,10 @@ function updateResourceCosts(provider, downloadedCSVPath, callback) { function(next) { resourceService.getAllResourcesForProvider(provider, next) }, + function(resources, next) { + resourceService.updateAWSResourceCostsFromCSV(provider, resources, downloadedCSVPath, + AWSResourceCostsAggregation.currentCronRunTime, next) + }, function(resources, next) { AWSResourceCostsAggregation.aggregateResourceCostsForAllPeriods(provider, resources, next) }, From 6c0bbb2daed1b5fd4c57cafa5b5d19024f8e33ac Mon Sep 17 00:00:00 2001 From: hrushikesh07 Date: Mon, 9 Jan 2017 16:53:24 +0530 Subject: [PATCH 11/81] capacity filter changed --- .../sections/dashboard/analytics/analytics.js | 2 +- .../dashboard/analytics/analytics.scss | 19 +- .../analytics/controller/capacityCtrl.js | 306 ++---------------- .../dashboard/analytics/view/capacity.html | 33 +- 4 files changed, 61 insertions(+), 299 deletions(-) diff --git a/client/cat3/src/partials/sections/dashboard/analytics/analytics.js b/client/cat3/src/partials/sections/dashboard/analytics/analytics.js index df8bec568..98c7dd777 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/analytics.js +++ b/client/cat3/src/partials/sections/dashboard/analytics/analytics.js @@ -25,7 +25,7 @@ url: "analytics/capacity/", templateUrl: "src/partials/sections/dashboard/analytics/view/capacity.html", controller: "capacityCtrl as capaCtr", - params:{filterView:{usage:true,org:true,provi:true,instanceType:true}}, + params:{filterView:{usage:true,org:true,provi:true,instanceType:true,period:true}}, resolve: { auth: ["$q", function ($q) { var deferred = $q.defer(); diff --git a/client/cat3/src/partials/sections/dashboard/analytics/analytics.scss b/client/cat3/src/partials/sections/dashboard/analytics/analytics.scss index c490e441c..ff8e3ed2d 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/analytics.scss +++ b/client/cat3/src/partials/sections/dashboard/analytics/analytics.scss @@ -330,15 +330,7 @@ float: right; width: 57%; } - .form-control{ - height: 29px; - padding: 2px 10px; - font-size: 12px; - line-height: 1; - } - .with250{ - width: 250px !important; - } + } .form-item-container { .list-inline { @@ -367,4 +359,13 @@ label { } .ui-grid-viewport { overflow-x: hidden !important; +} +.form-control{ + height: 29px; + padding: 2px 10px; + font-size: 12px; + line-height: 1; +} +.with250{ + width: 250px !important; } \ No newline at end of file diff --git a/client/cat3/src/partials/sections/dashboard/analytics/controller/capacityCtrl.js b/client/cat3/src/partials/sections/dashboard/analytics/controller/capacityCtrl.js index 53aed8740..fa687c5fc 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/controller/capacityCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/analytics/controller/capacityCtrl.js @@ -2,8 +2,7 @@ "use strict"; angular.module('dashboard.analytics') .controller('capacityCtrl', ['$scope', '$rootScope', '$state','analyticsServices', 'genericServices','$timeout','$location', '$anchorScroll','$modal',function ($scope,$rootScope,$state,analyticsServices,genSevs,$timeout,$location, $anchorScroll,$modal){ - - $rootScope.organNewEnt.provider='0'; + $rootScope.stateItems = $state.params; //analyticsServices.initFilter(); $scope.gototab = function(id) { // set the location.hash to the id of @@ -16,101 +15,6 @@ var capaCtr =this; capaCtr.chartData=[]; capaCtr.splitUp=null; - capaCtr.pieChat={ - option:{}, - totalCoust:'', - data: [] - }; - capaCtr.barChat={ - option:{}, - data: [] - }; - capaCtr.capaGridOptions={ - columnDefs:[], - data:[] - }; - capaCtr.createChart = function() { - capaCtr.pieChat = { - option: { - chart: { - type: 'pieChart', - margin: { - top: 20, - right: 0, - bottom: 60, - left: 0 - }, - height: 300, - x: function (d) { - return d.key; - }, - y: function (d) { - return d.value; - }, - pie: { - valueFormat: function (d) { - return d3.round(d); - } - }, - showLabels: false, - labelType: "value", - labelThreshold: 0.01, - labelSunbeamLayout: true, - legend: {} - } - }, - totalCoust: '', - data: [] - }; - - capaCtr.barChat = { - option: { - chart: { - type: 'multiBarChart', - height: 300, - margin: { - top: 20, - right: 20, - bottom: 60, - left: 60 - }, - duration:1000, - stacked: true, - x: function (d) { - return d.label; - }, - y: function (d) { - return d.value; - }, - showControls: true, - showValues: true, - xAxis: { - axisLabel: 'Aggregate', - showMaxMin: false, - staggerLabels:false - }, - yAxis: { - axisLabel: 'Count', - tickFormat: function (d) { - return d3.round(d); - } - } - } - }, - data: [] - }; - - capaCtr.capaGridOptions = { - enableGridMenu: true, - enableSelectAll: true, - exporterMenuPdf: false, - exporterCsvFilename: 'costFile.csv', - exporterCsvLinkElement: angular.element(document.querySelectorAll(".custom-csv-link-location")), - onRegisterApi: function (gridApi) { - $scope.gridApi = gridApi; - } - }; - }; capaCtr.getCapacityData=function(fltObj){ var param = { // url: 'src/partials/sections/dashboard/analytics/data/cost.json?org' @@ -147,186 +51,19 @@ } }); }; - capaCtr.createLable= function(result,viewType){ - capaCtr.createChart(); - if(result && result.capacity) { - capaCtr.capaGridOptions.data = []; - capaCtr.capaGridOptions.columnDefs = [ - {name: 'name', field: 'name'}, - {name: 'totalCapacity', field: 'capacity.totalCapacity'} - ]; - capaCtr.pieChat.totalCoust = result.capacity.totalCapacity; - capaCtr.pieChat.data = []; - capaCtr.barChat.data = []; - // create bar - //if(viewType === 'ProviderView'){ - capaCtr.capaGridOptions.data = result.splitUpCapacities[viewType]; - if(result.splitUpCapacities && Object.keys(result.splitUpCapacities).length >0 ) { - angular.forEach(result.splitUpCapacities[viewType], function (value) { - capaCtr.pieChat.data.push({ - key: value.name, - value: value.capacity.totalCapacity - }); - }); - } else{ - capaCtr.pieChat.data.push({ - key: result.entity.name, - value: result.capacity.totalCapacity - }); - } - if(result.capacity && result.capacity.AWS && result.capacity.AWS.services) { - capaCtr.serviceCapacity = result.capacity.AWS.services; - capaCtr.createList(); - angular.forEach(result.capacity.AWS.services, function (valueChild, keyChild) { - var va = []; - capaCtr.capaGridOptions.columnDefs.push({ - name: keyChild, - field: 'capacity.AWS.services.' + keyChild - }); - if(result.splitUpCapacities && Object.keys(result.splitUpCapacities).length >0 ) { - angular.forEach(result.splitUpCapacities[viewType], function (valBar) { - var chVal = ''; - if (valBar.capacity.AWS.services[keyChild]) { - chVal = valBar.capacity.AWS.services[keyChild]; - } else { - chVal = 0; - } - va.push( - { - "label": valBar.name, - "value": chVal - } - ); - }); - } else { - var chVal = ''; - if (result.capacity.AWS.services[keyChild]) { - chVal =result.capacity.AWS.services[keyChild]; - } else { - chVal = 0; - } - va.push( - { - "label": result.entity.name, - "value": chVal - } - ); - } - capaCtr.barChat.data.push({ - "key": keyChild, - "values": va - }); - }); - } - } - }; - capaCtr.trendsChart=function(fltObj){ - capaCtr.trendLineChart={}; - capaCtr.trendLineChart.options = { - chart: { - //type: 'stackedAreaChart', - type: 'lineChart', - height: 350, - margin: { - top: 20, - right: 20, - bottom: 40, - left: 60 - }, - x: function (d) { - return d[0]; - }, - y: function (d) { - return d[1]; - }, - useVoronoi: false, - clipEdge: true, - duration: 1000, - useInteractiveGuideline: true, - xAxis: { - showMaxMin: false, - axisLabel: 'Date', - tickFormat: function (d) { - return d3.time.format('%x')(new Date(d)); - } - }, - yAxis: { - axisLabel: 'Count', - tickFormat: function (d) { - return d3.round(d); - } - }, - zoom: { - enabled: true, - scaleExtent: [1, 10], - useFixedDomain: false, - useNiceScale: false, - horizontalOff: true, - verticalOff: true, - unzoomEventType: 'dblclick.zoom' - } - } - }; - capaCtr.trendLineChart.data = []; - var param = { - url: '' - }; - if(fltObj && fltObj.org){ - var entityId=null; - if(fltObj.provider){ - entityId=fltObj.provider.id; - } else { - entityId=fltObj.org.id; - } - //http://192.168.152.139:3001 - // param.url='/analytics/capacity/trend?parentEntityId='+fltObj.org.id+'&entityId='+fltObj.org.id+'&toTimeStamp='+new Date()+'&period='+fltObj.period+'&interval=86400' - } - - genSevs.promiseGet(param).then(function (result) { - if(result.capacityTrends && result.capacityTrends.length) { - capaCtr.trendLineChart.totalCapacity = result.capacity.totalCapacity; - capaCtr.trendLineChart.data = []; - angular.forEach(result.capacity.AWS.services, function (valueChild, keyChild) { - var va = []; - angular.forEach(result.capacityTrends, function (value) { - var chVal=''; - if(value.capacity.AWS.services[keyChild]){ - chVal=value.capacity.AWS.services[keyChild]; - } else { - chVal=0; - } - va.push([value.fromTime,chVal]); - }); - capaCtr.trendLineChart.data.push({ - "key": keyChild, - "values": va - }); - }); - capaCtr.trendLineChart.data[0].values.push([]); - } - }); - }; - $scope.$on('CHANGE_VIEW', function (event, data) { - if (data) { - capaCtr.splitUp = data.replace(/([A-Z])/g, ' $1').replace(/^./, function (str) { - return str.toUpperCase(); - }); - capaCtr.createLable(capaCtr.chartData, data); - } - }); $rootScope.applyFilter =function(filterApp,period){ analyticsServices.applyFilter(filterApp,period); if($state.current.name === "dashboard.analytics.capacity") { - capaCtr.getCapacityData($rootScope.filterNewEnt); + capaCtr.createList(); } }; capaCtr.init =function(){ - analyticsServices.initFilter(); - capaCtr.createChart(); + $rootScope.organNewEnt.instanceType='Unassigned'; + $rootScope.organNewEnt.provider='0'; + $rootScope.$emit('INI_usage', 'Unassigned'); $timeout(function () { $rootScope.applyFilter(true,'month'); - capaCtr.trendsChart($rootScope.filterNewEnt); var treeNames = ['Cloud Management','Analytics','capacity']; $rootScope.$emit('treeNameUpdate', treeNames); },500); @@ -364,8 +101,9 @@ capaCtr.listGrid[value].data=[]; capaCtr.listGrid[value].paginationPageSizes= [25, 50, 100]; capaCtr.listGrid[value].paginationPageSize=25; + $scope.colArray=['platformId','state','orgName','privateIpAddress','os'] capaCtr.listGrid[value].columnDefs=[ - {name: 'platformId', field: 'platformId', cellTooltip: true}, + {name: 'Instance Id', field: 'platformId', cellTooltip: true}, {name: 'os', enableFiltering: true,displayName: 'os', field:'os',cellTooltip: true}, {name: 'privateIpAddress', displayName: 'IP Address',cellTooltip: true}, {name: 'state', displayName: 'Status',cellTooltip: true}, @@ -373,10 +111,15 @@ field: 'providerData.region', cellTooltip: true }, - {name: 'cost', displayName: 'cost',cellTemplate: '12'}, + {name: 'orgName', displayName: 'Org Name', field: 'orgName', cellTooltip: true}, + {name: 'cost', displayName: 'cost',cellTemplate: '{{row.entity.cost.symbol}} {{row.entity.cost.aggregateInstanceCost}}'}, {name: 'Usage', cellTooltip: true,cellTemplate:""}, - {name: 'Chef', cellTooltip: true,cellTemplate:""} + // {name: 'Chef', cellTooltip: true,cellTemplate:""} ]; + capaCtr.listGrid[value].onRegisterApi=function (gridApi) { + gridApi.grid.registerRowsProcessor($scope.singleFilter, 200); + $scope.gridApi = gridApi; + } if(fltrObj && fltrObj.provider && fltrObj.provider.id) { var param = { url: '/providers/' + fltrObj.provider.id + '/unassigned-instances' @@ -389,7 +132,24 @@ //} }; - + $scope.filterInst = function() { + $scope.gridApi.grid.refresh(); + }; + $scope.singleFilter = function( renderableRows ){ + var matcher = new RegExp(capaCtr.filterValue); + renderableRows.forEach( function( row ) { + var match = false; + angular.forEach($scope.colArray,function( field ){ + if ( row.entity[field] && row.entity[field].match(matcher) ){ + match = true; + } + }); + if ( !match ){ + row.visible = false; + } + }); + return renderableRows; + }; capaCtr.init(); @@ -462,7 +222,7 @@ }; genSevs.promiseGet(param).then(function (result) { var va = []; - if (result) { + if (result && result.length) { angular.forEach(result[capChat.splitUp].dataPoints, function (value) { va.push([Date.parse(value.fromTime), value.average]); }); diff --git a/client/cat3/src/partials/sections/dashboard/analytics/view/capacity.html b/client/cat3/src/partials/sections/dashboard/analytics/view/capacity.html index dc23322cc..2f3895c88 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/view/capacity.html +++ b/client/cat3/src/partials/sections/dashboard/analytics/view/capacity.html @@ -1,20 +1,20 @@

-
-
- Total Capacity: {{capaCtr.pieChat.totalCoust}}           - Services - {{value}} : {{key}} - -
-
-
- Segregated by - -
-
-
+ + + + + + + + + + + + + + +
@@ -25,7 +25,8 @@

Instnce

-
+ +
No Data Available. From 96fc4862244c54c7cb290ebcde709e2d67c2871f Mon Sep 17 00:00:00 2001 From: hrushikesh07 Date: Tue, 10 Jan 2017 17:09:08 +0530 Subject: [PATCH 12/81] all instance listed --- .../sections/dashboard/analytics/analytics.js | 2 +- .../analytics/controller/capacityCtrl.js | 44 +++++++++++++++---- .../dashboard/analytics/view/capacity.html | 18 ++++++-- 3 files changed, 51 insertions(+), 13 deletions(-) diff --git a/client/cat3/src/partials/sections/dashboard/analytics/analytics.js b/client/cat3/src/partials/sections/dashboard/analytics/analytics.js index 98c7dd777..eb2225dca 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/analytics.js +++ b/client/cat3/src/partials/sections/dashboard/analytics/analytics.js @@ -25,7 +25,7 @@ url: "analytics/capacity/", templateUrl: "src/partials/sections/dashboard/analytics/view/capacity.html", controller: "capacityCtrl as capaCtr", - params:{filterView:{usage:true,org:true,provi:true,instanceType:true,period:true}}, + params:{filterView:{usage:true,org:true,provi:true,instanceType:true,period:true},dashboardHide:true,otherTab:'Capacity',otherTabView:true,reportHide:true}, resolve: { auth: ["$q", function ($q) { var deferred = $q.defer(); diff --git a/client/cat3/src/partials/sections/dashboard/analytics/controller/capacityCtrl.js b/client/cat3/src/partials/sections/dashboard/analytics/controller/capacityCtrl.js index fa687c5fc..41e1ee9ab 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/controller/capacityCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/analytics/controller/capacityCtrl.js @@ -34,6 +34,8 @@ genSevs.promiseGet(param).then(function (result) { capaCtr.chartData=result; $rootScope.splitUpCapacities=[]; + capaCtr.serviceCapacity=result.capacity.AWS; + capaCtr.serviceType=Object.keys(capaCtr.serviceCapacity.services)[0]; if(result.splitUpCapacities && Object.keys(result.splitUpCapacities).length >0) { angular.forEach(result.splitUpCapacities, function (val, key) { var a=key.replace(/([A-Z])/g, ' $1').replace(/^./, function(str) { @@ -46,16 +48,16 @@ capaCtr.splitUp = $rootScope.splitUpCapacities[0].val; capaCtr.createLable(result, $rootScope.splitUpCapacities[0].id); } - } else { - capaCtr.createLable(result,'provider'); } + capaCtr.createList(); + }); }; $rootScope.applyFilter =function(filterApp,period){ analyticsServices.applyFilter(filterApp,period); if($state.current.name === "dashboard.analytics.capacity") { - capaCtr.createList(); + capaCtr.getCapacityData($rootScope.filterNewEnt); } }; capaCtr.init =function(){ @@ -112,8 +114,9 @@ cellTooltip: true }, {name: 'orgName', displayName: 'Org Name', field: 'orgName', cellTooltip: true}, - {name: 'cost', displayName: 'cost',cellTemplate: '{{row.entity.cost.symbol}} {{row.entity.cost.aggregateInstanceCost}}'}, - {name: 'Usage', cellTooltip: true,cellTemplate:""}, + {name: 'cost', displayName: 'cost',cellTemplate: ''}, + {name: 'Action', cellTooltip: true,cellTemplate:" " + + "   "} // {name: 'Chef', cellTooltip: true,cellTemplate:""} ]; capaCtr.listGrid[value].onRegisterApi=function (gridApi) { @@ -121,17 +124,42 @@ $scope.gridApi = gridApi; } if(fltrObj && fltrObj.provider && fltrObj.provider.id) { + if($rootScope.organNewEnt.instanceType === 'Managed') { + $scope.instanceType= 'managedInstances'; + } else if($rootScope.organNewEnt.instanceType === 'Assigned'){ + $scope.instanceType= 'unmanagedInstances'; + } else if($rootScope.organNewEnt.instanceType === 'Unassigned'){ + $scope.instanceType= 'unassigned-instances'; + } var param = { - url: '/providers/' + fltrObj.provider.id + '/unassigned-instances' + url: '/providers/' + fltrObj.provider.id + '/'+$scope.instanceType // url:'src/partials/sections/dashboard/analytics/data/ins.json' }; genSevs.promiseGet(param).then(function (instResult) { - capaCtr.listGrid[value].data=instResult.data; + if($rootScope.organNewEnt.instanceType === 'Managed') { + capaCtr.listGrid[value].data= instResult.managedInstances; + } else if($rootScope.organNewEnt.instanceType === 'Assigned'){ + capaCtr.listGrid[value].data= instResult.unmanagedInstances; + } else if($rootScope.organNewEnt.instanceType === 'Unassigned'){ + capaCtr.listGrid[value].data = instResult.data; + } }); } //} }; + $scope.aggregateInstanceCost=function (cost) { + if(cost){ + return cost.symbol+' '+ cost.aggregateInstanceCost; + } else { + return '....'; + } + }; + $scope.Schedule =function (id) { + var a=[]; + a.push(id); + genSevs.scheduleTime(a); + }; $scope.filterInst = function() { $scope.gridApi.grid.refresh(); }; @@ -222,7 +250,7 @@ }; genSevs.promiseGet(param).then(function (result) { var va = []; - if (result && result.length) { + if (result) { angular.forEach(result[capChat.splitUp].dataPoints, function (value) { va.push([Date.parse(value.fromTime), value.average]); }); diff --git a/client/cat3/src/partials/sections/dashboard/analytics/view/capacity.html b/client/cat3/src/partials/sections/dashboard/analytics/view/capacity.html index 2f3895c88..d06fd4788 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/view/capacity.html +++ b/client/cat3/src/partials/sections/dashboard/analytics/view/capacity.html @@ -2,9 +2,9 @@
- - - + + + @@ -22,7 +22,17 @@
-

Instnce

+
+ +

Instance + + +

+ + + + +
From 5b1d655adf39f90d7aa7aa81852a8e991d7f14d7 Mon Sep 17 00:00:00 2001 From: Karthik K N Date: Mon, 9 Jan 2017 14:31:52 +0530 Subject: [PATCH 13/81] Resource cost aggregation from CSV updated --- .../aws-cost-aggregation/AWSResourceCostsAggregation.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/server/app/cronjobs/aws-cost-aggregation/AWSResourceCostsAggregation.js b/server/app/cronjobs/aws-cost-aggregation/AWSResourceCostsAggregation.js index 8fe204bc3..844de2c4f 100644 --- a/server/app/cronjobs/aws-cost-aggregation/AWSResourceCostsAggregation.js +++ b/server/app/cronjobs/aws-cost-aggregation/AWSResourceCostsAggregation.js @@ -206,6 +206,10 @@ function updateResourceCosts(provider, downloadedCSVPath, callback) { function(next) { resourceService.getAllResourcesForProvider(provider, next) }, + function(resources, next) { + resourceService.updateAWSResourceCostsFromCSV(provider, resources, downloadedCSVPath, + AWSResourceCostsAggregation.currentCronRunTime, next) + }, function(resources, next) { AWSResourceCostsAggregation.aggregateResourceCostsForAllPeriods(provider, resources, next) }, From 2e4c1ee14f91b1d0202f74ebea4537ff3a1e6c1a Mon Sep 17 00:00:00 2001 From: Karthik K N Date: Wed, 11 Jan 2017 14:05:26 +0530 Subject: [PATCH 14/81] Fix to enable entity cost aggregation --- server/app/services/resourceService.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/server/app/services/resourceService.js b/server/app/services/resourceService.js index e9a54edc6..6451bd765 100644 --- a/server/app/services/resourceService.js +++ b/server/app/services/resourceService.js @@ -225,9 +225,11 @@ function aggregateResourceCostsForPeriod(provider, resources, period, endTime, c resources[resourceCost._id].cost = { aggregateInstanceCost: Math.round(resourceCost.totalCost * 100) / 100, currency:'USD', - symbol:"$" + symbol: '$' } resources[resourceCost._id].save(next1) + } else { + next1() } }, function(err) { if(err) { @@ -241,6 +243,7 @@ function aggregateResourceCostsForPeriod(provider, resources, period, endTime, c if(err) { callback(err) } else { + logger.info("Individual resource costs aggregation complete") callback() } }) From 725bedba054edbe40176aab651382bf9fdf98443 Mon Sep 17 00:00:00 2001 From: Udesh Date: Wed, 11 Jan 2017 16:08:04 +0530 Subject: [PATCH 15/81] plan cost in business group --- .../htmls/private/ajax/Settings/CreateProductGroup.html | 9 +++++++++ server/app/model/d4dmasters/d4dmastersmodelnew.js | 5 +++++ 2 files changed, 14 insertions(+) diff --git a/client/htmls/private/ajax/Settings/CreateProductGroup.html b/client/htmls/private/ajax/Settings/CreateProductGroup.html index c0bacdf25..dc7e8c69f 100755 --- a/client/htmls/private/ajax/Settings/CreateProductGroup.html +++ b/client/htmls/private/ajax/Settings/CreateProductGroup.html @@ -34,6 +34,15 @@

Create Business Group

+ +
+ + + + + + +
diff --git a/server/app/model/d4dmasters/d4dmastersmodelnew.js b/server/app/model/d4dmasters/d4dmastersmodelnew.js index 5a19ff56b..bcbc4899b 100755 --- a/server/app/model/d4dmasters/d4dmastersmodelnew.js +++ b/server/app/model/d4dmasters/d4dmastersmodelnew.js @@ -157,6 +157,11 @@ var d4dMastersProductGroup = new mongoose.Schema({ trim: true, validate: descValidator }, + plannedCost: { + type: Number, + required: false, + default: 0.0 + }, active: { type: Boolean, trim: true, From ea8f06a0be243d5057deb0c1fc7910fdb97bec0c Mon Sep 17 00:00:00 2001 From: Karthik K N Date: Wed, 11 Jan 2017 16:21:55 +0530 Subject: [PATCH 16/81] Individual costs for RDS and S3 instances aggregated --- server/app/services/resourceService.js | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/server/app/services/resourceService.js b/server/app/services/resourceService.js index 6451bd765..2c5919026 100644 --- a/server/app/services/resourceService.js +++ b/server/app/services/resourceService.js @@ -17,6 +17,8 @@ var appConfig = require('_pr/config'); var Cryptography = require('_pr/lib/utils/cryptography'); var aws = require('aws-sdk'); var resources = require('_pr/model/resources/resources'); +var S3Resource = require('_pr/model/resources/s3-resource') +var RDSResource = require('_pr/model/resources/rds-resource') var CW = require('_pr/lib/cloudwatch.js'); var S3 = require('_pr/lib/s3.js'); var EC2 = require('_pr/lib/ec2.js'); @@ -50,6 +52,7 @@ resourceService.updateDomainNameForInstance = updateDomainNameForInstance resourceService.aggregateResourceCostsForPeriod = aggregateResourceCostsForPeriod // @TODO To be cached if needed. In memory data will not exceed 200MB for upto 2000 instances. +// @TODO Unique identifier of S3 and RDS resources should be available in resource without casting. function getAllResourcesForProvider(provider, next) { async.parallel([ function(callback) { @@ -61,10 +64,10 @@ function getAllResourcesForProvider(provider, next) { }, function(callback) { unassignedInstancesModel.getUnAssignedInstancesByProviderId(provider._id, callback); + }, + function(callback) { + resources.getResourcesByProviderId(provider._id, callback); } - /*function(callback) { - resources.getResourcesByProviderId(provider._id, callback); - }*/ ], function(err, results) { if (err) { @@ -76,6 +79,19 @@ function getAllResourcesForProvider(provider, next) { var resultsObject = resultsArray.reduce(function(temp, current) { if('platformId' in current) { temp[current.platformId] = current; + } else if('resourceType' in current) { + switch(current.resourceType) { + case 'RDS': + var temp = new RDSResource(current) + temp[temp.resourceDetails.dbInstanceIdentifier] = current; + break; + case 'S3': + var temp = new S3Resource(current) + temp[temp.resourceDetails.bucketName] = current; + break; + default: + break; + } } return temp; }, {}) @@ -217,7 +233,7 @@ function aggregateResourceCostsForPeriod(provider, resources, period, endTime, c {$match: query}, {$group: {_id: "$" + catalystEntityHierarchy['resource'].key, totalCost: {$sum: "$cost"}}} - ],next) + ], next) }, function(resourceCosts, next) { async.forEach(resourceCosts, function(resourceCost, next1) { From 2cdc6af501f30ac915609561f335d6f9ef788590 Mon Sep 17 00:00:00 2001 From: hrushikesh07 Date: Thu, 12 Jan 2017 10:44:47 +0530 Subject: [PATCH 17/81] RDS ,S3 listing is done --- client/cat3/main.html | 1 + .../sections/dashboard/analytics/analytics.js | 18 + .../analytics/controller/capacityCtrl.js | 483 ++++++++++-------- .../analytics/view/analyticsTreeMenu.html | 2 +- .../dashboard/analytics/view/capacity.html | 67 ++- .../analytics/view/capacityChart.html | 7 +- 6 files changed, 322 insertions(+), 256 deletions(-) diff --git a/client/cat3/main.html b/client/cat3/main.html index 7aee82223..f55d9bff2 100644 --- a/client/cat3/main.html +++ b/client/cat3/main.html @@ -111,6 +111,7 @@ + diff --git a/client/cat3/src/partials/sections/dashboard/analytics/analytics.js b/client/cat3/src/partials/sections/dashboard/analytics/analytics.js index eb2225dca..42aa1b518 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/analytics.js +++ b/client/cat3/src/partials/sections/dashboard/analytics/analytics.js @@ -25,6 +25,24 @@ url: "analytics/capacity/", templateUrl: "src/partials/sections/dashboard/analytics/view/capacity.html", controller: "capacityCtrl as capaCtr", + params:{filterView:{period:true,cost:true,viewBy:true,splitUpType:true,org:true}}, + 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; + }] + } + }).state('dashboard.analytics.capacityReport', { + url: "analytics/capacityReport/", + templateUrl: "src/partials/sections/dashboard/analytics/view/capacityReport.html", + controller: "capacityReportCtrl as capRept", params:{filterView:{usage:true,org:true,provi:true,instanceType:true,period:true},dashboardHide:true,otherTab:'Capacity',otherTabView:true,reportHide:true}, resolve: { auth: ["$q", function ($q) { diff --git a/client/cat3/src/partials/sections/dashboard/analytics/controller/capacityCtrl.js b/client/cat3/src/partials/sections/dashboard/analytics/controller/capacityCtrl.js index 41e1ee9ab..500014e5a 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/controller/capacityCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/analytics/controller/capacityCtrl.js @@ -1,20 +1,107 @@ (function (angular) { "use strict"; angular.module('dashboard.analytics') - .controller('capacityCtrl', ['$scope', '$rootScope', '$state','analyticsServices', 'genericServices','$timeout','$location', '$anchorScroll','$modal',function ($scope,$rootScope,$state,analyticsServices,genSevs,$timeout,$location, $anchorScroll,$modal){ + .controller('capacityCtrl', ['$scope', '$rootScope', '$state','analyticsServices', 'genericServices','$timeout', function ($scope,$rootScope,$state,analyticsServices,genSevs,$timeout){ $rootScope.stateItems = $state.params; //analyticsServices.initFilter(); - $scope.gototab = function(id) { - // set the location.hash to the id of - // the element you wish to scroll to. - $location.hash(id); - - // call $anchorScroll() - $anchorScroll(); - }; var capaCtr =this; capaCtr.chartData=[]; capaCtr.splitUp=null; + capaCtr.pieChat={ + option:{}, + totalCoust:'', + data: [] + }; + capaCtr.barChat={ + option:{}, + data: [] + }; + capaCtr.capaGridOptions={ + columnDefs:[], + data:[] + }; + capaCtr.createChart = function() { + capaCtr.pieChat = { + option: { + chart: { + type: 'pieChart', + margin: { + top: 20, + right: 0, + bottom: 60, + left: 0 + }, + height: 300, + x: function (d) { + return d.key; + }, + y: function (d) { + return d.value; + }, + pie: { + valueFormat: function (d) { + return d3.round(d); + } + }, + showLabels: false, + labelType: "value", + labelThreshold: 0.01, + labelSunbeamLayout: true, + legend: {} + } + }, + totalCoust: '', + data: [] + }; + + capaCtr.barChat = { + option: { + chart: { + type: 'multiBarChart', + height: 300, + margin: { + top: 20, + right: 20, + bottom: 60, + left: 60 + }, + duration:1000, + stacked: true, + x: function (d) { + return d.label; + }, + y: function (d) { + return d.value; + }, + showControls: true, + showValues: true, + xAxis: { + axisLabel: 'Aggregate', + showMaxMin: false, + staggerLabels:false + }, + yAxis: { + axisLabel: 'Count', + tickFormat: function (d) { + return d3.round(d); + } + } + } + }, + data: [] + }; + + capaCtr.capaGridOptions = { + enableGridMenu: true, + enableSelectAll: true, + exporterMenuPdf: false, + exporterCsvFilename: 'costFile.csv', + exporterCsvLinkElement: angular.element(document.querySelectorAll(".custom-csv-link-location")), + onRegisterApi: function (gridApi) { + $scope.gridApi = gridApi; + } + }; + }; capaCtr.getCapacityData=function(fltObj){ var param = { // url: 'src/partials/sections/dashboard/analytics/data/cost.json?org' @@ -34,8 +121,6 @@ genSevs.promiseGet(param).then(function (result) { capaCtr.chartData=result; $rootScope.splitUpCapacities=[]; - capaCtr.serviceCapacity=result.capacity.AWS; - capaCtr.serviceType=Object.keys(capaCtr.serviceCapacity.services)[0]; if(result.splitUpCapacities && Object.keys(result.splitUpCapacities).length >0) { angular.forEach(result.splitUpCapacities, function (val, key) { var a=key.replace(/([A-Z])/g, ' $1').replace(/^./, function(str) { @@ -48,12 +133,178 @@ capaCtr.splitUp = $rootScope.splitUpCapacities[0].val; capaCtr.createLable(result, $rootScope.splitUpCapacities[0].id); } + } else { + capaCtr.createLable(result,'provider'); } - capaCtr.createList(); - }); }; + capaCtr.createLable= function(result,viewType){ + capaCtr.createChart(); + if(result && result.capacity) { + capaCtr.capaGridOptions.data = []; + capaCtr.capaGridOptions.columnDefs = [ + {name: 'name', field: 'name'}, + {name: 'totalCapacity', field: 'capacity.totalCapacity'} + ]; + capaCtr.pieChat.totalCoust = result.capacity.totalCapacity; + capaCtr.pieChat.data = []; + capaCtr.barChat.data = []; + // create bar + //if(viewType === 'ProviderView'){ + capaCtr.capaGridOptions.data = result.splitUpCapacities[viewType]; + if(result.splitUpCapacities && Object.keys(result.splitUpCapacities).length >0 ) { + angular.forEach(result.splitUpCapacities[viewType], function (value) { + capaCtr.pieChat.data.push({ + key: value.name, + value: value.capacity.totalCapacity + }); + }); + } else{ + capaCtr.pieChat.data.push({ + key: result.entity.name, + value: result.capacity.totalCapacity + }); + } + if(result.capacity && result.capacity.AWS && result.capacity.AWS.services) { + capaCtr.serviceCapacity = result.capacity.AWS.services; + angular.forEach(result.capacity.AWS.services, function (valueChild, keyChild) { + var va = []; + capaCtr.capaGridOptions.columnDefs.push({ + name: keyChild, + field: 'capacity.AWS.services.' + keyChild + }); + if(result.splitUpCapacities && Object.keys(result.splitUpCapacities).length >0 ) { + angular.forEach(result.splitUpCapacities[viewType], function (valBar) { + var chVal = ''; + if (valBar.capacity.AWS.services[keyChild]) { + chVal = valBar.capacity.AWS.services[keyChild]; + } else { + chVal = 0; + } + va.push( + { + "label": valBar.name, + "value": chVal + } + ); + }); + } else { + var chVal = ''; + if (result.capacity.AWS.services[keyChild]) { + chVal =result.capacity.AWS.services[keyChild]; + } else { + chVal = 0; + } + va.push( + { + "label": result.entity.name, + "value": chVal + } + ); + } + capaCtr.barChat.data.push({ + "key": keyChild, + "values": va + }); + }); + } + } + }; + capaCtr.trendsChart=function(fltObj){ + capaCtr.trendLineChart={}; + capaCtr.trendLineChart.options = { + chart: { + //type: 'stackedAreaChart', + type: 'lineChart', + height: 350, + margin: { + top: 20, + right: 20, + bottom: 40, + left: 60 + }, + x: function (d) { + return d[0]; + }, + y: function (d) { + return d[1]; + }, + useVoronoi: false, + clipEdge: true, + duration: 1000, + useInteractiveGuideline: true, + xAxis: { + showMaxMin: false, + axisLabel: 'Date', + tickFormat: function (d) { + return d3.time.format('%x')(new Date(d)); + } + }, + yAxis: { + axisLabel: 'Count', + tickFormat: function (d) { + return d3.round(d); + } + }, + zoom: { + enabled: true, + scaleExtent: [1, 10], + useFixedDomain: false, + useNiceScale: false, + horizontalOff: true, + verticalOff: true, + unzoomEventType: 'dblclick.zoom' + } + } + }; + capaCtr.trendLineChart.data = []; + var param = { + url: '' + }; + if(fltObj && fltObj.org){ + var entityId=null; + if(fltObj.provider){ + entityId=fltObj.provider.id; + } else { + entityId=fltObj.org.id; + } + //http://192.168.152.139:3001 + // param.url='/analytics/capacity/trend?parentEntityId='+fltObj.org.id+'&entityId='+fltObj.org.id+'&toTimeStamp='+new Date()+'&period='+fltObj.period+'&interval=86400' + } + + genSevs.promiseGet(param).then(function (result) { + if(result.capacityTrends && result.capacityTrends.length) { + capaCtr.trendLineChart.totalCapacity = result.capacity.totalCapacity; + capaCtr.trendLineChart.data = []; + angular.forEach(result.capacity.AWS.services, function (valueChild, keyChild) { + var va = []; + angular.forEach(result.capacityTrends, function (value) { + var chVal=''; + if(value.capacity.AWS.services[keyChild]){ + chVal=value.capacity.AWS.services[keyChild]; + } else { + chVal=0; + } + va.push([value.fromTime,chVal]); + }); + capaCtr.trendLineChart.data.push({ + "key": keyChild, + "values": va + }); + }); + capaCtr.trendLineChart.data[0].values.push([]); + } + }); + }; + $scope.$on('CHANGE_VIEW', function (event, data) { + if (data) { + capaCtr.splitUp = data.replace(/([A-Z])/g, ' $1').replace(/^./, function (str) { + return str.toUpperCase(); + }); + capaCtr.createLable(capaCtr.chartData, data); + } + }); $rootScope.applyFilter =function(filterApp,period){ analyticsServices.applyFilter(filterApp,period); if($state.current.name === "dashboard.analytics.capacity") { @@ -61,214 +312,16 @@ } }; capaCtr.init =function(){ - $rootScope.organNewEnt.instanceType='Unassigned'; - $rootScope.organNewEnt.provider='0'; - $rootScope.$emit('INI_usage', 'Unassigned'); + analyticsServices.initFilter(); + capaCtr.createChart(); $timeout(function () { $rootScope.applyFilter(true,'month'); + capaCtr.trendsChart($rootScope.filterNewEnt); var treeNames = ['Cloud Management','Analytics','capacity']; $rootScope.$emit('treeNameUpdate', treeNames); },500); }; - // new e################################### - $scope.openChart=function (id) { - $modal.open({ - animation: true, - templateUrl: 'src/partials/sections/dashboard/analytics/view/capacityChart.html', - controller: 'capacityChartCtrl as capChat', - backdrop : 'static', - keyboard: false, - resolve: { - items: function() { - return id; - } - } - }). - result.then(function() { - - }, function() { - - }); - }; - $scope.chefConfig=function (id) { - var promise = genSevs.editRunlist(id); - }; - capaCtr.createList = function () { - capaCtr.listGrid=[]; - var fltrObj=$rootScope.filterNewEnt; - - // for(var value in capaCtr.serviceCapacity) { - var value='RDS'; - capaCtr.listGrid[value]=[]; - capaCtr.listGrid[value].data=[]; - capaCtr.listGrid[value].paginationPageSizes= [25, 50, 100]; - capaCtr.listGrid[value].paginationPageSize=25; - $scope.colArray=['platformId','state','orgName','privateIpAddress','os'] - capaCtr.listGrid[value].columnDefs=[ - {name: 'Instance Id', field: 'platformId', cellTooltip: true}, - {name: 'os', enableFiltering: true,displayName: 'os', field:'os',cellTooltip: true}, - {name: 'privateIpAddress', displayName: 'IP Address',cellTooltip: true}, - {name: 'state', displayName: 'Status',cellTooltip: true}, - {name: 'Region',displayName: 'Region', - field: 'providerData.region', - cellTooltip: true - }, - {name: 'orgName', displayName: 'Org Name', field: 'orgName', cellTooltip: true}, - {name: 'cost', displayName: 'cost',cellTemplate: ''}, - {name: 'Action', cellTooltip: true,cellTemplate:" " + - "   "} - // {name: 'Chef', cellTooltip: true,cellTemplate:""} - ]; - capaCtr.listGrid[value].onRegisterApi=function (gridApi) { - gridApi.grid.registerRowsProcessor($scope.singleFilter, 200); - $scope.gridApi = gridApi; - } - if(fltrObj && fltrObj.provider && fltrObj.provider.id) { - if($rootScope.organNewEnt.instanceType === 'Managed') { - $scope.instanceType= 'managedInstances'; - } else if($rootScope.organNewEnt.instanceType === 'Assigned'){ - $scope.instanceType= 'unmanagedInstances'; - } else if($rootScope.organNewEnt.instanceType === 'Unassigned'){ - $scope.instanceType= 'unassigned-instances'; - } - var param = { - url: '/providers/' + fltrObj.provider.id + '/'+$scope.instanceType - // url:'src/partials/sections/dashboard/analytics/data/ins.json' - }; - genSevs.promiseGet(param).then(function (instResult) { - if($rootScope.organNewEnt.instanceType === 'Managed') { - capaCtr.listGrid[value].data= instResult.managedInstances; - } else if($rootScope.organNewEnt.instanceType === 'Assigned'){ - capaCtr.listGrid[value].data= instResult.unmanagedInstances; - } else if($rootScope.organNewEnt.instanceType === 'Unassigned'){ - capaCtr.listGrid[value].data = instResult.data; - } - }); - } - - //} - }; - $scope.aggregateInstanceCost=function (cost) { - if(cost){ - return cost.symbol+' '+ cost.aggregateInstanceCost; - } else { - return '....'; - } - }; - $scope.Schedule =function (id) { - var a=[]; - a.push(id); - genSevs.scheduleTime(a); - }; - $scope.filterInst = function() { - $scope.gridApi.grid.refresh(); - }; - $scope.singleFilter = function( renderableRows ){ - var matcher = new RegExp(capaCtr.filterValue); - renderableRows.forEach( function( row ) { - var match = false; - angular.forEach($scope.colArray,function( field ){ - if ( row.entity[field] && row.entity[field].match(matcher) ){ - match = true; - } - }); - if ( !match ){ - row.visible = false; - } - }); - return renderableRows; - }; capaCtr.init(); - - }]).controller('capacityChartCtrl',['$scope','$rootScope','items','genericServices','$modalInstance',function($scope,$rootScope,items,genSevs,$modalInstance){ - var capChat=this; - capChat.items=items; - capChat.trendLineChart={ - options:{}, - data:[] - }; - capChat.splitUp='CPUUtilization'; - capChat.trendLineChart.options = { - chart: { - //type: 'stackedAreaChart', - type: 'lineChart', - height: 200, - 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' - } - } - }; - capChat.legends=[]; - - capChat.getData=function(fltObj){ - capChat.trendLineChart.data = []; - var $today = new Date(); - var $yesterday = new Date($today); - $yesterday.setDate($today.getDate() - 1); - if(fltObj && fltObj.resources && fltObj.resources.length >0) { - var $today = new Date(); - var $yesterday = new Date($today); - $yesterday.setDate($today.getDate() - 1); - var param = { - url: '/analytics/trend/usage?resource=' + items._id + '&fromTimeStamp=' + $yesterday + '&toTimeStamp=' + $today + '&interval=3600' - //url:'src/partials/sections/dashboard/analytics/data/usage.json' - }; - genSevs.promiseGet(param).then(function (result) { - var va = []; - if (result) { - angular.forEach(result[capChat.splitUp].dataPoints, function (value) { - va.push([Date.parse(value.fromTime), value.average]); - }); - capChat.trendLineChart.data.push({ - "key": items.platformId, - "values": va - }); - } - // } - }); - } - }; - capChat.splitChange=function() { - capChat.getData($rootScope.filterNewEnt); - }; - capChat.getData($rootScope.filterNewEnt); - $scope.cancel = function() { - $modalInstance.dismiss('cancel'); - }; - }]); + }]); })(angular); diff --git a/client/cat3/src/partials/sections/dashboard/analytics/view/analyticsTreeMenu.html b/client/cat3/src/partials/sections/dashboard/analytics/view/analyticsTreeMenu.html index 16f1c72a9..d1c5e54bc 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/view/analyticsTreeMenu.html +++ b/client/cat3/src/partials/sections/dashboard/analytics/view/analyticsTreeMenu.html @@ -91,7 +91,7 @@
-
  • +
  • diff --git a/client/cat3/src/partials/sections/dashboard/analytics/view/capacity.html b/client/cat3/src/partials/sections/dashboard/analytics/view/capacity.html index d06fd4788..a47c3948b 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/view/capacity.html +++ b/client/cat3/src/partials/sections/dashboard/analytics/view/capacity.html @@ -1,51 +1,48 @@

    - - - - - - - - - - - - - - - +
    +
    + Total Capacity: {{capaCtr.pieChat.totalCoust}}           + Services + {{value}} : {{key}} + +
    +
    +
    + Segregated by + +
    +
    +
    - -
    +
    +

    Aggregate Capacity

    +
    +
    +
    +
    +
    +
    +

    Distribution of all services across {{capaCtr.splitUp}}

    -

    Instance - - -

    - - - - -
    -
    - -
    -
    -
    - No Data Available. -
    -
    +
    +
    +
    +
    +
    +

    Daily trends of cost across organization

    +
    -
    +
    diff --git a/client/cat3/src/partials/sections/dashboard/analytics/view/capacityChart.html b/client/cat3/src/partials/sections/dashboard/analytics/view/capacityChart.html index 3aed50ff3..a6ae0afe1 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/view/capacityChart.html +++ b/client/cat3/src/partials/sections/dashboard/analytics/view/capacityChart.html @@ -13,11 +13,8 @@

    Usage Type

    From d5708dc651bf1b5c01cdfff144d122241703dc2a Mon Sep 17 00:00:00 2001 From: hrushikesh07 Date: Thu, 12 Jan 2017 10:45:24 +0530 Subject: [PATCH 18/81] RDS ,S3 listing is done --- .../controller/capacityReportCtrl.js | 358 ++++++++++++++++++ .../analytics/view/capacityReport.html | 72 ++++ 2 files changed, 430 insertions(+) create mode 100644 client/cat3/src/partials/sections/dashboard/analytics/controller/capacityReportCtrl.js create mode 100644 client/cat3/src/partials/sections/dashboard/analytics/view/capacityReport.html diff --git a/client/cat3/src/partials/sections/dashboard/analytics/controller/capacityReportCtrl.js b/client/cat3/src/partials/sections/dashboard/analytics/controller/capacityReportCtrl.js new file mode 100644 index 000000000..41159783d --- /dev/null +++ b/client/cat3/src/partials/sections/dashboard/analytics/controller/capacityReportCtrl.js @@ -0,0 +1,358 @@ +(function (angular) { + "use strict"; + angular.module('dashboard.analytics') + .controller('capacityReportCtrl', ['$scope', '$rootScope', '$state','analyticsServices', 'genericServices','$timeout','$location', '$anchorScroll','$modal',function ($scope,$rootScope,$state,analyticsServices,genSevs,$timeout,$location, $anchorScroll,$modal){ + $rootScope.stateItems = $state.params; + //analyticsServices.initFilter(); + $scope.gototab = function(id) { + // set the location.hash to the id of + // the element you wish to scroll to. + $location.hash(id); + + // call $anchorScroll() + $anchorScroll(); + }; + var capRept =this; + capRept.chartData=[]; + capRept.splitUp=null; + capRept.getCapacityData=function(fltObj){ + var param = { + // url: 'src/partials/sections/dashboard/analytics/data/cost.json?org' + url:'' + }; + if(fltObj && fltObj.org){ + var entityId=null; + if(fltObj.provider){ + entityId=fltObj.provider.id; + } else { + entityId=fltObj.org.id; + } + //param.url='http://d4d.rlcatalyst.com/analytics/capacity?parentEntityId=46d1da9a-d927-41dc-8e9e-7e926d927537&entityId=46d1da9a-d927-41dc-8e9e-7e926d927537&toTimeStamp=Mon%20Nov%2014%202016%2010:41:29%20GMT+0530%20(IST)&period=month'; + param.url='/analytics/capacity?parentEntityId='+fltObj.org.id+'&entityId='+entityId+'&toTimeStamp='+new Date()+'&period=month'; + } + + genSevs.promiseGet(param).then(function (result) { + capRept.chartData=result; + $rootScope.splitUpCapacities=[]; + capRept.serviceCapacity=result.capacity.AWS; + + if(result.splitUpCapacities && Object.keys(result.splitUpCapacities).length >0) { + angular.forEach(result.splitUpCapacities, function (val, key) { + var a=key.replace(/([A-Z])/g, ' $1').replace(/^./, function(str) { + return str.toUpperCase(); + }); + $rootScope.splitUpCapacities.push({id:key,val:a}); + }); + if( $rootScope.splitUpCapacities && $rootScope.splitUpCapacities.length >0) { + $scope.$emit('CHANGE_splitUp', $rootScope.splitUpCapacities[0].id); + capRept.splitUp = $rootScope.splitUpCapacities[0].val; + capRept.createLable(result, $rootScope.splitUpCapacities[0].id); + } + } + capRept.createList(); + + }); + }; + + $rootScope.applyFilter =function(filterApp,period){ + analyticsServices.applyFilter(filterApp,period); + if($state.current.name === "dashboard.analytics.capacityReport") { + capRept.getCapacityData($rootScope.filterNewEnt); + } + }; + capRept.init =function(){ + capRept.serviceType='Instance'; + $rootScope.organNewEnt.instanceType='Unassigned'; + $rootScope.organNewEnt.provider='0'; + $rootScope.$emit('INI_usage', 'Unassigned'); + $timeout(function () { + $rootScope.applyFilter(true,'month'); + var treeNames = ['Cloud Management','Analytics','capacity']; + $rootScope.$emit('treeNameUpdate', treeNames); + },500); + }; + // new e################################### + $scope.openChart=function (id) { + $modal.open({ + animation: true, + templateUrl: 'src/partials/sections/dashboard/analytics/view/capacityChart.html', + controller: 'capacityChartCtrl as capChat', + backdrop : 'static', + keyboard: false, + resolve: { + items: function() { + return id; + } + } + }). + result.then(function() { + + }, function() { + + }); + }; + $scope.chefConfig=function (id) { + var promise = genSevs.editRunlist(id); + }; + capRept.createList = function () { + capRept.filterValue=''; + capRept.listGrid=[]; + var fltrObj=$rootScope.filterNewEnt; + + // for(var value in capRept.serviceCapacity) { + var value=capRept.serviceType; + capRept.listGrid[value]=[]; + capRept.listGrid[value].data=[]; + capRept.listGrid[value].paginationPageSizes= [25, 50, 100]; + capRept.listGrid[value].paginationPageSize=25; + $scope.colArray=['platformId','state','orgName','privateIpAddress','os'] + if(capRept.serviceType !== 'S3') { + capRept.listGrid[value].columnDefs = [ + {name: 'Instance Id', field: 'platformId', cellTooltip: true}, + {name: 'os', enableFiltering: true, displayName: 'OS', field: 'os', cellTooltip: true}, + {name: 'privateIpAddress', displayName: 'IP Address', cellTooltip: true}, + {name: 'state', displayName: 'Status', cellTooltip: true}, + { + name: 'Region', displayName: 'Region', + field: 'providerData.region', + cellTooltip: true + }, + {name: 'orgName', displayName: 'Org Name', field: 'orgName', cellTooltip: true}, + { + name: 'cost', + displayName: 'cost', + cellTemplate: '' + }, + { + name: 'Action', + cellTooltip: true, + cellTemplate: " " + + "   " + } + // {name: 'Chef', cellTooltip: true,cellTemplate:""} + ]; + } + if(capRept.serviceType === 'S3'){ + $scope.colArray=['bucketName','bucketOwnerName','orgName'] + capRept.listGrid[value].columnDefs=[ + {name: 'bucketName', field: 'bucketName', cellTooltip: true}, + {name: 'bucketOwnerName', field: 'bucketOwnerName', cellTooltip: true}, + {name: 'bucketSize', field: 'bucketSize', cellTooltip: true}, + {name: 'orgName', field: 'orgName', cellTooltip: true}, + {name: 'cost', displayName: 'cost',cellTemplate: ''}, + {name: 'Action', cellTooltip: true,cellTemplate:" " + + "   "} + ] + } + capRept.listGrid[value].onRegisterApi=function (gridApi) { + gridApi.grid.registerRowsProcessor($scope.singleFilter, 200); + $scope.gridApi = gridApi; + } + + if(capRept.serviceType === 'Instance' && fltrObj && fltrObj.provider && fltrObj.provider.id) { + if($rootScope.organNewEnt.instanceType === 'Managed') { + $scope.instanceType= 'managedInstances'; + } else if($rootScope.organNewEnt.instanceType === 'Assigned'){ + $scope.instanceType= 'unmanagedInstances'; + } else if($rootScope.organNewEnt.instanceType === 'Unassigned'){ + $scope.instanceType= 'unassigned-instances'; + } + var param = { + inlineLoader:true, + url: '/providers/' + fltrObj.provider.id + '/'+$scope.instanceType + // url:'src/partials/sections/dashboard/analytics/data/ins.json' + }; + genSevs.promiseGet(param).then(function (instResult) { + if($rootScope.organNewEnt.instanceType === 'Managed') { + capRept.listGrid[value].data= instResult.managedInstances; + } else if($rootScope.organNewEnt.instanceType === 'Assigned'){ + capRept.listGrid[value].data= instResult.unmanagedInstances; + } else if($rootScope.organNewEnt.instanceType === 'Unassigned'){ + capRept.listGrid[value].data = instResult.data; + } + if(capRept.listGrid[value].data && capRept.listGrid[value].data.length == 0){ + capRept.listGrid[value].nodataFound =true; + } else { + capRept.listGrid[value].nodataFound =false; + } + }); + } else if(fltrObj && fltrObj.provider && fltrObj.provider.id){ + var param = { + inlineLoader:true, + url: '/resources?filterBy=providerId:'+fltrObj.provider.id+'+resourceType:'+capRept.serviceType+'+category:'+$rootScope.organNewEnt.instanceType.toLowerCase() + //url:'?filterBy=providerId:57e3774d4e738a500b342889+resourceType:RDS+category:unassigned' + }; + genSevs.promiseGet(param).then(function (instResult) { + ///// + capRept.listGrid[value].data = instResult.data; + if(capRept.serviceType === 'RDS'){ + angular.forEach(instResult.data,function (va,ke) { + capRept.listGrid[value].data[ke].platformId = va.resourceDetails.dbInstanceIdentifier; + capRept.listGrid[value].data[ke].privateIpAddress = '....'; + capRept.listGrid[value].data[ke].state = va.resourceDetails.dbInstanceStatus; + capRept.listGrid[value].data[ke].providerData={}; + capRept.listGrid[value].data[ke].providerData.region = va.resourceDetails.region; + capRept.listGrid[value].data[ke].orgName = va.masterDetails.orgName; + }); + } + + if(capRept.serviceType === 'S3'){ + angular.forEach(instResult.data,function (va,ke) { + capRept.listGrid[value].data[ke].platformId= va.resourceDetails.bucketName; + capRept.listGrid[value].data[ke].bucketName = va.resourceDetails.bucketName; + capRept.listGrid[value].data[ke].bucketOwnerName = va.resourceDetails.bucketOwnerName; + capRept.listGrid[value].data[ke].bucketSize = va.resourceDetails.bucketSize; + capRept.listGrid[value].data[ke].orgName = va.masterDetails.orgName; + }); + + } + /// + + + if(capRept.listGrid[value].data && capRept.listGrid[value].data.length == 0){ + capRept.listGrid[value].nodataFound =true; + } else { + capRept.listGrid[value].nodataFound =false; + } + }); + } + + //} + }; + $scope.$watch('capRept.serviceType',function (newValue, oldValue) { + capRept.createList(); + }); + $scope.aggregateInstanceCost=function (cost) { + if(cost){ + return cost.symbol+' '+ cost.aggregateInstanceCost; + } else { + return '....'; + } + }; + $scope.Schedule =function (id) { + var a=[]; + a.push(id); + genSevs.scheduleTime(a); + }; + $scope.filterInst = function() { + $scope.gridApi.grid.refresh(); + }; + $scope.singleFilter = function( renderableRows ){ + var matcher = new RegExp(capRept.filterValue); + renderableRows.forEach( function( row ) { + var match = false; + angular.forEach($scope.colArray,function( field ){ + if ( row.entity[field] && row.entity[field].match(matcher) ){ + match = true; + } + }); + if ( !match ){ + row.visible = false; + } + }); + return renderableRows; + }; + capRept.init(); + + + }]).controller('capacityChartCtrl',['$scope','$rootScope','items','genericServices','$modalInstance',function($scope,$rootScope,items,genSevs,$modalInstance){ + var capChat=this; + capChat.items=items; + capChat.trendLineChart={ + options:{}, + data:[] + }; + capChat.result=[]; + capChat.trendLineChart.options = { + chart: { + //type: 'stackedAreaChart', + type: 'lineChart', + height: 200, + 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' + } + } + }; + capChat.legends=[]; + + capChat.getData=function(fltObj){ + capChat.trendLineChart.data = []; + capChat.sliptOptions=[]; + var $today = new Date(); + var $yesterday = new Date($today); + $yesterday.setDate($today.getDate() - 1); + if(fltObj && fltObj.resources && fltObj.resources.length >0) { + var $today = new Date(); + var $yesterday = new Date($today); + $yesterday.setDate($today.getDate() - 1); + var param = { + url: '/analytics/trend/usage?resource=' + items._id + '&fromTimeStamp=' + $yesterday + '&toTimeStamp=' + $today + '&interval=3600' + //url:'src/partials/sections/dashboard/analytics/data/usage.json' + }; + genSevs.promiseGet(param).then(function (result) { + angular.forEach(result,function (val,ke) { + capChat.sliptOptions.push(ke); + }); + capChat.splitUp=Object.keys(result)[0]; + capChat.result=result; + capChat.createChart(); + // } + }); + } + }; + capChat.createChart=function () { + var va = []; + capChat.trendLineChart.data = []; + if (capChat.result) { + angular.forEach(capChat.result[capChat.splitUp].dataPoints, function (value) { + va.push([Date.parse(value.fromTime), value.average]); + }); + capChat.trendLineChart.data.push({ + "key": items.platformId, + "values": va + }); + } + }; + capChat.splitChange=function() { + capChat.createChart(); + }; + capChat.getData($rootScope.filterNewEnt); + $scope.cancel = function() { + $modalInstance.dismiss('cancel'); + }; + }]); +})(angular); diff --git a/client/cat3/src/partials/sections/dashboard/analytics/view/capacityReport.html b/client/cat3/src/partials/sections/dashboard/analytics/view/capacityReport.html new file mode 100644 index 000000000..0eb83d656 --- /dev/null +++ b/client/cat3/src/partials/sections/dashboard/analytics/view/capacityReport.html @@ -0,0 +1,72 @@ +
    +
    + + + + + + + + + + + + + + + +
    +
    +
    +
    + +
    +
    +
    + +

    + + +

    +
    + + + + +
    +
    +
    + + +
    +
    +
    + No Data Available. +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    + No Data Available. +
    +
    + +
    +
    + \ No newline at end of file From 9df7223e6abeb56825342e0c00a52bdf7636989b Mon Sep 17 00:00:00 2001 From: Durgesh1988 Date: Thu, 12 Jan 2017 11:49:09 +0530 Subject: [PATCH 19/81] GIT-REPO-SYNC Implementation --- .../private/ajax/Settings/githubList.html | 2 +- server/app/model/github/github.js | 11 +- server/app/services/gitHubService.js | 154 +++++++++++------- 3 files changed, 105 insertions(+), 62 deletions(-) diff --git a/client/htmls/private/ajax/Settings/githubList.html b/client/htmls/private/ajax/Settings/githubList.html index 3b6f80d5f..98a7d5d45 100644 --- a/client/htmls/private/ajax/Settings/githubList.html +++ b/client/htmls/private/ajax/Settings/githubList.html @@ -31,7 +31,7 @@
    Organization Repo URL Repo Type - Action + Action diff --git a/server/app/model/github/github.js b/server/app/model/github/github.js index 082de2907..7c87e3ad3 100644 --- a/server/app/model/github/github.js +++ b/server/app/model/github/github.js @@ -25,17 +25,17 @@ var GitHubSchema = new Schema({ required: true, trim: true }, - name: { + repositoryName: { type: String, required: true, trim: true }, - description: { + repositoryDesc: { type: String, required: false, trim: true }, - repositoryURL: { + repositoryOwner: { type: String, trim: true, required: true @@ -44,6 +44,11 @@ var GitHubSchema = new Schema({ type: String, required: true }, + repositoryToken: { + type: String, + trim: true, + required: false + }, repositoryUserName: { type: String, trim: true, diff --git a/server/app/services/gitHubService.js b/server/app/services/gitHubService.js index e6896a5d5..cbd30a666 100644 --- a/server/app/services/gitHubService.js +++ b/server/app/services/gitHubService.js @@ -20,10 +20,10 @@ var appConfig = require('_pr/config'); var Cryptography = require('_pr/lib/utils/cryptography'); var fileUpload = require('_pr/model/file-upload/file-upload'); var nodeGit = require('nodegit'); -var promisify = require("promisify-node"); -var fse = promisify(require("fs-extra")); var async = require('async'); var apiUtil = require('_pr/lib/utils/apiUtil.js'); +var promisify = require("promisify-node"); +var fse = promisify(require("fs-extra")); var gitGubService = module.exports = {}; @@ -112,68 +112,92 @@ gitGubService.getGitHubSync = function getGitHubSync(gitHubId, callback) { return callback(err); } else{ formatGitHubResponse(gitHub,function(formattedGitHub){ - if(formattedGitHub.repositoryType === 'Private' && formattedGitHub.authenticationType === 'userName') { + if(formattedGitHub.repositoryType === 'Private' && formattedGitHub.authenticationType === 'token') { var cloneOpts = { fetchOpts: { callbacks: { credentials: function () { - return nodeGit.Cred.userpassPlaintextNew(formattedGitHub.repositoryUserName, formattedGitHub.repositoryPassword); + var cred = nodeGit.Cred.userpassPlaintextNew(formattedGitHub.repositoryToken, "x-oauth-basic"); + return cred; + }, + certificateCheck: function() { + return 1; } } } } - var path = "/tmp/"+ formattedGitHub.name; - fse.remove(path).then(function () { - nodeGit.Clone( - formattedGitHub.repositoryURL, - path, - cloneOpts) - .then(function (repo) { - logger.debug("GIT Repository Clone is Done."); - callback(null,repo); - }).catch(function(err){ - var err = new Error('Invalid Credentials'); - err.status = 400; - err.msg = 'Invalid Credentials'; + var localClonePath = "/tmp/"+ formattedGitHub.repositoryName; + var repoUrl = "https://github.com/" + formattedGitHub.repositoryOwner + "/" + formattedGitHub.repositoryName + ".git"; + gitRepoCloning(repoUrl,localClonePath,cloneOpts,function(err,cloneStatus){ + if(err){ callback(err,null); - }) + return; + }else{ + callback(null,cloneStatus); + return; + } + }); + }else if(formattedGitHub.repositoryType === 'Private' && formattedGitHub.authenticationType === 'userName') { + var cloneOpts = { + fetchOpts: { + callbacks: { + credentials: function () { + var cred = nodeGit.Cred.userpassPlaintextNew(formattedGitHub.repositoryUserName, formattedGitHub.repositoryPassword); + return cred; + }, + certificateCheck: function() { + return 1; + } + } + } + } + var localClonePath = "/tmp/"+ formattedGitHub.repositoryName; + var repoUrl = "https://github.com/" + formattedGitHub.repositoryOwner + "/" + formattedGitHub.repositoryName + ".git"; + gitRepoCloning(repoUrl,localClonePath,cloneOpts,function(err,cloneStatus){ + if(err){ + callback(err,null); + return; + }else{ + callback(null,cloneStatus); + return; + } }); }else if(formattedGitHub.repositoryType === 'Private' && formattedGitHub.authenticationType === 'sshKey') { var cloneOpts = { fetchOpts: { callbacks: { credentials: function () { - return nodeGit.Cred.sshKeyNew(formattedGitHub.repositoryUserName, formattedGitHub.repositorySSHPublicKeyFileData,formattedGitHub.repositorySSHPrivateKeyFileData,''); + var cred = nodeGit.Cred.sshKeyNew(formattedGitHub.repositoryUserName, formattedGitHub.repositorySSHPublicKeyFileData,formattedGitHub.repositorySSHPrivateKeyFileData,''); + return cred; + }, + certificateCheck: function() { + return 1; } } } } - var path = "/tmp/"+ formattedGitHub.name; - fse.remove(path).then(function () { - nodeGit.Clone( - formattedGitHub.repositoryURL, - path, - cloneOpts) - .then(function (repo) { - logger.debug("GIT Repository Clone is Done."); - callback(null,repo); - }).catch(function(err){ - var err = new Error('Invalid Credentials'); - err.status = 400; - err.msg = 'Invalid Credentials'; - callback(err,null); - }) + var localClonePath = "/tmp/"+ formattedGitHub.repositoryName; + var repoUrl = "https://github.com/" + formattedGitHub.repositoryOwner + "/" + formattedGitHub.repositoryName + ".git"; + gitRepoCloning(repoUrl,localClonePath,cloneOpts,function(err,cloneStatus){ + if(err){ + callback(err,null); + return; + }else{ + callback(null,cloneStatus); + return; + } }); }else{ - var path = "/tmp/"+ formattedGitHub.name; - nodeGit.Clone(formattedGitHub.repositoryURL, path, {}).then(function (repo) { - logger.debug("GIT Repository Clone is Done."); - callback(null,repo); - }).catch(function (err) { - var err = new Error('Invalid Credentials'); - err.status = 400; - err.msg = 'Invalid Credentials'; - callback(err,null); + var localClonePath = "/tmp/"+ formattedGitHub.repositoryName; + var repoUrl = "https://github.com/" + formattedGitHub.repositoryOwner + "/" + formattedGitHub.repositoryName + ".git"; + gitRepoCloning(repoUrl,localClonePath,{},function(err,cloneStatus){ + if(err){ + callback(err,null); + return; + }else{ + callback(null,cloneStatus); + return; + } }); } }) @@ -246,24 +270,12 @@ gitGubService.getGitHubById = function getGitHubById(gitHubId, callback) { }); }; - -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; -}; - function formatGitHubResponse(gitHub,callback) { var formatted = { _id:gitHub._id, - name:gitHub.name, - description:gitHub.description, - repositoryURL:gitHub.repositoryURL, + repositoryName:gitHub.repositoryName, + repositoryDesc:gitHub.repositoryDesc, + repositoryOwner:gitHub.repositoryOwner, repositoryType:gitHub.repositoryType }; if (gitHub.organization.length) { @@ -301,8 +313,34 @@ function formatGitHubResponse(gitHub,callback) { callback(formatted); }); }); + }else if (gitHub.repositoryType === 'Private' && gitHub.authenticationType === 'token') { + formatted.authenticationType = gitHub.authenticationType; + formatted.repositoryToken = gitHub.repositoryToken; + callback(formatted); }else { formatted.authenticationType = gitHub.authenticationType; callback(formatted); } } + +function gitRepoCloning(url,path,options,callback){ + console.log("Hello"); + fse.remove(path).then(function() { + nodeGit.Clone(url, path, options,function(err,data){ + if(err){ + console.log("Error"); + }else{ + console.log("no Error"); + } + })/*.then(function(repo) { + logger.debug("GIT Repository Clone is Done."); + callback(null, repo); + }).catch(function(err) { + logger.error(err); + var err = new Error('Invalid Credentials'); + err.status = 400; + err.msg = 'Invalid Credentials'; + callback(err, null); + });*/ + }); +} From 1c030d429978587e9f646b4b68ff37dd9f259997 Mon Sep 17 00:00:00 2001 From: Divakar Konakalla Date: Thu, 12 Jan 2017 12:55:20 +0530 Subject: [PATCH 20/81] New BOTs UI enhancements, Added filter functionlity for BOTs. --- .../sections/dashboard/bots/bots.scss | 38 +++-- .../bots/controller/audittrailCtrl.js | 6 +- .../dashboard/bots/controller/libraryCtrl.js | 134 +++++++++++++++++- .../sections/dashboard/bots/view/library.html | 73 +++++++--- 4 files changed, 216 insertions(+), 35 deletions(-) diff --git a/client/cat3/src/partials/sections/dashboard/bots/bots.scss b/client/cat3/src/partials/sections/dashboard/bots/bots.scss index ed52f151a..c2942a792 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/bots.scss +++ b/client/cat3/src/partials/sections/dashboard/bots/bots.scss @@ -24,6 +24,10 @@ margin-top: 8px; } +.paddingleft0 { + padding-left: 0px; +} + .cookbook-edit-text { background: #fff; } @@ -88,6 +92,23 @@ width: 100%; } + .botFilter, .botSubFilter { + height: 26px; + padding: 2px 12px; + } + + .botFilter { + width: 112px; + } + + .botSubFilter { + width: 200px; + } + + .filter-by-text { + margin-top: 4px; + } + .bot-library-search { height: 33px; margin-right: 12px; @@ -123,11 +144,11 @@ } .circle-tile-number { - padding: 5px 0 6px; - font-size: 26px; + padding: 0px 0 0px; + font-size: 30px; font-weight: 700; - line-height: 1; - height: 37px; + line-height: .6; + height: 28px; } .circle-tile-content { @@ -136,11 +157,12 @@ .circle-tile-description { text-transform: uppercase; + height: 29px; } .text-faded { - color: rgba(255,255,255,0.7); - font-weight: bold; + font-weight: normal; + color: #fff; } .dark-blue { @@ -183,8 +205,8 @@ font-size: 16px; } - a.cursor { - padding: 0 5px; + a { + padding: 0 8px; } .margin-21 { diff --git a/client/cat3/src/partials/sections/dashboard/bots/controller/audittrailCtrl.js b/client/cat3/src/partials/sections/dashboard/bots/controller/audittrailCtrl.js index f8aa58063..fa1302dfe 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/controller/audittrailCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/bots/controller/audittrailCtrl.js @@ -38,10 +38,10 @@ '' + '', cellTooltip: true}, - { name: 'Org',field:'masterDetails.orgName'}, - { name: 'BU',field:'masterDetails.bgName'}, + { name: 'Organization',field:'masterDetails.orgName'}, + { name: 'Business Group',field:'masterDetails.bgName'}, { name: 'Project',field:'masterDetails.projectName'}, - { name: 'Env',field:'masterDetails.envName'}, + { name: 'Environment',field:'masterDetails.envName'}, { name: 'User',field:'user'}, { name: 'Logs',cellTemplate: ''} ] 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 cec610bc3..0aeaea87e 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js @@ -8,11 +8,15 @@ (function (angular) { "use strict"; angular.module('dashboard.bots') - .controller('libraryCtrl',['$scope', '$rootScope', '$state', 'genericServices', 'confirmbox', 'toastr', 'workzoneUIUtils', '$modal', 'uiGridOptionsService', '$timeout', function ($scope, $rootScope, $state, genSevs, confirmbox, toastr, workzoneUIUtils, $modal, uiGridOptionsService, $timeout) { + .controller('libraryCtrl',['$scope', '$rootScope', '$state', 'genericServices', 'confirmbox', 'toastr', 'workzoneUIUtils', '$modal', 'uiGridOptionsService', '$timeout', 'workzoneServices', function ($scope, $rootScope, $state, genSevs, confirmbox, toastr, workzoneUIUtils, $modal, uiGridOptionsService, $timeout, workzoneServices) { var treeNames = ['BOTs','Library']; $rootScope.$emit('treeNameUpdate', treeNames); var lib=this; $scope.totalBotsSelected = true; + $scope.botCategoryList = []; + workzoneServices.getBotCategoryList().then(function (catList) { + $scope.botCategoryList=catList.data; + }); var botLibraryUIGridDefaults = uiGridOptionsService.options(); $scope.paginationParams = botLibraryUIGridDefaults.pagination; $scope.paginationParams=[]; @@ -20,6 +24,10 @@ $scope.paginationParams.pageSize = 10; $scope.paginationParams.sortBy = 'createdOn'; $scope.paginationParams.sortOrder = 'desc'; + $scope.botLibrarySearch = ''; + $scope.botLibFilterBot = 'Task'; + $scope.botLibFilterTask = 'chef'; + $scope.botLibFilterCategory = 'Active Directory'; $scope.initGrids = function(){ $scope.botLibGridOptions={}; @@ -36,13 +44,13 @@ { name: 'Total Runs',field:'executionCount'}, { name: 'BOT Action',width:200,displayName: 'BOT Action',cellTemplate: // ''+ - ''+ - ''+ + ''+ + ''+ //''+ - '' + - '' + + '' + + '' + //'' + - '' + '' } ] $scope.botLibGridOptions.data=[]; @@ -91,6 +99,7 @@ $timeout(function() { $scope.botLibGridOptions.totalItems = result.metaData.totalRecords; $scope.botLibGridOptions.data=result.bots; + $scope.filterBy(); }, 100); $scope.isBotLibraryPageLoading = false; }, function(error) { @@ -102,6 +111,7 @@ $scope.botLibraryGridView(); $scope.searchBotNameCategory = function() { $scope.searchString = $scope.botLibrarySearch; + $scope.searchText = true; lib.gridOptions=[]; if($scope.totalBotsSelected) { var param={ @@ -111,6 +121,10 @@ var param={ url:'/bots?actionStatus=running&page=' + $scope.paginationParams.page +'&pageSize=' + $scope.paginationParams.pageSize +'&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder+'&search=' + $scope.searchString } + } else if($scope.scheduledBotsselected) { + var param={ + url:'/bots?filterBy=isBotScheduled:true&page=' + $scope.paginationParams.page +'&pageSize=' + $scope.paginationParams.pageSize +'&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder+'&search=' + $scope.searchString + } } else if($scope.failedBotsselected) { var param={ url:'/bots?actionStatus=failed&page=' + $scope.paginationParams.page +'&pageSize=' + $scope.paginationParams.pageSize +'&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder+'&search=' + $scope.searchString @@ -128,6 +142,110 @@ $scope.errorMessage = "No Records found"; }); }; + $scope.clearBotSearchText = function() { + $scope.botLibrarySearch = ''; + $scope.searchText = false; + if($scope.totalBotsSelected) { + $scope.showAllBots(); + } else if($scope.runningBotsselected) { + $scope.showBotsRunning(); + }else if($scope.scheduledBotsselected) { + $scope.showBotsScheduled(); + } else if($scope.failedBotsselected) { + $scope.showBotsFailed(); + } + }; + + $("#searchBots").keyup(function(event) { + if (event.keyCode === 13) { + $scope.searchBotNameCategory(); + } + }); + //$scope.subFilterBy = true; + $scope.filterBy = function() { + if($scope.botLibFilter === 'botType') { + $scope.filterByBotType = true; + $scope.filterByTaskType = false; + $scope.filterByCategory = false; + $scope.subFilterBy = false; + $scope.filterByBot(); + } else if($scope.botLibFilter === 'taskType') { + $scope.filterByTaskType = true; + $scope.filterByBotType = false; + $scope.filterByCategory = false; + $scope.subFilterBy = false; + $scope.filterByTask(); + } else if($scope.botLibFilter === 'category') { + $scope.filterByCategory = true; + $scope.filterByBotType = false; + $scope.filterByTaskType = false; + $scope.subFilterBy = false; + $scope.filterByCateg(); + } else { + $scope.subFilterBy = true; + $scope.filterByBotType = false; + $scope.filterByTaskType = false; + $scope.filterByCategory = false; + //$scope.showAllBots(); + } + }; + $scope.filterByBot = function() { + console.log($scope.botLibFilterBot); + lib.gridOptions=[]; + var param={ + url:'/bots?filterBy=botLinkedCategory:'+$scope.botLibFilterBot+'&page=' + $scope.paginationParams.page +'&pageSize=' + $scope.paginationParams.pageSize +'&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder + } + genSevs.promiseGet(param).then(function (result) { + $timeout(function() { + $scope.botLibGridOptions.totalItems = result.metaData.totalRecords; + $scope.botLibGridOptions.data=result.bots; + }, 100); + $scope.isBotLibraryPageLoading = false; + }, function(error) { + $scope.isBotLibraryPageLoading = false; + toastr.error(error); + $scope.errorMessage = "No Records found"; + }); + }; + + $scope.filterByTask = function() { + console.log($scope.botLibFilterTask); + lib.gridOptions=[]; + var param={ + url:'/bots?filterBy=botLinkedSubCategory:'+$scope.botLibFilterTask+'&page=' + $scope.paginationParams.page +'&pageSize=' + $scope.paginationParams.pageSize +'&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder + } + genSevs.promiseGet(param).then(function (result) { + $timeout(function() { + $scope.botLibGridOptions.totalItems = result.metaData.totalRecords; + $scope.botLibGridOptions.data=result.bots; + }, 100); + $scope.isBotLibraryPageLoading = false; + }, function(error) { + $scope.isBotLibraryPageLoading = false; + toastr.error(error); + $scope.errorMessage = "No Records found"; + }); + }; + + $scope.filterByCateg = function() { + console.log($scope.botLibFilterCategory); + lib.gridOptions=[]; + var param={ + url:'/bots?filterBy=botCategory:'+$scope.botLibFilterCategory+'&page=' + $scope.paginationParams.page +'&pageSize=' + $scope.paginationParams.pageSize +'&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder + } + genSevs.promiseGet(param).then(function (result) { + $timeout(function() { + $scope.botLibGridOptions.totalItems = result.metaData.totalRecords; + $scope.botLibGridOptions.data=result.bots; + }, 100); + $scope.isBotLibraryPageLoading = false; + }, function(error) { + $scope.isBotLibraryPageLoading = false; + toastr.error(error); + $scope.errorMessage = "No Records found"; + }); + }; + var gridBottomSpace = 265; $scope.gridHeight = workzoneUIUtils.makeTabScrollable('botLibraryPage') - gridBottomSpace; $scope.launchInstance = function(launch){ @@ -233,6 +351,10 @@ $scope.botLibraryGridView(); }); $scope.RefreshBotsLibrary = function() { + $scope.botLibFilter = ''; + $scope.botLibFilterBot = 'Task'; + $scope.botLibFilterTask = 'chef'; + $scope.botLibFilterCategory = 'Active Directory'; $scope.botLibrarySearch = ''; lib.summary(); if($scope.totalBotsSelected) { 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 683e46691..6c083c543 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/view/library.html +++ b/client/cat3/src/partials/sections/dashboard/bots/view/library.html @@ -22,12 +22,12 @@
    +
    + {{botSummary.totalNoOfBots}} +
    Total BOTs
    -
    - {{botSummary.totalNoOfBots}} -
    @@ -40,12 +40,12 @@
    • -
    - Running BOTs -
    {{botSummary.totalNoOfRunningBots}}
    +
    + Running BOTs +
    @@ -59,12 +59,12 @@
    +
    + {{totalSavedTimeForBots}} mins +
    Time saved
    -
    - {{totalSavedTimeForBots}} mins -
    @@ -76,12 +76,12 @@
    +
    + {{botSummary.totalNoOfScheduledBots}} +
    Scheduled BOTs
    -
    - {{botSummary.totalNoOfScheduledBots}} -
    @@ -94,12 +94,12 @@
    +
    + {{botSummary.totalNoOfFailedBots}} +
    Failed BOTs
    -
    - {{botSummary.totalNoOfFailedBots}} -
    @@ -110,14 +110,51 @@
    +
    +
    +
    + + + + +
    +
    +
    +
    +
    +
    +
    +
    + +
    +
    +
    No data Available
    - + \ No newline at end of file From 1ea911243ca93906af007ce3253e8d6e0d2c9bca Mon Sep 17 00:00:00 2001 From: Durgesh1988 Date: Thu, 12 Jan 2017 13:07:37 +0530 Subject: [PATCH 21/81] Instance Scheduler Fixed and CAT-2628 Fixed --- server/app/model/github/github.js | 5 +++++ server/app/routes/v1.0/routes_d4dMasters.js | 12 +++++++----- server/app/services/gitHubService.js | 19 ++++++++++++------- server/app/services/instanceService.js | 2 +- 4 files changed, 25 insertions(+), 13 deletions(-) diff --git a/server/app/model/github/github.js b/server/app/model/github/github.js index 7c87e3ad3..141ed5ee4 100644 --- a/server/app/model/github/github.js +++ b/server/app/model/github/github.js @@ -74,6 +74,11 @@ var GitHubSchema = new Schema({ trim: true, required: false }, + isRepoCloned:{ + type: Boolean, + required: false, + default:false + }, createdOn:{ type: Number, required: false, diff --git a/server/app/routes/v1.0/routes_d4dMasters.js b/server/app/routes/v1.0/routes_d4dMasters.js index 0faf7e75b..53f1800e8 100755 --- a/server/app/routes/v1.0/routes_d4dMasters.js +++ b/server/app/routes/v1.0/routes_d4dMasters.js @@ -2520,7 +2520,8 @@ module.exports.setRoutes = function (app, sessionVerification) { // Start Auto create Team if (req.params.id === '1') { d4dModelNew.d4dModelMastersOrg.find({ - orgname: bodyJson["orgname"] + orgname: bodyJson["orgname"], + id: '1' }, function (err, orgs) { if (err) { logger.error('Hit error while check org is exist with Org Name', err); @@ -2701,7 +2702,8 @@ module.exports.setRoutes = function (app, sessionVerification) { } bodyJson["password"] = hashedPassword; d4dModelNew.d4dModelMastersUsers.find({ - loginname: bodyJson["loginname"] + loginname: bodyJson["loginname"], + id: '7' }, function (err, users) { if (err) { logger.error('Hit error while check user is exist with Login Name', err); @@ -2713,8 +2715,9 @@ module.exports.setRoutes = function (app, sessionVerification) { return; } else { d4dModelNew.d4dModelMastersUsers.find({ - email: bodyJson["email"] - },function(err,usersList){ + email: bodyJson["email"], + id: '7' + },function(err,usersList){ if (err) { logger.error('Hit error while check user is exist with email', err); res.send(500); @@ -2806,7 +2809,6 @@ module.exports.setRoutes = function (app, sessionVerification) { }); }); } else if (req.params.id === '4') { - // bodyJson['repositories'] = JSON.parse(bodyJson['repositories']); var projectModel = new d4dModelNew.d4dModelMastersProjects(bodyJson); projectModel.save(function (err, data) { if (err) { diff --git a/server/app/services/gitHubService.js b/server/app/services/gitHubService.js index f472cc3ff..f7193b59d 100644 --- a/server/app/services/gitHubService.js +++ b/server/app/services/gitHubService.js @@ -128,7 +128,7 @@ gitGubService.getGitHubSync = function getGitHubSync(gitHubId, callback) { } var localClonePath = "/tmp/"+ formattedGitHub.repositoryName; var repoUrl = "https://github.com/" + formattedGitHub.repositoryOwner + "/" + formattedGitHub.repositoryName + ".git"; - gitRepoCloning(repoUrl,localClonePath,cloneOpts,function(err,cloneStatus){ + gitRepoCloning(repoUrl,localClonePath,cloneOpts,gitHubId,function(err,cloneStatus){ if(err){ callback(err,null); return; @@ -153,7 +153,7 @@ gitGubService.getGitHubSync = function getGitHubSync(gitHubId, callback) { } var localClonePath = "/tmp/"+ formattedGitHub.repositoryName; var repoUrl = "https://github.com/" + formattedGitHub.repositoryOwner + "/" + formattedGitHub.repositoryName + ".git"; - gitRepoCloning(repoUrl,localClonePath,cloneOpts,function(err,cloneStatus){ + gitRepoCloning(repoUrl,localClonePath,cloneOpts,gitHubId,function(err,cloneStatus){ if(err){ callback(err,null); return; @@ -178,7 +178,7 @@ gitGubService.getGitHubSync = function getGitHubSync(gitHubId, callback) { } var localClonePath = "/tmp/"+ formattedGitHub.repositoryName; var repoUrl = "https://github.com/" + formattedGitHub.repositoryOwner + "/" + formattedGitHub.repositoryName + ".git"; - gitRepoCloning(repoUrl,localClonePath,cloneOpts,function(err,cloneStatus){ + gitRepoCloning(repoUrl,localClonePath,cloneOpts,gitHubId,function(err,cloneStatus){ if(err){ callback(err,null); return; @@ -190,7 +190,7 @@ gitGubService.getGitHubSync = function getGitHubSync(gitHubId, callback) { }else{ var localClonePath = "/tmp/"+ formattedGitHub.repositoryName; var repoUrl = "https://github.com/" + formattedGitHub.repositoryOwner + "/" + formattedGitHub.repositoryName + ".git"; - gitRepoCloning(repoUrl,localClonePath,{},function(err,cloneStatus){ + gitRepoCloning(repoUrl,localClonePath,{},gitHubId,function(err,cloneStatus){ if(err){ callback(err,null); return; @@ -323,13 +323,18 @@ function formatGitHubResponse(gitHub,callback) { } } -function gitRepoCloning(url,path,options,callback){ +function gitRepoCloning(url,path,options,gitHubId,callback){ fse.remove(path).then(function() { nodeGit.Clone(url, path, options) .done(function(repo) { if (repo instanceof nodeGit.Repository) { - logger.debug("GIT Repository Clone is Done."); - callback(null, repo); + gitHubModel.updateGitHub(gitHubId, {isRepoCloned:true}, function (err, gitHub) { + if (err) { + logger.error(err); + } + logger.debug("GIT Repository Clone is Done."); + callback(null, repo); + }); } else { var err = new Error('Invalid Credentials'); diff --git a/server/app/services/instanceService.js b/server/app/services/instanceService.js index 2a3b24681..13b232adb 100644 --- a/server/app/services/instanceService.js +++ b/server/app/services/instanceService.js @@ -46,7 +46,6 @@ var AppData = require('_pr/model/app-deploy/app-data'); var instancesDao = require('_pr/model/classes/instance/instance'); var providerService = require('_pr/services/providerService.js'); var schedulerService = require('_pr/services/schedulerService.js'); -var catalystSync = require('_pr/cronjobs/catalyst-scheduler/catalystScheduler.js'); var instanceService = module.exports = {}; @@ -1485,6 +1484,7 @@ function updateScheduler(instanceScheduler, callback) { return callback(err, null); } else { callback(null, {"message": "Scheduler Updated."}); + var catalystSync = require('_pr/cronjobs/catalyst-scheduler/catalystScheduler.js'); catalystSync.executeScheduledInstances(); return; } From 7acf20d247647df4c33a6ee76c919839d03f3bce Mon Sep 17 00:00:00 2001 From: hrushikesh07 Date: Thu, 12 Jan 2017 14:16:27 +0530 Subject: [PATCH 22/81] date picker added for cost and fixex the bugs --- .../sections/dashboard/analytics/analytics.html | 13 +++++++++++-- .../sections/dashboard/analytics/analytics.js | 2 +- .../dashboard/analytics/analyticsServices.js | 16 ++++++++++++++++ .../analytics/controller/capacityReportCtrl.js | 15 +++++++-------- .../dashboard/analytics/controller/costCtrl.js | 3 ++- .../dashboard/analytics/view/capacityReport.html | 3 +-- .../sections/dashboard/analytics/view/cost.html | 3 ++- 7 files changed, 40 insertions(+), 15 deletions(-) diff --git a/client/cat3/src/partials/sections/dashboard/analytics/analytics.html b/client/cat3/src/partials/sections/dashboard/analytics/analytics.html index 6c2df7210..341c337c0 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/analytics.html +++ b/client/cat3/src/partials/sections/dashboard/analytics/analytics.html @@ -9,7 +9,8 @@
    Filter:
    -
    + +
    @@ -123,6 +124,7 @@ + Up to :
    @@ -136,4 +138,11 @@
    -
    \ No newline at end of file + + \ No newline at end of file diff --git a/client/cat3/src/partials/sections/dashboard/analytics/analytics.js b/client/cat3/src/partials/sections/dashboard/analytics/analytics.js index 42aa1b518..fdf45133f 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/analytics.js +++ b/client/cat3/src/partials/sections/dashboard/analytics/analytics.js @@ -61,7 +61,7 @@ url: "analytics/usage/", templateUrl: "src/partials/sections/dashboard/analytics/view/usage.html", controller: "usageCtrl as usage", - params:{filterView:{usage:true,org:true,provi:true,instanceType:true,resources:true}}, + params:{filterView:{period:true,usage:true,org:true,provi:true,instanceType:true,resources:true}}, resolve: { auth: ["$q", function ($q) { var deferred = $q.defer(); diff --git a/client/cat3/src/partials/sections/dashboard/analytics/analyticsServices.js b/client/cat3/src/partials/sections/dashboard/analytics/analyticsServices.js index fc2b31619..7311b3b2d 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/analyticsServices.js +++ b/client/cat3/src/partials/sections/dashboard/analytics/analyticsServices.js @@ -10,14 +10,30 @@ $rootScope.filterNewEnt.period='month'; $rootScope.splitUpCosts=[]; $rootScope.filterNewEnt.platformId=[]; + $rootScope.filterNewEnt.endDate=moment(new Date()).format('DD/MM/YYYY'); + $rootScope.filterNewEnt.fromDate=''; }, applyFilter : function(filterApp,period){ + if($rootScope.organObject) { var obj = $rootScope.organObject, or = $rootScope.organNewEnt.org, bu = $rootScope.organNewEnt.buss, pr = $rootScope.organNewEnt.proj; if (period) { + // if(period === 'month'){ + // var newdate = $rootScope.filterNewEnt.endDate; + // newdate.setDate(newdate.getDate() - 30); + // $rootScope.filterNewEnt.fromDate = new Date(newdate); + // } else if(period === 'week') { + // var newdate = $rootScope.filterNewEnt.endDate; + // newdate.setDate(newdate.getDate() - 7); + // $rootScope.filterNewEnt.fromDate = new Date(newdate); + // } else if(period === 'day') { + // var newdate = $rootScope.filterNewEnt.endDate; + // newdate.setDate(newdate.getDate() - 1); + // $rootScope.filterNewEnt.fromDate = new Date(newdate); + // } $rootScope.filterNewEnt.period = period; } diff --git a/client/cat3/src/partials/sections/dashboard/analytics/controller/capacityReportCtrl.js b/client/cat3/src/partials/sections/dashboard/analytics/controller/capacityReportCtrl.js index 41159783d..992451b9e 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/controller/capacityReportCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/analytics/controller/capacityReportCtrl.js @@ -35,7 +35,7 @@ capRept.chartData=result; $rootScope.splitUpCapacities=[]; capRept.serviceCapacity=result.capacity.AWS; - + capRept.serviceType=Object.keys(capRept.serviceCapacity.services)[0]; if(result.splitUpCapacities && Object.keys(result.splitUpCapacities).length >0) { angular.forEach(result.splitUpCapacities, function (val, key) { var a=key.replace(/([A-Z])/g, ' $1').replace(/^./, function(str) { @@ -61,7 +61,6 @@ } }; capRept.init =function(){ - capRept.serviceType='Instance'; $rootScope.organNewEnt.instanceType='Unassigned'; $rootScope.organNewEnt.provider='0'; $rootScope.$emit('INI_usage', 'Unassigned'); @@ -120,14 +119,14 @@ {name: 'orgName', displayName: 'Org Name', field: 'orgName', cellTooltip: true}, { name: 'cost', - displayName: 'cost', + displayName: 'Cost', cellTemplate: '' }, { name: 'Action', cellTooltip: true, cellTemplate: " " + - "   " + "   " } // {name: 'Chef', cellTooltip: true,cellTemplate:""} ]; @@ -139,9 +138,8 @@ {name: 'bucketOwnerName', field: 'bucketOwnerName', cellTooltip: true}, {name: 'bucketSize', field: 'bucketSize', cellTooltip: true}, {name: 'orgName', field: 'orgName', cellTooltip: true}, - {name: 'cost', displayName: 'cost',cellTemplate: ''}, - {name: 'Action', cellTooltip: true,cellTemplate:" " + - "   "} + {name: 'cost', displayName: 'Cost',cellTemplate: ''}, + {name: 'Action', cellTooltip: true,cellTemplate:" "} ] } capRept.listGrid[value].onRegisterApi=function (gridApi) { @@ -149,7 +147,7 @@ $scope.gridApi = gridApi; } - if(capRept.serviceType === 'Instance' && fltrObj && fltrObj.provider && fltrObj.provider.id) { + if(capRept.serviceType === 'EC2' && fltrObj && fltrObj.provider && fltrObj.provider.id) { if($rootScope.organNewEnt.instanceType === 'Managed') { $scope.instanceType= 'managedInstances'; } else if($rootScope.organNewEnt.instanceType === 'Assigned'){ @@ -193,6 +191,7 @@ capRept.listGrid[value].data[ke].providerData={}; capRept.listGrid[value].data[ke].providerData.region = va.resourceDetails.region; capRept.listGrid[value].data[ke].orgName = va.masterDetails.orgName; + capRept.listGrid[value].data[ke].hideSchedule=true; }); } diff --git a/client/cat3/src/partials/sections/dashboard/analytics/controller/costCtrl.js b/client/cat3/src/partials/sections/dashboard/analytics/controller/costCtrl.js index 17d145288..152f8fe68 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/controller/costCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/analytics/controller/costCtrl.js @@ -109,8 +109,9 @@ } else { entityId=fltObj.org.id; } + //param.url='src/partials/sections/dashboard/analytics/data/cost.json'; - param.url='/analytics/cost/aggregate?parentEntityId='+fltObj.org.id+'&entityId='+entityId+'&toTimeStamp='+new Date()+'&period='+fltObj.period; + param.url='/analytics/cost/aggregate?parentEntityId='+fltObj.org.id+'&entityId='+entityId+'&toTimeStamp='+fltObj.endDate+'&period='+fltObj.period; } genSevs.promiseGet(param).then(function (result) { diff --git a/client/cat3/src/partials/sections/dashboard/analytics/view/capacityReport.html b/client/cat3/src/partials/sections/dashboard/analytics/view/capacityReport.html index 0eb83d656..34d39a93e 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/view/capacityReport.html +++ b/client/cat3/src/partials/sections/dashboard/analytics/view/capacityReport.html @@ -30,8 +30,7 @@

    diff --git a/client/cat3/src/partials/sections/dashboard/analytics/view/cost.html b/client/cat3/src/partials/sections/dashboard/analytics/view/cost.html index d8cb1edb7..24bcd47f2 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/view/cost.html +++ b/client/cat3/src/partials/sections/dashboard/analytics/view/cost.html @@ -53,4 +53,5 @@

    Aggregate cos

    - \ No newline at end of file + + From 615ac8116915a6ec0a88adc8f1a5783d5b35eedc Mon Sep 17 00:00:00 2001 From: Durgesh1988 Date: Thu, 12 Jan 2017 14:24:09 +0530 Subject: [PATCH 23/81] Instance Scheduler Fixed and CAT-2628 Fixed --- server/app/services/gitHubService.js | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/server/app/services/gitHubService.js b/server/app/services/gitHubService.js index f7193b59d..27c5edfd0 100644 --- a/server/app/services/gitHubService.js +++ b/server/app/services/gitHubService.js @@ -325,23 +325,19 @@ function formatGitHubResponse(gitHub,callback) { function gitRepoCloning(url,path,options,gitHubId,callback){ fse.remove(path).then(function() { - nodeGit.Clone(url, path, options) - .done(function(repo) { - if (repo instanceof nodeGit.Repository) { - gitHubModel.updateGitHub(gitHubId, {isRepoCloned:true}, function (err, gitHub) { - if (err) { - logger.error(err); - } - logger.debug("GIT Repository Clone is Done."); - callback(null, repo); - }); - } - else { - var err = new Error('Invalid Credentials'); - err.status = 400; - err.msg = 'Invalid Credentials'; - callback(err, null); + nodeGit.Clone(url, path, options).then(function(repo){ + gitHubModel.updateGitHub(gitHubId, {isRepoCloned:true}, function (err, gitHub) { + if (err) { + logger.error(err); } + logger.debug("GIT Repository Clone is Done."); + callback(null, repo); }); + }).catch(function(err){ + var err = new Error('Invalid Git-Hub Details'); + err.status = 400; + err.msg = 'Invalid Git-Hub Details'; + callback(err, null); + }) }); } From 6e582ca25cc2d5a2caade75f9dbb9dba5b782ecb Mon Sep 17 00:00:00 2001 From: Durgesh1988 Date: Thu, 12 Jan 2017 15:25:01 +0530 Subject: [PATCH 24/81] Implement FilterBy in Bots --- server/app/lib/utils/apiUtil.js | 2 +- server/app/model/github/github.js | 1 + server/app/services/auditTrailService.js | 61 ++++++++++++++++++++---- server/app/services/botsService.js | 3 +- 4 files changed, 55 insertions(+), 12 deletions(-) diff --git a/server/app/lib/utils/apiUtil.js b/server/app/lib/utils/apiUtil.js index 24326b86e..02625b83c 100644 --- a/server/app/lib/utils/apiUtil.js +++ b/server/app/lib/utils/apiUtil.js @@ -231,7 +231,7 @@ var ApiUtil = function() { }; var filterBy={}; if(data.filterBy) { - var a = data.filterBy.split(" "); + var a = data.filterBy.split(","); for (var i = 0; i < a.length; i++) { var b = a[i].split(":"); var c = b[1].split(","); diff --git a/server/app/model/github/github.js b/server/app/model/github/github.js index 141ed5ee4..daddf37e5 100644 --- a/server/app/model/github/github.js +++ b/server/app/model/github/github.js @@ -102,6 +102,7 @@ GitHubSchema.statics.createNew = function createNew(gitHubObj, callback) { }; GitHubSchema.statics.getGitHubList = function (params, callback) { + console.log(params); GitHub.paginate(params.queryObj, params.options, function(err, gitRepoList) { if (err) { logger.error(err); diff --git a/server/app/services/auditTrailService.js b/server/app/services/auditTrailService.js index c6c3930c5..9c191ddce 100644 --- a/server/app/services/auditTrailService.js +++ b/server/app/services/auditTrailService.js @@ -189,11 +189,25 @@ auditTrailService.getBOTsSummary = function getBOTsSummary(callback){ actionStatus:'success', isDeleted:false }; - auditTrail.getAuditTrails(query,function(err,data){ + var botsIds = []; + auditTrail.getAuditTrails(query, function(err,botsAudits){ if(err){ callback(err,null); - }else { - callback(null, data.length); + }else if (botsAudits.length > 0) { + var results = []; + for (var i = 0; i < botsAudits.length; i++) { + if (botsIds.indexOf(botsAudits[i].auditId) === -1) { + botsIds.push(botsAudits[i].auditId); + results.push(botsAudits[i].auditId); + } else { + results.push(botsAudits[i].auditId); + } + } + if (results.length === botsAudits.length) { + callback(null,botsIds.length); + } + } else { + callback(null,botsIds.length); } }); @@ -213,14 +227,27 @@ auditTrailService.getBOTsSummary = function getBOTsSummary(callback){ actionStatus:'running', isDeleted:false }; - auditTrail.getAuditTrails(query,function(err,data){ + var botsIds = []; + auditTrail.getAuditTrails(query, function(err,botsAudits){ if(err){ callback(err,null); - }else { - callback(null, data.length); + }else if (botsAudits.length > 0) { + var results = []; + for (var i = 0; i < botsAudits.length; i++) { + if (botsIds.indexOf(botsAudits[i].auditId) === -1) { + botsIds.push(botsAudits[i].auditId); + results.push(botsAudits[i].auditId); + } else { + results.push(botsAudits[i].auditId); + } + } + if (results.length === botsAudits.length) { + callback(null,botsIds.length); + } + } else { + callback(null,botsIds.length); } }); - }, totalSavedTimeForBots: function(callback){ var query={ @@ -257,11 +284,25 @@ auditTrailService.getBOTsSummary = function getBOTsSummary(callback){ actionStatus:'failed', isDeleted:false }; - auditTrail.getAuditTrails(query,function(err,data){ + var botsIds = []; + auditTrail.getAuditTrails(query, function(err,botsAudits){ if(err){ callback(err,null); - }else { - callback(null, data.length); + }else if (botsAudits.length > 0) { + var results = []; + for (var i = 0; i < botsAudits.length; i++) { + if (botsIds.indexOf(botsAudits[i].auditId) === -1) { + botsIds.push(botsAudits[i].auditId); + results.push(botsAudits[i].auditId); + } else { + results.push(botsAudits[i].auditId); + } + } + if (results.length === botsAudits.length) { + callback(null,botsIds.length); + } + } else { + callback(null,botsIds.length); } }); } diff --git a/server/app/services/botsService.js b/server/app/services/botsService.js index 4dc732a6b..ae7c128ff 100644 --- a/server/app/services/botsService.js +++ b/server/app/services/botsService.js @@ -174,7 +174,8 @@ botsService.getBotsList = function getBotsList(botsQuery,actionStatus,callback) if(actionStatus !== null){ var query = { auditType: 'BOTs', - actionStatus: actionStatus + actionStatus: actionStatus, + isDeleted:false }; var botsIds = []; auditTrail.getAuditTrails(query, function(err,botsAudits){ From 343bb2f5d6124bf7437a7f37ee943944c0751f49 Mon Sep 17 00:00:00 2001 From: Durgesh1988 Date: Thu, 12 Jan 2017 15:52:13 +0530 Subject: [PATCH 25/81] Change API End-Point for FilterBy --- .../controller/capacityReportCtrl.js | 2 +- .../private/ajax/Settings/providerSync.html | 4 ++-- client/htmls/public/js/awsCapacity.js | 24 +++++++++---------- client/htmls/public/js/awsRDSDashboard.js | 12 +++++----- client/htmls/public/js/awsS3Dashboard.js | 12 +++++----- 5 files changed, 27 insertions(+), 27 deletions(-) diff --git a/client/cat3/src/partials/sections/dashboard/analytics/controller/capacityReportCtrl.js b/client/cat3/src/partials/sections/dashboard/analytics/controller/capacityReportCtrl.js index 41159783d..27bc00cd6 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/controller/capacityReportCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/analytics/controller/capacityReportCtrl.js @@ -179,7 +179,7 @@ } else if(fltrObj && fltrObj.provider && fltrObj.provider.id){ var param = { inlineLoader:true, - url: '/resources?filterBy=providerId:'+fltrObj.provider.id+'+resourceType:'+capRept.serviceType+'+category:'+$rootScope.organNewEnt.instanceType.toLowerCase() + url: '/resources?filterBy=providerId:'+fltrObj.provider.id+',resourceType:'+capRept.serviceType+',category:'+$rootScope.organNewEnt.instanceType.toLowerCase() //url:'?filterBy=providerId:57e3774d4e738a500b342889+resourceType:RDS+category:unassigned' }; genSevs.promiseGet(param).then(function (instResult) { diff --git a/client/htmls/private/ajax/Settings/providerSync.html b/client/htmls/private/ajax/Settings/providerSync.html index 0a8ca23b1..fd971a003 100644 --- a/client/htmls/private/ajax/Settings/providerSync.html +++ b/client/htmls/private/ajax/Settings/providerSync.html @@ -733,7 +733,7 @@

    Importing Instances

    "processing": true, "serverSide": true, "destroy":true, - "ajax": '/resources?filterBy=providerId:'+ urlproviderId +'+resourceType:S3+category:assigned', + "ajax": '/resources?filterBy=providerId:'+ urlproviderId +',resourceType:S3,category:assigned', "columns": [ {"data": "resourceDetails.bucketName", "orderable" : true}, {"data": "resourceDetails.bucketOwnerName" ,"orderable" : false }, @@ -884,7 +884,7 @@

    Importing Instances

    "processing": true, "serverSide": true, "destroy":true, - "ajax": '/resources?filterBy=providerId:'+ urlproviderId +'+resourceType:RDS+category:assigned', + "ajax": '/resources?filterBy=providerId:'+ urlproviderId +',resourceType:RDS,category:assigned', "columns": [ {"data": "resourceDetails.dbInstanceIdentifier", "orderable" : true}, {"data": "resourceDetails.dbEngine","orderable" : true }, diff --git a/client/htmls/public/js/awsCapacity.js b/client/htmls/public/js/awsCapacity.js index b4ae6ac9e..40db660f5 100644 --- a/client/htmls/public/js/awsCapacity.js +++ b/client/htmls/public/js/awsCapacity.js @@ -117,9 +117,9 @@ $(document).ready(function() { $('#instanceActionListLoader').show(); var urlManagedNoProvider, urlManagedProvider; if (orgProviderId) { - urlManagedNoProvider = "../tracked-instances?category=managed&filterBy=orgId:" + orgId + ' ' + "providerId:" + orgProviderId; + urlManagedNoProvider = "../tracked-instances?category=managed&filterBy=orgId:" + orgId + ",providerId:" + orgProviderId; } else { - urlManagedProvider = "../tracked-instances?category=managed&filterBy=orgId:" + orgId + ' ' + "providerType:aws"; + urlManagedProvider = "../tracked-instances?category=managed&filterBy=orgId:" + orgId + ",providerType:aws"; } $.ajax({ type: "get", @@ -143,9 +143,9 @@ $(document).ready(function() { $('#instanceActionListLoader').show(); var urlManagedNoProvider, urlManagedProvider; if (orgProviderId) { - urlManagedNoProvider = "../tracked-instances?category=assigned&filterBy=orgId:" + orgId + ' ' + "providerId:" + orgProviderId; + urlManagedNoProvider = "../tracked-instances?category=assigned&filterBy=orgId:" + orgId + ",providerId:" + orgProviderId; } else { - urlManagedProvider = "../tracked-instances?category=assigned&filterBy=orgId:" + orgId + ' ' + "providerType:aws"; + urlManagedProvider = "../tracked-instances?category=assigned&filterBy=orgId:" + orgId + ",providerType:aws"; } $.ajax({ type: "get", @@ -169,9 +169,9 @@ $(document).ready(function() { $('#instanceActionListLoader').show(); var urlManagedNoProvider, urlManagedProvider; if (orgProviderId) { - urlManagedNoProvider = "../tracked-instances?category=unassigned&filterBy=orgId:" + orgId + ' ' + "providerId:" + orgProviderId; + urlManagedNoProvider = "../tracked-instances?category=unassigned&filterBy=orgId:" + orgId + ",providerId:" + orgProviderId; } else { - urlManagedProvider = "../tracked-instances?category=unassigned&filterBy=orgId:" + orgId + ' ' + "providerType:aws"; + urlManagedProvider = "../tracked-instances?category=unassigned&filterBy=orgId:" + orgId +",providerType:aws"; } $.ajax({ type: "get", @@ -230,9 +230,9 @@ $(document).ready(function() { function loadAllManagedInstances() { var urlManagedNoProvider, urlManagedProvider; if (orgProviderId) { - urlManagedNoProvider = "../tracked-instances?category=managed&filterBy=orgId:" + orgId + ' ' + "providerId:" + orgProviderId; + urlManagedNoProvider = "../tracked-instances?category=managed&filterBy=orgId:" + orgId + ",providerId:" + orgProviderId; } else { - urlManagedProvider = "../tracked-instances?category=managed&filterBy=orgId:" + orgId + ' ' + "providerType:aws"; + urlManagedProvider = "../tracked-instances?category=managed&filterBy=orgId:" + orgId +",providerType:aws"; } $('.footer').addClass('hidden'); $('#instanceListTable').DataTable({ @@ -287,9 +287,9 @@ $(document).ready(function() { function loadAllUnManagedInstances() { var urlManagedNoProvider, urlManagedProvider; if (orgProviderId) { - urlManagedNoProvider = "../tracked-instances?category=assigned&filterBy=orgId:" + orgId + ' ' + "providerId:" + orgProviderId; + urlManagedNoProvider = "../tracked-instances?category=assigned&filterBy=orgId:" + orgId + ",providerId:" + orgProviderId; } else { - urlManagedProvider = "../tracked-instances?category=assigned&filterBy=orgId:" + orgId + ' ' + "providerType:aws"; + urlManagedProvider = "../tracked-instances?category=assigned&filterBy=orgId:" + orgId + ",providerType:aws"; } $('.footer').addClass('hidden'); $('#instanceAssignedTable').DataTable({ @@ -345,7 +345,7 @@ $(document).ready(function() { var urlManagedNoProvider, urlManagedProvider; var envProjectMappingObject = {}; if (orgProviderId) { - urlManagedNoProvider = "../tracked-instances?category=unassigned&filterBy=orgId:" + orgId + ' ' + "providerId:" + orgProviderId; + urlManagedNoProvider = "../tracked-instances?category=unassigned&filterBy=orgId:" + orgId + ",providerId:" + orgProviderId; $.get('/providers/'+ orgProviderId +'/tag-mappings', function(tagsListSelected) { if (tagsListSelected) { for (var i = 0; i < tagsListSelected.length; i++) { @@ -373,7 +373,7 @@ $(document).ready(function() { bootbox.alert(msg); }); } else { - urlManagedProvider = "../tracked-instances?category=unassigned&filterBy=orgId:" + orgId + ' ' + "providerType:aws"; + urlManagedProvider = "../tracked-instances?category=unassigned&filterBy=orgId:" + orgId + ",providerType:aws"; getUnassignedInstancesWithTagMapping(envProjectMappingObject,urlManagedProvider,false); } } diff --git a/client/htmls/public/js/awsRDSDashboard.js b/client/htmls/public/js/awsRDSDashboard.js index 235e553d9..ae8be5937 100644 --- a/client/htmls/public/js/awsRDSDashboard.js +++ b/client/htmls/public/js/awsRDSDashboard.js @@ -87,7 +87,7 @@ $(document).ready(function() { loadUnAssignedDBInstances(providerId); }); - $.get('../resources/resourceList?filterBy=providerId:'+ providerId +'+resourceType:RDS+category:assigned', function(assignedRDSDBInstances){ + $.get('../resources/resourceList?filterBy=providerId:'+ providerId +',resourceType:RDS,category:assigned', function(assignedRDSDBInstances){ var rdsAssignedDBInstancesLength = assignedRDSDBInstances.metaData.totalRecords; $childRDSAssignedDBInstanceTemplate.find('.countAssignedDBInstance').empty().append(rdsAssignedDBInstancesLength); @@ -97,7 +97,7 @@ $(document).ready(function() { - $.get('../resources/resourceList?filterBy=providerId:'+ providerId +'+resourceType:RDS+category:unassigned', function(unAssignedDBInstances) { + $.get('../resources/resourceList?filterBy=providerId:'+ providerId +',resourceType:RDS,category:unassigned', function(unAssignedDBInstances) { var rdsUnAssignedDBInstancesLength = unAssignedDBInstances.metaData.totalRecords; $childRDSUnAssignedDBInstancesTemplate.find('.countUnAssignedDBInstance').empty().append(rdsUnAssignedDBInstancesLength); @@ -151,7 +151,7 @@ $(document).ready(function() { "processing": true, "serverSide": true, "destroy":true, - "ajax": '/resources?filterBy=providerId:'+ providerId +'+resourceType:RDS+category:assigned', + "ajax": '/resources?filterBy=providerId:'+ providerId +',resourceType:RDS,category:assigned', "columns": [ {"data": "resourceDetails.dbInstanceIdentifier", "orderable" : true}, {"data": "masterDetails.orgName","orderable" : false, @@ -208,7 +208,7 @@ $(document).ready(function() { "processing": true, "serverSide": true, "destroy":true, - "ajax": '/resources?filterBy=resourceType:RDS+category:assigned', + "ajax": '/resources?filterBy=resourceType:RDS,category:assigned', "columns": [ {"data": "resourceDetails.dbInstanceIdentifier", "orderable" : true}, {"data": "masterDetails.orgName","orderable" : false, @@ -276,7 +276,7 @@ $(document).ready(function() { "processing": true, "serverSide": true, "destroy":true, - "ajax": '/resources?filterBy=providerId:'+ providerId +'+resourceType:RDS+category:unassigned', + "ajax": '/resources?filterBy=providerId:'+ providerId +',resourceType:RDS,category:unassigned', "createdRow": function( row, data ) { $( row ).attr({"resourceId" : data._id,"resourceType":data.resourceType}) }, @@ -300,7 +300,7 @@ $(document).ready(function() { "processing": true, "serverSide": true, "destroy":true, - "ajax": '/resources?filterBy=resourceType:RDS+category:unassigned', + "ajax": '/resources?filterBy=resourceType:RDS,category:unassigned', "createdRow": function( row, data ) { $( row ).attr({"resourceId" : data._id,"resourceType":data.resourceType}) }, diff --git a/client/htmls/public/js/awsS3Dashboard.js b/client/htmls/public/js/awsS3Dashboard.js index edeb39d5c..8b36ab5f7 100644 --- a/client/htmls/public/js/awsS3Dashboard.js +++ b/client/htmls/public/js/awsS3Dashboard.js @@ -85,7 +85,7 @@ $(document).ready(function() { loadUnAssignedS3Buckets(providerId); }); - $.get('../resources/resourceList?filterBy=providerId:'+ providerId +'+resourceType:S3+category:assigned', function(assignedS3Buckets){ + $.get('../resources/resourceList?filterBy=providerId:'+ providerId +',resourceType:S3,category:assigned', function(assignedS3Buckets){ var s3AssignedBucketsLength = assignedS3Buckets.metaData.totalRecords; $childS3ManagedInstanceTemplate.find('.countAssignedBuckets').empty().append(s3AssignedBucketsLength); @@ -95,7 +95,7 @@ $(document).ready(function() { - $.get('../resources/resourceList?filterBy=providerId:'+ providerId +'+resourceType:S3+category:unassigned', function(unAssignedS3Buckets) { + $.get('../resources/resourceList?filterBy=providerId:'+ providerId +',resourceType:S3,category:unassigned', function(unAssignedS3Buckets) { var s3UnAssignedBucketsLength = unAssignedS3Buckets.metaData.totalRecords; $childS3UnmanagedInstanceTemplate.find('.countUnAssignedBuckets').empty().append(s3UnAssignedBucketsLength); @@ -149,7 +149,7 @@ $(document).ready(function() { "processing": true, "serverSide": true, "destroy":true, - "ajax": '/resources?filterBy=providerId:'+ providerId +'+resourceType:S3+category:assigned', + "ajax": '/resources?filterBy=providerId:'+ providerId +',resourceType:S3,category:assigned', "columns": [ {"data": "resourceDetails.bucketName", "orderable" : true}, {"data": "resourceDetails.bucketOwnerName" ,"orderable" : false }, @@ -206,7 +206,7 @@ $(document).ready(function() { "processing": true, "serverSide": true, "destroy":true, - "ajax": '/resources?filterBy=resourceType:S3+category:assigned', + "ajax": '/resources?filterBy=resourceType:S3,category:assigned', "columns": [ {"data": "resourceDetails.bucketName", "orderable" : true}, {"data": "resourceDetails.bucketOwnerName" ,"orderable" : false }, @@ -274,7 +274,7 @@ $(document).ready(function() { "processing": true, "serverSide": true, "destroy":true, - "ajax": '/resources?filterBy=providerId:'+ providerId +'+resourceType:S3+category:unassigned', + "ajax": '/resources?filterBy=providerId:'+ providerId +',resourceType:S3,category:unassigned', "createdRow": function( row, data ) { $( row ).attr({"resourceId" : data._id,"resourceType":data.resourceType}) }, @@ -298,7 +298,7 @@ $(document).ready(function() { "processing": true, "serverSide": true, "destroy":true, - "ajax": '/resources?filterBy=resourceType:S3+category:unassigned', + "ajax": '/resources?filterBy=resourceType:S3,category:unassigned', "createdRow": function( row, data ) { $( row ).attr({"resourceId" : data._id,"resourceType":data.resourceType}) }, From 6ad01eff6c122da0aa1a57aa198380cf64197642 Mon Sep 17 00:00:00 2001 From: Divakar Konakalla Date: Thu, 12 Jan 2017 16:20:03 +0530 Subject: [PATCH 26/81] review comments has been taken care. --- .../dashboard/bots/controller/libraryCtrl.js | 63 ++++++------------- .../sections/dashboard/bots/view/library.html | 6 +- 2 files changed, 21 insertions(+), 48 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 0aeaea87e..51f766d88 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js @@ -168,19 +168,19 @@ $scope.filterByTaskType = false; $scope.filterByCategory = false; $scope.subFilterBy = false; - $scope.filterByBot(); + $scope.filterByAll(); } else if($scope.botLibFilter === 'taskType') { $scope.filterByTaskType = true; $scope.filterByBotType = false; $scope.filterByCategory = false; $scope.subFilterBy = false; - $scope.filterByTask(); + $scope.filterByAll(); } else if($scope.botLibFilter === 'category') { $scope.filterByCategory = true; $scope.filterByBotType = false; $scope.filterByTaskType = false; $scope.subFilterBy = false; - $scope.filterByCateg(); + $scope.filterByAll(); } else { $scope.subFilterBy = true; $scope.filterByBotType = false; @@ -189,49 +189,22 @@ //$scope.showAllBots(); } }; - $scope.filterByBot = function() { - console.log($scope.botLibFilterBot); + $scope.filterByAll = function() { lib.gridOptions=[]; - var param={ - url:'/bots?filterBy=botLinkedCategory:'+$scope.botLibFilterBot+'&page=' + $scope.paginationParams.page +'&pageSize=' + $scope.paginationParams.pageSize +'&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder - } - genSevs.promiseGet(param).then(function (result) { - $timeout(function() { - $scope.botLibGridOptions.totalItems = result.metaData.totalRecords; - $scope.botLibGridOptions.data=result.bots; - }, 100); - $scope.isBotLibraryPageLoading = false; - }, function(error) { - $scope.isBotLibraryPageLoading = false; - toastr.error(error); - $scope.errorMessage = "No Records found"; - }); - }; - - $scope.filterByTask = function() { - console.log($scope.botLibFilterTask); - lib.gridOptions=[]; - var param={ - url:'/bots?filterBy=botLinkedSubCategory:'+$scope.botLibFilterTask+'&page=' + $scope.paginationParams.page +'&pageSize=' + $scope.paginationParams.pageSize +'&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder - } - genSevs.promiseGet(param).then(function (result) { - $timeout(function() { - $scope.botLibGridOptions.totalItems = result.metaData.totalRecords; - $scope.botLibGridOptions.data=result.bots; - }, 100); - $scope.isBotLibraryPageLoading = false; - }, function(error) { - $scope.isBotLibraryPageLoading = false; - toastr.error(error); - $scope.errorMessage = "No Records found"; - }); - }; - - $scope.filterByCateg = function() { - console.log($scope.botLibFilterCategory); - lib.gridOptions=[]; - var param={ - url:'/bots?filterBy=botCategory:'+$scope.botLibFilterCategory+'&page=' + $scope.paginationParams.page +'&pageSize=' + $scope.paginationParams.pageSize +'&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder + if ($scope.botLibFilter === 'botType') { + var param={ + url:'/bots?filterBy=botLinkedCategory:'+$scope.botLibFilterBot+'&page=' + $scope.paginationParams.page +'&pageSize=' + $scope.paginationParams.pageSize +'&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder + } + } else if($scope.botLibFilter === 'taskType') { + var param={ + url:'/bots?filterBy=botLinkedSubCategory:'+$scope.botLibFilterTask+'&page=' + $scope.paginationParams.page +'&pageSize=' + $scope.paginationParams.pageSize +'&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder + } + } else if($scope.botLibFilter === 'category') { + var param={ + url:'/bots?filterBy=botCategory:'+$scope.botLibFilterCategory+'&page=' + $scope.paginationParams.page +'&pageSize=' + $scope.paginationParams.pageSize +'&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder + } + } else { + $scope.RefreshBotsLibrary(); } genSevs.promiseGet(param).then(function (result) { $timeout(function() { 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 6c083c543..dcfa8889a 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/view/library.html +++ b/client/cat3/src/partials/sections/dashboard/bots/view/library.html @@ -121,16 +121,16 @@ - - - From 9f7883e164d5ea34d97fe398b7305226511cf4d1 Mon Sep 17 00:00:00 2001 From: Karthik K N Date: Thu, 12 Jan 2017 17:02:58 +0530 Subject: [PATCH 27/81] Fix to aggregate cost for EC2 instances --- server/app/services/resourceService.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/server/app/services/resourceService.js b/server/app/services/resourceService.js index 2c5919026..a6d8462d7 100644 --- a/server/app/services/resourceService.js +++ b/server/app/services/resourceService.js @@ -82,12 +82,12 @@ function getAllResourcesForProvider(provider, next) { } else if('resourceType' in current) { switch(current.resourceType) { case 'RDS': - var temp = new RDSResource(current) - temp[temp.resourceDetails.dbInstanceIdentifier] = current; + var tempInstance = new RDSResource(current) + temp[tempInstance.resourceDetails.dbInstanceIdentifier] = current; break; case 'S3': - var temp = new S3Resource(current) - temp[temp.resourceDetails.bucketName] = current; + var tempInstance = new S3Resource(current) + temp[tempInstance.resourceDetails.bucketName] = current; break; default: break; From 1ddd826c115b376fe7de45e17aa3a34c7d172999 Mon Sep 17 00:00:00 2001 From: Karthik K N Date: Thu, 12 Jan 2017 17:22:31 +0530 Subject: [PATCH 28/81] Revert "Git Hub Integration/CAT-2628 Fixed" --- .dockerignore | 5 + CHANGELOG.md | 74 +++ Dockerfile | 33 ++ .../private/ajax/Settings/githubList.html | 483 +++++++++++++++-- .../private/ajax/Settings/scriptList.html | 4 +- client/htmls/private/css/catalyst.css | 16 - client/htmls/private/js/gitHubList.js | 497 ------------------ docker-compose.yml | 51 ++ nginx.conf | 10 + server/app/lib/utils/apiUtil.js | 2 +- server/app/model/github/github.js | 77 +-- server/app/routes/v1.0/routes_d4dMasters.js | 12 +- server/app/routes/v1.0/routes_github.js | 313 +---------- server/app/services/auditTrailService.js | 61 +-- server/app/services/botsService.js | 3 +- server/app/services/gitHubService.js | 238 ++------- server/app/services/instanceService.js | 2 +- server/app/validators/gitHubValidator.js | 10 +- server/install.js | 3 +- server/package.json | 4 +- server/test/routes/testInstances.js | 10 +- 21 files changed, 722 insertions(+), 1186 deletions(-) create mode 100644 .dockerignore create mode 100644 CHANGELOG.md create mode 100644 Dockerfile delete mode 100644 client/htmls/private/js/gitHubList.js create mode 100644 docker-compose.yml create mode 100644 nginx.conf diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 000000000..b4867fd72 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,5 @@ +*/node_modules/ +*/*/node_modules/ +.git/ +.dockerignore +Dockerfile diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 000000000..843c9e967 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,74 @@ +3.5.0 - November 10th , 2016 +---------------------------- +* Cloud Management - Capacity Report +* Telemetry Enhancements - SAE Dashboards +* Improved 'Design' page written in AngularJS +* Bots Library + +3.4.0 - SEptember 2nd , 2016 +---------------------------- +* Cloud Management - Daily/Weekly/Monthly cost and usage reports and trends +* Provider wise listing of unassigned instances in track +* New Wizard for setup +* Audit Trail for docker containers + + +3.3.0 - August 11th , 2016 +---------------------------- +* Composite blueprints enhancements +* Audit log trail implementation +* Script executor implementation +* Chef node import improvements +* Critical Bug Fixes + +3.2.1 - July 8th , 2016 +---------------------------- +* Composite blueprints implementation - To design and launch a complete application stack +* Critical Bug Fixes + +3.1.0 - June 14th, 2016 +---------------------------- +* Improved GUI with AngularJS +* Script Executor to enbale execution of shell scripts on selected instances +* Role based discovery of instances +* RDS and S3 Report from AWS Account + +3.0.6 - May 10th, 2016 +---------------------------- +* Update AWS tags from Catalyst +* Instance Level Cost and Usage Dashboards +* Option to edit and clone blueprints +* Attribute Editor for Blueprints + +3.0.5 - April 15th, 2016 +---------------------------- +* AWS tag based allocation of instances +* Promote feature for Application Deployments + +3.0.4 - March 21st, 2016 +---------------------------- +* Introducing IAM based authorization to AWS account +* Import Instances from AWS +* Application Deployment using Blueprints + +3.0.3 - March 7th, 2016 +---------------------------- +* Hardening application deployment history +* Security Fixes + +3.0.2 - February 26th, 2016 +---------------------------- +* Security Fixes +* Dashboards for AWS Summary and Cost + +3.0.1 - February 24th, 2016 +--------------------------- +* VMware Support - VM provisioning and management +* Bootstrap instances with Puppet + +3.0.0 - February 22nd, 2016 +--------------------------- + +Docs : http://catalyst.readthedocs.org + +* Initial public release diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 000000000..f923c0c25 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,33 @@ +FROM node:4.6.0 +RUN apt-get update -qq && apt-get install -y build-essential libpq-dev libkrb5-dev make g++ ruby libstdc++6 + +RUN npm install -g kerberos + +##Client +RUN npm install -g grunt-cli +RUN npm install -g npm +RUN npm install forever --global +RUN gem install sass +RUN curl -L https://www.opscode.com/chef/install.sh | bash + +RUN mkdir -p /rlc/client +RUN mkdir -p /rlc/server + +## Client +ADD ./client/cat3 /rlc/client/cat3 +ADD ./client/htmls /rlc/client/htmls +WORKDIR /rlc/client/cat3 +RUN npm install --production +RUN npm run-script build-prod + +## Server +WORKDIR /rlc/server +ADD ./server /rlc/server +RUN node install.js + +EXPOSE 3001 + +## Server App +# CMD forever start app.js +WORKDIR /rlc/server/app +CMD node app.js diff --git a/client/htmls/private/ajax/Settings/githubList.html b/client/htmls/private/ajax/Settings/githubList.html index a80ec2398..bf46d1d9b 100644 --- a/client/htmls/private/ajax/Settings/githubList.html +++ b/client/htmls/private/ajax/Settings/githubList.html @@ -4,9 +4,6 @@ } -
    @@ -29,12 +26,12 @@
    - + - - - + + + @@ -65,13 +62,13 @@

    - +
    - +
    @@ -83,30 +80,22 @@

    - +
    - +
    - -
    -
    - -
    -
    - -
    -
    + +
    @@ -125,7 +114,7 @@

    - +
    @@ -135,16 +124,10 @@

    - +
    - @@ -161,4 +144,442 @@

    - \ No newline at end of file + + \ No newline at end of file diff --git a/client/htmls/private/ajax/Settings/scriptList.html b/client/htmls/private/ajax/Settings/scriptList.html index 81ca471e4..921bc9224 100644 --- a/client/htmls/private/ajax/Settings/scriptList.html +++ b/client/htmls/private/ajax/Settings/scriptList.html @@ -98,10 +98,10 @@

    -
    +
    -
    +
    diff --git a/client/htmls/private/css/catalyst.css b/client/htmls/private/css/catalyst.css index 0dd89e866..c79ca3de3 100644 --- a/client/htmls/private/css/catalyst.css +++ b/client/htmls/private/css/catalyst.css @@ -4675,19 +4675,3 @@ input:focus, select:focus, textarea:focus { .blueprintdiv-aws { width:77%!important; } - -.radioInline { - display: inline-block; -} - -.marginTop8 { - margin-top: 8px!important; -} - -#gitHubListLoader { - opacity: 0.6; - height: 100%; - width: 100%; - position: absolute; - background: #ddd; -} diff --git a/client/htmls/private/js/gitHubList.js b/client/htmls/private/js/gitHubList.js deleted file mode 100644 index ac5ba287c..000000000 --- a/client/htmls/private/js/gitHubList.js +++ /dev/null @@ -1,497 +0,0 @@ - - //initialising the datatable... - if (!$.fn.dataTable.isDataTable('#gitTable')) { - var $gitDatatable = $('#gitTable').DataTable({ - "pagingType": "full_numbers", - "bInfo": false, - "bLengthChange": false, - "paging": true, - "bFilter": false, - "aoColumns": [{ - "bSortable": false - }, { - "bSortable": false - }, { - "bSortable": false - }, { - "bSortable": false - }, { - "bSortable": false - }, { - "bSortable": false - }] - - }); - } - - //calling the global track functionality when track params are available.. - $(document).ready(function(e) { - getGlobalGitServers(); - }); - - function setFileNameCertificate(val) { - $('#certificateFileNameDisplay').empty(); - var fileNamePublic = val.substr(val.lastIndexOf("\\") + 1, val.length); - $("#certificateFileNameDisplay").append(fileNamePublic); - } - - function setFileNamePrivate(val) { - $('#privateFileNameDisplay').empty(); - var fileNamePrivate = val.substr(val.lastIndexOf("\\") + 1, val.length); - $("#privateFileNameDisplay").append(fileNamePrivate); - } - - - $("input[name='isAuthenticated']:radio").change(function(){ - if($(this).val() === 'Private') { - $('.isAunthenticatedSection').removeClass('hidden'); - } else { - $("#authenticationType").val($("#authenticationType option:first").val()); - $('.isAunthenticatedSection').addClass('hidden'); - $('.showForUser').addClass('hidden'); - $('.showForSSH').addClass('hidden'); - $('.showForToken').addClass('hidden'); - } - }); - - $('#authenticationType').change(function(e) { - var val = $(this).val(); - if (val === 'userName') { - $('.showForUser').removeClass('hidden'); - $('.showForSSH').addClass('hidden'); - $('.showForToken').addClass('hidden'); - } else if(val === 'sshKey') { - $('.showForUser').addClass('hidden'); - $('.showForSSH').removeClass('hidden'); - $('.showForToken').addClass('hidden'); - } else if(val === 'token') { - $('.showForUser').addClass('hidden'); - $('.showForSSH').addClass('hidden'); - $('.showForToken').removeClass('hidden'); - } else { - $('.showForUser').addClass('hidden'); - $('.showForSSH').addClass('hidden'); - $('.showForToken').addClass('hidden'); - } - }); - - //when the user clicks on the new button the setting the value to 'new' for the hidden field to know that user is creating the new item.. - $('.addGitHub').click(function(e) { - $('#gitHubRepoForn').trigger('reset'); - $('.modal-header').find('.modal-title').html('Create New GitHub Repository'); - $('#gitEditHiddenInput').val('new'); - getOrganizationList(); - $('#orgName,#authenticationType').removeAttr('disabled'); - $('.isAunthenticatedSection').addClass('hidden'); - $('#authenticationType').change(); - $('#gitEditHiddenInputId,#gitHiddenPublicFile,#gitHiddenPrivateFile').val(''); - $('input:radio[name="isAuthenticated"][value="Public"]').removeAttr('disabled'); - $('input:radio[name="isAuthenticated"][value="Private"]').removeAttr('disabled'); - $('#certificateFileNameDisplay').empty(); - $('#privateFileNameDisplay').empty(); - }); - - //to list down the organization for creating the gitHub repo item. - function getOrganizationList() { - $.get('/d4dMasters/readmasterjsonnew/1', function(data) { - var str = ' ', - len = data.length; - for (var i = 0; i < data.length; i++) { - str = str + ''; - } - $('#orgName').html(str); - }) - } - - //to show the focus on first input .... - $(document).on('shown.bs.modal', function(e) { - $('[autofocus]', e.target).focus(); - }); - - //form validation for dashboard save - var validator = $('#gitHubRepoForn').validate({ - ignore: [], - rules: { - certificateFile: { - extension: "pem|txt|sh" - }, - privateFile: { - extension: "pem|txt|sh" - }, - gitName: { - maxlength: 15 - }, - token: { - number: true - } - }, - messages: { - certificateFile: { - extension: "Only .pem/.txt/.sh files" - }, - privateFile: { - extension: "Only .pem/.txt/.sh files" - }, - gitName: { - maxlength: "Limited to 15 chars" - } - }, - onkeyup: false, - errorClass: "error", - - //put error message behind each form element - errorPlacement: function(error, element) { - console.log(error, element); - var elem = $(element); - if (element.parent('.input-groups').length) { - error.insertBefore(element.parent()); - } else { - if (element.parent('div.inputGroups')) { - error.insertBefore('div.inputGroups'); - } - } - } - }); - $('a.addGitHub[type="reset"]').on('click', function(e) { - validator.resetForm(); - }); - - function getGlobalGitServers() { - $('#gitTable').DataTable( { - "processing": true, - "serverSide": true, - "destroy":true, - "createdRow": function( row, data ) { - $( row ).attr({"githubName": data.repositoryName,"githubId" : data._id,"repositoryOwner":data.repositoryOwner, - "repositoryType":data.repositoryType,"authenticationType":data.authenticationType,"repositoryToken":data.repositoryToken, - "githubDescription" : data.repositoryDesc, "orgId" : data.orgId ,"orgName" : data.orgName, - "repositoryUserName" : data.repositoryUserName,"repositoryPassword" : data.repositoryPassword, - "repositorySSHPublicKeyFileId" : data.repositorySSHPublicKeyFileId,"repositorySSHPrivateKeyFileId":data.repositorySSHPrivateKeyFileId, - "repositorySSHPublicKeyFileName": data.repositorySSHPublicKeyFileName,"repositorySSHPrivateKeyFileName": data.repositorySSHPrivateKeyFileName - }); - }, - "ajax": '/git-hub', - "columns": [ - {"data": "repositoryName", "orderable" : true}, - {"data": "repositoryDesc" ,"orderable" : false }, - {"data": "orgName","orderable" : false }, - {"data": "repositoryOwner" ,"orderable" : false }, - {"data": "repositoryType" ,"orderable" : false}, - {"data": "","orderable" : true, - "render": function (data) { - var $tdAction = '
    '; - $tdAction = $tdAction + '
    '; - return $tdAction; - } - } - ] - } ); - }; - - $('#gitTable tbody').on( 'click', 'button.editGitRepo', function(){ - validator.resetForm(); - var $this = $(this); - var $this = $(this); - var $editModal = $('#modalForGitEdit'); - $editModal.modal('show'); - $editModal.find('#gitEditHiddenInput').val('edit'); - $editModal.find('h4.modal-title').html('Edit GitHub Repo  -  ' + $this.parents('tr').attr('githubName')); - $editModal.find('#gitName').val($this.parents('tr').attr('githubName')); - $editModal.find('#gitDescription').val($this.parents('tr').attr('githubDescription')); - $editModal.find('#orgName').empty().append('').attr('disabled','disabled'); - $editModal.find('#gitRepoOwner').val($this.parents('tr').attr('repositoryOwner')); - $editModal.find('#gitEditHiddenInputId').val($this.parents('tr').attr('githubId')); - var repoType = $this.parents('tr').attr('repositoryType'); - var authType = $this.parents('tr').attr('authenticationType'); - - if(repoType === 'Private'){ - $('input:radio[name="isAuthenticated"][value="Public"]').attr('disabled', true); - $('input:radio[name="isAuthenticated"][value="Private"]').removeAttr('disabled').prop('checked', true); - $('.isAunthenticatedSection').removeClass('hidden'); - if(authType === 'userName') { - $editModal.find('#authenticationType').val('userName').change().attr('disabled','disabled'); - $editModal.find('#protocolUser').val($this.parents('tr').attr('repositoryUserName')); - $editModal.find('#protocolPassword').val($this.parents('tr').attr('repositoryPassword')); - }else if(authType === 'sshKey'){ - $('#privateFile').val(''); - $('#privateFile').removeClass('required'); - $('#certificateFile').val(''); - $('#certificateFile').removeClass('required'); - $editModal.find('#certificateFileNameDisplay').empty(); - $editModal.find('#privateFileNameDisplay').empty(); - $editModal.find('#authenticationType').val('sshKey').change().attr('disabled','disabled'); - $editModal.find('#gitHiddenPublicFile').val($this.parents('tr').attr('repositorySSHPublicKeyFileId')); - $editModal.find('#gitHiddenPrivateFile').val($this.parents('tr').attr('repositorySSHPrivateKeyFileId')); - $editModal.find('#certificateFileNameDisplay').append($this.parents('tr').attr('repositorySSHPublicKeyFileName')); - $editModal.find('#privateFileNameDisplay').append($this.parents('tr').attr('repositorySSHPrivateKeyFileName')); - } else { - $editModal.find('#authenticationType').val('token').change().attr('disabled','disabled'); - $editModal.find('#token').val($this.parents('tr').attr('repositoryToken')); - } - }else{ - $('input:radio[name="isAuthenticated"][value="Private"]').attr('disabled', true); - $('input:radio[name="isAuthenticated"][value="Public"]').removeAttr('disabled').prop('checked', true); - $('.isAunthenticatedSection').addClass('hidden'); - $("#authenticationType").val($("#authenticationType option:first").val()); - $editModal.find('#protocolUser').val(''); - $editModal.find('#protocolPassword').val(''); - $('.showForUser').addClass('hidden'); - $('.showForSSH').addClass('hidden'); - $('.showForToken').addClass('hidden'); - } - - return false; - }); - - $('#gitTable tbody').on( 'click', 'button.deleteGitRepo', function(){ - var $this = $(this); - bootbox.confirm({ - message: 'Are you sure you want to Delete GitHub Repo - ' + $this.parents('tr').attr('githubName'), - title: "Warning", - callback: function(result) { - if (result) { - $.ajax({ - url: '../git-hub/' + $this.parents('tr').attr('githubId'), - method: 'DELETE', - success: function() { - getGlobalGitServers(); - }, - error: function(jxhr) { - var msg = "Unable to Delete GitHub Repo please try again later"; - if (jxhr.responseJSON && jxhr.responseJSON.message) { - msg = jxhr.responseJSON.message; - } else if (jxhr.responseText) { - msg = jxhr.responseText; - } - bootbox.alert(msg); - } - }); - } else { - return; - } - } - }); - return false; - }); - - $('#gitTable tbody').on( 'click', 'button.syncGitRepo', function(){ - $('#gitHubListLoader').show(); - var $this = $(this); - $.ajax({ - url: '../git-hub/' + $this.parents('tr').attr('githubId') + '/sync', - method: 'GET', - success: function() { - bootbox.alert('Sucessfully cloned'); - $('#gitHubListLoader').hide(); - }, - error: function(jxhr) { - console.log(jxhr); - var msg = "Unable to Fetch GitRepo please try again later"; - if (jxhr.responseJSON && jxhr.responseJSON.message) { - msg = jxhr.responseJSON.message; - } else if (jxhr.responseText) { - var msgCheck = JSON.parse(jxhr.responseText); - msg = msgCheck.msg; - } - bootbox.alert(msg); - $('#gitHubListLoader').hide(); - } - }); - return false; - }); - - -function saveForm(methodName,url,reqBody) { - $.ajax({ - method: methodName, - url: url, - async:false, - data: reqBody, - success: function(data, success) { - $('#modalForGitEdit').modal('hide'); - $('#saveItemSpinner').addClass('hidden'); - $('#saveBtnTrack').removeAttr('disabled'); - getGlobalGitServers(); - $('#saveBtnTrack').removeAttr('disabled'); - }, - error: function(jxhr) { - console.log(jxhr); - var msg = "Server Behaved Unexpectedly"; - if (jxhr.responseJSON && jxhr.responseJSON.message) { - msg = jxhr.responseJSON.message; - } else if (jxhr.responseText) { - msg = jxhr.responseText; - } - bootbox.alert(msg); - - $('#saveItemSpinner').addClass('hidden'); - $('#saveBtnTrack').removeAttr('disabled'); - } - }); -} - -//save form for creating a new gitHub item and updation of the gitHub details. -$('#gitHubRepoForn').submit(function(e) { - var isValidator = $('#gitHubRepoForn').valid(); - if (!isValidator) { - e.preventDefault(); - return false; - } else { - e.preventDefault(); - $('#saveItemSpinner').removeClass('hidden'); - var $form = $('#gitHubRepoForn'); - $this = $(this); - var repositoryName, orgValue, description, authenticationType, repositoryOwner, repositoryType, - passwordName, userName, certChainFileId, privateKeyFileId, certChainFileName, privateKeyFileName, repositoryToken; - - repositoryName = $this.find('.gitName').val().trim(); - orgValue = $this.find('#orgName').val(); - description = $this.find('#gitDescription').val(); - repositoryOwner = $this.find('#gitRepoOwner').val(); - repositoryType= $('input[name=isAuthenticated]:checked').val(); - authenticationType = $this.find('#authenticationType').val(); - userName = $this.find('#protocolUser').val().trim(); - repositoryToken = $this.find('#token').val().trim(); - passwordName = $this.find('#protocolPassword').val().trim(); - certChainFileId = $this.find('#gitHiddenPublicFile').val(); - privateKeyFileId = $this.find('#gitHiddenPrivateFile').val(); - var dashboardEditNew = $this.find('#gitEditHiddenInput').val(); - var gitHubId = $form.find('input#gitEditHiddenInputId').val(); - var url; - var reqBody = {}; - var methodName; - //for edit of form. - var fileCertificate = $('#certificateFile').get(0).files[0]; - var filePrivate = $('#privateFile').get(0).files[0]; - var formData = new FormData(); - formData.append('file', fileCertificate); - var newFormData = new FormData(); - newFormData.append('file', filePrivate); - if (dashboardEditNew === 'edit') { - url = '../git-hub/' + gitHubId; - methodName = 'PUT'; - } else { - methodName = 'POST'; - url = '../git-hub'; - } - if (authenticationType === 'sshKey') { - if(certChainFileId === '' && privateKeyFileId === ''){ - $.ajax({ - method: "POST", - url: '../fileUpload?fileId=' + certChainFileId, - data: formData, - cache: false, - contentType: false, - processData: false, - success: function(dataCertificate, success) { - $.ajax({ - method: "POST", - url: '../fileUpload?fileId=' + privateKeyFileId, - data: newFormData, - cache: false, - contentType: false, - processData: false, - success: function(dataPrivate, success) { - reqBody = { - "repositoryName": repositoryName, - "orgId": orgValue, - "repositoryDesc": description, - "repositoryOwner": repositoryOwner, - "repositoryType": repositoryType, - "authenticationType": authenticationType, - "repositorySSHPublicKeyFileId": dataCertificate.fileId, - "repositorySSHPrivateKeyFileId": dataPrivate.fileId - } - saveForm(methodName,url,reqBody); - } - }); - } - }); - } else { - reqBody = { - "_id": gitHubId, - "repositoryName": repositoryName, - "orgId": orgValue, - "repositoryDesc": description, - "repositoryOwner": repositoryOwner, - "repositoryType": repositoryType, - "authenticationType": authenticationType, - "repositorySSHPublicKeyFileId": certChainFileId, - "repositorySSHPrivateKeyFileId": privateKeyFileId - } - saveForm(methodName,url,reqBody); - } - } else if (authenticationType === 'userName') { - if(dashboardEditNew === 'new'){ - reqBody = { - "repositoryName": repositoryName, - "orgId": orgValue, - "repositoryDesc": description, - "repositoryOwner": repositoryOwner, - "repositoryType": repositoryType, - "authenticationType": authenticationType, - "repositoryUserName": userName, - "repositoryPassword": passwordName - } - } else { - reqBody = { - "_id": gitHubId, - "repositoryName": repositoryName, - "orgId": orgValue, - "repositoryDesc": description, - "repositoryOwner": repositoryOwner, - "repositoryType": repositoryType, - "authenticationType": authenticationType, - "repositoryUserName": userName, - "repositoryPassword": passwordName - } - } - saveForm(methodName,url,reqBody); - } else if (authenticationType === 'token') { - if(dashboardEditNew === 'new'){ - reqBody = { - "repositoryName": repositoryName, - "orgId": orgValue, - "repositoryDesc": description, - "repositoryOwner": repositoryOwner, - "repositoryType": repositoryType, - "authenticationType": authenticationType, - "repositoryToken": repositoryToken - } - } else { - reqBody = { - "_id": gitHubId, - "repositoryName": repositoryName, - "orgId": orgValue, - "repositoryDesc": description, - "repositoryOwner": repositoryOwner, - "repositoryType": repositoryType, - "authenticationType": authenticationType, - "repositoryToken": repositoryToken - } - } - saveForm(methodName,url,reqBody); - } else { - if(dashboardEditNew === 'new'){ - reqBody = { - "repositoryName": repositoryName, - "orgId": orgValue, - "repositoryDesc": description, - "repositoryOwner": repositoryOwner, - "repositoryType": repositoryType - } - } else { - reqBody = { - "_id": gitHubId, - "repositoryName": repositoryName, - "orgId": orgValue, - "repositoryDesc": description, - "repositoryOwner": repositoryOwner, - "repositoryType": repositoryType - } - } - saveForm(methodName,url,reqBody); - } - return false; - } -}); \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 000000000..f9299bef9 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,51 @@ +version: '2' + +services: + database: + image: mongo + restart: always + ports: + - "27017" + networks: + rlcnet: + ipv4_address: 172.10.1.3 + command: "--smallfiles --logpath=/dev/null" + + nodeapp: + build: . + restart: always + ports: + - "3001" + networks: + rlcnet: + ipv4_address: 172.10.1.2 + environment: + PORT: 3001 + DB_HOST: 172.10.1.3 + + dataloader: + image: mongo + networks: + - rlcnet + volumes: + - ${PWD}:/data + command: "mongorestore --host 172.10.1.3 --port 27017 --db devops_new --drop /data/seed/mongodump/devops_new/" + + webfront: + image: nginx + ports: + - "80:80" + volumes: + - ${PWD}/nginx.conf:/etc/nginx/conf.d/default.conf + restart: always + networks: + rlcnet: + ipv4_address: 172.10.1.1 + +networks: + rlcnet: + driver: bridge + ipam: + config: + - subnet: 172.10.0.0/16 + gateway: 172.10.5.254 \ No newline at end of file diff --git a/nginx.conf b/nginx.conf new file mode 100644 index 000000000..9469c8432 --- /dev/null +++ b/nginx.conf @@ -0,0 +1,10 @@ +server { + listen 80; + server_name example.com; + + location / { + proxy_set_header X-Forwarded-For $remote_addr; + proxy_set_header Host $http_host; + proxy_pass "http://172.10.1.2:3001"; + } +} \ No newline at end of file diff --git a/server/app/lib/utils/apiUtil.js b/server/app/lib/utils/apiUtil.js index 02625b83c..24326b86e 100644 --- a/server/app/lib/utils/apiUtil.js +++ b/server/app/lib/utils/apiUtil.js @@ -231,7 +231,7 @@ var ApiUtil = function() { }; var filterBy={}; if(data.filterBy) { - var a = data.filterBy.split(","); + var a = data.filterBy.split(" "); for (var i = 0; i < a.length; i++) { var b = a[i].split(":"); var c = b[1].split(","); diff --git a/server/app/model/github/github.js b/server/app/model/github/github.js index daddf37e5..d59a18fc7 100644 --- a/server/app/model/github/github.js +++ b/server/app/model/github/github.js @@ -18,37 +18,27 @@ var mongoose = require('mongoose'); var ObjectId = require('mongoose').Types.ObjectId; var logger = require('_pr/logger')(module); var Schema = mongoose.Schema; -var mongoosePaginate = require('mongoose-paginate'); var GitHubSchema = new Schema({ orgId: { type: String, required: true, trim: true }, - repositoryName: { + name: { type: String, required: true, trim: true }, - repositoryDesc: { + description: { type: String, required: false, trim: true }, - repositoryOwner: { + repositoryName: { type: String, trim: true, required: true }, - repositoryType: { - type: String, - required: true - }, - repositoryToken: { - type: String, - trim: true, - required: false - }, repositoryUserName: { type: String, trim: true, @@ -59,6 +49,11 @@ var GitHubSchema = new Schema({ trim: true, required: false }, + isAuthenticated: { + type: Boolean, + required: false, + default: false + }, authenticationType: { type: String, required: false, @@ -73,21 +68,9 @@ var GitHubSchema = new Schema({ type: String, trim: true, required: false - }, - isRepoCloned:{ - type: Boolean, - required: false, - default:false - }, - createdOn:{ - type: Number, - required: false, - default:Date.now() } }); -GitHubSchema.plugin(mongoosePaginate); - GitHubSchema.statics.createNew = function createNew(gitHubObj, callback) { var self = this; var gitHub = new self(gitHubObj); @@ -102,37 +85,23 @@ GitHubSchema.statics.createNew = function createNew(gitHubObj, callback) { }; GitHubSchema.statics.getGitHubList = function (params, callback) { - console.log(params); - GitHub.paginate(params.queryObj, params.options, function(err, gitRepoList) { + this.aggregate([{ + $lookup: { + from: "d4dmastersnew", + localField: "orgId", + foreignField: "rowid", + as: "organization" + } + }], function (err, gitHubList) { if (err) { - logger.error(err); - var error = new Error('Internal server error'); - error.status = 500; - return callback(error); + callback(err, null); + return; + } else if (gitHubList.length === 0) { + callback(null, gitHubList); + return; + } else { + return callback(null, gitHubList); } - GitHub.aggregate([ - {$match: params.queryObj}, - { - $lookup: { - from: "d4dmastersnew", - localField: "orgId", - foreignField: "rowid", - as: "organization" - } - }, - {$skip: (params.options.page - 1) * params.options.limit}, - {$limit: params.options.limit}, - {$sort: params.options.sort} - ], function (err, gitHubList) { - if (err) { - callback(err, null); - return; - } else { - gitRepoList.docs = gitHubList; - callback(null, gitRepoList); - return; - } - }); }); }; diff --git a/server/app/routes/v1.0/routes_d4dMasters.js b/server/app/routes/v1.0/routes_d4dMasters.js index 53f1800e8..0faf7e75b 100755 --- a/server/app/routes/v1.0/routes_d4dMasters.js +++ b/server/app/routes/v1.0/routes_d4dMasters.js @@ -2520,8 +2520,7 @@ module.exports.setRoutes = function (app, sessionVerification) { // Start Auto create Team if (req.params.id === '1') { d4dModelNew.d4dModelMastersOrg.find({ - orgname: bodyJson["orgname"], - id: '1' + orgname: bodyJson["orgname"] }, function (err, orgs) { if (err) { logger.error('Hit error while check org is exist with Org Name', err); @@ -2702,8 +2701,7 @@ module.exports.setRoutes = function (app, sessionVerification) { } bodyJson["password"] = hashedPassword; d4dModelNew.d4dModelMastersUsers.find({ - loginname: bodyJson["loginname"], - id: '7' + loginname: bodyJson["loginname"] }, function (err, users) { if (err) { logger.error('Hit error while check user is exist with Login Name', err); @@ -2715,9 +2713,8 @@ module.exports.setRoutes = function (app, sessionVerification) { return; } else { d4dModelNew.d4dModelMastersUsers.find({ - email: bodyJson["email"], - id: '7' - },function(err,usersList){ + email: bodyJson["email"] + },function(err,usersList){ if (err) { logger.error('Hit error while check user is exist with email', err); res.send(500); @@ -2809,6 +2806,7 @@ module.exports.setRoutes = function (app, sessionVerification) { }); }); } else if (req.params.id === '4') { + // bodyJson['repositories'] = JSON.parse(bodyJson['repositories']); var projectModel = new d4dModelNew.d4dModelMastersProjects(bodyJson); projectModel.save(function (err, data) { if (err) { diff --git a/server/app/routes/v1.0/routes_github.js b/server/app/routes/v1.0/routes_github.js index af19489de..24d99f744 100644 --- a/server/app/routes/v1.0/routes_github.js +++ b/server/app/routes/v1.0/routes_github.js @@ -18,78 +18,7 @@ var gitHubValidator = require('_pr/validators/gitHubValidator'); module.exports.setRoutes = function(app, sessionVerificationFunc) { app.all('/git-hub/*', sessionVerificationFunc); - - /** - * @api {get} /git-hub/ List all Git-Hub Repository - * @apiName /git-hub - * @apiGroup List all the Git-Hub Repository with Pagination - * - * @apiQueryParam {Number} page Page Number - * @apiQueryParam {Number} pageSize Number of Records per page - * @apiQueryParam {String} sortBy All the records are sorted By one common field - * @apiQueryParam {String} filterBy All the records are filter By selected values - * @apiQueryParam {String} search All the records are search By input text - * - * @apiSuccess [JSONObject] - * - * @apiSuccessExample Success-Response: - * { - * "gitHub": [{ - * "_id": "586f58a417c109866b1067ba", - * "name": "Durgesh-Bots", - * "description": "BOT Factory", - * "repositoryURL": "https://github.com/RLIndia/botsfactory.git", - * "repositoryType": "Private", - * "orgId": "46d1da9a-d927-41dc-8e9e-7e926d927537", - * "orgName": "Phoenix", - * "repositoryUserName": "Durgesh1988", - * "authenticationType": "userName", - * "repositoryPassword": "Durgesh@12356" - * }], - * "metaData": { - * "totalRecords": 1, - * "pageSize": 50, - * "page": 1, - * "totalPages": 1, - * "sortBy": "createdOn", - * "sortOrder": "asc" - * } - * } - * - * @apiError 400 Bad Request. - * - * @apiErrorExample Error-Response: - * { - * code:400, - * message:'Bad Request', - * fields:{errorMessage:'Bad Request',attribute:'Git-Hub List'} - * }; - * @apiError 403 Forbidden. - * - * @apiErrorExample Error-Response: - * { - * code:403, - * message:'Forbidden', - * fields:{errorMessage:'The request was a valid request, but the server is refusing to respond to it',attribute:'Git-Hub List'} - * }; - * @apiError 404 Not Found. - * - * @apiErrorExample Error-Response: - * { - * code:404, - * message:'Not Found', - * fields:{errorMessage:'The requested resource could not be found but may be available in the future',attribute:'Git-Hub List'} - * }; - * @apiError 500 InternalServerError. - * - * @apiErrorExample Error-Response: - * { - * code:500, - * message:'Internal Server Error', - * fields:{errorMessage:'Server Behaved Unexpectedly',attribute:'Git-Hub List'} - * }; - */ - + app.get("/git-hub", getGitHubList); function getGitHubList(req, res) { @@ -106,63 +35,6 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) { }); } - /** - * @api {get} /git-hub/:gitHubId Git-Hub Repository Details - * @apiName /git-hub - * @apiGroup Particular Git-Hub Repository Details - * - * @apiParam {String} gitHubId Git Hub ID - * - * @apiSuccess [JSONObject] - * - * @apiSuccessExample Success-Response: - * { - * "_id": "586f58a417c109866b1067ba", - * "name": "Durgesh-Bots", - * "description": "BOT Factory", - * "repositoryURL": "https://github.com/RLIndia/botsfactory.git", - * "repositoryType": "Private", - * "orgId": "46d1da9a-d927-41dc-8e9e-7e926d927537", - * "orgName": "Phoenix", - * "repositoryUserName": "Durgesh1988", - * "authenticationType": "userName", - * "repositoryPassword": "Durgesh@12356" - * } - * - * @apiError 400 Bad Request. - * - * @apiErrorExample Error-Response: - * { - * code:400, - * message:'Bad Request', - * fields:{errorMessage:'Bad Request',attribute:'Git-Hub List'} - * }; - * @apiError 403 Forbidden. - * - * @apiErrorExample Error-Response: - * { - * code:403, - * message:'Forbidden', - * fields:{errorMessage:'The request was a valid request, but the server is refusing to respond to it',attribute:'Git-Hub List'} - * }; - * @apiError 404 Not Found. - * - * @apiErrorExample Error-Response: - * { - * code:404, - * message:'Not Found', - * fields:{errorMessage:'The requested resource could not be found but may be available in the future',attribute:'Git-Hub List'} - * }; - * @apiError 500 InternalServerError. - * - * @apiErrorExample Error-Response: - * { - * code:500, - * message:'Internal Server Error', - * fields:{errorMessage:'Server Behaved Unexpectedly',attribute:'Git-Hub List'} - * }; - */ - app.get('/git-hub/:gitHubId', getGitHubById); function getGitHubById(req, res) { async.waterfall( @@ -184,56 +56,6 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) { ); } - /** - * @api {get} /git-hub/:gitHubId/sync Git-Hub Repository Sync - * @apiName /git-hub - * @apiGroup Sync Git-Hub Repository - * - * @apiParam {String} gitHubId Git Hub ID - * - * @apiSuccess [JSONObject] - * - * @apiSuccessExample Success-Response: - * { - * code:200, - * message:'Git Hub Repository Successfully Synced.', - * fields:{successMessage:'Git Hub Repository Successfully Synced',attribute:'Git-Hub Sync'} - * } - * - * @apiError 400 Bad Request. - * - * @apiErrorExample Error-Response: - * { - * code:400, - * message:'Bad Request', - * fields:{errorMessage:'Bad Request',attribute:'Git-Hub Sync'} - * }; - * @apiError 403 Forbidden. - * - * @apiErrorExample Error-Response: - * { - * code:403, - * message:'Forbidden', - * fields:{errorMessage:'The request was a valid request, but the server is refusing to respond to it',attribute:'Git-Hub Sync'} - * }; - * @apiError 404 Not Found. - * - * @apiErrorExample Error-Response: - * { - * code:404, - * message:'Not Found', - * fields:{errorMessage:'The requested resource could not be found but may be available in the future',attribute:'Git-Hub Sync'} - * }; - * @apiError 500 InternalServerError. - * - * @apiErrorExample Error-Response: - * { - * code:500, - * message:'Internal Server Error', - * fields:{errorMessage:'Server Behaved Unexpectedly',attribute:'Git-Hub Sync'} - * }; - */ - app.get('/git-hub/:gitHubId/sync', getGitHubSync); function getGitHubSync(req, res) { async.waterfall( @@ -255,73 +77,6 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) { ); } - /** - * @api {post} /git-hub/ Create a Git-Hub Repository - * @apiName /git-hub - * @apiGroup Create a Git-Hub Repository - * - * @apiParamExample {json} Request-Example: - * { - * "name": "Durgesh-Bots", - * "description": "BOT Factory", - * "repositoryURL": "https://github.com/RLIndia/botsfactory.git", - * "repositoryType": "Private", - * "orgId": "46d1da9a-d927-41dc-8e9e-7e926d927537", - * "repositoryUserName": "Durgesh1988", - * "authenticationType": "userName", - * "repositoryPassword": "Durgesh@12356" - * } - * - * @apiSuccess [JSONObject] - * - * @apiSuccessExample Success-Response: - * { - * "_id": "586f58a417c109866b1067ba", - * "name": "Durgesh-Bots", - * "description": "BOT Factory", - * "repositoryURL": "https://github.com/RLIndia/botsfactory.git", - * "repositoryType": "Private", - * "orgId": "46d1da9a-d927-41dc-8e9e-7e926d927537", - * "orgName": "Phoenix", - * "repositoryUserName": "Durgesh1988", - * "authenticationType": "userName", - * "repositoryPassword": "Durgesh@12356" - * } - * - * @apiError 400 Bad Request. - * - * @apiErrorExample Error-Response: - * { - * code:400, - * message:'Bad Request', - * fields:{errorMessage:'Bad Request',attribute:'Git-Hub Creation'} - * }; - * @apiError 403 Forbidden. - * - * @apiErrorExample Error-Response: - * { - * code:403, - * message:'Forbidden', - * fields:{errorMessage:'The request was a valid request, but the server is refusing to respond to it',attribute:'Git-Hub Creation'} - * }; - * @apiError 404 Not Found. - * - * @apiErrorExample Error-Response: - * { - * code:404, - * message:'Not Found', - * fields:{errorMessage:'The requested resource could not be found but may be available in the future',attribute:'Git-Hub Creation'} - * }; - * @apiError 500 InternalServerError. - * - * @apiErrorExample Error-Response: - * { - * code:500, - * message:'Internal Server Error', - * fields:{errorMessage:'Server Behaved Unexpectedly',attribute:'Git-Hub Creation'} - * }; - */ - app.post('/git-hub', validate(gitHubValidator.create), createGitHub); function createGitHub(req, res) { @@ -341,67 +96,6 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) { ); } - /** - * @api {put} /git-hub/:gitHubId Update a Git-Hub Repository - * @apiName /git-hub - * @apiGroup Update a Git-Hub Repository - * - * @apiParamExample {json} Request-Example: - * { - * "_id": "586f58a417c109866b1067ba" - * "name": "Durgesh-Bots", - * "description": "BOT Factory", - * "repositoryURL": "https://github.com/RLIndia/botsfactory.git", - * "repositoryType": "Private", - * "orgId": "46d1da9a-d927-41dc-8e9e-7e926d927537", - * "repositoryUserName": "Durgesh1988", - * "authenticationType": "userName", - * "repositoryPassword": "Durgesh@12356" - * } - * - * @apiSuccess [JSONObject] - * - * @apiSuccessExample Success-Response: - * { - * code:200, - * message:'Git Hub Repository Successfully updated.', - * fields:{successMessage:'Git Hub Repository Successfully updated',attribute:'Git-Hub Updating'} - * } - * - * @apiError 400 Bad Request. - * - * @apiErrorExample Error-Response: - * { - * code:400, - * message:'Bad Request', - * fields:{errorMessage:'Bad Request',attribute:'Git-Hub Updating'} - * }; - * @apiError 403 Forbidden. - * - * @apiErrorExample Error-Response: - * { - * code:403, - * message:'Forbidden', - * fields:{errorMessage:'The request was a valid request, but the server is refusing to respond to it',attribute:'Git-Hub Updating'} - * }; - * @apiError 404 Not Found. - * - * @apiErrorExample Error-Response: - * { - * code:404, - * message:'Not Found', - * fields:{errorMessage:'The requested resource could not be found but may be available in the future',attribute:'Git-Hub Updating'} - * }; - * @apiError 500 InternalServerError. - * - * @apiErrorExample Error-Response: - * { - * code:500, - * message:'Internal Server Error', - * fields:{errorMessage:'Server Behaved Unexpectedly',attribute:'Git-Hub Updating'} - * }; - */ - app.put('/git-hub/:gitHubId', validate(gitHubValidator.update), updateGitHub); @@ -434,11 +128,6 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) { * @apiSuccess [JSONObject] * * @apiSuccessExample Success-Response: - * { - * code:200, - * message:'Git Hub Repository Successfully deleted.', - * fields:{successMessage:'Git Hub Repository Successfully deleted',attribute:'Git-Hub Deletion'} - * } * * @apiError 400 Bad Request. * diff --git a/server/app/services/auditTrailService.js b/server/app/services/auditTrailService.js index 9c191ddce..c6c3930c5 100644 --- a/server/app/services/auditTrailService.js +++ b/server/app/services/auditTrailService.js @@ -189,25 +189,11 @@ auditTrailService.getBOTsSummary = function getBOTsSummary(callback){ actionStatus:'success', isDeleted:false }; - var botsIds = []; - auditTrail.getAuditTrails(query, function(err,botsAudits){ + auditTrail.getAuditTrails(query,function(err,data){ if(err){ callback(err,null); - }else if (botsAudits.length > 0) { - var results = []; - for (var i = 0; i < botsAudits.length; i++) { - if (botsIds.indexOf(botsAudits[i].auditId) === -1) { - botsIds.push(botsAudits[i].auditId); - results.push(botsAudits[i].auditId); - } else { - results.push(botsAudits[i].auditId); - } - } - if (results.length === botsAudits.length) { - callback(null,botsIds.length); - } - } else { - callback(null,botsIds.length); + }else { + callback(null, data.length); } }); @@ -227,27 +213,14 @@ auditTrailService.getBOTsSummary = function getBOTsSummary(callback){ actionStatus:'running', isDeleted:false }; - var botsIds = []; - auditTrail.getAuditTrails(query, function(err,botsAudits){ + auditTrail.getAuditTrails(query,function(err,data){ if(err){ callback(err,null); - }else if (botsAudits.length > 0) { - var results = []; - for (var i = 0; i < botsAudits.length; i++) { - if (botsIds.indexOf(botsAudits[i].auditId) === -1) { - botsIds.push(botsAudits[i].auditId); - results.push(botsAudits[i].auditId); - } else { - results.push(botsAudits[i].auditId); - } - } - if (results.length === botsAudits.length) { - callback(null,botsIds.length); - } - } else { - callback(null,botsIds.length); + }else { + callback(null, data.length); } }); + }, totalSavedTimeForBots: function(callback){ var query={ @@ -284,25 +257,11 @@ auditTrailService.getBOTsSummary = function getBOTsSummary(callback){ actionStatus:'failed', isDeleted:false }; - var botsIds = []; - auditTrail.getAuditTrails(query, function(err,botsAudits){ + auditTrail.getAuditTrails(query,function(err,data){ if(err){ callback(err,null); - }else if (botsAudits.length > 0) { - var results = []; - for (var i = 0; i < botsAudits.length; i++) { - if (botsIds.indexOf(botsAudits[i].auditId) === -1) { - botsIds.push(botsAudits[i].auditId); - results.push(botsAudits[i].auditId); - } else { - results.push(botsAudits[i].auditId); - } - } - if (results.length === botsAudits.length) { - callback(null,botsIds.length); - } - } else { - callback(null,botsIds.length); + }else { + callback(null, data.length); } }); } diff --git a/server/app/services/botsService.js b/server/app/services/botsService.js index ae7c128ff..4dc732a6b 100644 --- a/server/app/services/botsService.js +++ b/server/app/services/botsService.js @@ -174,8 +174,7 @@ botsService.getBotsList = function getBotsList(botsQuery,actionStatus,callback) if(actionStatus !== null){ var query = { auditType: 'BOTs', - actionStatus: actionStatus, - isDeleted:false + actionStatus: actionStatus }; var botsIds = []; auditTrail.getAuditTrails(query, function(err,botsAudits){ diff --git a/server/app/services/gitHubService.js b/server/app/services/gitHubService.js index 27c5edfd0..4c454fa27 100644 --- a/server/app/services/gitHubService.js +++ b/server/app/services/gitHubService.js @@ -18,12 +18,6 @@ var logger = require('_pr/logger')(module); var gitHubModel = require('_pr/model/github/github.js'); var appConfig = require('_pr/config'); var Cryptography = require('_pr/lib/utils/cryptography'); -var fileUpload = require('_pr/model/file-upload/file-upload'); -var nodeGit = require('nodegit'); -var async = require('async'); -var apiUtil = require('_pr/lib/utils/apiUtil.js'); -var promisify = require("promisify-node"); -var fse = promisify(require("fs-extra")); var gitGubService = module.exports = {}; @@ -45,7 +39,7 @@ gitGubService.checkIfGitHubExists = function checkIfGitHubExists(gitHubId, callb gitGubService.createGitHub = function createGitHub(gitHubObj, callback) { - if(gitHubObj.repositoryType === 'Private' && gitHubObj.authenticationType === 'userName'){ + if(gitHubObj.isAuthenticated === true || gitHubObj.isAuthenticated === 'true'){ var cryptoConfig = appConfig.cryptoSettings; var cryptography = new Cryptography(cryptoConfig.algorithm, cryptoConfig.password); gitHubObj.repositoryPassword = cryptography.encryptText(gitHubObj.repositoryPassword, cryptoConfig.encryptionEncoding, @@ -67,7 +61,7 @@ gitGubService.createGitHub = function createGitHub(gitHubObj, callback) { }; gitGubService.updateGitHub = function updateGitHub(gitHubId, gitHubObj, callback) { - if(gitHubObj.repositoryType === 'Private' && gitHubObj.authenticationType === 'userName'){ + if((gitHubObj.isAuthenticated === true || gitHubObj.isAuthenticated === 'true') && gitHubObj.authenticationType === 'UserName'){ var cryptoConfig = appConfig.cryptoSettings; var cryptography = new Cryptography(cryptoConfig.algorithm, cryptoConfig.password); gitHubObj.repositoryPassword = cryptography.encryptText(gitHubObj.repositoryPassword, cryptoConfig.encryptionEncoding, @@ -111,144 +105,36 @@ gitGubService.getGitHubSync = function getGitHubSync(gitHubId, callback) { err.status = 404; return callback(err); } else{ - formatGitHubResponse(gitHub,function(formattedGitHub){ - if(formattedGitHub.repositoryType === 'Private' && formattedGitHub.authenticationType === 'token') { - var cloneOpts = { - fetchOpts: { - callbacks: { - credentials: function () { - var cred = nodeGit.Cred.userpassPlaintextNew(formattedGitHub.repositoryToken, "x-oauth-basic"); - return cred; - }, - certificateCheck: function() { - return 1; - } - } - } - } - var localClonePath = "/tmp/"+ formattedGitHub.repositoryName; - var repoUrl = "https://github.com/" + formattedGitHub.repositoryOwner + "/" + formattedGitHub.repositoryName + ".git"; - gitRepoCloning(repoUrl,localClonePath,cloneOpts,gitHubId,function(err,cloneStatus){ - if(err){ - callback(err,null); - return; - }else{ - callback(null,cloneStatus); - return; - } - }); - } else if(formattedGitHub.repositoryType === 'Private' && formattedGitHub.authenticationType === 'userName') { - var cloneOpts = { - fetchOpts: { - callbacks: { - credentials: function () { - var cred = nodeGit.Cred.userpassPlaintextNew(formattedGitHub.repositoryUserName, formattedGitHub.repositoryPassword); - return cred; - }, - certificateCheck: function() { - return 1; - } - } - } - } - var localClonePath = "/tmp/"+ formattedGitHub.repositoryName; - var repoUrl = "https://github.com/" + formattedGitHub.repositoryOwner + "/" + formattedGitHub.repositoryName + ".git"; - gitRepoCloning(repoUrl,localClonePath,cloneOpts,gitHubId,function(err,cloneStatus){ - if(err){ - callback(err,null); - return; - }else{ - callback(null,cloneStatus); - return; - } - }); - }else if(formattedGitHub.repositoryType === 'Private' && formattedGitHub.authenticationType === 'sshKey') { - var cloneOpts = { - fetchOpts: { - callbacks: { - credentials: function () { - var cred = nodeGit.Cred.sshKeyNew(formattedGitHub.repositoryUserName, formattedGitHub.repositorySSHPublicKeyFileData,formattedGitHub.repositorySSHPrivateKeyFileData,''); - return cred; - }, - certificateCheck: function() { - return 1; - } - } - } - } - var localClonePath = "/tmp/"+ formattedGitHub.repositoryName; - var repoUrl = "https://github.com/" + formattedGitHub.repositoryOwner + "/" + formattedGitHub.repositoryName + ".git"; - gitRepoCloning(repoUrl,localClonePath,cloneOpts,gitHubId,function(err,cloneStatus){ - if(err){ - callback(err,null); - return; - }else{ - callback(null,cloneStatus); - return; - } - }); - }else{ - var localClonePath = "/tmp/"+ formattedGitHub.repositoryName; - var repoUrl = "https://github.com/" + formattedGitHub.repositoryOwner + "/" + formattedGitHub.repositoryName + ".git"; - gitRepoCloning(repoUrl,localClonePath,{},gitHubId,function(err,cloneStatus){ - if(err){ - callback(err,null); - return; - }else{ - callback(null,cloneStatus); - return; - } - }); - } - }) + } }); }; gitGubService.getGitHubList = function getGitHubList(query, callback) { - var reqData = {}; - async.waterfall([ - function(next) { - apiUtil.changeRequestForJqueryPagination(query, next); - }, - function(filterQuery,next) { - reqData = filterQuery; - apiUtil.paginationRequest(filterQuery, 'gitHub', next); - }, - function(paginationReq, next) { - paginationReq['searchColumns'] = ['name', 'repositoryType', 'repositoryURL']; - apiUtil.databaseUtil(paginationReq, next); - }, - function(queryObj, next) { - gitHubModel.getGitHubList(queryObj, next); - }, - function(gitHubList, next) { - if (gitHubList.docs.length > 0) { - var formattedResponseList = []; - for (var i = 0; i < gitHubList.docs.length; i++) { - formatGitHubResponse(gitHubList.docs[i],function(formattedData){ - formattedResponseList.push(formattedData); - if (formattedResponseList.length === gitHubList.docs.length) { - gitHubList.docs = formattedResponseList; - next(null,gitHubList); - } - }); + var params = {}; + logger.debug('get GitHub'); + if ('filterBy' in query) { + params = parseFilterBy(query.filterBy); + } + gitHubModel.getGitHubList(params, function (err, gitHubList) { + if (err) { + logger.error(err); + var err = new Error('Internal Server Error'); + err.status = 500; + return callback(err); + } else { + var response = []; + if (gitHubList.length > 0) { + for (var i = 0; i < gitHubList.length; i++) { + response.push(formatGitHubResponse(gitHubList[i])); + if (response.length === gitHubList.length) { + return callback(null, response); + } } } else { - next(null,gitHubList); + return callback(null, response); } - }, - function(formattedGitHubResponseList, next) { - apiUtil.changeResponseForJqueryPagination(formattedGitHubResponseList, reqData, next); } - ],function(err, results) { - if (err){ - logger.error(err); - callback(err,null); - return; - } - callback(null,results) - return; }); }; @@ -263,81 +149,41 @@ gitGubService.getGitHubById = function getGitHubById(gitHubId, callback) { err.status = 404; return callback(err); } else{ - formatGitHubResponse(gitHub,function(err,formattedData){ - callback(null,formattedData); - }); + callback(null,formatGitHubResponse(gitHub)); } }); }; -function formatGitHubResponse(gitHub,callback) { + +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; +}; + +function formatGitHubResponse(gitHub) { var formatted = { _id:gitHub._id, + name:gitHub.name, + description:gitHub.description, repositoryName:gitHub.repositoryName, - repositoryDesc:gitHub.repositoryDesc, - repositoryOwner:gitHub.repositoryOwner, - repositoryType:gitHub.repositoryType + isAuthenticated:gitHub.isAuthenticated }; if (gitHub.organization.length) { formatted.orgId = gitHub.organization[0].rowid; formatted.orgName=gitHub.organization[0].orgname; } - if (gitHub.repositoryType === 'Private' && gitHub.authenticationType === 'userName') { + if (gitHub.isAuthenticated === true) { formatted.repositoryUserName = gitHub.repositoryUserName; - formatted.authenticationType = gitHub.authenticationType; var cryptoConfig = appConfig.cryptoSettings; var cryptography = new Cryptography(cryptoConfig.algorithm, cryptoConfig.password); formatted.repositoryPassword = cryptography.decryptText(gitHub.repositoryPassword, cryptoConfig.decryptionEncoding, cryptoConfig.encryptionEncoding); - callback(formatted); - }else if (gitHub.repositoryType === 'Private' && gitHub.authenticationType === 'sshKey') { - formatted.authenticationType = gitHub.authenticationType; - fileUpload.getReadStreamFileByFileId(gitHub.repositorySSHPublicKeyFileId,function(err,publicKeyFile){ - if(err){ - var err = new Error('Internal server error'); - err.status = 500; - logger.error(err); - } - formatted.repositorySSHPublicKeyFileId = gitHub.repositorySSHPublicKeyFileId; - formatted.repositorySSHPublicKeyFileName = publicKeyFile.fileName; - formatted.repositorySSHPublicKeyFileData = publicKeyFile.fileData; - fileUpload.getReadStreamFileByFileId(gitHub.repositorySSHPrivateKeyFileId,function(err,privateKeyFile){ - if(err){ - var err = new Error('Internal server error'); - err.status = 500; - logger.error(err); - } - formatted.repositorySSHPrivateKeyFileId = gitHub.repositorySSHPrivateKeyFileId; - formatted.repositorySSHPrivateKeyFileName = privateKeyFile.fileName; - formatted.repositorySSHPrivateKeyFileData = privateKeyFile.fileData; - callback(formatted); - }); - }); - }else if (gitHub.repositoryType === 'Private' && gitHub.authenticationType === 'token') { - formatted.authenticationType = gitHub.authenticationType; - formatted.repositoryToken = gitHub.repositoryToken; - callback(formatted); - }else { - formatted.authenticationType = gitHub.authenticationType; - callback(formatted); } -} - -function gitRepoCloning(url,path,options,gitHubId,callback){ - fse.remove(path).then(function() { - nodeGit.Clone(url, path, options).then(function(repo){ - gitHubModel.updateGitHub(gitHubId, {isRepoCloned:true}, function (err, gitHub) { - if (err) { - logger.error(err); - } - logger.debug("GIT Repository Clone is Done."); - callback(null, repo); - }); - }).catch(function(err){ - var err = new Error('Invalid Git-Hub Details'); - err.status = 400; - err.msg = 'Invalid Git-Hub Details'; - callback(err, null); - }) - }); + return formatted; } diff --git a/server/app/services/instanceService.js b/server/app/services/instanceService.js index 13b232adb..2a3b24681 100644 --- a/server/app/services/instanceService.js +++ b/server/app/services/instanceService.js @@ -46,6 +46,7 @@ var AppData = require('_pr/model/app-deploy/app-data'); var instancesDao = require('_pr/model/classes/instance/instance'); var providerService = require('_pr/services/providerService.js'); var schedulerService = require('_pr/services/schedulerService.js'); +var catalystSync = require('_pr/cronjobs/catalyst-scheduler/catalystScheduler.js'); var instanceService = module.exports = {}; @@ -1484,7 +1485,6 @@ function updateScheduler(instanceScheduler, callback) { return callback(err, null); } else { callback(null, {"message": "Scheduler Updated."}); - var catalystSync = require('_pr/cronjobs/catalyst-scheduler/catalystScheduler.js'); catalystSync.executeScheduledInstances(); return; } diff --git a/server/app/validators/gitHubValidator.js b/server/app/validators/gitHubValidator.js index dd1c3027b..75e1beb9a 100644 --- a/server/app/validators/gitHubValidator.js +++ b/server/app/validators/gitHubValidator.js @@ -21,17 +21,15 @@ var monitorsValidator = module.exports = {}; monitorsValidator.create = { body: { "orgId": Joi.string().max(40).required(), - "repositoryName": Joi.string().max(40).required(), - "repositoryOwner": Joi.string().max(100).required(), - "repositoryType": Joi.string().max(40).required() + "name": Joi.string().max(40).required(), + "repositoryName": Joi.string().max(40).required() } }; monitorsValidator.update = { body: { "orgId": Joi.string().max(40).required(), - "repositoryName": Joi.string().max(40).required(), - "repositoryOwner": Joi.string().max(100).required(), - "repositoryType": Joi.string().max(40).required() + "name": Joi.string().max(40).required(), + "repositoryName": Joi.string().max(40).required() } }; diff --git a/server/install.js b/server/install.js index e8296e38a..4e15ebef8 100755 --- a/server/install.js +++ b/server/install.js @@ -116,8 +116,7 @@ function getDefaultsConfig() { "blueprints":"name", "compositeBlueprints":"name", "containerLogs":"createdOn", - "bots":"createdOn", - "gitHub":"createdOn" + "bots":"createdOn" }, skip_Records : 1, max_record_limit : 200, diff --git a/server/package.json b/server/package.json index 99e0c3794..1a23f28dd 100644 --- a/server/package.json +++ b/server/package.json @@ -74,9 +74,7 @@ "moment": "2.14.1", "json2csv": "3.6.3", "gridfs-stream":"1.1.1", - "mongoose-double": "0.0.1", - "nodegit": "0.16.0", - "promisify":"0.0.3" + "mongoose-double": "0.0.1" }, "devDependencies": { "grunt": "0.4.5", diff --git a/server/test/routes/testInstances.js b/server/test/routes/testInstances.js index c8f8d5823..116524999 100644 --- a/server/test/routes/testInstances.js +++ b/server/test/routes/testInstances.js @@ -59,7 +59,7 @@ describe("Deploy Permission ",function(){ }); });*/ - /*it(" Save Git Hub ",function(done){ + it(" Save Git Hub ",function(done){ var reqBody = { "orgId": "46d1da9a-d927-41dc-8e9e-7e926d927537", "name": "RL-Bot-Library", @@ -100,12 +100,12 @@ describe("Deploy Permission ",function(){ done(); }); }); -*/ - it(" Sync Git Hub ",function(done){ + + it(" Delete Git Hub ",function(done){ server - .get('/git-hub/586f58a417c109866b1067ba/sync') + .delete('/git-hub/5864e1a67beeb0fd27591e23') .end(function(err,res){ - console.log(res.body); + console.log(res); assert.equal(res.status, 200); done(); }); From d1c4dc03243efcd0ff4d36d21ee9c6f9b89131e3 Mon Sep 17 00:00:00 2001 From: hrushikesh07 Date: Fri, 13 Jan 2017 11:41:15 +0530 Subject: [PATCH 29/81] date range added --- .../dashboard/analytics/analytics.html | 60 ++++++++++++++++--- .../dashboard/analytics/analyticsServices.js | 29 ++++----- .../controller/capacityReportCtrl.js | 7 ++- .../analytics/controller/costCtrl.js | 2 +- .../dashboard/analytics/view/cost.html | 1 - 5 files changed, 70 insertions(+), 29 deletions(-) diff --git a/client/cat3/src/partials/sections/dashboard/analytics/analytics.html b/client/cat3/src/partials/sections/dashboard/analytics/analytics.html index 341c337c0..0c56c6cfa 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/analytics.html +++ b/client/cat3/src/partials/sections/dashboard/analytics/analytics.html @@ -118,16 +118,41 @@
    -
    +
    - - Up to : + + + +
    + + + + + + + + + + + + + + + + +
    -
    +
    {{filt.title}}: {{filt.name}} @@ -140,9 +165,26 @@
    \ No newline at end of file + + \ No newline at end of file diff --git a/client/cat3/src/partials/sections/dashboard/analytics/analyticsServices.js b/client/cat3/src/partials/sections/dashboard/analytics/analyticsServices.js index 7311b3b2d..c7ea8c697 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/analyticsServices.js +++ b/client/cat3/src/partials/sections/dashboard/analytics/analyticsServices.js @@ -10,30 +10,27 @@ $rootScope.filterNewEnt.period='month'; $rootScope.splitUpCosts=[]; $rootScope.filterNewEnt.platformId=[]; - $rootScope.filterNewEnt.endDate=moment(new Date()).format('DD/MM/YYYY'); - $rootScope.filterNewEnt.fromDate=''; + $rootScope.filterNewEnt.endDate={ + year:'2017', + week:'1st', + month:'January', + day:moment(new Date()).format('YYYY-MM-DD') + }; + $rootScope.filterNewEnt.date= $rootScope.filterNewEnt.endDate.month+' '+ $rootScope.filterNewEnt.endDate.year; }, applyFilter : function(filterApp,period){ - + $rootScope.filterNewEnt.date= $rootScope.filterNewEnt.endDate.month+' '+ $rootScope.filterNewEnt.endDate.year; if($rootScope.organObject) { var obj = $rootScope.organObject, or = $rootScope.organNewEnt.org, bu = $rootScope.organNewEnt.buss, pr = $rootScope.organNewEnt.proj; if (period) { - // if(period === 'month'){ - // var newdate = $rootScope.filterNewEnt.endDate; - // newdate.setDate(newdate.getDate() - 30); - // $rootScope.filterNewEnt.fromDate = new Date(newdate); - // } else if(period === 'week') { - // var newdate = $rootScope.filterNewEnt.endDate; - // newdate.setDate(newdate.getDate() - 7); - // $rootScope.filterNewEnt.fromDate = new Date(newdate); - // } else if(period === 'day') { - // var newdate = $rootScope.filterNewEnt.endDate; - // newdate.setDate(newdate.getDate() - 1); - // $rootScope.filterNewEnt.fromDate = new Date(newdate); - // } + if (period === 'day'){ + $rootScope.filterNewEnt.date= $rootScope.filterNewEnt.endDate.day; + } else { + $rootScope.filterNewEnt.date= $rootScope.filterNewEnt.endDate.month+' '+ $rootScope.filterNewEnt.endDate.year; + } $rootScope.filterNewEnt.period = period; } diff --git a/client/cat3/src/partials/sections/dashboard/analytics/controller/capacityReportCtrl.js b/client/cat3/src/partials/sections/dashboard/analytics/controller/capacityReportCtrl.js index 992451b9e..3a7f49630 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/controller/capacityReportCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/analytics/controller/capacityReportCtrl.js @@ -136,7 +136,7 @@ capRept.listGrid[value].columnDefs=[ {name: 'bucketName', field: 'bucketName', cellTooltip: true}, {name: 'bucketOwnerName', field: 'bucketOwnerName', cellTooltip: true}, - {name: 'bucketSize', field: 'bucketSize', cellTooltip: true}, + {name: 'bucketSize', field: 'bucketSize', displayName:'Bucket Size (MB)', cellTooltip: true}, {name: 'orgName', field: 'orgName', cellTooltip: true}, {name: 'cost', displayName: 'Cost',cellTemplate: ''}, {name: 'Action', cellTooltip: true,cellTemplate:" "} @@ -161,6 +161,7 @@ // url:'src/partials/sections/dashboard/analytics/data/ins.json' }; genSevs.promiseGet(param).then(function (instResult) { + capRept.listGrid[value].data=[]; if($rootScope.organNewEnt.instanceType === 'Managed') { capRept.listGrid[value].data= instResult.managedInstances; } else if($rootScope.organNewEnt.instanceType === 'Assigned'){ @@ -271,7 +272,7 @@ top: 20, right: 20, bottom:70, - left: 40 + left: 60 }, x: function (d) { return d[0]; @@ -291,6 +292,7 @@ } }, yAxis: { + axisLabel: 'Date', tickFormat: function (d) { return d3.format(',.2f')(d); } @@ -337,6 +339,7 @@ var va = []; capChat.trendLineChart.data = []; if (capChat.result) { + capChat.trendLineChart.options.chart.yAxis.axisLabel=capChat.result[capChat.splitUp].unit; angular.forEach(capChat.result[capChat.splitUp].dataPoints, function (value) { va.push([Date.parse(value.fromTime), value.average]); }); diff --git a/client/cat3/src/partials/sections/dashboard/analytics/controller/costCtrl.js b/client/cat3/src/partials/sections/dashboard/analytics/controller/costCtrl.js index 152f8fe68..60ca2e0df 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/controller/costCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/analytics/controller/costCtrl.js @@ -111,7 +111,7 @@ } //param.url='src/partials/sections/dashboard/analytics/data/cost.json'; - param.url='/analytics/cost/aggregate?parentEntityId='+fltObj.org.id+'&entityId='+entityId+'&toTimeStamp='+fltObj.endDate+'&period='+fltObj.period; + param.url='/analytics/cost/aggregate?parentEntityId='+fltObj.org.id+'&entityId='+entityId+'&toTimeStamp='+new Date(fltObj.date)+'&period='+fltObj.period; } genSevs.promiseGet(param).then(function (result) { diff --git a/client/cat3/src/partials/sections/dashboard/analytics/view/cost.html b/client/cat3/src/partials/sections/dashboard/analytics/view/cost.html index 24bcd47f2..ef73be2d3 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/view/cost.html +++ b/client/cat3/src/partials/sections/dashboard/analytics/view/cost.html @@ -54,4 +54,3 @@

    Aggregate cos

    - From 262b0d1df191eb7dfceb536b62f1eec1af8755fd Mon Sep 17 00:00:00 2001 From: hrushikesh07 Date: Fri, 13 Jan 2017 11:50:38 +0530 Subject: [PATCH 30/81] month added --- .../partials/sections/dashboard/analytics/analyticsServices.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/client/cat3/src/partials/sections/dashboard/analytics/analyticsServices.js b/client/cat3/src/partials/sections/dashboard/analytics/analyticsServices.js index c7ea8c697..b8252c9d5 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/analyticsServices.js +++ b/client/cat3/src/partials/sections/dashboard/analytics/analyticsServices.js @@ -10,10 +10,11 @@ $rootScope.filterNewEnt.period='month'; $rootScope.splitUpCosts=[]; $rootScope.filterNewEnt.platformId=[]; + var months=['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December']; $rootScope.filterNewEnt.endDate={ year:'2017', week:'1st', - month:'January', + month:months[new Date().getMonth()], day:moment(new Date()).format('YYYY-MM-DD') }; $rootScope.filterNewEnt.date= $rootScope.filterNewEnt.endDate.month+' '+ $rootScope.filterNewEnt.endDate.year; From 62be83aa13ec217fc9559e74bb9e3e9599dd10c5 Mon Sep 17 00:00:00 2001 From: hrushikesh07 Date: Fri, 13 Jan 2017 11:54:52 +0530 Subject: [PATCH 31/81] css changed --- .../sections/dashboard/analytics/analytics.scss | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/client/cat3/src/partials/sections/dashboard/analytics/analytics.scss b/client/cat3/src/partials/sections/dashboard/analytics/analytics.scss index ff8e3ed2d..906a768fb 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/analytics.scss +++ b/client/cat3/src/partials/sections/dashboard/analytics/analytics.scss @@ -368,4 +368,15 @@ label { } .with250{ width: 250px !important; +} +.weekPick { + position: absolute; + left: 24%; + background: #FFFFFF; + width: 217px; + z-index: 999; + padding: 7px 17px; + border: 1px solid #ccc; + border-radius: 5px; + margin: 2px; } \ No newline at end of file From 553c3d6ef36f64c15e668f103dd95bdffe43c077 Mon Sep 17 00:00:00 2001 From: hrushikesh07 Date: Fri, 13 Jan 2017 11:56:02 +0530 Subject: [PATCH 32/81] css changed --- .../sections/dashboard/analytics/analytics.html | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/client/cat3/src/partials/sections/dashboard/analytics/analytics.html b/client/cat3/src/partials/sections/dashboard/analytics/analytics.html index 0c56c6cfa..2213a1349 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/analytics.html +++ b/client/cat3/src/partials/sections/dashboard/analytics/analytics.html @@ -175,16 +175,3 @@ }); }); - \ No newline at end of file From b81d4e4b0f018e5df6b0731fc92d07a6103aa520 Mon Sep 17 00:00:00 2001 From: hrushikesh07 Date: Fri, 13 Jan 2017 12:41:19 +0530 Subject: [PATCH 33/81] added condition for managed instance and chenged the resources instance in line edit --- .../controller/capacityReportCtrl.js | 2 +- .../controller/discoveryResourcesCtrl.js | 83 ++++++++++--------- 2 files changed, 43 insertions(+), 42 deletions(-) diff --git a/client/cat3/src/partials/sections/dashboard/analytics/controller/capacityReportCtrl.js b/client/cat3/src/partials/sections/dashboard/analytics/controller/capacityReportCtrl.js index 3a7f49630..9f10b06f7 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/controller/capacityReportCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/analytics/controller/capacityReportCtrl.js @@ -126,7 +126,7 @@ name: 'Action', cellTooltip: true, cellTemplate: " " + - "   " + "   " } // {name: 'Chef', cellTooltip: true,cellTemplate:""} ]; diff --git a/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryResourcesCtrl.js b/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryResourcesCtrl.js index b6bc9c2e0..d2e9a4f1c 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryResourcesCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryResourcesCtrl.js @@ -77,50 +77,51 @@ gridApi.grid.registerRowsProcessor( $scope.singleFilter, 200 ); $scope.gridApi=gridApi; gridApi.edit.on.afterCellEdit($scope, function (rowEntity, colDefa, newValue, oldValue) { - console.log(rowEntity); - confirmbox.showModal({}, { - closeButtonText: 'Cancel', - actionButtonText: 'Yes', - actionButtonStyle: 'cat-btn-update', - headerText: 'Update tag value', - bodyText: 'Are you sure you want to Update ?' - }).then(function() { - var tagna=colDefa.name.substring(0, colDefa.name.length-3); - var param = { - url: '/providers/' + fltrObj.provider.id + '/unassigned-instances/' + rowEntity._id, - data: { - tags:{} - } - }; - param.data.tags[tagna]=newValue; - console.log(param); - if(newValue !== oldValue) { - genSevs.promisePatch(param).then(function () { - toastr.success('Successfully updated.', 'Update'); - }); - } - },function() { - var param = { - url: '/providers/' + fltrObj.provider.id + '/' + $scope.instanceType - // url:'src/partials/sections/dashboard/analytics/data/ins.json' - }; - genSevs.promiseGet(param).then(function (instResult) { - if($rootScope.organNewEnt.instanceType === 'Managed') { - disResrc.gridOptionInstances.data = instResult.managedInstances; - } else if($rootScope.organNewEnt.instanceType === 'Assigned'){ - disResrc.gridOptionInstances.data = instResult.unmanagedInstances; - } else if($rootScope.organNewEnt.instanceType === 'Unassigned'){ - disResrc.gridOptionInstances.data = instResult.data; - } - disResrc.gridOptionInstances.isRowSelectable = function(row){ - if(row.entity.state !== 'running'){ - return false; - } else { - return true; + if(newValue !== oldValue) { + confirmbox.showModal({}, { + closeButtonText: 'Cancel', + actionButtonText: 'Yes', + actionButtonStyle: 'cat-btn-update', + headerText: 'Update tag value', + bodyText: 'Are you sure you want to Update ?' + }).then(function () { + var tagna = colDefa.name.substring(0, colDefa.name.length - 3); + var param = { + url: '/providers/' + fltrObj.provider.id + '/unassigned-instances/' + rowEntity._id, + data: { + tags: {} } }; + param.data.tags[tagna] = newValue; + console.log(param); + if (newValue !== oldValue) { + genSevs.promisePatch(param).then(function () { + toastr.success('Successfully updated.', 'Update'); + }); + } + }, function () { + var param = { + url: '/providers/' + fltrObj.provider.id + '/' + $scope.instanceType + // url:'src/partials/sections/dashboard/analytics/data/ins.json' + }; + genSevs.promiseGet(param).then(function (instResult) { + if ($rootScope.organNewEnt.instanceType === 'Managed') { + disResrc.gridOptionInstances.data = instResult.managedInstances; + } else if ($rootScope.organNewEnt.instanceType === 'Assigned') { + disResrc.gridOptionInstances.data = instResult.unmanagedInstances; + } else if ($rootScope.organNewEnt.instanceType === 'Unassigned') { + disResrc.gridOptionInstances.data = instResult.data; + } + disResrc.gridOptionInstances.isRowSelectable = function (row) { + if (row.entity.state !== 'running') { + return false; + } else { + return true; + } + }; + }); }); - }); + } }); gridApi.selection.on.rowSelectionChanged($scope,function(row){ From 61e99a5f57497762076d0f36c59abdff4b625076 Mon Sep 17 00:00:00 2001 From: Durgesh1988 Date: Fri, 13 Jan 2017 14:47:05 +0530 Subject: [PATCH 34/81] GIT Hub Implementation --- .../catalyst-scheduler/catalystScheduler.js | 2 +- server/app/lib/utils/apiUtil.js | 4 +- server/app/model/bots/{ => 1.0}/bots.js | 0 server/app/model/bots/1.1/bots.js | 296 ++++++++++++++++++ server/app/model/classes/tasks/tasks.js | 2 +- server/app/routes/v1.0/routes_blueprints.js | 2 +- server/app/services/auditTrailService.js | 2 +- server/app/services/blueprintService.js | 2 +- server/app/services/botsService.js | 2 +- server/app/services/schedulerService.js | 2 +- server/app/services/taskService.js | 2 +- 11 files changed, 306 insertions(+), 10 deletions(-) rename server/app/model/bots/{ => 1.0}/bots.js (100%) create mode 100644 server/app/model/bots/1.1/bots.js diff --git a/server/app/cronjobs/catalyst-scheduler/catalystScheduler.js b/server/app/cronjobs/catalyst-scheduler/catalystScheduler.js index d05439767..1165a3906 100644 --- a/server/app/cronjobs/catalyst-scheduler/catalystScheduler.js +++ b/server/app/cronjobs/catalyst-scheduler/catalystScheduler.js @@ -1,7 +1,7 @@ var logger = require('_pr/logger')(module); var instancesDao = require('_pr/model/classes/instance/instance'); var taskDao = require('_pr/model/classes/tasks/tasks.js'); -var botsDao = require('_pr/model/bots/bots.js'); +var botsDao = require('_pr/model/bots/1.0/bots.js'); var schedulerService = require('_pr/services/schedulerService'); var async = require('async'); var cronTab = require('node-crontab'); diff --git a/server/app/lib/utils/apiUtil.js b/server/app/lib/utils/apiUtil.js index 24326b86e..de6590ec7 100644 --- a/server/app/lib/utils/apiUtil.js +++ b/server/app/lib/utils/apiUtil.js @@ -231,10 +231,10 @@ var ApiUtil = function() { }; var filterBy={}; if(data.filterBy) { - var a = data.filterBy.split(" "); + var a = data.filterBy.split(","); for (var i = 0; i < a.length; i++) { var b = a[i].split(":"); - var c = b[1].split(","); + var c = b[1].split(" "); if (c.length > 1) { filterBy[b[0]] = {'$in': c}; } else { diff --git a/server/app/model/bots/bots.js b/server/app/model/bots/1.0/bots.js similarity index 100% rename from server/app/model/bots/bots.js rename to server/app/model/bots/1.0/bots.js diff --git a/server/app/model/bots/1.1/bots.js b/server/app/model/bots/1.1/bots.js new file mode 100644 index 000000000..49d2a79eb --- /dev/null +++ b/server/app/model/bots/1.1/bots.js @@ -0,0 +1,296 @@ +/* + 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 logger = require('_pr/logger')(module); +var ObjectId = require('mongoose').Types.ObjectId; +var mongoosePaginate = require('mongoose-paginate'); +var Schema = mongoose.Schema; + +var BotsSchema = new Schema ({ + name: { + type: String, + trim: true, + required: true + }, + type: { + type: String, + trim: true, + required: true + }, + category: { + type: String, + trim: true, + required: true + }, + description: { + type: String, + trim: true, + required: true + }, + orgId:{ + type: String, + trim: true, + required: true + }, + yamlDocId:{ + type: String, + trim: true, + required: false + }, + manualExecutionTime: { + type: Number, + default: 10 + }, + executionCount: { + type: Number, + default: 0 + }, + isScheduled: { + type: Boolean, + default: false + }, + scheduler:{ + cronStartOn: { + type: String, + required: false, + trim: true + }, + cronEndOn: { + type: String, + required: false, + trim: true + }, + cronPattern: { + type: String, + required: false, + trim: true + }, + cronRepeatEvery: { + type: Number, + required: false + }, + cronFrequency: { + type: String, + required: false, + trim: true + }, + cronMinute:{ + type: Number, + required: false, + trim: true + }, + cronHour:{ + type: Number, + required: false + }, + cronWeekDay:{ + type: Number, + required: false + }, + cronDate:{ + type: Number, + required: false + }, + cronMonth:{ + type: String, + required: false, + trim: true + }, + cronYear:{ + type: Number, + required: false + } + }, + cronJobId:{ + type: String, + required: false, + trim: true + }, + createdOn:{ + type: Number, + default: Date.now() + }, + isDeleted: { + type: Boolean, + default: false + } +}); +BotsSchema.plugin(mongoosePaginate); + + +BotsSchema.statics.createNew = function(botsDetail,callback){ + var botsData = new Bots(botsDetail); + botsData.save(function(err, data) { + if (err) { + logger.error("createNew Failed", err, data); + callback(err,null); + return; + } + callback(null,data); + return; + }); +} +BotsSchema.statics.updateBotsDetail = function(botId,botsDetail,callback){ + Bots.update({botId:botId},{$set:botsDetail},{upsert:false}, function(err, updateBotDetail) { + if (err) { + logger.error(err); + var error = new Error('Internal server error'); + error.status = 500; + return callback(error); + } + return callback(null, updateBotDetail); + }); +}; + +BotsSchema.statics.getBotsList = function(botsQuery,callback){ + botsQuery.queryObj.isDeleted = false; + Bots.paginate(botsQuery.queryObj, botsQuery.options, function(err, botsList) { + if (err) { + logger.error(err); + var error = new Error('Internal server error'); + error.status = 500; + return callback(error); + } + return callback(null, botsList); + }); +}; + +BotsSchema.statics.getBotsById = function(botId,callback){ + Bots.find({botId:botId}, function(err, bots) { + if (err) { + logger.error(err); + var error = new Error('Internal server error'); + error.status = 500; + return callback(error); + }else if(bots.length > 0){ + return callback(null, bots); + }else{ + return callback(null, []); + } + }); +}; + +BotsSchema.statics.getAllBots = function(callback){ + Bots.find({isDeleted:false}, function(err, bots) { + if (err) { + logger.error(err); + var error = new Error('Internal server error'); + error.status = 500; + return callback(error); + }else if(bots.length > 0){ + return callback(null, bots); + }else{ + return callback(null, []); + } + }); +}; + +BotsSchema.statics.removeBotsById = function(botId,callback){ + Bots.remove({botId:botId}, function(err, bots) { + if (err) { + logger.error(err); + var error = new Error('Internal server error'); + error.status = 500; + return callback(error); + }else { + return callback(null, bots); + } + }); +}; + +BotsSchema.statics.removeSoftBotsById = function(botId,callback){ + Bots.update({botId:botId},{$set:{isDeleted:true}}, function(err, bots) { + if (err) { + logger.error(err); + var error = new Error('Internal server error'); + error.status = 500; + return callback(error); + }else { + return callback(null, bots); + } + }); +}; + +BotsSchema.statics.updateBotsExecutionCount = function updateBotsExecutionCount(botId,count,callback) { + Bots.update({ + botId: botId, + }, { + $set: { + executionCount: count + } + }, { + upsert: false + }, function (err, data) { + if (err) { + callback(err, null); + return; + } + callback(null, data); + }); +}; + +BotsSchema.statics.getScheduledBots = function getScheduledBots(callback) { + Bots.find({ + isBotScheduled: true, + isDeleted:false + }, function (err, bots) { + if (err) { + logger.error(err); + return callback(err, null); + } + return callback(null, bots); + }) +} + +BotsSchema.statics.updateCronJobIdByBotId = function updateCronJobIdByBotId(botId, cronJobId, callback) { + Bots.update({ + "_id": new ObjectId(botId), + }, { + $set: { + cronJobId: cronJobId + } + }, { + upsert: false + }, function (err, data) { + if (err) { + callback(err, null); + return; + } + callback(null, data); + }); +}; + +BotsSchema.statics.updateBotsScheduler = function updateBotsScheduler(botId, callback) { + Bots.update({ + "_id": new ObjectId(botId), + }, { + $set: { + isBotScheduled: false + } + }, { + upsert: false + }, function (err, data) { + if (err) { + callback(err, null); + return; + } + callback(null, data); + }); +}; + +var Bots = mongoose.model('bots', BotsSchema); +module.exports = Bots; diff --git a/server/app/model/classes/tasks/tasks.js b/server/app/model/classes/tasks/tasks.js index 9b87b7a7f..b168536a4 100755 --- a/server/app/model/classes/tasks/tasks.js +++ b/server/app/model/classes/tasks/tasks.js @@ -30,7 +30,7 @@ var mongoosePaginate = require('mongoose-paginate'); var ApiUtils = require('_pr/lib/utils/apiUtil.js'); var Schema = mongoose.Schema; var auditTrailService = require('_pr/services/auditTrailService'); -var bots = require('_pr/model/bots/bots.js'); +var bots = require('_pr/model/bots/1.0/bots.js'); var Cryptography = require('_pr/lib/utils/cryptography'); var appConfig = require('_pr/config'); diff --git a/server/app/routes/v1.0/routes_blueprints.js b/server/app/routes/v1.0/routes_blueprints.js index 7198da90b..c4860b5d5 100755 --- a/server/app/routes/v1.0/routes_blueprints.js +++ b/server/app/routes/v1.0/routes_blueprints.js @@ -24,7 +24,7 @@ var credentialcryptography = require('_pr/lib/credentialcryptography'); var fs = require('fs'); var blueprintService = require('_pr/services/blueprintService.js'); var auditTrailService = require('_pr/services/auditTrailService'); -var bots = require('_pr/model/bots/bots.js'); +var bots = require('_pr/model/bots/1.0/bots.js'); var botsService = require('_pr/services/botsService.js'); module.exports.setRoutes = function(app, sessionVerificationFunc) { diff --git a/server/app/services/auditTrailService.js b/server/app/services/auditTrailService.js index c6c3930c5..7f255f007 100644 --- a/server/app/services/auditTrailService.js +++ b/server/app/services/auditTrailService.js @@ -19,7 +19,7 @@ var instanceAuditTrail = require('_pr/model/audit-trail/instance-audit-trail.js' var botAuditTrail = require('_pr/model/audit-trail/bot-audit-trail.js'); var containerAuditTrail = require('_pr/model/audit-trail/container-audit-trail.js'); var auditTrail = require('_pr/model/audit-trail/audit-trail.js'); -var bots = require('_pr/model/bots/bots.js');; +var bots = require('_pr/model/bots/1.0/bots.js');; const errorType = 'auditTrailService'; diff --git a/server/app/services/blueprintService.js b/server/app/services/blueprintService.js index 88b74aa22..5e8c7055a 100644 --- a/server/app/services/blueprintService.js +++ b/server/app/services/blueprintService.js @@ -33,7 +33,7 @@ var AWSKeyPair = require('_pr/model/classes/masters/cloudprovider/keyPair.js'); var auditTrail = require('_pr/model/audit-trail/audit-trail.js'); var usersDao = require('_pr/model/users.js'); var auditTrailService = require('_pr/services/auditTrailService'); -var bots = require('_pr/model/bots/bots.js'); +var bots = require('_pr/model/bots/1.0/bots.js'); var botsService = require('_pr/services/botsService.js'); var ObjectId = require('mongoose').Types.ObjectId; var uuid = require('node-uuid'); diff --git a/server/app/services/botsService.js b/server/app/services/botsService.js index 4dc732a6b..4ef646c3c 100644 --- a/server/app/services/botsService.js +++ b/server/app/services/botsService.js @@ -16,7 +16,7 @@ */ var logger = require('_pr/logger')(module); -var bots = require('_pr/model/bots/bots.js'); +var bots = require('_pr/model/bots/1.0/bots.js'); var async = require("async"); var apiUtil = require('_pr/lib/utils/apiUtil.js'); var taskService = require('_pr/services/taskService.js'); diff --git a/server/app/services/schedulerService.js b/server/app/services/schedulerService.js index e4d0c5801..f4492bb91 100644 --- a/server/app/services/schedulerService.js +++ b/server/app/services/schedulerService.js @@ -41,7 +41,7 @@ var botsService = require('_pr/services/botsService.js'); var gcpProviderModel = require('_pr/model/v2.0/providers/gcp-providers'); var GCP = require('_pr/lib/gcp.js'); var crontab = require('node-crontab'); -var botsDao = require('_pr/model/bots/bots.js'); +var botsDao = require('_pr/model/bots/1.0/bots.js'); schedulerService.executeSchedulerForInstances = function executeSchedulerForInstances(instance,callback) { logger.debug("Instance Scheduler is started for Instance. "+instance.platformId); diff --git a/server/app/services/taskService.js b/server/app/services/taskService.js index 106c8d95d..3b31241fb 100644 --- a/server/app/services/taskService.js +++ b/server/app/services/taskService.js @@ -16,7 +16,7 @@ var logger = require('_pr/logger')(module); var taskDao = require('_pr/model/classes/tasks/tasks.js'); -var bots = require('_pr/model/bots/bots.js'); +var bots = require('_pr/model/bots/1.0/bots.js'); var masterUtil = require('_pr/lib/utils/masterUtil.js'); var d4dModelNew = require('_pr/model/d4dmasters/d4dmastersmodelnew.js'); var TaskHistory = require('_pr/model/classes/tasks/taskHistory'); From 014611168ef872213e4b4158d675e3d27bdd8ffb Mon Sep 17 00:00:00 2001 From: Durgesh1988 Date: Fri, 13 Jan 2017 15:08:29 +0530 Subject: [PATCH 35/81] GIT Hub Implementation --- .../private/ajax/Settings/githubList.html | 521 ++---------------- client/htmls/private/css/catalyst.css | 36 +- client/htmls/private/js/githubList.js | 497 +++++++++++++++++ server/app/model/github/github.js | 77 ++- server/app/routes/v1.0/routes_d4dMasters.js | 42 +- server/app/routes/v1.0/routes_github.js | 313 ++++++++++- server/app/services/auditTrailService.js | 61 +- server/app/services/botsService.js | 3 +- server/app/services/gitHubService.js | 244 ++++++-- server/app/services/instanceService.js | 2 +- server/app/validators/gitHubValidator.js | 10 +- server/install.js | 3 +- server/package.json | 4 +- 13 files changed, 1225 insertions(+), 588 deletions(-) create mode 100644 client/htmls/private/js/githubList.js diff --git a/client/htmls/private/ajax/Settings/githubList.html b/client/htmls/private/ajax/Settings/githubList.html index bf46d1d9b..b60d04e7e 100644 --- a/client/htmls/private/ajax/Settings/githubList.html +++ b/client/htmls/private/ajax/Settings/githubList.html @@ -1,9 +1,12 @@ +
    @@ -26,12 +29,12 @@

    - + - - - + + + @@ -62,13 +65,13 @@

    - +
    - +
    @@ -80,54 +83,68 @@

    - +
    - +
    - - + +
    +
    + +
    +
    + +
    +
    - + + @@ -144,442 +161,4 @@

    - - \ No newline at end of file + \ No newline at end of file diff --git a/client/htmls/private/css/catalyst.css b/client/htmls/private/css/catalyst.css index c79ca3de3..e9a6c2abb 100644 --- a/client/htmls/private/css/catalyst.css +++ b/client/htmls/private/css/catalyst.css @@ -2451,15 +2451,15 @@ hr { padding: 8px 17px 8px 54px !important; } .smart-style-1 nav ul ul li > span {} .smart-style-1 nav ul ul li > span { - color: #E1EAF1; - display: block; - font-size: 13px; - font-weight: 300; - padding-bottom: 6px !important; - padding-left: 43px; - padding-top: 6px !important; - text-shadow: 0 1px 1px #000000; -} + color: #E1EAF1; + display: block; + font-size: 13px; + font-weight: 300; + padding-bottom: 6px !important; + padding-left: 43px; + padding-top: 6px !important; + text-shadow: 0 1px 1px #000000; + } .domain-roles-heading { font-size: 12px; height: 25px; @@ -4664,7 +4664,7 @@ input:focus, select:focus, textarea:focus { } .scriptContainerRead { height:400px; - overflow-y:auto; + overflow-y:auto; background: #333; color:#fff; font-size: 12px; @@ -4675,3 +4675,19 @@ input:focus, select:focus, textarea:focus { .blueprintdiv-aws { width:77%!important; } + +.radioInline { + display: inline-block; +} + +.marginTop8 { + margin-top: 8px!important; +} + +#gitHubListLoader { + opacity: 0.6; + height: 100%; + width: 100%; + position: absolute; + background: #ddd; +} diff --git a/client/htmls/private/js/githubList.js b/client/htmls/private/js/githubList.js new file mode 100644 index 000000000..26b33fbe6 --- /dev/null +++ b/client/htmls/private/js/githubList.js @@ -0,0 +1,497 @@ + +//initialising the datatable... +if (!$.fn.dataTable.isDataTable('#gitTable')) { + var $gitDatatable = $('#gitTable').DataTable({ + "pagingType": "full_numbers", + "bInfo": false, + "bLengthChange": false, + "paging": true, + "bFilter": false, + "aoColumns": [{ + "bSortable": false + }, { + "bSortable": false + }, { + "bSortable": false + }, { + "bSortable": false + }, { + "bSortable": false + }, { + "bSortable": false + }] + + }); +} + +//calling the global track functionality when track params are available.. +$(document).ready(function(e) { + getGlobalGitServers(); +}); + +function setFileNameCertificate(val) { + $('#certificateFileNameDisplay').empty(); + var fileNamePublic = val.substr(val.lastIndexOf("\\") + 1, val.length); + $("#certificateFileNameDisplay").append(fileNamePublic); +} + +function setFileNamePrivate(val) { + $('#privateFileNameDisplay').empty(); + var fileNamePrivate = val.substr(val.lastIndexOf("\\") + 1, val.length); + $("#privateFileNameDisplay").append(fileNamePrivate); +} + + +$("input[name='isAuthenticated']:radio").change(function(){ + if($(this).val() === 'Private') { + $('.isAunthenticatedSection').removeClass('hidden'); + } else { + $("#authenticationType").val($("#authenticationType option:first").val()); + $('.isAunthenticatedSection').addClass('hidden'); + $('.showForUser').addClass('hidden'); + $('.showForSSH').addClass('hidden'); + $('.showForToken').addClass('hidden'); + } +}); + +$('#authenticationType').change(function(e) { + var val = $(this).val(); + if (val === 'userName') { + $('.showForUser').removeClass('hidden'); + $('.showForSSH').addClass('hidden'); + $('.showForToken').addClass('hidden'); + } else if(val === 'sshKey') { + $('.showForUser').addClass('hidden'); + $('.showForSSH').removeClass('hidden'); + $('.showForToken').addClass('hidden'); + } else if(val === 'token') { + $('.showForUser').addClass('hidden'); + $('.showForSSH').addClass('hidden'); + $('.showForToken').removeClass('hidden'); + } else { + $('.showForUser').addClass('hidden'); + $('.showForSSH').addClass('hidden'); + $('.showForToken').addClass('hidden'); + } +}); + +//when the user clicks on the new button the setting the value to 'new' for the hidden field to know that user is creating the new item.. +$('.addGitHub').click(function(e) { + $('#gitHubRepoForn').trigger('reset'); + $('.modal-header').find('.modal-title').html('Create New GitHub Repository'); + $('#gitEditHiddenInput').val('new'); + getOrganizationList(); + $('#orgName,#authenticationType').removeAttr('disabled'); + $('.isAunthenticatedSection').addClass('hidden'); + $('#authenticationType').change(); + $('#gitEditHiddenInputId,#gitHiddenPublicFile,#gitHiddenPrivateFile').val(''); + $('input:radio[name="isAuthenticated"][value="Public"]').removeAttr('disabled'); + $('input:radio[name="isAuthenticated"][value="Private"]').removeAttr('disabled'); + $('#certificateFileNameDisplay').empty(); + $('#privateFileNameDisplay').empty(); +}); + +//to list down the organization for creating the gitHub repo item. +function getOrganizationList() { + $.get('/d4dMasters/readmasterjsonnew/1', function(data) { + var str = ' ', + len = data.length; + for (var i = 0; i < data.length; i++) { + str = str + ''; + } + $('#orgName').html(str); + }) +} + +//to show the focus on first input .... +$(document).on('shown.bs.modal', function(e) { + $('[autofocus]', e.target).focus(); +}); + +//form validation for dashboard save +var validator = $('#gitHubRepoForn').validate({ + ignore: [], + rules: { + certificateFile: { + extension: "pem|txt|sh" + }, + privateFile: { + extension: "pem|txt|sh" + }, + gitName: { + maxlength: 15 + }, + token: { + number: true + } + }, + messages: { + certificateFile: { + extension: "Only .pem/.txt/.sh files" + }, + privateFile: { + extension: "Only .pem/.txt/.sh files" + }, + gitName: { + maxlength: "Limited to 15 chars" + } + }, + onkeyup: false, + errorClass: "error", + + //put error message behind each form element + errorPlacement: function(error, element) { + console.log(error, element); + var elem = $(element); + if (element.parent('.input-groups').length) { + error.insertBefore(element.parent()); + } else { + if (element.parent('div.inputGroups')) { + error.insertBefore('div.inputGroups'); + } + } + } +}); +$('a.addGitHub[type="reset"]').on('click', function(e) { + validator.resetForm(); +}); + +function getGlobalGitServers() { + $('#gitTable').DataTable( { + "processing": true, + "serverSide": true, + "destroy":true, + "createdRow": function( row, data ) { + $( row ).attr({"githubName": data.repositoryName,"githubId" : data._id,"repositoryOwner":data.repositoryOwner, + "repositoryType":data.repositoryType,"authenticationType":data.authenticationType,"repositoryToken":data.repositoryToken, + "githubDescription" : data.repositoryDesc, "orgId" : data.orgId ,"orgName" : data.orgName, + "repositoryUserName" : data.repositoryUserName,"repositoryPassword" : data.repositoryPassword, + "repositorySSHPublicKeyFileId" : data.repositorySSHPublicKeyFileId,"repositorySSHPrivateKeyFileId":data.repositorySSHPrivateKeyFileId, + "repositorySSHPublicKeyFileName": data.repositorySSHPublicKeyFileName,"repositorySSHPrivateKeyFileName": data.repositorySSHPrivateKeyFileName + }); + }, + "ajax": '/git-hub', + "columns": [ + {"data": "repositoryName", "orderable" : true}, + {"data": "repositoryDesc" ,"orderable" : false }, + {"data": "orgName","orderable" : false }, + {"data": "repositoryOwner" ,"orderable" : false }, + {"data": "repositoryType" ,"orderable" : false}, + {"data": "","orderable" : true, + "render": function (data) { + var $tdAction = '
    '; + $tdAction = $tdAction + '
    '; + return $tdAction; + } + } + ] + } ); +}; + +$('#gitTable tbody').on( 'click', 'button.editGitRepo', function(){ + validator.resetForm(); + var $this = $(this); + var $this = $(this); + var $editModal = $('#modalForGitEdit'); + $editModal.modal('show'); + $editModal.find('#gitEditHiddenInput').val('edit'); + $editModal.find('h4.modal-title').html('Edit GitHub Repo  -  ' + $this.parents('tr').attr('githubName')); + $editModal.find('#gitName').val($this.parents('tr').attr('githubName')); + $editModal.find('#gitDescription').val($this.parents('tr').attr('githubDescription')); + $editModal.find('#orgName').empty().append('').attr('disabled','disabled'); + $editModal.find('#gitRepoOwner').val($this.parents('tr').attr('repositoryOwner')); + $editModal.find('#gitEditHiddenInputId').val($this.parents('tr').attr('githubId')); + var repoType = $this.parents('tr').attr('repositoryType'); + var authType = $this.parents('tr').attr('authenticationType'); + + if(repoType === 'Private'){ + $('input:radio[name="isAuthenticated"][value="Public"]').attr('disabled', true); + $('input:radio[name="isAuthenticated"][value="Private"]').removeAttr('disabled').prop('checked', true); + $('.isAunthenticatedSection').removeClass('hidden'); + if(authType === 'userName') { + $editModal.find('#authenticationType').val('userName').change().attr('disabled','disabled'); + $editModal.find('#protocolUser').val($this.parents('tr').attr('repositoryUserName')); + $editModal.find('#protocolPassword').val($this.parents('tr').attr('repositoryPassword')); + }else if(authType === 'sshKey'){ + $('#privateFile').val(''); + $('#privateFile').removeClass('required'); + $('#certificateFile').val(''); + $('#certificateFile').removeClass('required'); + $editModal.find('#certificateFileNameDisplay').empty(); + $editModal.find('#privateFileNameDisplay').empty(); + $editModal.find('#authenticationType').val('sshKey').change().attr('disabled','disabled'); + $editModal.find('#gitHiddenPublicFile').val($this.parents('tr').attr('repositorySSHPublicKeyFileId')); + $editModal.find('#gitHiddenPrivateFile').val($this.parents('tr').attr('repositorySSHPrivateKeyFileId')); + $editModal.find('#certificateFileNameDisplay').append($this.parents('tr').attr('repositorySSHPublicKeyFileName')); + $editModal.find('#privateFileNameDisplay').append($this.parents('tr').attr('repositorySSHPrivateKeyFileName')); + } else { + $editModal.find('#authenticationType').val('token').change().attr('disabled','disabled'); + $editModal.find('#token').val($this.parents('tr').attr('repositoryToken')); + } + }else{ + $('input:radio[name="isAuthenticated"][value="Private"]').attr('disabled', true); + $('input:radio[name="isAuthenticated"][value="Public"]').removeAttr('disabled').prop('checked', true); + $('.isAunthenticatedSection').addClass('hidden'); + $("#authenticationType").val($("#authenticationType option:first").val()); + $editModal.find('#protocolUser').val(''); + $editModal.find('#protocolPassword').val(''); + $('.showForUser').addClass('hidden'); + $('.showForSSH').addClass('hidden'); + $('.showForToken').addClass('hidden'); + } + + return false; +}); + +$('#gitTable tbody').on( 'click', 'button.deleteGitRepo', function(){ + var $this = $(this); + bootbox.confirm({ + message: 'Are you sure you want to Delete GitHub Repo - ' + $this.parents('tr').attr('githubName'), + title: "Warning", + callback: function(result) { + if (result) { + $.ajax({ + url: '../git-hub/' + $this.parents('tr').attr('githubId'), + method: 'DELETE', + success: function() { + getGlobalGitServers(); + }, + error: function(jxhr) { + var msg = "Unable to Delete GitHub Repo please try again later"; + if (jxhr.responseJSON && jxhr.responseJSON.message) { + msg = jxhr.responseJSON.message; + } else if (jxhr.responseText) { + msg = jxhr.responseText; + } + bootbox.alert(msg); + } + }); + } else { + return; + } + } + }); + return false; +}); + +$('#gitTable tbody').on( 'click', 'button.syncGitRepo', function(){ + $('#gitHubListLoader').show(); + var $this = $(this); + $.ajax({ + url: '../git-hub/' + $this.parents('tr').attr('githubId') + '/sync', + method: 'GET', + success: function() { + bootbox.alert('Sucessfully cloned'); + $('#gitHubListLoader').hide(); + }, + error: function(jxhr) { + console.log(jxhr); + var msg = "Unable to Fetch GitRepo please try again later"; + if (jxhr.responseJSON && jxhr.responseJSON.message) { + msg = jxhr.responseJSON.message; + } else if (jxhr.responseText) { + var msgCheck = JSON.parse(jxhr.responseText); + msg = msgCheck.msg; + } + bootbox.alert(msg); + $('#gitHubListLoader').hide(); + } + }); + return false; +}); + + +function saveForm(methodName,url,reqBody) { + $.ajax({ + method: methodName, + url: url, + async:false, + data: reqBody, + success: function(data, success) { + $('#modalForGitEdit').modal('hide'); + $('#saveItemSpinner').addClass('hidden'); + $('#saveBtnTrack').removeAttr('disabled'); + getGlobalGitServers(); + $('#saveBtnTrack').removeAttr('disabled'); + }, + error: function(jxhr) { + console.log(jxhr); + var msg = "Server Behaved Unexpectedly"; + if (jxhr.responseJSON && jxhr.responseJSON.message) { + msg = jxhr.responseJSON.message; + } else if (jxhr.responseText) { + msg = jxhr.responseText; + } + bootbox.alert(msg); + + $('#saveItemSpinner').addClass('hidden'); + $('#saveBtnTrack').removeAttr('disabled'); + } + }); +} + +//save form for creating a new gitHub item and updation of the gitHub details. +$('#gitHubRepoForn').submit(function(e) { + var isValidator = $('#gitHubRepoForn').valid(); + if (!isValidator) { + e.preventDefault(); + return false; + } else { + e.preventDefault(); + $('#saveItemSpinner').removeClass('hidden'); + var $form = $('#gitHubRepoForn'); + $this = $(this); + var repositoryName, orgValue, description, authenticationType, repositoryOwner, repositoryType, + passwordName, userName, certChainFileId, privateKeyFileId, certChainFileName, privateKeyFileName, repositoryToken; + + repositoryName = $this.find('.gitName').val().trim(); + orgValue = $this.find('#orgName').val(); + description = $this.find('#gitDescription').val(); + repositoryOwner = $this.find('#gitRepoOwner').val(); + repositoryType= $('input[name=isAuthenticated]:checked').val(); + authenticationType = $this.find('#authenticationType').val(); + userName = $this.find('#protocolUser').val().trim(); + repositoryToken = $this.find('#token').val().trim(); + passwordName = $this.find('#protocolPassword').val().trim(); + certChainFileId = $this.find('#gitHiddenPublicFile').val(); + privateKeyFileId = $this.find('#gitHiddenPrivateFile').val(); + var dashboardEditNew = $this.find('#gitEditHiddenInput').val(); + var gitHubId = $form.find('input#gitEditHiddenInputId').val(); + var url; + var reqBody = {}; + var methodName; + //for edit of form. + var fileCertificate = $('#certificateFile').get(0).files[0]; + var filePrivate = $('#privateFile').get(0).files[0]; + var formData = new FormData(); + formData.append('file', fileCertificate); + var newFormData = new FormData(); + newFormData.append('file', filePrivate); + if (dashboardEditNew === 'edit') { + url = '../git-hub/' + gitHubId; + methodName = 'PUT'; + } else { + methodName = 'POST'; + url = '../git-hub'; + } + if (authenticationType === 'sshKey') { + if(certChainFileId === '' && privateKeyFileId === ''){ + $.ajax({ + method: "POST", + url: '../fileUpload?fileId=' + certChainFileId, + data: formData, + cache: false, + contentType: false, + processData: false, + success: function(dataCertificate, success) { + $.ajax({ + method: "POST", + url: '../fileUpload?fileId=' + privateKeyFileId, + data: newFormData, + cache: false, + contentType: false, + processData: false, + success: function(dataPrivate, success) { + reqBody = { + "repositoryName": repositoryName, + "orgId": orgValue, + "repositoryDesc": description, + "repositoryOwner": repositoryOwner, + "repositoryType": repositoryType, + "authenticationType": authenticationType, + "repositorySSHPublicKeyFileId": dataCertificate.fileId, + "repositorySSHPrivateKeyFileId": dataPrivate.fileId + } + saveForm(methodName,url,reqBody); + } + }); + } + }); + } else { + reqBody = { + "_id": gitHubId, + "repositoryName": repositoryName, + "orgId": orgValue, + "repositoryDesc": description, + "repositoryOwner": repositoryOwner, + "repositoryType": repositoryType, + "authenticationType": authenticationType, + "repositorySSHPublicKeyFileId": certChainFileId, + "repositorySSHPrivateKeyFileId": privateKeyFileId + } + saveForm(methodName,url,reqBody); + } + } else if (authenticationType === 'userName') { + if(dashboardEditNew === 'new'){ + reqBody = { + "repositoryName": repositoryName, + "orgId": orgValue, + "repositoryDesc": description, + "repositoryOwner": repositoryOwner, + "repositoryType": repositoryType, + "authenticationType": authenticationType, + "repositoryUserName": userName, + "repositoryPassword": passwordName + } + } else { + reqBody = { + "_id": gitHubId, + "repositoryName": repositoryName, + "orgId": orgValue, + "repositoryDesc": description, + "repositoryOwner": repositoryOwner, + "repositoryType": repositoryType, + "authenticationType": authenticationType, + "repositoryUserName": userName, + "repositoryPassword": passwordName + } + } + saveForm(methodName,url,reqBody); + } else if (authenticationType === 'token') { + if(dashboardEditNew === 'new'){ + reqBody = { + "repositoryName": repositoryName, + "orgId": orgValue, + "repositoryDesc": description, + "repositoryOwner": repositoryOwner, + "repositoryType": repositoryType, + "authenticationType": authenticationType, + "repositoryToken": repositoryToken + } + } else { + reqBody = { + "_id": gitHubId, + "repositoryName": repositoryName, + "orgId": orgValue, + "repositoryDesc": description, + "repositoryOwner": repositoryOwner, + "repositoryType": repositoryType, + "authenticationType": authenticationType, + "repositoryToken": repositoryToken + } + } + saveForm(methodName,url,reqBody); + } else { + if(dashboardEditNew === 'new'){ + reqBody = { + "repositoryName": repositoryName, + "orgId": orgValue, + "repositoryDesc": description, + "repositoryOwner": repositoryOwner, + "repositoryType": repositoryType + } + } else { + reqBody = { + "_id": gitHubId, + "repositoryName": repositoryName, + "orgId": orgValue, + "repositoryDesc": description, + "repositoryOwner": repositoryOwner, + "repositoryType": repositoryType + } + } + saveForm(methodName,url,reqBody); + } + return false; + } +}); \ No newline at end of file diff --git a/server/app/model/github/github.js b/server/app/model/github/github.js index d59a18fc7..daddf37e5 100644 --- a/server/app/model/github/github.js +++ b/server/app/model/github/github.js @@ -18,27 +18,37 @@ var mongoose = require('mongoose'); var ObjectId = require('mongoose').Types.ObjectId; var logger = require('_pr/logger')(module); var Schema = mongoose.Schema; +var mongoosePaginate = require('mongoose-paginate'); var GitHubSchema = new Schema({ orgId: { type: String, required: true, trim: true }, - name: { + repositoryName: { type: String, required: true, trim: true }, - description: { + repositoryDesc: { type: String, required: false, trim: true }, - repositoryName: { + repositoryOwner: { type: String, trim: true, required: true }, + repositoryType: { + type: String, + required: true + }, + repositoryToken: { + type: String, + trim: true, + required: false + }, repositoryUserName: { type: String, trim: true, @@ -49,11 +59,6 @@ var GitHubSchema = new Schema({ trim: true, required: false }, - isAuthenticated: { - type: Boolean, - required: false, - default: false - }, authenticationType: { type: String, required: false, @@ -68,9 +73,21 @@ var GitHubSchema = new Schema({ type: String, trim: true, required: false + }, + isRepoCloned:{ + type: Boolean, + required: false, + default:false + }, + createdOn:{ + type: Number, + required: false, + default:Date.now() } }); +GitHubSchema.plugin(mongoosePaginate); + GitHubSchema.statics.createNew = function createNew(gitHubObj, callback) { var self = this; var gitHub = new self(gitHubObj); @@ -85,23 +102,37 @@ GitHubSchema.statics.createNew = function createNew(gitHubObj, callback) { }; GitHubSchema.statics.getGitHubList = function (params, callback) { - this.aggregate([{ - $lookup: { - from: "d4dmastersnew", - localField: "orgId", - foreignField: "rowid", - as: "organization" - } - }], function (err, gitHubList) { + console.log(params); + GitHub.paginate(params.queryObj, params.options, function(err, gitRepoList) { if (err) { - callback(err, null); - return; - } else if (gitHubList.length === 0) { - callback(null, gitHubList); - return; - } else { - return callback(null, gitHubList); + logger.error(err); + var error = new Error('Internal server error'); + error.status = 500; + return callback(error); } + GitHub.aggregate([ + {$match: params.queryObj}, + { + $lookup: { + from: "d4dmastersnew", + localField: "orgId", + foreignField: "rowid", + as: "organization" + } + }, + {$skip: (params.options.page - 1) * params.options.limit}, + {$limit: params.options.limit}, + {$sort: params.options.sort} + ], function (err, gitHubList) { + if (err) { + callback(err, null); + return; + } else { + gitRepoList.docs = gitHubList; + callback(null, gitRepoList); + return; + } + }); }); }; diff --git a/server/app/routes/v1.0/routes_d4dMasters.js b/server/app/routes/v1.0/routes_d4dMasters.js index 0faf7e75b..6dc2f22ca 100755 --- a/server/app/routes/v1.0/routes_d4dMasters.js +++ b/server/app/routes/v1.0/routes_d4dMasters.js @@ -1,12 +1,12 @@ /* 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. @@ -216,10 +216,10 @@ module.exports.setRoutes = function (app, sessionVerification) { app.get('/d4dMasters/mastersjson', function (req, res) { logger.debug("Enter get() for /d4dMasters/mastersjson"); res.send([{ - name: 'master' - }, { - name: 'master2' - }]); + name: 'master' + }, { + name: 'master2' + }]); logger.debug("Exit get() for /d4dMasters/mastersjson"); }); //getAccessFilesForRole @@ -253,10 +253,10 @@ module.exports.setRoutes = function (app, sessionVerification) { logger.debug("Enter get() for /d4dMasters/getuser : " + JSON.stringify(req.session.user)); res.send({ "user": [{ - username: req.session.user - }, { - role: '[' + req.session.user.roleId + ']' - }] + username: req.session.user + }, { + role: '[' + req.session.user.roleId + ']' + }] }); logger.debug("Exit get() for /d4dMasters/getuser"); }); @@ -2520,7 +2520,8 @@ module.exports.setRoutes = function (app, sessionVerification) { // Start Auto create Team if (req.params.id === '1') { d4dModelNew.d4dModelMastersOrg.find({ - orgname: bodyJson["orgname"] + orgname: bodyJson["orgname"], + id: '1' }, function (err, orgs) { if (err) { logger.error('Hit error while check org is exist with Org Name', err); @@ -2701,7 +2702,8 @@ module.exports.setRoutes = function (app, sessionVerification) { } bodyJson["password"] = hashedPassword; d4dModelNew.d4dModelMastersUsers.find({ - loginname: bodyJson["loginname"] + loginname: bodyJson["loginname"], + id: '7' }, function (err, users) { if (err) { logger.error('Hit error while check user is exist with Login Name', err); @@ -2713,8 +2715,9 @@ module.exports.setRoutes = function (app, sessionVerification) { return; } else { d4dModelNew.d4dModelMastersUsers.find({ - email: bodyJson["email"] - },function(err,usersList){ + email: bodyJson["email"], + id: '7' + },function(err,usersList){ if (err) { logger.error('Hit error while check user is exist with email', err); res.send(500); @@ -2806,7 +2809,6 @@ module.exports.setRoutes = function (app, sessionVerification) { }); }); } else if (req.params.id === '4') { - // bodyJson['repositories'] = JSON.parse(bodyJson['repositories']); var projectModel = new d4dModelNew.d4dModelMastersProjects(bodyJson); projectModel.save(function (err, data) { if (err) { @@ -4018,10 +4020,10 @@ module.exports.setRoutes = function (app, sessionVerification) { dockerId: '18' }; async.parallel({ - server: function (callback) { - masterUtil.getServerDetails(jsonData, callback) - } - }, + server: function (callback) { + masterUtil.getServerDetails(jsonData, callback) + } + }, function (err, results) { if (err) res.status(500).send("Internal Server Error"); diff --git a/server/app/routes/v1.0/routes_github.js b/server/app/routes/v1.0/routes_github.js index 24d99f744..af19489de 100644 --- a/server/app/routes/v1.0/routes_github.js +++ b/server/app/routes/v1.0/routes_github.js @@ -18,7 +18,78 @@ var gitHubValidator = require('_pr/validators/gitHubValidator'); module.exports.setRoutes = function(app, sessionVerificationFunc) { app.all('/git-hub/*', sessionVerificationFunc); - + + /** + * @api {get} /git-hub/ List all Git-Hub Repository + * @apiName /git-hub + * @apiGroup List all the Git-Hub Repository with Pagination + * + * @apiQueryParam {Number} page Page Number + * @apiQueryParam {Number} pageSize Number of Records per page + * @apiQueryParam {String} sortBy All the records are sorted By one common field + * @apiQueryParam {String} filterBy All the records are filter By selected values + * @apiQueryParam {String} search All the records are search By input text + * + * @apiSuccess [JSONObject] + * + * @apiSuccessExample Success-Response: + * { + * "gitHub": [{ + * "_id": "586f58a417c109866b1067ba", + * "name": "Durgesh-Bots", + * "description": "BOT Factory", + * "repositoryURL": "https://github.com/RLIndia/botsfactory.git", + * "repositoryType": "Private", + * "orgId": "46d1da9a-d927-41dc-8e9e-7e926d927537", + * "orgName": "Phoenix", + * "repositoryUserName": "Durgesh1988", + * "authenticationType": "userName", + * "repositoryPassword": "Durgesh@12356" + * }], + * "metaData": { + * "totalRecords": 1, + * "pageSize": 50, + * "page": 1, + * "totalPages": 1, + * "sortBy": "createdOn", + * "sortOrder": "asc" + * } + * } + * + * @apiError 400 Bad Request. + * + * @apiErrorExample Error-Response: + * { + * code:400, + * message:'Bad Request', + * fields:{errorMessage:'Bad Request',attribute:'Git-Hub List'} + * }; + * @apiError 403 Forbidden. + * + * @apiErrorExample Error-Response: + * { + * code:403, + * message:'Forbidden', + * fields:{errorMessage:'The request was a valid request, but the server is refusing to respond to it',attribute:'Git-Hub List'} + * }; + * @apiError 404 Not Found. + * + * @apiErrorExample Error-Response: + * { + * code:404, + * message:'Not Found', + * fields:{errorMessage:'The requested resource could not be found but may be available in the future',attribute:'Git-Hub List'} + * }; + * @apiError 500 InternalServerError. + * + * @apiErrorExample Error-Response: + * { + * code:500, + * message:'Internal Server Error', + * fields:{errorMessage:'Server Behaved Unexpectedly',attribute:'Git-Hub List'} + * }; + */ + app.get("/git-hub", getGitHubList); function getGitHubList(req, res) { @@ -35,6 +106,63 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) { }); } + /** + * @api {get} /git-hub/:gitHubId Git-Hub Repository Details + * @apiName /git-hub + * @apiGroup Particular Git-Hub Repository Details + * + * @apiParam {String} gitHubId Git Hub ID + * + * @apiSuccess [JSONObject] + * + * @apiSuccessExample Success-Response: + * { + * "_id": "586f58a417c109866b1067ba", + * "name": "Durgesh-Bots", + * "description": "BOT Factory", + * "repositoryURL": "https://github.com/RLIndia/botsfactory.git", + * "repositoryType": "Private", + * "orgId": "46d1da9a-d927-41dc-8e9e-7e926d927537", + * "orgName": "Phoenix", + * "repositoryUserName": "Durgesh1988", + * "authenticationType": "userName", + * "repositoryPassword": "Durgesh@12356" + * } + * + * @apiError 400 Bad Request. + * + * @apiErrorExample Error-Response: + * { + * code:400, + * message:'Bad Request', + * fields:{errorMessage:'Bad Request',attribute:'Git-Hub List'} + * }; + * @apiError 403 Forbidden. + * + * @apiErrorExample Error-Response: + * { + * code:403, + * message:'Forbidden', + * fields:{errorMessage:'The request was a valid request, but the server is refusing to respond to it',attribute:'Git-Hub List'} + * }; + * @apiError 404 Not Found. + * + * @apiErrorExample Error-Response: + * { + * code:404, + * message:'Not Found', + * fields:{errorMessage:'The requested resource could not be found but may be available in the future',attribute:'Git-Hub List'} + * }; + * @apiError 500 InternalServerError. + * + * @apiErrorExample Error-Response: + * { + * code:500, + * message:'Internal Server Error', + * fields:{errorMessage:'Server Behaved Unexpectedly',attribute:'Git-Hub List'} + * }; + */ + app.get('/git-hub/:gitHubId', getGitHubById); function getGitHubById(req, res) { async.waterfall( @@ -56,6 +184,56 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) { ); } + /** + * @api {get} /git-hub/:gitHubId/sync Git-Hub Repository Sync + * @apiName /git-hub + * @apiGroup Sync Git-Hub Repository + * + * @apiParam {String} gitHubId Git Hub ID + * + * @apiSuccess [JSONObject] + * + * @apiSuccessExample Success-Response: + * { + * code:200, + * message:'Git Hub Repository Successfully Synced.', + * fields:{successMessage:'Git Hub Repository Successfully Synced',attribute:'Git-Hub Sync'} + * } + * + * @apiError 400 Bad Request. + * + * @apiErrorExample Error-Response: + * { + * code:400, + * message:'Bad Request', + * fields:{errorMessage:'Bad Request',attribute:'Git-Hub Sync'} + * }; + * @apiError 403 Forbidden. + * + * @apiErrorExample Error-Response: + * { + * code:403, + * message:'Forbidden', + * fields:{errorMessage:'The request was a valid request, but the server is refusing to respond to it',attribute:'Git-Hub Sync'} + * }; + * @apiError 404 Not Found. + * + * @apiErrorExample Error-Response: + * { + * code:404, + * message:'Not Found', + * fields:{errorMessage:'The requested resource could not be found but may be available in the future',attribute:'Git-Hub Sync'} + * }; + * @apiError 500 InternalServerError. + * + * @apiErrorExample Error-Response: + * { + * code:500, + * message:'Internal Server Error', + * fields:{errorMessage:'Server Behaved Unexpectedly',attribute:'Git-Hub Sync'} + * }; + */ + app.get('/git-hub/:gitHubId/sync', getGitHubSync); function getGitHubSync(req, res) { async.waterfall( @@ -77,6 +255,73 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) { ); } + /** + * @api {post} /git-hub/ Create a Git-Hub Repository + * @apiName /git-hub + * @apiGroup Create a Git-Hub Repository + * + * @apiParamExample {json} Request-Example: + * { + * "name": "Durgesh-Bots", + * "description": "BOT Factory", + * "repositoryURL": "https://github.com/RLIndia/botsfactory.git", + * "repositoryType": "Private", + * "orgId": "46d1da9a-d927-41dc-8e9e-7e926d927537", + * "repositoryUserName": "Durgesh1988", + * "authenticationType": "userName", + * "repositoryPassword": "Durgesh@12356" + * } + * + * @apiSuccess [JSONObject] + * + * @apiSuccessExample Success-Response: + * { + * "_id": "586f58a417c109866b1067ba", + * "name": "Durgesh-Bots", + * "description": "BOT Factory", + * "repositoryURL": "https://github.com/RLIndia/botsfactory.git", + * "repositoryType": "Private", + * "orgId": "46d1da9a-d927-41dc-8e9e-7e926d927537", + * "orgName": "Phoenix", + * "repositoryUserName": "Durgesh1988", + * "authenticationType": "userName", + * "repositoryPassword": "Durgesh@12356" + * } + * + * @apiError 400 Bad Request. + * + * @apiErrorExample Error-Response: + * { + * code:400, + * message:'Bad Request', + * fields:{errorMessage:'Bad Request',attribute:'Git-Hub Creation'} + * }; + * @apiError 403 Forbidden. + * + * @apiErrorExample Error-Response: + * { + * code:403, + * message:'Forbidden', + * fields:{errorMessage:'The request was a valid request, but the server is refusing to respond to it',attribute:'Git-Hub Creation'} + * }; + * @apiError 404 Not Found. + * + * @apiErrorExample Error-Response: + * { + * code:404, + * message:'Not Found', + * fields:{errorMessage:'The requested resource could not be found but may be available in the future',attribute:'Git-Hub Creation'} + * }; + * @apiError 500 InternalServerError. + * + * @apiErrorExample Error-Response: + * { + * code:500, + * message:'Internal Server Error', + * fields:{errorMessage:'Server Behaved Unexpectedly',attribute:'Git-Hub Creation'} + * }; + */ + app.post('/git-hub', validate(gitHubValidator.create), createGitHub); function createGitHub(req, res) { @@ -96,6 +341,67 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) { ); } + /** + * @api {put} /git-hub/:gitHubId Update a Git-Hub Repository + * @apiName /git-hub + * @apiGroup Update a Git-Hub Repository + * + * @apiParamExample {json} Request-Example: + * { + * "_id": "586f58a417c109866b1067ba" + * "name": "Durgesh-Bots", + * "description": "BOT Factory", + * "repositoryURL": "https://github.com/RLIndia/botsfactory.git", + * "repositoryType": "Private", + * "orgId": "46d1da9a-d927-41dc-8e9e-7e926d927537", + * "repositoryUserName": "Durgesh1988", + * "authenticationType": "userName", + * "repositoryPassword": "Durgesh@12356" + * } + * + * @apiSuccess [JSONObject] + * + * @apiSuccessExample Success-Response: + * { + * code:200, + * message:'Git Hub Repository Successfully updated.', + * fields:{successMessage:'Git Hub Repository Successfully updated',attribute:'Git-Hub Updating'} + * } + * + * @apiError 400 Bad Request. + * + * @apiErrorExample Error-Response: + * { + * code:400, + * message:'Bad Request', + * fields:{errorMessage:'Bad Request',attribute:'Git-Hub Updating'} + * }; + * @apiError 403 Forbidden. + * + * @apiErrorExample Error-Response: + * { + * code:403, + * message:'Forbidden', + * fields:{errorMessage:'The request was a valid request, but the server is refusing to respond to it',attribute:'Git-Hub Updating'} + * }; + * @apiError 404 Not Found. + * + * @apiErrorExample Error-Response: + * { + * code:404, + * message:'Not Found', + * fields:{errorMessage:'The requested resource could not be found but may be available in the future',attribute:'Git-Hub Updating'} + * }; + * @apiError 500 InternalServerError. + * + * @apiErrorExample Error-Response: + * { + * code:500, + * message:'Internal Server Error', + * fields:{errorMessage:'Server Behaved Unexpectedly',attribute:'Git-Hub Updating'} + * }; + */ + app.put('/git-hub/:gitHubId', validate(gitHubValidator.update), updateGitHub); @@ -128,6 +434,11 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) { * @apiSuccess [JSONObject] * * @apiSuccessExample Success-Response: + * { + * code:200, + * message:'Git Hub Repository Successfully deleted.', + * fields:{successMessage:'Git Hub Repository Successfully deleted',attribute:'Git-Hub Deletion'} + * } * * @apiError 400 Bad Request. * diff --git a/server/app/services/auditTrailService.js b/server/app/services/auditTrailService.js index 7f255f007..2fb5c2386 100644 --- a/server/app/services/auditTrailService.js +++ b/server/app/services/auditTrailService.js @@ -189,11 +189,25 @@ auditTrailService.getBOTsSummary = function getBOTsSummary(callback){ actionStatus:'success', isDeleted:false }; - auditTrail.getAuditTrails(query,function(err,data){ + var botsIds = []; + auditTrail.getAuditTrails(query, function(err,botsAudits){ if(err){ callback(err,null); - }else { - callback(null, data.length); + }else if (botsAudits.length > 0) { + var results = []; + for (var i = 0; i < botsAudits.length; i++) { + if (botsIds.indexOf(botsAudits[i].auditId) === -1) { + botsIds.push(botsAudits[i].auditId); + results.push(botsAudits[i].auditId); + } else { + results.push(botsAudits[i].auditId); + } + } + if (results.length === botsAudits.length) { + callback(null,botsIds.length); + } + } else { + callback(null,botsIds.length); } }); @@ -213,14 +227,27 @@ auditTrailService.getBOTsSummary = function getBOTsSummary(callback){ actionStatus:'running', isDeleted:false }; - auditTrail.getAuditTrails(query,function(err,data){ + var botsIds = []; + auditTrail.getAuditTrails(query, function(err,botsAudits){ if(err){ callback(err,null); - }else { - callback(null, data.length); + }else if (botsAudits.length > 0) { + var results = []; + for (var i = 0; i < botsAudits.length; i++) { + if (botsIds.indexOf(botsAudits[i].auditId) === -1) { + botsIds.push(botsAudits[i].auditId); + results.push(botsAudits[i].auditId); + } else { + results.push(botsAudits[i].auditId); + } + } + if (results.length === botsAudits.length) { + callback(null,botsIds.length); + } + } else { + callback(null,botsIds.length); } }); - }, totalSavedTimeForBots: function(callback){ var query={ @@ -257,11 +284,25 @@ auditTrailService.getBOTsSummary = function getBOTsSummary(callback){ actionStatus:'failed', isDeleted:false }; - auditTrail.getAuditTrails(query,function(err,data){ + var botsIds = []; + auditTrail.getAuditTrails(query, function(err,botsAudits){ if(err){ callback(err,null); - }else { - callback(null, data.length); + }else if (botsAudits.length > 0) { + var results = []; + for (var i = 0; i < botsAudits.length; i++) { + if (botsIds.indexOf(botsAudits[i].auditId) === -1) { + botsIds.push(botsAudits[i].auditId); + results.push(botsAudits[i].auditId); + } else { + results.push(botsAudits[i].auditId); + } + } + if (results.length === botsAudits.length) { + callback(null,botsIds.length); + } + } else { + callback(null,botsIds.length); } }); } diff --git a/server/app/services/botsService.js b/server/app/services/botsService.js index 4ef646c3c..72ae9647d 100644 --- a/server/app/services/botsService.js +++ b/server/app/services/botsService.js @@ -174,7 +174,8 @@ botsService.getBotsList = function getBotsList(botsQuery,actionStatus,callback) if(actionStatus !== null){ var query = { auditType: 'BOTs', - actionStatus: actionStatus + actionStatus: actionStatus, + isDeleted:false }; var botsIds = []; auditTrail.getAuditTrails(query, function(err,botsAudits){ diff --git a/server/app/services/gitHubService.js b/server/app/services/gitHubService.js index 4c454fa27..e3854144a 100644 --- a/server/app/services/gitHubService.js +++ b/server/app/services/gitHubService.js @@ -1,12 +1,12 @@ /* 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. @@ -18,6 +18,12 @@ var logger = require('_pr/logger')(module); var gitHubModel = require('_pr/model/github/github.js'); var appConfig = require('_pr/config'); var Cryptography = require('_pr/lib/utils/cryptography'); +var fileUpload = require('_pr/model/file-upload/file-upload'); +var nodeGit = require('nodegit'); +var async = require('async'); +var apiUtil = require('_pr/lib/utils/apiUtil.js'); +var promisify = require("promisify-node"); +var fse = promisify(require("fs-extra")); var gitGubService = module.exports = {}; @@ -39,7 +45,7 @@ gitGubService.checkIfGitHubExists = function checkIfGitHubExists(gitHubId, callb gitGubService.createGitHub = function createGitHub(gitHubObj, callback) { - if(gitHubObj.isAuthenticated === true || gitHubObj.isAuthenticated === 'true'){ + if(gitHubObj.repositoryType === 'Private' && gitHubObj.authenticationType === 'userName'){ var cryptoConfig = appConfig.cryptoSettings; var cryptography = new Cryptography(cryptoConfig.algorithm, cryptoConfig.password); gitHubObj.repositoryPassword = cryptography.encryptText(gitHubObj.repositoryPassword, cryptoConfig.encryptionEncoding, @@ -61,7 +67,7 @@ gitGubService.createGitHub = function createGitHub(gitHubObj, callback) { }; gitGubService.updateGitHub = function updateGitHub(gitHubId, gitHubObj, callback) { - if((gitHubObj.isAuthenticated === true || gitHubObj.isAuthenticated === 'true') && gitHubObj.authenticationType === 'UserName'){ + if(gitHubObj.repositoryType === 'Private' && gitHubObj.authenticationType === 'userName'){ var cryptoConfig = appConfig.cryptoSettings; var cryptography = new Cryptography(cryptoConfig.algorithm, cryptoConfig.password); gitHubObj.repositoryPassword = cryptography.encryptText(gitHubObj.repositoryPassword, cryptoConfig.encryptionEncoding, @@ -105,36 +111,144 @@ gitGubService.getGitHubSync = function getGitHubSync(gitHubId, callback) { err.status = 404; return callback(err); } else{ - + formatGitHubResponse(gitHub,function(formattedGitHub){ + if(formattedGitHub.repositoryType === 'Private' && formattedGitHub.authenticationType === 'token') { + var cloneOpts = { + fetchOpts: { + callbacks: { + credentials: function () { + var cred = nodeGit.Cred.userpassPlaintextNew(formattedGitHub.repositoryToken, "x-oauth-basic"); + return cred; + }, + certificateCheck: function() { + return 1; + } + } + } + } + var localClonePath = "/tmp/"+ formattedGitHub.repositoryName; + var repoUrl = "https://github.com/" + formattedGitHub.repositoryOwner + "/" + formattedGitHub.repositoryName + ".git"; + gitRepoCloning(repoUrl,localClonePath,cloneOpts,gitHubId,function(err,cloneStatus){ + if(err){ + callback(err,null); + return; + }else{ + callback(null,cloneStatus); + return; + } + }); + } else if(formattedGitHub.repositoryType === 'Private' && formattedGitHub.authenticationType === 'userName') { + var cloneOpts = { + fetchOpts: { + callbacks: { + credentials: function () { + var cred = nodeGit.Cred.userpassPlaintextNew(formattedGitHub.repositoryUserName, formattedGitHub.repositoryPassword); + return cred; + }, + certificateCheck: function() { + return 1; + } + } + } + } + var localClonePath = "/tmp/"+ formattedGitHub.repositoryName; + var repoUrl = "https://github.com/" + formattedGitHub.repositoryOwner + "/" + formattedGitHub.repositoryName + ".git"; + gitRepoCloning(repoUrl,localClonePath,cloneOpts,gitHubId,function(err,cloneStatus){ + if(err){ + callback(err,null); + return; + }else{ + callback(null,cloneStatus); + return; + } + }); + }else if(formattedGitHub.repositoryType === 'Private' && formattedGitHub.authenticationType === 'sshKey') { + var cloneOpts = { + fetchOpts: { + callbacks: { + credentials: function () { + var cred = nodeGit.Cred.sshKeyNew(formattedGitHub.repositoryUserName, formattedGitHub.repositorySSHPublicKeyFileData,formattedGitHub.repositorySSHPrivateKeyFileData,''); + return cred; + }, + certificateCheck: function() { + return 1; + } + } + } + } + var localClonePath = "/tmp/"+ formattedGitHub.repositoryName; + var repoUrl = "https://github.com/" + formattedGitHub.repositoryOwner + "/" + formattedGitHub.repositoryName + ".git"; + gitRepoCloning(repoUrl,localClonePath,cloneOpts,gitHubId,function(err,cloneStatus){ + if(err){ + callback(err,null); + return; + }else{ + callback(null,cloneStatus); + return; + } + }); + }else{ + var localClonePath = "/tmp/"+ formattedGitHub.repositoryName; + var repoUrl = "https://github.com/" + formattedGitHub.repositoryOwner + "/" + formattedGitHub.repositoryName + ".git"; + gitRepoCloning(repoUrl,localClonePath,{},gitHubId,function(err,cloneStatus){ + if(err){ + callback(err,null); + return; + }else{ + callback(null,cloneStatus); + return; + } + }); + } + }) } }); }; gitGubService.getGitHubList = function getGitHubList(query, callback) { - var params = {}; - logger.debug('get GitHub'); - if ('filterBy' in query) { - params = parseFilterBy(query.filterBy); - } - gitHubModel.getGitHubList(params, function (err, gitHubList) { - if (err) { - logger.error(err); - var err = new Error('Internal Server Error'); - err.status = 500; - return callback(err); - } else { - var response = []; - if (gitHubList.length > 0) { - for (var i = 0; i < gitHubList.length; i++) { - response.push(formatGitHubResponse(gitHubList[i])); - if (response.length === gitHubList.length) { - return callback(null, response); - } + var reqData = {}; + async.waterfall([ + function(next) { + apiUtil.changeRequestForJqueryPagination(query, next); + }, + function(filterQuery,next) { + reqData = filterQuery; + apiUtil.paginationRequest(filterQuery, 'gitHub', next); + }, + function(paginationReq, next) { + paginationReq['searchColumns'] = ['name', 'repositoryType', 'repositoryURL']; + apiUtil.databaseUtil(paginationReq, next); + }, + function(queryObj, next) { + gitHubModel.getGitHubList(queryObj, next); + }, + function(gitHubList, next) { + if (gitHubList.docs.length > 0) { + var formattedResponseList = []; + for (var i = 0; i < gitHubList.docs.length; i++) { + formatGitHubResponse(gitHubList.docs[i],function(formattedData){ + formattedResponseList.push(formattedData); + if (formattedResponseList.length === gitHubList.docs.length) { + gitHubList.docs = formattedResponseList; + next(null,gitHubList); + } + }); } } else { - return callback(null, response); + next(null,gitHubList); } + }, + function(formattedGitHubResponseList, next) { + apiUtil.changeResponseForJqueryPagination(formattedGitHubResponseList, reqData, next); + } + ],function(err, results) { + if (err){ + logger.error(err); + callback(err,null); + return; } + callback(null,results) + return; }); }; @@ -149,41 +263,81 @@ gitGubService.getGitHubById = function getGitHubById(gitHubId, callback) { err.status = 404; return callback(err); } else{ - callback(null,formatGitHubResponse(gitHub)); + formatGitHubResponse(gitHub,function(err,formattedData){ + callback(null,formattedData); + }); } }); }; - -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; -}; - -function formatGitHubResponse(gitHub) { +function formatGitHubResponse(gitHub,callback) { var formatted = { _id:gitHub._id, - name:gitHub.name, - description:gitHub.description, repositoryName:gitHub.repositoryName, - isAuthenticated:gitHub.isAuthenticated + repositoryDesc:gitHub.repositoryDesc, + repositoryOwner:gitHub.repositoryOwner, + repositoryType:gitHub.repositoryType }; if (gitHub.organization.length) { formatted.orgId = gitHub.organization[0].rowid; formatted.orgName=gitHub.organization[0].orgname; } - if (gitHub.isAuthenticated === true) { + if (gitHub.repositoryType === 'Private' && gitHub.authenticationType === 'userName') { formatted.repositoryUserName = gitHub.repositoryUserName; + formatted.authenticationType = gitHub.authenticationType; var cryptoConfig = appConfig.cryptoSettings; var cryptography = new Cryptography(cryptoConfig.algorithm, cryptoConfig.password); formatted.repositoryPassword = cryptography.decryptText(gitHub.repositoryPassword, cryptoConfig.decryptionEncoding, cryptoConfig.encryptionEncoding); + callback(formatted); + }else if (gitHub.repositoryType === 'Private' && gitHub.authenticationType === 'sshKey') { + formatted.authenticationType = gitHub.authenticationType; + fileUpload.getReadStreamFileByFileId(gitHub.repositorySSHPublicKeyFileId,function(err,publicKeyFile){ + if(err){ + var err = new Error('Internal server error'); + err.status = 500; + logger.error(err); + } + formatted.repositorySSHPublicKeyFileId = gitHub.repositorySSHPublicKeyFileId; + formatted.repositorySSHPublicKeyFileName = publicKeyFile.fileName; + formatted.repositorySSHPublicKeyFileData = publicKeyFile.fileData; + fileUpload.getReadStreamFileByFileId(gitHub.repositorySSHPrivateKeyFileId,function(err,privateKeyFile){ + if(err){ + var err = new Error('Internal server error'); + err.status = 500; + logger.error(err); + } + formatted.repositorySSHPrivateKeyFileId = gitHub.repositorySSHPrivateKeyFileId; + formatted.repositorySSHPrivateKeyFileName = privateKeyFile.fileName; + formatted.repositorySSHPrivateKeyFileData = privateKeyFile.fileData; + callback(formatted); + }); + }); + }else if (gitHub.repositoryType === 'Private' && gitHub.authenticationType === 'token') { + formatted.authenticationType = gitHub.authenticationType; + formatted.repositoryToken = gitHub.repositoryToken; + callback(formatted); + }else { + formatted.authenticationType = gitHub.authenticationType; + callback(formatted); } - return formatted; +} + +function gitRepoCloning(url,path,options,gitHubId,callback){ + fse.remove(path).then(function() { + nodeGit.Clone(url, path, options).then(function(repo){ + gitHubModel.updateGitHub(gitHubId, {isRepoCloned:true}, function (err, gitHub) { + if (err) { + logger.error(err); + } + logger.debug("GIT Repository Clone is Done."); + callback(null, repo); + }); + }).catch(function(err){ + var err = new Error('Invalid Git-Hub Details'); + err.status = 400; + err.msg = 'Invalid Git-Hub Details'; + callback(err, null); + }) + }); } diff --git a/server/app/services/instanceService.js b/server/app/services/instanceService.js index 2a3b24681..13b232adb 100644 --- a/server/app/services/instanceService.js +++ b/server/app/services/instanceService.js @@ -46,7 +46,6 @@ var AppData = require('_pr/model/app-deploy/app-data'); var instancesDao = require('_pr/model/classes/instance/instance'); var providerService = require('_pr/services/providerService.js'); var schedulerService = require('_pr/services/schedulerService.js'); -var catalystSync = require('_pr/cronjobs/catalyst-scheduler/catalystScheduler.js'); var instanceService = module.exports = {}; @@ -1485,6 +1484,7 @@ function updateScheduler(instanceScheduler, callback) { return callback(err, null); } else { callback(null, {"message": "Scheduler Updated."}); + var catalystSync = require('_pr/cronjobs/catalyst-scheduler/catalystScheduler.js'); catalystSync.executeScheduledInstances(); return; } diff --git a/server/app/validators/gitHubValidator.js b/server/app/validators/gitHubValidator.js index 75e1beb9a..dd1c3027b 100644 --- a/server/app/validators/gitHubValidator.js +++ b/server/app/validators/gitHubValidator.js @@ -21,15 +21,17 @@ var monitorsValidator = module.exports = {}; monitorsValidator.create = { body: { "orgId": Joi.string().max(40).required(), - "name": Joi.string().max(40).required(), - "repositoryName": Joi.string().max(40).required() + "repositoryName": Joi.string().max(40).required(), + "repositoryOwner": Joi.string().max(100).required(), + "repositoryType": Joi.string().max(40).required() } }; monitorsValidator.update = { body: { "orgId": Joi.string().max(40).required(), - "name": Joi.string().max(40).required(), - "repositoryName": Joi.string().max(40).required() + "repositoryName": Joi.string().max(40).required(), + "repositoryOwner": Joi.string().max(100).required(), + "repositoryType": Joi.string().max(40).required() } }; diff --git a/server/install.js b/server/install.js index 4e15ebef8..e8296e38a 100755 --- a/server/install.js +++ b/server/install.js @@ -116,7 +116,8 @@ function getDefaultsConfig() { "blueprints":"name", "compositeBlueprints":"name", "containerLogs":"createdOn", - "bots":"createdOn" + "bots":"createdOn", + "gitHub":"createdOn" }, skip_Records : 1, max_record_limit : 200, diff --git a/server/package.json b/server/package.json index 1a23f28dd..99e0c3794 100644 --- a/server/package.json +++ b/server/package.json @@ -74,7 +74,9 @@ "moment": "2.14.1", "json2csv": "3.6.3", "gridfs-stream":"1.1.1", - "mongoose-double": "0.0.1" + "mongoose-double": "0.0.1", + "nodegit": "0.16.0", + "promisify":"0.0.3" }, "devDependencies": { "grunt": "0.4.5", From 336947de55fcb5d6617de6786d4fb6f695d08030 Mon Sep 17 00:00:00 2001 From: Durgesh1988 Date: Fri, 13 Jan 2017 15:20:39 +0530 Subject: [PATCH 36/81] GIT Hub Implementation --- client/htmls/private/ajax/Settings/githubList.html | 9 ++++----- client/htmls/private/js/{githubList.js => gitHubList.js} | 3 --- server/app/model/github/github.js | 1 - 3 files changed, 4 insertions(+), 9 deletions(-) rename client/htmls/private/js/{githubList.js => gitHubList.js} (99%) diff --git a/client/htmls/private/ajax/Settings/githubList.html b/client/htmls/private/ajax/Settings/githubList.html index b60d04e7e..476adde66 100644 --- a/client/htmls/private/ajax/Settings/githubList.html +++ b/client/htmls/private/ajax/Settings/githubList.html @@ -30,9 +30,8 @@

    - - - + + @@ -77,13 +76,13 @@

    - +
    - +
    diff --git a/client/htmls/private/js/githubList.js b/client/htmls/private/js/gitHubList.js similarity index 99% rename from client/htmls/private/js/githubList.js rename to client/htmls/private/js/gitHubList.js index 26b33fbe6..45aa0d276 100644 --- a/client/htmls/private/js/githubList.js +++ b/client/htmls/private/js/gitHubList.js @@ -17,8 +17,6 @@ if (!$.fn.dataTable.isDataTable('#gitTable')) { "bSortable": false }, { "bSortable": false - }, { - "bSortable": false }] }); @@ -173,7 +171,6 @@ function getGlobalGitServers() { "ajax": '/git-hub', "columns": [ {"data": "repositoryName", "orderable" : true}, - {"data": "repositoryDesc" ,"orderable" : false }, {"data": "orgName","orderable" : false }, {"data": "repositoryOwner" ,"orderable" : false }, {"data": "repositoryType" ,"orderable" : false}, diff --git a/server/app/model/github/github.js b/server/app/model/github/github.js index daddf37e5..141ed5ee4 100644 --- a/server/app/model/github/github.js +++ b/server/app/model/github/github.js @@ -102,7 +102,6 @@ GitHubSchema.statics.createNew = function createNew(gitHubObj, callback) { }; GitHubSchema.statics.getGitHubList = function (params, callback) { - console.log(params); GitHub.paginate(params.queryObj, params.options, function(err, gitRepoList) { if (err) { logger.error(err); From cd0cd0d49f8200840ef7af21a8a2d9adadefaa0c Mon Sep 17 00:00:00 2001 From: Divakar Konakalla Date: Fri, 13 Jan 2017 15:26:07 +0530 Subject: [PATCH 37/81] BOTs filter related UI changes, added right side panel for filter hide/show, modified BOT types as per new requirements. --- .../sections/dashboard/bots/bots.scss | 17 ++-- .../dashboard/bots/controller/libraryCtrl.js | 16 ++-- .../sections/dashboard/bots/view/library.html | 88 ++++++++++--------- .../orchestration/popups/newTask.html | 2 +- server/install.js | 2 +- 5 files changed, 64 insertions(+), 61 deletions(-) diff --git a/client/cat3/src/partials/sections/dashboard/bots/bots.scss b/client/cat3/src/partials/sections/dashboard/bots/bots.scss index c2942a792..c4886c643 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/bots.scss +++ b/client/cat3/src/partials/sections/dashboard/bots/bots.scss @@ -12,6 +12,10 @@ margin-left: 23px; } +.marginbottom15 { + margin-bottom: 15px; +} + .paddingbottom10 { padding-bottom: 10px; } @@ -92,17 +96,8 @@ width: 100%; } - .botFilter, .botSubFilter { - height: 26px; - padding: 2px 12px; - } - - .botFilter { - width: 112px; - } - - .botSubFilter { - width: 200px; + .filter-margin { + margin: 2px 10px 0 0; } .filter-by-text { 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 51f766d88..f91f81caf 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js @@ -12,6 +12,7 @@ var treeNames = ['BOTs','Library']; $rootScope.$emit('treeNameUpdate', treeNames); var lib=this; + $rootScope.isOpenSidebar = false; $scope.totalBotsSelected = true; $scope.botCategoryList = []; workzoneServices.getBotCategoryList().then(function (catList) { @@ -36,10 +37,11 @@ 'row.entity.botLinkedSubCategory'+ 'row.entity.taskType'+ 'row.entity.botType',cellTooltip: true}, - { name: 'BOT Type',displayName: 'BOT Type',field:'botLinkedCategory',cellTooltip: true}, + { name: 'BOT Type',displayName: 'BOT Type',field:'botType',cellTooltip: true}, { name: 'BOT Name',displayName: 'BOT Name',field:'botName',cellTooltip: true}, { name: 'Category',field:'botCategory',cellTooltip: true}, { name: 'description',field:'botDesc',cellTooltip: true}, + { name: 'BOT Created From',displayName: 'BOT Created From',field:'botLinkedCategory',cellTooltip: true}, { name: 'Organization',field:'masterDetails.orgName',cellTooltip: true}, { name: 'Total Runs',field:'executionCount'}, { name: 'BOT Action',width:200,displayName: 'BOT Action',cellTemplate: @@ -161,26 +163,23 @@ $scope.searchBotNameCategory(); } }); - //$scope.subFilterBy = true; - $scope.filterBy = function() { + + $scope.filterBy = function() { if($scope.botLibFilter === 'botType') { $scope.filterByBotType = true; $scope.filterByTaskType = false; $scope.filterByCategory = false; $scope.subFilterBy = false; - $scope.filterByAll(); } else if($scope.botLibFilter === 'taskType') { $scope.filterByTaskType = true; $scope.filterByBotType = false; $scope.filterByCategory = false; $scope.subFilterBy = false; - $scope.filterByAll(); } else if($scope.botLibFilter === 'category') { $scope.filterByCategory = true; $scope.filterByBotType = false; $scope.filterByTaskType = false; $scope.subFilterBy = false; - $scope.filterByAll(); } else { $scope.subFilterBy = true; $scope.filterByBotType = false; @@ -189,11 +188,12 @@ //$scope.showAllBots(); } }; - $scope.filterByAll = function() { + + $rootScope.applyFilter = function() { lib.gridOptions=[]; if ($scope.botLibFilter === 'botType') { var param={ - url:'/bots?filterBy=botLinkedCategory:'+$scope.botLibFilterBot+'&page=' + $scope.paginationParams.page +'&pageSize=' + $scope.paginationParams.pageSize +'&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder + url:'/bots?filterBy=botType:'+$scope.botLibFilterBot+'&page=' + $scope.paginationParams.page +'&pageSize=' + $scope.paginationParams.pageSize +'&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder } } else if($scope.botLibFilter === 'taskType') { var param={ 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 dcfa8889a..96f93c694 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/view/library.html +++ b/client/cat3/src/partials/sections/dashboard/bots/view/library.html @@ -4,13 +4,57 @@
    BOTs Library  - - + +
    +
    @@ -115,42 +159,6 @@
    -
    -
    -
    - - - - -
    -
    -
    -
    -
    -
    -
    -
    - -
    -
    -
    diff --git a/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/newTask.html b/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/newTask.html index 98a6df5bf..5a2f55ef5 100644 --- a/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/newTask.html +++ b/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/newTask.html @@ -64,7 +64,7 @@
    Job Details
    diff --git a/server/install.js b/server/install.js index 4e15ebef8..7cca386e3 100755 --- a/server/install.js +++ b/server/install.js @@ -133,7 +133,7 @@ function getDefaultsConfig() { }, taggingServerList: ['Sensu Server','LDAP Server','AD Server'], botTypeList: ['Task','Check','Learning', 'Composite','Built with other','Run','UI'], - categoryList: ['Active Directory', 'OpenDJ LDAP','Monitoring', 'Application Deployment', 'Service Management', 'Database Management', 'Upgrade', 'Installation'], + categoryList: ['Active Directory', 'OpenDJ LDAP','Monitoring', 'Application Deployment', 'Service Management', 'User Management', 'Upgrade', 'Installation'], aws: { pemFileLocation: __dirname + '/app/config/', s3BucketDownloadFileLocation: currentDirectory + '/catdata/catalyst/temp/', From ab1441b83c3a960c74887b7018b2776d1f48b8c7 Mon Sep 17 00:00:00 2001 From: Durgesh1988 Date: Mon, 16 Jan 2017 13:12:44 +0530 Subject: [PATCH 38/81] GIT Hub Implementation --- .../app/cronjobs/provider-rds-s3-sync/AWSRDSS3ProviderSync.js | 2 +- server/app/model/bots/1.1/{bots.js => botsDao.js} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename server/app/model/bots/1.1/{bots.js => botsDao.js} (100%) diff --git a/server/app/cronjobs/provider-rds-s3-sync/AWSRDSS3ProviderSync.js b/server/app/cronjobs/provider-rds-s3-sync/AWSRDSS3ProviderSync.js index f74a011c5..c127eef6c 100644 --- a/server/app/cronjobs/provider-rds-s3-sync/AWSRDSS3ProviderSync.js +++ b/server/app/cronjobs/provider-rds-s3-sync/AWSRDSS3ProviderSync.js @@ -312,7 +312,7 @@ function deleteRDSResourceData(rdsInfo,providerId, callback) { })(rdsData[i]); } } else { - next(null, dbNames); + next(null, rdsData); } }], function (err, results) { if (err) { diff --git a/server/app/model/bots/1.1/bots.js b/server/app/model/bots/1.1/botsDao.js similarity index 100% rename from server/app/model/bots/1.1/bots.js rename to server/app/model/bots/1.1/botsDao.js From e77d03fb36754ad0d4d89777348a67d89689ee55 Mon Sep 17 00:00:00 2001 From: Durgesh1988 Date: Mon, 16 Jan 2017 13:20:02 +0530 Subject: [PATCH 39/81] GIT Hub Implementation --- server/package.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/server/package.json b/server/package.json index 99e0c3794..4aaf98450 100644 --- a/server/package.json +++ b/server/package.json @@ -76,7 +76,9 @@ "gridfs-stream":"1.1.1", "mongoose-double": "0.0.1", "nodegit": "0.16.0", - "promisify":"0.0.3" + "promisify":"0.0.3", + "filehound":"1.13.0", + "yamljs":"0.2.8" }, "devDependencies": { "grunt": "0.4.5", From 787fae3aa0e24aa2a5b475f099520cef6fa333f2 Mon Sep 17 00:00:00 2001 From: hrushikesh07 Date: Mon, 16 Jan 2017 14:08:14 +0530 Subject: [PATCH 40/81] API changed --- .../analytics/controller/capacityReportCtrl.js | 5 +++-- .../dashboard/analytics/view/capacityReport.html | 10 ---------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/client/cat3/src/partials/sections/dashboard/analytics/controller/capacityReportCtrl.js b/client/cat3/src/partials/sections/dashboard/analytics/controller/capacityReportCtrl.js index 9f10b06f7..4278907da 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/controller/capacityReportCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/analytics/controller/capacityReportCtrl.js @@ -57,7 +57,7 @@ $rootScope.applyFilter =function(filterApp,period){ analyticsServices.applyFilter(filterApp,period); if($state.current.name === "dashboard.analytics.capacityReport") { - capRept.getCapacityData($rootScope.filterNewEnt); + capRept.createList(); } }; capRept.init =function(){ @@ -66,6 +66,7 @@ $rootScope.$emit('INI_usage', 'Unassigned'); $timeout(function () { $rootScope.applyFilter(true,'month'); + capRept.getCapacityData($rootScope.filterNewEnt); var treeNames = ['Cloud Management','Analytics','capacity']; $rootScope.$emit('treeNameUpdate', treeNames); },500); @@ -178,7 +179,7 @@ } else if(fltrObj && fltrObj.provider && fltrObj.provider.id){ var param = { inlineLoader:true, - url: '/resources?filterBy=providerId:'+fltrObj.provider.id+'+resourceType:'+capRept.serviceType+'+category:'+$rootScope.organNewEnt.instanceType.toLowerCase() + url: '/resources?filterBy=providerDetails.id:'+fltrObj.provider.id+'+resourceType:'+capRept.serviceType+'+category:'+$rootScope.organNewEnt.instanceType.toLowerCase() //url:'?filterBy=providerId:57e3774d4e738a500b342889+resourceType:RDS+category:unassigned' }; genSevs.promiseGet(param).then(function (instResult) { diff --git a/client/cat3/src/partials/sections/dashboard/analytics/view/capacityReport.html b/client/cat3/src/partials/sections/dashboard/analytics/view/capacityReport.html index 34d39a93e..3678a2b34 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/view/capacityReport.html +++ b/client/cat3/src/partials/sections/dashboard/analytics/view/capacityReport.html @@ -16,7 +16,6 @@
    -
    @@ -50,16 +49,7 @@

    -
    -
    -
    -
    -
    - No Data Available. -
    -
    -