Skip to content

RDS ,S3 listing is completed #1129

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 2 commits into from
Jan 12, 2017
Merged

RDS ,S3 listing is completed #1129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2cdc6af
RDS ,S3 listing is done
Jan 12, 2017
d5708dc
RDS ,S3 listing is done
Jan 12, 2017
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
1 change: 1 addition & 0 deletions client/cat3/main.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@
<script src="src/partials/sections/dashboard/analytics/analyticsServices.js"></script>
<script src="src/partials/sections/dashboard/analytics/controller/costCtrl.js"></script>
<script src="src/partials/sections/dashboard/analytics/controller/capacityCtrl.js"></script>
<script src="src/partials/sections/dashboard/analytics/controller/capacityReportCtrl.js"></script>
<script src="src/partials/sections/dashboard/analytics/controller/discoveryResourcesCtrl.js"></script>
<script src="src/partials/sections/dashboard/analytics/controller/discoverySyncResultCtrl.js"></script>
<script src="src/partials/sections/dashboard/analytics/controller/discoveryTagMappingCtrl.js"></script>
Expand Down
18 changes: 18 additions & 0 deletions client/cat3/src/partials/sections/dashboard/analytics/analytics.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
483 changes: 268 additions & 215 deletions client/cat3/src/partials/sections/dashboard/analytics/controller/capacityCtrl.js
View file
Open in desktop

Large diffs are not rendered by default.

358 changes: 358 additions & 0 deletions client/cat3/src/partials/sections/dashboard/analytics/controller/capacityReportCtrl.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion client/cat3/src/partials/sections/dashboard/analytics/view/analyticsTreeMenu.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
</div>
</div>
</li>
<li class="pointer-cursor" ui-sref="dashboard.analytics.capacity" ui-sref-active='activeSection' >
<li class="pointer-cursor" ui-sref="dashboard.analytics.capacityReport" ui-sref-active='activeSection' >
<div class="liContents">
<div class="liContents-wrapper">
<i class="icon fa fa-pie-chart label-spacing"></i>
Expand Down
67 changes: 32 additions & 35 deletions client/cat3/src/partials/sections/dashboard/analytics/view/capacity.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,51 +1,48 @@
<div class="leftnavdiv" style="padding-right:7px;">
<br>
<!--<div class="col-lg-12 col-md-12 col-sm-12 top-stats">-->
<!--<div class="col-lg-9 col-md-9 col-sm-12 no-padding" >-->
<!--<span class="box-title font-size-15" ><span>Total Capacity:</span> <span class="red">{{capaCtr.serviceCapacity.totalCapacity}}</span> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>-->
<!--<span class="box-title font-size-15" ><span>Services</span>-->
<!--<span class="badge cursor" ng-repeat="(value , key) in capaCtr.serviceCapacity.services" ng-click="gototab(value)"> {{value}} : {{key}}</span>-->
<!--</span>-->
<!--</div>-->
<!--<div class="col-lg-3 col-md-3 col-sm-12 text-right no-padding" >-->
<!--<div ng-show="stateItems.filterView.splitUpType && splitUpCapacities.length > 1">-->
<!--<span class="box-title font-size-15">Segregated by </span>-->
<!--<select class="form-control select2 select2-hidden-accessible" ng-model="analytic.splitUp" ng-options="sp.id as sp.val for sp in splitUpCapacities" >-->
<!--</select>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<div class="col-lg-12 col-md-12 col-sm-12 top-stats">
<div class="col-lg-9 col-md-9 col-sm-12 no-padding" >
<span class="box-title font-size-15" ng-show="capaCtr.pieChat.data.length >0" ><span>Total Capacity:</span> <span class="red">{{capaCtr.pieChat.totalCoust}}</span> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
<span class="box-title font-size-15" ng-show="capaCtr.pieChat.data.length >0"><span>Services</span>
<span class="badge" ng-repeat="(value , key) in capaCtr.serviceCapacity"> {{value}} : {{key}}</span>
</span>
</div>
<div class="col-lg-3 col-md-3 col-sm-12 text-right no-padding" >
<div ng-show="stateItems.filterView.splitUpType && splitUpCapacities.length > 1">
<span class="box-title font-size-15">Segregated by </span>
<select class="form-control select2 select2-hidden-accessible" ng-model="analytic.splitUp" ng-options="sp.id as sp.val for sp in splitUpCapacities" >
</select>
</div>
</div>
</div>
<div class="clearfix"></div>
<div ng-if="analytic.tabShowChat">
<div class="row">
<div class="clearfix"></div>
<!--ng-repeat="(value , key) in capaCtr.serviceCapacity"-->
<div class="col-lg-12 col-md-12 col-sm-12" >
<div class="col-lg-4 col-md-4 col-sm-12" >
<div class="box box-infobox box-info">
<div class="box-header with-border">
<h3 class="box-title font-size-15"><i class="fa fa-pie-chart"></i> Aggregate Capacity</h3>
</div>
<div class="box-body" ><nvd3 options="capaCtr.pieChat.option" data="capaCtr.pieChat.data"></nvd3></div>
</div>
</div>
<div class="col-lg-8 col-md-8 col-sm-12" >
<div class="box box-infobox box-info">
<div class="box-header with-border"><h3 class="box-title font-size-15"><i class="fa fa-bar-chart"></i> Distribution of all services across {{capaCtr.splitUp}}</h3>

<h3 class="box-title font-size-15"> <i class="fa fa-list-ol"></i> Instance


</h3>
<!--<div class="box-tools pull-right">-->
<!--Service: <select class="form-control select2 select2-hidden-accessible" ng-model="capaCtr.serviceType" style=" display: table-cell; width: auto;" >-->
<!--<option ng-repeat="(value , key) in capaCtr.serviceCapacity.services" value="{{value}}"> {{value}} : {{key}}</option>-->
<!--</select>-->
<!--</div>-->
</div>
<div class="box-body" >
<input ng-if="capaCtr.listGrid['RDS'].data.length > 0" ng-model='capaCtr.filterValue' class="form-control with250" ng-change="filterInst()" placeholder="Search" />
<div ng-if="capaCtr.listGrid['RDS'].data.length >0" ui-grid="capaCtr.listGrid['RDS']" ui-grid-exporter ui-grid-auto-resize ui-grid-pagination class="grid margintop15"></div>
<div ng-if="!capaCtr.listGrid['RDS'].data.length >0">
<div class="alert alert-warning">
No Data Available.
</div>
</div>
<div class="box-body" ><nvd3 options="capaCtr.barChat.option" data="capaCtr.barChat.data"></nvd3></div>
</div>
</div>
<div class="col-lg-12 col-md-12 col-sm-12" ng-show="false" >
<div class="box box-infobox box-info">
<div class="box-header with-border"><h3 class="box-title font-size-15"> <i class="fa fa-line-chart"></i> Daily trends of cost across organization</h3>
</div>
<div class="box-body" ><nvd3 options="capaCtr.trendLineChart.options" data="capaCtr.trendLineChart.data" class="with-3d-shadow with-transitions"></nvd3></div>
</div>
</div>
</div>
</div>
</div>
<div ng-if="analytic.tabShowReport">
<div ng-if="capaCtr.capaGridOptions.data.length >0" ui-grid="capaCtr.capaGridOptions" ui-grid-selection ui-grid-exporter ui-grid-auto-resize class="grid"></div>
Expand Down
7 changes: 2 additions & 5 deletions client/cat3/src/partials/sections/dashboard/analytics/view/capacityChart.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,8 @@ <h4 class="modal-title">
<span class="pull-right">
<span class="box-title font-size-15">Usage Type</span>
<select class="form-control select2 select2-hidden-accessible " ng-change="capChat.splitChange()" style="width: auto;height: 31px;display: table-cell" ng-model="capChat.splitUp" >
<option value="CPUUtilization">CPUUtilization</option>
<option value="DiskReadBytes">DiskReadBytes</option>
<option value="DiskWriteBytes">DiskWriteBytes</option>
<option value="NetworkIn">NetworkIn</option>
<option value="NetworkOut">NetworkOut</option>
<option ng-repeat="(val,ke) in capChat.sliptOptions" value="{{ke}}">{{ke}}</option>

</select>
</span>
</div>
Expand Down
72 changes: 72 additions & 0 deletions client/cat3/src/partials/sections/dashboard/analytics/view/capacityReport.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
<div class="leftnavdiv" style="padding-right:7px;">
<br>
<!--<div class="col-lg-12 col-md-12 col-sm-12 top-stats">-->
<!--<div class="col-lg-9 col-md-9 col-sm-12 no-padding" >-->
<!--<span class="box-title font-size-15" ><span>Total Capacity:</span> <span class="red">{{capRept.serviceCapacity.totalCapacity}}</span> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>-->
<!--<span class="box-title font-size-15" ><span>Services</span>-->
<!--<span class="badge cursor" ng-repeat="(value , key) in capRept.serviceCapacity.services" ng-click="gototab(value)"> {{value}} : {{key}}</span>-->
<!--</span>-->
<!--</div>-->
<!--<div class="col-lg-3 col-md-3 col-sm-12 text-right no-padding" >-->
<!--<div ng-show="stateItems.filterView.splitUpType && splitUpCapacities.length > 1">-->
<!--<span class="box-title font-size-15">Segregated by </span>-->
<!--<select class="form-control select2 select2-hidden-accessible" ng-model="analytic.splitUp" ng-options="sp.id as sp.val for sp in splitUpCapacities" >-->
<!--</select>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<div class="clearfix"></div>
<div ng-if="analytic.tabShowChat">
<div class="row">
<div class="clearfix"></div>
<!--ng-repeat="(value , key) in capRept.serviceCapacity"-->
<div class="col-lg-12 col-md-12 col-sm-12" >
<div class="box box-infobox box-info">
<div class="box-header with-border">

<h3 class="box-title font-size-15">


</h3>
<div class="box-tools" style="left: 10px;">
<ul class="nav nav-tabs inst">
<li class="active"><a ng-click="capRept.serviceType = 'Instance' " data-toggle="tab"><i class="fa fa-list-ol"></i> Instance</a></li>
<li ng-repeat="(value , key) in capRept.serviceCapacity.services"><a ng-click="capRept.serviceType = value" data-toggle="tab"><i class="fa fa-list-ol"></i> {{value}} </a></li>
</ul>
<!--Service: <select class="form-control select2 select2-hidden-accessible" ng-model="capRept.serviceType" style=" display: table-cell; width: auto;" >-->
<!--<option ng-repeat="(value , key) in capRept.serviceCapacity.services" value="{{value}}"> {{value}} : {{key}}</option>-->
<!--</select>-->
</div>
</div>
<div class="box-body" >

<input ng-if="!capRept.listGrid[capRept.serviceType].nodataFound" ng-model='capRept.filterValue' class="form-control with250" ng-change="filterInst()" placeholder="Search" />
<div ng-if="!capRept.listGrid[capRept.serviceType].nodataFound" ui-grid="capRept.listGrid[capRept.serviceType]" ui-grid-exporter ui-grid-auto-resize ui-grid-pagination class="grid margintop15"></div>
<div ng-if="capRept.listGrid[capRept.serviceType].nodataFound">
<div class="alert alert-warning">
No Data Available.
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<div ng-if="analytic.tabShowReport">
<div ng-if="capRept.capaGridOptions.data.length >0" ui-grid="capRept.capaGridOptions" ui-grid-selection ui-grid-exporter ui-grid-auto-resize class="grid"></div>
<div ng-if="!capRept.capaGridOptions.data.length >0">
<div class="alert alert-warning">
No Data Available.
</div>
</div>

</div>
</div>
<style>
.inst > li > a {
padding: 7px 7px !important;
}
.inst {
border-bottom: 0px solid #ddd !important;
}
</style >