Skip to content

BOTs Summary and Audit Trail Implementation #968

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 24, 2016
Merged

BOTs Summary and Audit Trail Implementation #968

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
675ba24
BOTs Summary and Audit Trail Implementation
Durgesh1988 Nov 23, 2016
30eff72
BOTs Summary and Audit Trail Implementation
Durgesh1988 Nov 23, 2016
37b7caf
Merge remote-tracking branch 'upstream/dev' into dev
Durgesh1988 Nov 23, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 2 additions & 15 deletions server/app/model/audit-trail/audit-trail.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,21 +35,8 @@ AuditTrailSchema.statics.getAuditTrailList = function(auditTrailQuery,callback){
});
};

AuditTrailSchema.statics.getAuditTrailByStatus = function(auditType,actionStatus,callback){
AuditTrail.find({auditType:auditType,actionStatus:actionStatus}, function(err, auditTrailList) {
if (err) {
logger.error(err);
var error = new Error('Internal server error');
error.status = 500;
return callback(error);
}
return callback(null, auditTrailList);
});
};


AuditTrailSchema.statics.getAuditTrailByType = function(auditType,callback){
AuditTrail.find({auditType:auditType}, function(err, auditTrailList) {
AuditTrailSchema.statics.getAuditTrails = function(queryObj,callback){
AuditTrail.find(queryObj, function(err, auditTrailList) {
if (err) {
logger.error(err);
var error = new Error('Internal server error');
Expand Down
2 changes: 1 addition & 1 deletion server/app/model/blueprint/blueprint.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1009,7 +1009,7 @@ BlueprintSchema.statics.getBlueprintsByOrgBgProject = function(jsonData, callbac
};


BlueprintSchema.statics.getBlueprintsServiceDeliveryCheck = function(serviceDeliveryCheck, callback) {
BlueprintSchema.statics.getAllServiceDeliveryBlueprint = function(serviceDeliveryCheck, callback) {
this.find({serviceDeliveryCheck:serviceDeliveryCheck}, function(err, blueprints) {
if (err) {
callback(err, null);
Expand Down
59 changes: 1 addition & 58 deletions server/app/model/classes/tasks/tasks.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,63 +360,6 @@ taskSchema.methods.getPuppetTaskNodes = function() {
return [];
}
};

/*taskSchema.methods.getHistory = function(callback) {
TaskHistory.getHistoryByTaskId(this.id, function(err, tHistories) {
if (err) {
callback(err, null);
return;
}
var checker;
var uniqueResults = [];
if (tHistories && tHistories.length) {
for (var i = 0; i < tHistories.length; ++i) {
if (!checker || comparer(checker, tHistories[i]) != 0) {
checker = tHistories[i];
uniqueResults.push(checker);
}
}

if (uniqueResults.length) {
var hCount = 0;
for (var i = 0; i < uniqueResults.length; i++) {
(function(i) {
if (uniqueResults[i].nodeIds && uniqueResults[i].nodeIds.length) {
instancesDao.getInstancesByIDs(uniqueResults[i].nodeIds, function(err, data) {
hCount++;
if (err) {
return;
}

if (data && data.length) {
var pId = [];
for (var j = 0; j < data.length; j++) {
pId.push(data[j].platformId);
}
uniqueResults[i] = JSON.parse(JSON.stringify(uniqueResults[i]));
uniqueResults[i]['platformId'] = pId;
}

if (uniqueResults.length == hCount) {
return callback(null, uniqueResults);
}
});
} else {
hCount++;
if (uniqueResults.length == hCount) {
return callback(null, uniqueResults);
}
}
})(i);
}
}

} else {
return callback(null, tHistories);
}
});
};*/

taskSchema.methods.getHistory = function(callback) {
TaskHistory.getHistoryByTaskId(this.id, function(err, tHistories) {
if (err) {
Expand Down Expand Up @@ -598,7 +541,7 @@ taskSchema.statics.getScriptTypeTask = function(callback){
});
};

taskSchema.statics.getTasksServiceDeliveryCheck = function(serviceDeliveryCheck, callback) {
taskSchema.statics.getAllServiceDeliveryTask = function(serviceDeliveryCheck, callback) {
this.find({serviceDeliveryCheck:serviceDeliveryCheck}, function(err, tasks) {
if (err) {
callback(err, null);
Expand Down
24 changes: 9 additions & 15 deletions server/app/routes/v1.0/routes_blueprints.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,25 +28,19 @@ var auditTrailService = require('_pr/services/auditTrailService');
module.exports.setRoutes = function(app, sessionVerificationFunc) {
app.all('/blueprints/*', sessionVerificationFunc);

app.get('/blueprints/serviceDelivery', function(req, res) {
var serviceDeliveryCheck = false;
if(req.query.serviceDeliveryCheck &&
(req.query.serviceDeliveryCheck === 'true' || req.query.serviceDeliveryCheck === true)) {
serviceDeliveryCheck = true;
app.get('/blueprints', function(req, res) {
var queryObj = {
serviceDeliveryCheck : req.query.serviceDeliveryCheck === "true" ? true:false,
actionStatus:req.query.actionStatus
}

Blueprints.getBlueprintsServiceDeliveryCheck(serviceDeliveryCheck, function(err, blueprints) {
blueprintService.getAllServiceDeliveryBlueprint(queryObj, function(err,data){
if (err) {
res.status(500).send({
code: 500,
errMessage: "Blueprints fetch failed."
});
return;
return res.status(500).send(err);
} else {
return res.status(200).send(data);
}
res.status(200).send(blueprints);
});
})
});

app.delete('/blueprints/serviceDelivery/:blueprintId', function(req, res) {
Blueprints.removeServiceDeliveryBlueprints(req.params.blueprintId, function(err, data) {
if (err) {
Expand Down
138 changes: 52 additions & 86 deletions server/app/routes/v1.0/routes_tasks.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,39 +38,7 @@ var fileIo = require('_pr/lib/utils/fileio');
module.exports.setRoutes = function(app, sessionVerification) {
app.all('/tasks/*', sessionVerification);

app.get('/tasks/serviceDelivery', function(req, res) {
var serviceDeliveryCheck = false;
if (req.query.serviceDeliveryCheck &&
(req.query.serviceDeliveryCheck === 'true' || req.query.serviceDeliveryCheck === true)) {
serviceDeliveryCheck = true;
}
Tasks.getTasksServiceDeliveryCheck(serviceDeliveryCheck, function(err, tasks) {
if (err) {
res.status(500).send({
code: 500,
errMessage: "Task fetch failed."
});
return;
}
res.status(200).send(tasks);
});
});

app.delete('/tasks/serviceDelivery/:taskId', function(req, res) {
Tasks.removeServiceDeliveryTask(req.params.taskId, function(err, data) {
if (err) {
logger.error("Failed to delete service delivery Task", err);
res.send(500, errorResponses.db.error);
return;
}
res.send(200, {
message: "deleted"
});
});
});

app.get('/tasks/history/list/all', function(req, res) {
logger.debug("------------------ ", JSON.stringify(TaskHistory));
TaskHistory.listHistory(function(err, tHistories) {
if (err) {
res.status(500).send(errorResponses.db.error);
Expand Down Expand Up @@ -126,7 +94,22 @@ module.exports.setRoutes = function(app, sessionVerification) {
});
});

app.delete('/tasks/serviceDelivery/:taskId', function(req, res) {
Tasks.removeServiceDeliveryTask(req.params.taskId, function(err, data) {
if (err) {
logger.error("Failed to delete service delivery Task", err);
res.send(500, errorResponses.db.error);
return;
}
res.send(200, {
message: "deleted"
});
});
});


app.post('/tasks/:taskId/run', function(req, res) {

var taskId = req.params.taskId;
var user = req.session.user.cn;
var hostProtocol = req.protocol + '://' + req.get('host');
Expand All @@ -136,43 +119,11 @@ module.exports.setRoutes = function(app, sessionVerification) {
var cookbookAttributes = req.body.cookbookAttributes;
var botTagServer = req.body.tagServer;


logger.debug('reqbody ======>', JSON.stringify(req.body));



/*Tasks.getTaskById(req.params.taskId, function(err, task) {

if (err) {
logger.error(err);
res.status(500).send(errorResponses.db.error);
return;
}
var blueprintIds = [];
if (task.blueprintIds && task.blueprintIds.length) {
blueprintIds = task.blueprintIds
}
task.execute(req.session.user.cn, req.protocol + '://' + req.get('host'), choiceParam, nexusData, blueprintIds, task.envId, function(err, taskRes, historyData) {
if (err) {
logger.error(err);
res.status(500).send(err);
return;
}
if (historyData) {
taskRes.historyId = historyData.id;
}
logger.debug("taskRes::::: ", JSON.stringify(taskRes));
res.send(taskRes);
});
});
*/

var paramOptions = {
cookbookAttributes: cookbookAttributes,
scriptParams: scriptParams
};

// encrypting script bot params if any
if (paramOptions.scriptParams && paramOptions.scriptParams.length) {
var cryptoConfig = appConfig.cryptoSettings;
var cryptography = new Cryptography(cryptoConfig.algorithm, cryptoConfig.password);
Expand All @@ -185,8 +136,6 @@ module.exports.setRoutes = function(app, sessionVerification) {
paramOptions.scriptParams = encryptedParams;
}



taskService.executeTask(taskId, user, hostProtocol, choiceParam, appData, paramOptions, botTagServer, function(err, historyData) {
if (err === 404) {
res.status(404).send("Task not found.");
Expand Down Expand Up @@ -524,27 +473,44 @@ module.exports.setRoutes = function(app, sessionVerification) {

function getTaskList(req, res, next) {
var reqData = {};
async.waterfall(
[

function(next) {
apiUtil.paginationRequest(req.query, 'tasks', next);
},
function(paginationReq, next) {
reqData = paginationReq;
Tasks.listTasks(paginationReq, next);
},
function(tasks, next) {
apiUtil.paginationResponse(tasks, reqData, next);
if(req.query.page) {
async.waterfall(
[
function (next) {
apiUtil.paginationRequest(req.query, 'tasks', next);
},
function (paginationReq, next) {
paginationReq['searchColumns'] = ['name', 'orgName', 'bgName', 'projectName', 'envName'];
reqData = paginationReq;
apiUtil.databaseUtil(paginationReq, next);
},
function (queryObj, next) {
Tasks.listTasks(queryObj, next);
},
function (tasks, next) {
apiUtil.paginationResponse(tasks, reqData, next);
}
],
function (err, results) {
if (err) {
return res.status(500).send(err);
} else {
return res.status(200).send(results);
}
});
}else{
var queryObj = {
serviceDeliveryCheck : req.query.serviceDeliveryCheck === "true" ? true:false,
actionStatus:req.query.actionStatus
}
taskService.getAllServiceDeliveryTask(queryObj, function(err,data){
if (err) {
return res.status(500).send(err);
} else {
return res.status(200).send(data);
}

],
function(err, results) {
if (err)
next(err);
else
return res.status(200).send(results);
});
})
}
}

app.post('/tasks/:taskId/update', function(req, res) {
Expand Down
24 changes: 20 additions & 4 deletions server/app/services/auditTrailService.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ auditTrailService.insertAuditTrail = function insertAuditTrail(auditDetails,audi
envName: auditDetails.envName?auditDetails.envName:auditDetails.environmentName
},
status: actionObj.status,
auditCategory:actionObj.auditCategory,
actionStatus: actionObj.actionStatus,
user: actionObj.catUser,
startedOn: new Date().getTime(),
Expand Down Expand Up @@ -197,7 +198,11 @@ auditTrailService.getBOTsSummary = function getBOTsSummary(callback){

},
totalNoOfSuccessBots: function(callback){
auditTrail.getAuditTrailByStatus('BOTs','success',function(err,data){
var query={
auditType:'BOTs',
actionStatus:'success'
};
auditTrail.getAuditTrails(query,function(err,data){
if(err){
callback(err,null);
}
Expand All @@ -206,7 +211,11 @@ auditTrailService.getBOTsSummary = function getBOTsSummary(callback){

},
totalNoOfRunningBots: function(callback){
auditTrail.getAuditTrailByStatus('BOTs','running',function(err,data){
var query={
auditType:'BOTs',
actionStatus:'running'
};
auditTrail.getAuditTrails(query,function(err,data){
if(err){
callback(err,null);
}
Expand All @@ -215,7 +224,10 @@ auditTrailService.getBOTsSummary = function getBOTsSummary(callback){

},
totalSavedTimeForBots: function(callback){
auditTrail.getAuditTrailByType('BOTs',function(err,botAuditTrail){
var query={
auditType:'BOTs'
};
auditTrail.getAuditTrails(query,function(err,botAuditTrail){
if(err){
callback(err,null);
} else if(botAuditTrail.length > 0){
Expand All @@ -238,7 +250,11 @@ auditTrailService.getBOTsSummary = function getBOTsSummary(callback){
});
},
totalNoOfFailedBots: function(callback){
auditTrail.getAuditTrailByStatus('BOTs','failed',function(err,data){
var query={
auditType:'BOTs',
actionStatus:'failed'
};
auditTrail.getAuditTrails(query,function(err,data){
if(err){
callback(err,null);
}
Expand Down
Loading