Skip to content

Integrated analytics Oracle stats changes in UI,bug id is #1350680 #266

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

Open
vishnuvv wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Integrated analytics Oracle stats changes in UI,bug id is #1350680 #266

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
8 changes: 7 additions & 1 deletion src/serverroot/common/global.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,13 @@ global.QUERY_JSON = {
ObjectCollectorInfo: {"table": 'ObjectCollectorInfo', "start_time": "", "end_time": "", "select_fields": ["MessageTS", "Source", "ModuleId"], "sort_fields": ['MessageTS'], "sort": 2, "filter": []},
ObjectSITable: {"table": 'ObjectSITable', "start_time": "", "end_time": "", "select_fields": ["MessageTS", "Source", "ModuleId"], "sort_fields": ['MessageTS'], "sort": 2, "filter": []},
FlowSeriesTable: {"table": 'FlowSeriesTable', "start_time": "", "end_time": "", "select_fields": ['flow_class_id', 'direction_ing']},
FlowRecordTable: {"table": 'FlowRecordTable', "start_time": "", "end_time": "", "select_fields": ['vrouter', 'sourcevn', 'sourceip', 'sport', 'destvn', 'destip', 'dport', 'protocol', 'direction_ing']}
FlowRecordTable: {"table": 'FlowRecordTable', "start_time": "", "end_time": "", "select_fields": ['vrouter', 'sourcevn', 'sourceip', 'sport', 'destvn', 'destip', 'dport', 'protocol', 'direction_ing']},
StatTable_UveVirtualNetworkAgent_vn_stats: {"table": 'StatTable.UveVirtualNetworkAgent.vn_stats',"start_time": "", "end_time": "",
"select_fields": []},
StatTable_VirtualMachineStats_if_stats: {"table": 'StatTable.VirtualMachineStats.if_stats',"start_time": "", "end_time": "",
"select_fields": []},
StatTable_VirtualMachineStats_fip_stats: {"table": 'StatTable.VirtualMachineStats.fip_stats',"start_time": "", "end_time": "",
"select_fields": []},
};

global.FORMAT_TABLE_COLUMNS = {
Expand Down
2 changes: 1 addition & 1 deletion webroot/js/d3-utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -499,7 +499,7 @@ function successHandlerTSChart(data, cbParams) {
var selectorId = "#" + $(cbParams.selector).attr('id');
var options = {
height:300,
yAxisLabel: 'Bytes per 7 secs',
yAxisLabel: 'Bytes per 30 secs',
y2AxisLabel: 'Bytes per min'
};
initTrafficTSChart(selectorId, data, options, null, "formatSumBytes", "formatSumBytes");
Expand Down
3 changes: 3 additions & 0 deletions webroot/js/slickgrid-utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -827,6 +827,9 @@ function getDefaultGridConfig() {
removeGridLoading: function(){
gridContainer.find('.grid-header-icon-loading').hide();
},
showGridLoading: function() {
gridContainer.find('.grid-header-icon-loading').show();
},
adjustAllRowHeight: function() {
var self = this;
gridContainer.find('.slick-row-master').each(function(){
Expand Down
8 changes: 6 additions & 2 deletions webroot/js/web-utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ var defColors = ['#1c638d', '#4DA3D5'];
if (chartData['link']['context'] == 'instance') {
//Get the instance ip from drop-down
var instObj = getSelInstanceFromDropDown();
$.extend(detailObj, {ip:instObj['ip'], vnName:instObj['vnName']});
$.extend(detailObj, {ip:instObj['ip_address'], vnName:instObj['virtual_network']});
}
if (chartData['class'] != null)
viewObj = chartData['class'];
Expand Down Expand Up @@ -682,7 +682,11 @@ function prettifyBytes(obj) {
}

function formatThroughput(bytes,noDecimal,maxPrecision) {
return formatBytes(bytes,noDecimal,maxPrecision).replace('B','b') + 'ps';
var data = formatBytes(bytes,noDecimal,maxPrecision);
if(data != '-')
return data.replace('B','b') + 'ps';
else
return '-';
}

function formatBytes(bytes, noDecimal, maxPrecision, precision) {
Expand Down