Skip to content

All instance listed for capacity #1124

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 1 commit into from
Jan 10, 2017
Merged

All instance listed for capacity #1124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion 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,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();
Expand Down
44 changes: 36 additions & 8 deletions client/cat3/src/partials/sections/dashboard/analytics/controller/capacityCtrl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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(){
Expand Down Expand Up @@ -112,26 +114,52 @@
cellTooltip: true
},
{name: 'orgName', displayName: 'Org Name', field: 'orgName', cellTooltip: true},
{name: 'cost', displayName: 'cost',cellTemplate: '<span>{{row.entity.cost.symbol}} {{row.entity.cost.aggregateInstanceCost}}</span>'},
{name: 'Usage', cellTooltip: true,cellTemplate:"<span class='cursor' ng-click='grid.appScope.openChart(row.entity)'><i class=\"fa fa-bar-chart\"></i></span>"},
{name: 'cost', displayName: 'cost',cellTemplate: '<span ng-bind-html="grid.appScope.aggregateInstanceCost(row.entity.cost)"></span>'},
{name: 'Action', cellTooltip: true,cellTemplate:"<span class='cursor' title='Usage' style='font-size: 14px;' ng-click='grid.appScope.openChart(row.entity)'><i class=\"fa fa-line-chart\"></i></span> " +
"&nbsp;&nbsp; <span class='cursor' ng-click='grid.appScope.Schedule(row.entity._id)' style='font-size: 14px;' title='Schedule'><i class=\"fa fa-calendar\"></i></span>"}
// {name: 'Chef', cellTooltip: true,cellTemplate:"<span class='cursor' ng-click='grid.appScope.chefConfig(row.entity)'><i class=\"fa fa-eye\" title=\"Chef Configuration\"></i></span>"}
];
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 + '/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();
};
Expand Down Expand Up @@ -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]);
});
Expand Down
18 changes: 14 additions & 4 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
Expand Up @@ -2,9 +2,9 @@
<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" 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 cursor" ng-repeat="(value , key) in capaCtr.serviceCapacity" ng-click="gototab(value)"> {{value}} : {{key}}</span>-->
<!--<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" >-->
Expand All @@ -22,7 +22,17 @@
<!--ng-repeat="(value , key) in capaCtr.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"> <i class="fa fa-line-chart"></i> <a id="{{value}}">Instnce</a> </h3>
<div class="box-header with-border">

<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" />
Expand Down