Skip to content

BOTs Audit Trail Implementation #952

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 9 commits into from
Nov 22, 2016
Merged

BOTs Audit Trail Implementation #952

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c3dab06
BOTs Summary Implementation
Durgesh1988 Nov 21, 2016
c23b6cf
BOTs Audit Trail Implementation
Durgesh1988 Nov 21, 2016
a7f98cb
BOTs Audit Trail Implementation
Durgesh1988 Nov 22, 2016
75a9d15
BOTs Audit Trail Implementation
Durgesh1988 Nov 22, 2016
97ea9f6
BOTs Audit Trail Implementation
Durgesh1988 Nov 22, 2016
c2099ba
BOTs Audit Trail Implementation
Durgesh1988 Nov 22, 2016
7f6d643
BOTs Audit Trail Implementation
Durgesh1988 Nov 22, 2016
ecd1645
Resolved merge conflicts
Durgesh1988 Nov 22, 2016
94b5b78
Resolved merge conflicts
Durgesh1988 Nov 22, 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
200 changes: 100 additions & 100 deletions client/cat3/src/partials/sections/dashboard/bots/view/library.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,63 +2,63 @@
<div class="container summary-container">
<div class="panel-group text-center">
<div class="col-md-4ths infrastructureClass" data-text="Total Number of Providers">
<div class="small-box bg-aqua">
<div class="inner">
<h3 id="totalProviders">{{botSummary.totalNoOfBots}}</h3>
<p>Total <br>Number of BOTs</p>
</div>
<div class="icon">
<i class="fa fa-th" style="color: rgba(0, 0, 0, 0.15)"></i>
</div>
<div class="small-box bg-aqua">
<div class="inner">
<h3 id="totalProviders">{{botSummary.totalNoOfBots}}</h3>
<p>Total <br>Number of BOTs</p>
</div>
<div class="icon">
<i class="fa fa-th" style="color: rgba(0, 0, 0, 0.15)"></i>
</div>
<span class="small-box-footer managedUnmanagedCSS">
</span>
</div>
</div>
<div class="col-md-4ths infrastructureClass" data-text="Total Number of Providers">
<div class="small-box bg-aqua">
<div class="inner">
<h3 id="totalProviders">{{botSummary.totalNoOfSuccessBots}}</h3>
<p>Total <br>Number of BOTs running</p>
</div>
<div class="icon">
<i class="fa fa-laptop" style="color: rgba(0, 0, 0, 0.15)"></i>
</div>
</div>
</div>
<div class="col-md-4ths infrastructureClass" data-text="Total Number of Providers">
<div class="small-box bg-aqua">
<div class="inner">
<h3 id="totalProviders">{{botSummary.totalNoOfSuccessBots}}</h3>
<p>Total <br>Number of BOTs running</p>
</div>
<div class="icon">
<i class="fa fa-laptop" style="color: rgba(0, 0, 0, 0.15)"></i>
</div>
<span class="small-box-footer managedUnmanagedCSS">
</span>
</div>
</div>
<div class="col-md-4ths infrastructureClass" data-text="Total Number of Providers">
<div class="small-box bg-aqua">
<div class="inner">
<h3 id="totalProviders">{{botSummary.totalSavedTimeForBots/60}} mins</h3>
<p>Total <br>Time saved</p>
</div>
<div class="icon">
<i class="fa fa-cube" style="color: rgba(0, 0, 0, 0.15)"></i>
</div>
</div>
</div>
<div class="col-md-4ths infrastructureClass" data-text="Total Number of Providers">
<div class="small-box bg-aqua">
<div class="inner">
<h3 id="totalProviders">{{botSummary.totalSavedTimeForBots}} mins</h3>
<p>Total <br>Time saved</p>
</div>
<div class="icon">
<i class="fa fa-cube" style="color: rgba(0, 0, 0, 0.15)"></i>
</div>
<span class="small-box-footer managedUnmanagedCSS">
</span>
</div>
</div>
<div class="col-md-4ths infrastructureClass" data-text="Total Number of Providers">
<div class="small-box bg-aqua">
<div class="inner">
<h3 id="totalProviders">{{botSummary.totalNoOfFailedBots}}</h3>
<p>Total <br>Number of failed runs</p>
</div>
<div class="icon">
<i class="fa fa-external-link" style="color: rgba(0, 0, 0, 0.15)"></i>
</div>
</div>
</div>
<div class="col-md-4ths infrastructureClass" data-text="Total Number of Providers">
<div class="small-box bg-aqua">
<div class="inner">
<h3 id="totalProviders">{{botSummary.totalNoOfFailedBots}}</h3>
<p>Total <br>Number of failed runs</p>
</div>
<div class="icon">
<i class="fa fa-external-link" style="color: rgba(0, 0, 0, 0.15)"></i>
</div>
<span class="small-box-footer managedUnmanagedCSS">
</span>
</div>
</div>
</div>
</div>
</div>
</div>

<div id="grid" ng-if="libr.gridOptions.data.length > 0" ui-grid="libr.gridOptions" ui-grid-pagination class="grid" style="height: {{gridHeight}}px"></div>
<div class="alert alert-info text-center" ng-if="!libr.gridOptions.data.length > 0">
No data Available
No data Available
</div>
</div>

Expand All @@ -69,99 +69,99 @@ <h3 id="totalProviders">{{botSummary.totalNoOfFailedBots}}</h3>

.summary-container {
width: 100%;
margin: 15px 0;
margin: 15px 0;
}

.panel-heading {
font-weight: bold;
}

.col-md-4ths {
width: 25%;
float: left;
width: 25%;
float: left;
}

.col-md-4ths {
position: relative;
min-height: 1px;
padding-right: 10px;
padding-left: 10px;
color: #fff;
position: relative;
min-height: 1px;
padding-right: 10px;
padding-left: 10px;
color: #fff;
}

.small-box {
border-radius: 2px;
position: relative;
display: block;
/* margin-bottom: 2px; */
margin-bottom: 15px;
box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1);
border-radius: 2px;
position: relative;
display: block;
/* margin-bottom: 2px; */
margin-bottom: 15px;
box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1);
}

.bg-aqua {
background-color: #00c0ef !important;
background-color: #00c0ef !important;
}

.small-box .icon {
-webkit-transition: all 0.3s linear;
-o-transition: all 0.3s linear;
transition: all 0.3s linear;
position: absolute;
/* top: -10px; */
top: 10px;
right: 10px;
z-index: 0;
font-size: 90px;
color: rgba(0, 0, 0, 0.15);
-webkit-transition: all 0.3s linear;
-o-transition: all 0.3s linear;
transition: all 0.3s linear;
position: absolute;
/* top: -10px; */
top: 10px;
right: 10px;
z-index: 0;
font-size: 90px;
color: rgba(0, 0, 0, 0.15);
}

.small-box h3 {
font-size: 38px;
font-weight: bold;
margin: 0 0 10px 0;
white-space: nowrap;
padding: 0;
text-align: left;
font-size: 38px;
font-weight: bold;
margin: 0 0 10px 0;
white-space: nowrap;
padding: 0;
text-align: left;
}


.small-box p {
font-size: 13px;
text-align: left;
font-size: 13px;
text-align: left;
}

.small-box > .inner {
padding: 10px;
padding: 10px;
}

.small-box > .small-box-footer {
position: relative;
text-align: center;
padding: 3px 0;
color: #fff;
color: rgba(255, 255, 255, 0.8);
display: block;
z-index: 10;
background: rgba(0, 0, 0, 0.1);
text-decoration: none;
cursor: pointer;
height: 27px;
position: relative;
text-align: center;
padding: 3px 0;
color: #fff;
color: rgba(255, 255, 255, 0.8);
display: block;
z-index: 10;
background: rgba(0, 0, 0, 0.1);
text-decoration: none;
cursor: pointer;
height: 27px;
}

.small-box .icon {
-webkit-transition: all 0.3s linear;
-o-transition: all 0.3s linear;
transition: all 0.3s linear;
position: absolute;
/* top: -10px; */
top: 10px;
right: 10px;
z-index: 0;
font-size: 90px;
color: rgba(0, 0, 0, 0.15);
-webkit-transition: all 0.3s linear;
-o-transition: all 0.3s linear;
transition: all 0.3s linear;
position: absolute;
/* top: -10px; */
top: 10px;
right: 10px;
z-index: 0;
font-size: 90px;
color: rgba(0, 0, 0, 0.15);
}

.small-box .icon {
color: rgba(0, 0, 0, 0.15) !important;
color: rgba(0, 0, 0, 0.15) !important;
}
</style>
2 changes: 0 additions & 2 deletions server/app/cronjobs/docker-container-sync/DockerContainerSync.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,8 +270,6 @@ function saveAndUpdateContainers(containers,containerIds,instanceId,instance,nex
log: logs,
timestamp: timestampStarted
});


var containerLogs ={
actionId: actionLog._id,
containerId: container.Id,
Expand Down
16 changes: 8 additions & 8 deletions server/app/model/audit-trail/base-audit-trail.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,42 +34,42 @@ var AuditTrailSchema = function AuditTrail() {
orgName: {
type: String,
trim:true,
required:true
required:false
},
orgId: {
type: String,
trim:true,
required:true
required:false
},
bgName: {
type: String,
trim:true,
required:true
required:false
},
bgId: {
type: String,
trim:true,
required:true
required:false
},
projectName: {
type: String,
trim:true,
required:true
required:false
},
projectId: {
type: String,
trim:true,
required:true
required:false
},
envName: {
type: String,
trim:true,
required:true
required:false
},
envId: {
type: String,
trim:true,
required:true
required:false
}
},
auditType: {
Expand Down
1 change: 0 additions & 1 deletion server/app/model/audit-trail/bot-audit-trail.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ var BotAuditTrailSchema = new BaseAuditTrail({
},
type: {
type: String,
unique: true,
trim:true
},
description:{
Expand Down
5 changes: 2 additions & 3 deletions server/app/model/audit-trail/container-audit-trail.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,13 @@ var ContainerAuditTrailSchema = new BaseAuditTrail({
},
name: {
type: String,
unique: true,
trim:true
},
Image:{
image:{
type: String,
trim:true
},
ImageId:{
imageId:{
type: String,
trim:true
},
Expand Down
1 change: 0 additions & 1 deletion server/app/model/audit-trail/instance-audit-trail.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ var InstanceAuditTrailSchema = new BaseAuditTrail({
},
platform: {
type: String,
unique: true,
trim: true
},
os: {
Expand Down
2 changes: 1 addition & 1 deletion ...pp/model/blueprint/blueprint-types/cloud-formation-blueprint/cloud-formation-blueprint.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ CloudFormationBlueprintSchema.methods.launch = function(launchParams, callback)
return;
}
callback(null, {
stackId: cloudFormation._id
stackId: cloudFormation._id,
});

awsCF.waitForStackCompleteStatus(stackData.StackId, function(err, completeStack) {
Expand Down
Loading