Skip to content

Commit

Permalink
Related-Bug: #1437577
Browse files Browse the repository at this point in the history 
Changed the infra node details page,process CPU charts title from '% CPU Utilization' to 'CPU Share(%)'.

Conflicts:
	webroot/monitor/infra/analyticsnode/ui/js/monitor_infra_analyticsnode_details.js
	webroot/monitor/infra/confignode/ui/js/monitor_infra_confignode_details.js
	webroot/monitor/infra/controlnode/ui/js/monitor_infra_controlnode_details.js
	webroot/monitor/infra/vrouter/ui/js/monitor_infra_vrouter_details.js

Change-Id: Id8c3708456ded3ae4b66466c81177f063fc48b7e
  • Loading branch information
@vishnuvv @manojgn
vishnuvv authored and manojgn committed Jul 23, 2015
1 parent ecae8a1 commit 5a7acff
Show file tree
Hide file tree
Showing 10 changed files with 44 additions and 40 deletions.
20 changes: 10 additions & 10 deletions webroot/monitor/infra/analyticsnode/ui/js/monitor_infra_analyticsnode_details.js
View file
Expand Up @@ -46,28 +46,28 @@ monitorInfraAnalyticsDetailsClass = (function() {
var slConfig;
startTime = endTime - 600000;
slConfig = {startTime: startTime, endTime: endTime};
$('#collector-sparklines' + '_' + obj.name).initMemCPUSparkLines(cpuMemStats, 'parseMemCPUData4SparkLines', {'value': [
$('#collector-sparklines').initMemCPUSparkLines(cpuMemStats, 'parseMemCPUData4SparkLines', {'value': [
{name: 'contrail-collector-cpu-share', color: 'blue-sparkline'},
{name: 'contrail-collector-mem-res', color: 'green-sparkline'}
]}, slConfig);
$('#queryengine-sparklines' + '_' + obj.name).initMemCPUSparkLines(cpuMemStats, 'parseMemCPUData4SparkLines', {'value': [
$('#queryengine-sparklines').initMemCPUSparkLines(cpuMemStats, 'parseMemCPUData4SparkLines', {'value': [
{name: 'contrail-query-engine-cpu-share', color: 'blue-sparkline'},
{name: 'contrail-query-engine-mem-res', color: 'green-sparkline'}
]}, slConfig);
$('#opServer-sparklines' + '_' + obj.name).initMemCPUSparkLines(cpuMemStats, 'parseMemCPUData4SparkLines', {'value': [
$('#opServer-sparklines').initMemCPUSparkLines(cpuMemStats, 'parseMemCPUData4SparkLines', {'value': [
{name: 'contrail-analytics-api-cpu-share', color: 'blue-sparkline'},
{name: 'contrail-analytics-api-mem-res', color: 'green-sparkline'}
]}, slConfig);
endWidgetLoading('analytics-sparklines' + '_' + obj.name);
$('#collector-chart' + '_' + obj.name).initMemCPULineChart($.extend({url:function() {
endWidgetLoading('analytics-sparklines');
$('#collector-chart').initMemCPULineChart($.extend({url:function() {
return contrail.format(monitorInfraUrls['FLOWSERIES_CPU'], 'contrail-collector', '30', '10', obj['name'], endTime);
}, parser: "parseProcessMemCPUData", plotOnLoad: true, lineChartId: 'collector-sparklines' + '_' + obj.name, showWidgetIds: ['collector-chart' + '_' + obj.name + '-box'], hideWidgetIds: ['queryengine-chart' + '_' + obj.name + '-box', 'opServer-chart' + '_' + obj.name + '-box'], titles: {memTitle:'Memory',cpuTitle:'% CPU Utilization'}}),110);
$('#queryengine-chart' + '_' + obj.name).initMemCPULineChart($.extend({url:function() {
}, parser: "parseProcessMemCPUData", plotOnLoad: true, lineChartId: 'collector-sparklines', showWidgetIds: ['collector-chart-box'], hideWidgetIds: ['queryengine-chart-box', 'opServer-chart-box'], titles: {memTitle:'Memory',cpuTitle:infraDetailsPageCPUChartTitle}}),110);
$('#queryengine-chart').initMemCPULineChart($.extend({url:function() {
return contrail.format(monitorInfraUrls['FLOWSERIES_CPU'], 'contrail-query-engine', '30', '10', obj['name'], endTime);
}, parser: "parseProcessMemCPUData", plotOnLoad: false, lineChartId: 'queryengine-sparklines' + '_' + obj.name, showWidgetIds: ['queryengine-chart' + '_' + obj.name + '-box'], hideWidgetIds: ['collector-chart' + '_' + obj.name + '-box', 'opServer-chart' + '_' + obj.name + '-box'], titles: {memTitle:'Memory',cpuTitle:'% CPU Utilization'}}),110);
$('#opServer-chart' + '_' + obj.name).initMemCPULineChart($.extend({url:function() {
}, parser: "parseProcessMemCPUData", plotOnLoad: false, lineChartId: 'queryengine-sparklines', showWidgetIds: ['queryengine-chart-box'], hideWidgetIds: ['collector-chart-box', 'opServer-chart-box'], titles: {memTitle:'Memory',cpuTitle:infraDetailsPageCPUChartTitle}}),110);
$('#opServer-chart').initMemCPULineChart($.extend({url:function() {
return contrail.format(monitorInfraUrls['FLOWSERIES_CPU'], 'contrail-analytics-api', '30', '10', obj['name'], endTime);
}, parser: "parseProcessMemCPUData", plotOnLoad: false, lineChartId: 'opServer-sparklines' + '_' + obj.name, showWidgetIds: ['opServer-chart' + '_' + obj.name + '-box'], hideWidgetIds: ['collector-chart' + '_' + obj.name + '-box', 'queryengine-chart' + '_' + obj.name + '-box'], titles: {memTitle:'Memory',cpuTitle:'% CPU Utilization'}}),110);
}, parser: "parseProcessMemCPUData", plotOnLoad: false, lineChartId: 'opServer-sparklines', showWidgetIds: ['opServer-chart-box'], hideWidgetIds: ['collector-chart-box', 'queryengine-chart-box'], titles: {memTitle:'Memory',cpuTitle:infraDetailsPageCPUChartTitle}}),110);
});
});
var procStateList, overallStatus = noDataStr;
Expand Down
6 changes: 3 additions & 3 deletions webroot/monitor/infra/analyticsnode/ui/views/monitor_infra_analyticnode.view
View file
Expand Up @@ -60,7 +60,7 @@
<div id="collector-sparklines" class="span4 collector-chart-link sparklines-box">
<p class="sparkline-title">Collector</p>
<div class="row-fluid">
<span class="span6"><small>CPU Utilization</small></span> <span id="contrail-collector-cpu-share_sparkline" class="span6 pull-right"></span>
<span class="span6"><small>{{getInfraDetailsPageCPUChartTitle}}</small></span> <span id="contrail-collector-cpu-share_sparkline" class="span6 pull-right"></span>
</div>
<div class="row-fluid">
<span class="span6"><small>Memory</small></span> <span id="contrail-collector-mem-res_sparkline" class="span6 pull-right"></span>
Expand All @@ -69,7 +69,7 @@
<div id="queryengine-sparklines" class="span4 queryengine-chart-link sparklines-box">
<p class="sparkline-title">Query Engine</p>
<div class="row-fluid">
<span class="span6"><small>CPU Utilization</small></span> <span id="contrail-query-engine-cpu-share_sparkline" class="span6 pull-right"></span>
<span class="span6"><small>{{getInfraDetailsPageCPUChartTitle}}</small></span> <span id="contrail-query-engine-cpu-share_sparkline" class="span6 pull-right"></span>
</div>
<div class="row-fluid">
<span class="span6"><small>Memory</small></span> <span id="contrail-query-engine-mem-res_sparkline" class="span6 pull-right"></span>
Expand All @@ -78,7 +78,7 @@
<div id="opServer-sparklines" class="span4 opServer-chart-link sparklines-box">
<p class="sparkline-title">OpServer</p>
<div class="row-fluid">
<span class="span6"><small>CPU Utilization</small></span> <span id="contrail-analytics-api-cpu-share_sparkline" class="span6 pull-right"></span>
<span class="span6"><small>{{getInfraDetailsPageCPUChartTitle}}</small></span> <span id="contrail-analytics-api-cpu-share_sparkline" class="span6 pull-right"></span>
</div>
<div class="row-fluid">
<span class="span6"><small>Memory</small></span> <span id="contrail-analytics-api-mem-res_sparkline" class="span6 pull-right"></span>
Expand Down
2 changes: 1 addition & 1 deletion webroot/monitor/infra/common/ui/js/monitor_infra_constants.js
View file
Expand Up @@ -21,7 +21,7 @@ var configNodeTabStrip = "config_tabstrip";
var aNodeTabStrip = "analytics_tabstrip";
var ctrlNodeTabStrip = "control_tabstrip";
var dbNodeTabStrip = "db_tabstrip";

var infraDetailsPageCPUChartTitle = 'CPU Share (%)';
var CONSOLE_LOGS_REFRESH_INTERVAL = 90000;//Auto refresh interval in console tab (ms)


Expand Down
4 changes: 4 additions & 0 deletions webroot/monitor/infra/common/ui/js/monitor_infra_utils.js
View file
Expand Up @@ -2341,6 +2341,10 @@ Handlebars.registerHelper('renderStatusTemplate', function(sevLevel, options) {
return new Handlebars.SafeString(html);
});

Handlebars.registerHelper('getInfraDetailsPageCPUChartTitle',function() {
return infraDetailsPageCPUChartTitle;
})

function getAllvRouters(defferedObj,dataSource,dsObj){
var obj = {};
if(dsObj['getFromCache'] == null || dsObj['getFromCache'] == true){
Expand Down
20 changes: 10 additions & 10 deletions webroot/monitor/infra/confignode/ui/js/monitor_infra_confignode_details.js
View file
Expand Up @@ -42,28 +42,28 @@ monitorInfraConfigDetailsClass = (function() {
var slConfig;
startTime = endTime - 600000;
slConfig = {startTime: startTime, endTime: endTime};
$('#apiServer-sparklines' + '_' + obj.name).initMemCPUSparkLines(cpuMemStats, 'parseMemCPUData4SparkLines', {'value': [
$('#apiServer-sparklines').initMemCPUSparkLines(cpuMemStats, 'parseMemCPUData4SparkLines', {'value': [
{name: 'contrail-api-cpu-share', color: 'blue-sparkline'},
{name: 'contrail-api-mem-res', color: 'green-sparkline'}
]}, slConfig);
$('#serviceMonitor-sparklines' + '_' + obj.name).initMemCPUSparkLines(cpuMemStats, 'parseMemCPUData4SparkLines', {'value': [
$('#serviceMonitor-sparklines').initMemCPUSparkLines(cpuMemStats, 'parseMemCPUData4SparkLines', {'value': [
{name: 'contrail-svc-monitor-cpu-share', color: 'blue-sparkline'},
{name: 'contrail-svc-monitor-mem-res', color: 'green-sparkline'}
]}, slConfig);
$('#schema-sparklines' + '_' + obj.name).initMemCPUSparkLines(cpuMemStats, 'parseMemCPUData4SparkLines', {'value': [
$('#schema-sparklines').initMemCPUSparkLines(cpuMemStats, 'parseMemCPUData4SparkLines', {'value': [
{name: 'contrail-schema-cpu-share', color: 'blue-sparkline'},
{name: 'contrail-schema-mem-res', color: 'green-sparkline'}
]}, slConfig);
endWidgetLoading('config-sparklines' + '_' + obj.name);
$('#apiServer-chart' + '_' + obj.name).initMemCPULineChart($.extend({url:function() {
endWidgetLoading('config-sparklines');
$('#apiServer-chart').initMemCPULineChart($.extend({url:function() {
return contrail.format(monitorInfraUrls['FLOWSERIES_CPU'], 'contrail-api', '30', '10', obj['name'], endTime);
}, parser: "parseProcessMemCPUData", parser: "parseProcessMemCPUData", plotOnLoad: true, lineChartId: 'apiServer-sparklines' + '_' + obj.name, showWidgetIds: ['apiServer-chart' + '_' + obj.name + '-box'], hideWidgetIds: ['serviceMonitor-chart' + '_' + obj.name + '-box', 'schema-chart' + '_' + obj.name + '-box'], titles: {memTitle:'Memory',cpuTitle:'% CPU Utilization'}}),110);
$('#serviceMonitor-chart' + '_' + obj.name).initMemCPULineChart($.extend({url:function() {
}, parser: "parseProcessMemCPUData", parser: "parseProcessMemCPUData", plotOnLoad: true, lineChartId: 'apiServer-sparklines', showWidgetIds: ['apiServer-chart' + '-box'], hideWidgetIds: ['serviceMonitor-chart' + '-box', 'schema-chart' + '-box'], titles: {memTitle:'Memory',cpuTitle: infraDetailsPageCPUChartTitle}}),110);
$('#serviceMonitor-chart').initMemCPULineChart($.extend({url:function() {
return contrail.format(monitorInfraUrls['FLOWSERIES_CPU'], 'contrail-svc-monitor', '30', '10', obj['name'], endTime);
}, parser: "parseProcessMemCPUData", plotOnLoad: false, lineChartId: 'serviceMonitor-sparklines' + '_' + obj.name, showWidgetIds: ['serviceMonitor-chart' + '_' + obj.name + '-box'], hideWidgetIds: ['apiServer-chart' + '_' + obj.name + '-box', 'schema-chart' + '_' + obj.name + '-box'], titles: {memTitle:'Memory',cpuTitle:'% CPU Utilization'}}),110);
$('#schema-chart' + '_' + obj.name).initMemCPULineChart($.extend({url:function() {
}, parser: "parseProcessMemCPUData", plotOnLoad: false, lineChartId: 'serviceMonitor-sparklines', showWidgetIds: ['serviceMonitor-chart' + '-box'], hideWidgetIds: ['apiServer-chart' + '-box', 'schema-chart' + '-box'], titles: {memTitle:'Memory',cpuTitle: infraDetailsPageCPUChartTitle}}),110);
$('#schema-chart').initMemCPULineChart($.extend({url:function() {
return contrail.format(monitorInfraUrls['FLOWSERIES_CPU'], 'contrail-schema', '30', '10', obj['name'], endTime);
}, parser: "parseProcessMemCPUData", plotOnLoad: false, lineChartId: 'schema-sparklines' + '_' + obj.name, showWidgetIds: ['schema-chart' + '_' + obj.name + '-box'], hideWidgetIds: ['apiServer-chart' + '_' + obj.name + '-box', 'serviceMonitor-chart' + '_' + obj.name + '-box'], titles: {memTitle:'Memory',cpuTitle:'% CPU Utilization'}}),110);
}, parser: "parseProcessMemCPUData", plotOnLoad: false, lineChartId: 'schema-sparklines', showWidgetIds: ['schema-chart' + '-box'], hideWidgetIds: ['apiServer-chart' + '-box', 'serviceMonitor-chart' + '-box'], titles: {memTitle:'Memory',cpuTitle: infraDetailsPageCPUChartTitle}}),110);
});

});
Expand Down
6 changes: 3 additions & 3 deletions webroot/monitor/infra/confignode/ui/views/monitor_infra_confignode.view
View file
Expand Up @@ -55,7 +55,7 @@
<div id="apiServer-sparklines" class="span4 apiServer-chart-link sparklines-box">
<p class="sparkline-title">API Server</p>
<div class="row-fluid">
<span class="span6"><small>CPU Utilization</small></span>
<span class="span6"><small>{{getInfraDetailsPageCPUChartTitle}}</small></span>
<span id="contrail-api-cpu-share_sparkline" class="span6 pull-right"></span>
</div>
<div class="row-fluid">
Expand All @@ -66,7 +66,7 @@
<div id="serviceMonitor-sparklines" class="span4 serviceMonitor-chart-link sparklines-box">
<p class="sparkline-title">Service Monitor</p>
<div class="row-fluid">
<span class="span6"><small>CPU Utilization</small></span> <span id="contrail-svc-monitor-cpu-share_sparkline" class="span6 pull-right"></span>
<span class="span6"><small>{{getInfraDetailsPageCPUChartTitle}}</small></span> <span id="contrail-svc-monitor-cpu-share_sparkline" class="span6 pull-right"></span>
</div>
<div class="row-fluid">
<span class="span6"><small>Memory</small></span>
Expand All @@ -76,7 +76,7 @@
<div id="schema-sparklines" class="span4 schema-chart-link sparklines-box">
<p class="sparkline-title">Schema Transformer</p>
<div class="row-fluid">
<span class="span6"><small>CPU Utilization</small></span>
<span class="span6"><small>{{getInfraDetailsPageCPUChartTitle}}</small></span>
<span id="contrail-schema-cpu-share_sparkline" class="span6 pull-right"></span>
</div>
<div class="row-fluid">
Expand Down
8 changes: 4 additions & 4 deletions webroot/monitor/infra/controlnode/ui/js/monitor_infra_controlnode_details.js
View file
Expand Up @@ -44,14 +44,14 @@ monitorInfraControlDetailsClass = (function() {
var slConfig;
startTime = endTime - 600000;
slConfig = {startTime: startTime, endTime: endTime};
$('#control-sparklines' + '_' + obj.name).initMemCPUSparkLines(cpuMemStats, 'parseMemCPUData4SparkLines', {'value': [
$('#control-sparklines').initMemCPUSparkLines(cpuMemStats, 'parseMemCPUData4SparkLines', {'value': [
{name: 'contrail-control-cpu-share', color: 'blue-sparkline'},
{name: 'contrail-control-mem-res', color: 'green-sparkline'}
]}, slConfig);
endWidgetLoading('control-sparklines' + '_' + obj.name);
$('#control-chart' + '_' + obj.name).initMemCPULineChart($.extend({url:function() {
endWidgetLoading('control-sparklines');
$('#control-chart').initMemCPULineChart($.extend({url:function() {
return contrail.format(monitorInfraUrls['FLOWSERIES_CPU'], 'contrail-control', '30', '10', obj['name'], endTime);
}, parser: "parseProcessMemCPUData", plotOnLoad: true, lineChartId: 'control-sparklines' + '_' + obj.name, showWidgetIds: [], hideWidgetIds: [], titles: {memTitle:'Memory',cpuTitle:'% CPU Utilization'}}),110);
}, parser: "parseProcessMemCPUData", plotOnLoad: true, lineChartId: 'control-sparklines', showWidgetIds: [], hideWidgetIds: [], titles: {memTitle:'Memory',cpuTitle:infraDetailsPageCPUChartTitle}}),110);
});

});
Expand Down
2 changes: 1 addition & 1 deletion webroot/monitor/infra/controlnode/ui/views/monitor_infra_controlnode.view
View file
Expand Up @@ -60,7 +60,7 @@
<div id="control-sparklines" class="span4 control-chart-link sparklines-box">
<p class="sparkline-title">Control Node</p>
<div class="row-fluid">
<span class="span6"><small>CPU Utilization</small></span>
<span class="span6"><small>{{getInfraDetailsPageCPUChartTitle}}</small></span>
<span id="contrail-control-cpu-share_sparkline" class="span6 pull-right"></span>
</div>
<div class="row-fluid">
Expand Down

0 comments on commit 5a7acff

Please sign in to comment.