Skip to content

Usage report added #813

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
Oct 10, 2016
Merged

Usage report added #813

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.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@
<div id='rightPanel' class='container-fluid'>
<ul class="nav nav-tabs" >
<li ng-class="{'active':analytic.tabShowChat === true}"><a ng-click="analytic.tabShow(true,false)" ><i class="fa fa-area-chart fa-2" aria-hidden="true"></i> Dashboard</a></li>
<li ng-show="!stateItems.filterView.report" ng-class="{'active':analytic.tabShowReport === true}"><a ng-click="analytic.tabShow(false,true)" ><i class="fa fa-file-text fa-2" aria-hidden="true"></i> Reports</a></li>
<li ng-class="{'active':analytic.tabShowReport === true}"><a ng-click="analytic.tabShow(false,true)" ><i class="fa fa-file-text fa-2" aria-hidden="true"></i> Reports</a></li>
<li class="form-group pull-right filter-btn" >
<button type="button" class="btn btn-xs cat-btn-update ng-scope pull-right margin-left6" ng-click="isOpenSidebar = !isOpenSidebar">
<i class="fa fa-filter fa-2 white" aria-hidden="true"></i>&nbsp;Filter
Expand Down
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 @@ -43,7 +43,7 @@
url: "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,report:true}},
params:{filterView:{usage:true,org:true,provi:true,instanceType:true,resources:true}},
resolve: {
auth: ["$q", function ($q) {
var deferred = $q.defer();
Expand Down
17 changes: 17 additions & 0 deletions client/cat3/src/partials/sections/dashboard/analytics/controller/usageCtrl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@
};
usage.getData=function(fltObj){
usage.trendLineChart.data = [];
usage.costGridOptions.data=[];
var $today = new Date();
var $yesterday = new Date($today);
$yesterday.setDate($today.getDate() - 1);
Expand All @@ -84,7 +85,23 @@
// angular.forEach(result[usage.splitUp], function (valu, keyChild) {
var va = [];
if(result && result.length >0) {
usage.costGridOptions.columnDefs=[
{name: 'name', field: 'name'},
{name: 'fromTime', field: 'fromTime'},
{name: 'toTime', field: 'toTime'},
{name: 'maximum', field: 'maximum'},
{name: 'minimum', field: 'minimum'},
{name: 'average', field: 'average'},
]
angular.forEach(result[usage.splitUp].dataPoints, function (value) {
usage.costGridOptions.data.push({
name:$rootScope.filterNewEnt.platformId[resId],
fromTime:value.fromTime,
toTime:value.toTime,
maximum:value.maximum,
minimum:value.minimum,
average:value.average
});
va.push([Date.parse(value.fromTime), value.average]);
});
usage.trendLineChart.data.push({
Expand Down
23 changes: 13 additions & 10 deletions client/cat3/src/partials/sections/dashboard/analytics/view/usage.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,20 @@
<div class="leftnavdiv" style="padding-right:7px;">
<br>
<div class="col-lg-12 col-md-12 col-sm-12 top-stats">
<span class="pull-right">
<span class="box-title font-size-15">Usage Type</span>
<select class="form-control select2 select2-hidden-accessible " ng-change="usage.splitChange()" style="width: auto;height: 31px;display: table-cell" ng-model="usage.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>
</select>
</span>
</div>
<div class="clearfix"></div>
<div ng-if="analytic.tabShowChat">
<div class="row usage">
<div class="col-lg-12 col-md-12 col-sm-12 top-stats">
<span class="box-title font-size-15">Usage Type</span>
<select class="form-control select2 select2-hidden-accessible " ng-change="usage.splitChange()" style="width: auto;height: 31px;display: table-cell" ng-model="usage.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>
</select>
</div>
<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> Daily trends of usage</h3>
Expand Down