Skip to content

Commit

Permalink
Revert "Related-Bug:#1437577"
Browse files Browse the repository at this point in the history 
This reverts commit b2ada15.

Change-Id: I08019ff3f0087c4d26baa63bf69592bd3574ea57
  • Loading branch information
@manojgn
manojgn committed Jul 23, 2015
1 parent e5c39be commit a510925
Show file tree
Hide file tree
Showing 10 changed files with 17 additions and 21 deletions.
6 changes: 3 additions & 3 deletions webroot/monitor/infra/analyticsnode/ui/js/monitor_infra_analyticsnode_details.js
View file
Expand Up @@ -52,13 +52,13 @@ monitorInfraAnalyticsDetailsClass = (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', showWidgetIds: ['collector-chart-box'], hideWidgetIds: ['queryengine-chart-box', 'opServer-chart-box'], titles: {memTitle:'Memory',cpuTitle: infraDetailsPageCPUChartTitle}}),110);
}, parser: "parseProcessMemCPUData", plotOnLoad: true, lineChartId: 'collector-sparklines', showWidgetIds: ['collector-chart-box'], hideWidgetIds: ['queryengine-chart-box', 'opServer-chart-box'], titles: {memTitle:'Memory',cpuTitle:'% CPU Utilization'}}),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', showWidgetIds: ['queryengine-chart-box'], hideWidgetIds: ['collector-chart-box', 'opServer-chart-box'], titles: {memTitle:'Memory',cpuTitle: infraDetailsPageCPUChartTitle}}),110);
}, parser: "parseProcessMemCPUData", plotOnLoad: false, lineChartId: 'queryengine-sparklines', showWidgetIds: ['queryengine-chart-box'], hideWidgetIds: ['collector-chart-box', 'opServer-chart-box'], titles: {memTitle:'Memory',cpuTitle:'% CPU Utilization'}}),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', showWidgetIds: ['opServer-chart-box'], hideWidgetIds: ['collector-chart-box', 'queryengine-chart-box'], titles: {memTitle:'Memory',cpuTitle: infraDetailsPageCPUChartTitle}}),110);
}, parser: "parseProcessMemCPUData", plotOnLoad: false, lineChartId: 'opServer-sparklines', showWidgetIds: ['opServer-chart-box'], hideWidgetIds: ['collector-chart-box', 'queryengine-chart-box'], titles: {memTitle:'Memory',cpuTitle:'% CPU Utilization'}}),110);
});
var procStateList, overallStatus = noDataStr;
var analyticsProcessStatusList = [];
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>{{getInfraDetailsPageCPUChartTitle}}</small></span> <span id="collector_cpu_share_sparkline" class="span6 pull-right"></span>
<span class="span6"><small>CPU Utilization</small></span> <span id="collector_cpu_share_sparkline" class="span6 pull-right"></span>
</div>
<div class="row-fluid">
<span class="span6"><small>Memory</small></span> <span id="collector_mem_virt_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>{{getInfraDetailsPageCPUChartTitle}}</small></span> <span id="queryengine_cpu_share_sparkline" class="span6 pull-right"></span>
<span class="span6"><small>CPU Utilization</small></span> <span id="queryengine_cpu_share_sparkline" class="span6 pull-right"></span>
</div>
<div class="row-fluid">
<span class="span6"><small>Memory</small></span> <span id="queryengine_mem_virt_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>{{getInfraDetailsPageCPUChartTitle}}</small></span> <span id="opserver_cpu_share_sparkline" class="span6 pull-right"></span>
<span class="span6"><small>CPU Utilization</small></span> <span id="opserver_cpu_share_sparkline" class="span6 pull-right"></span>
</div>
<div class="row-fluid">
<span class="span6"><small>Memory</small></span> <span id="opserver_mem_virt_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: 0 additions & 4 deletions webroot/monitor/infra/common/ui/js/monitor_infra_utils.js
View file
Expand Up @@ -2257,10 +2257,6 @@ 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
6 changes: 3 additions & 3 deletions webroot/monitor/infra/confignode/ui/js/monitor_infra_confignode_details.js
View file
Expand Up @@ -47,13 +47,13 @@ monitorInfraConfigDetailsClass = (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', showWidgetIds: ['apiServer-chart-box'], hideWidgetIds: ['serviceMonitor-chart-box', 'schema-chart-box'], titles: {memTitle:'Memory',cpuTitle: infraDetailsPageCPUChartTitle}}),110);
}, parser: "parseProcessMemCPUData", parser: "parseProcessMemCPUData", plotOnLoad: true, lineChartId: 'apiServer-sparklines', showWidgetIds: ['apiServer-chart-box'], hideWidgetIds: ['serviceMonitor-chart-box', 'schema-chart-box'], titles: {memTitle:'Memory',cpuTitle:'% CPU Utilization'}}),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', showWidgetIds: ['serviceMonitor-chart-box'], hideWidgetIds: ['apiServer-chart-box', 'schema-chart-box'], titles: {memTitle:'Memory',cpuTitle: infraDetailsPageCPUChartTitle}}),110);
}, parser: "parseProcessMemCPUData", plotOnLoad: false, lineChartId: 'serviceMonitor-sparklines', showWidgetIds: ['serviceMonitor-chart-box'], hideWidgetIds: ['apiServer-chart-box', 'schema-chart-box'], titles: {memTitle:'Memory',cpuTitle:'% CPU Utilization'}}),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', showWidgetIds: ['schema-chart-box'], hideWidgetIds: ['apiServer-chart-box', 'serviceMonitor-chart-box'], titles: {memTitle:'Memory',cpuTitle: infraDetailsPageCPUChartTitle}}),110);
}, parser: "parseProcessMemCPUData", plotOnLoad: false, lineChartId: 'schema-sparklines', showWidgetIds: ['schema-chart-box'], hideWidgetIds: ['apiServer-chart-box', 'serviceMonitor-chart-box'], titles: {memTitle:'Memory',cpuTitle:'% CPU Utilization'}}),110);
});
confNodeData = result;
var parsedData = infraMonitorUtils.parseConfigNodesDashboardData([{name:obj['name'],value:confNodeData}])[0];
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>{{getInfraDetailsPageCPUChartTitle}}</small></span>
<span class="span6"><small>CPU Utilization</small></span>
<span id="api_server_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>{{getInfraDetailsPageCPUChartTitle}}</small></span> <span id="service_monitor_cpu_share_sparkline" class="span6 pull-right"></span>
<span class="span6"><small>CPU Utilization</small></span> <span id="service_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>{{getInfraDetailsPageCPUChartTitle}}</small></span>
<span class="span6"><small>CPU Utilization</small></span>
<span id="schema_xmer_cpu_share_sparkline" class="span6 pull-right"></span>
</div>
<div class="row-fluid">
Expand Down
2 changes: 1 addition & 1 deletion webroot/monitor/infra/controlnode/ui/js/monitor_infra_controlnode_details.js
View file
Expand Up @@ -42,7 +42,7 @@ monitorInfraControlDetailsClass = (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', showWidgetIds: [], hideWidgetIds: [], titles: {memTitle:'Memory',cpuTitle:infraDetailsPageCPUChartTitle}}),110);
}, parser: "parseProcessMemCPUData", plotOnLoad: true, lineChartId: 'control-sparklines', showWidgetIds: [], hideWidgetIds: [], titles: {memTitle:'Memory',cpuTitle:'% CPU Utilization'}}),110);
});
var procStateList, overallStatus = noDataStr;
var controlProcessStatusList = [];
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>{{getInfraDetailsPageCPUChartTitle}}</small></span>
<span class="span6"><small>CPU Utilization</small></span>
<span id="cpu_share_sparkline" class="span6 pull-right"></span>
</div>
<div class="row-fluid">
Expand Down
2 changes: 1 addition & 1 deletion webroot/monitor/infra/vrouter/ui/js/monitor_infra_vrouter_details.js
View file
Expand Up @@ -48,7 +48,7 @@ monitorInfraComputeDetailsClass = (function() {
endWidgetLoading('vrouter-sparklines');
$('#vrouter-chart').initMemCPULineChart($.extend({url:function() {
return contrail.format(monitorInfraUrls['FLOWSERIES_CPU'], 'contrail-vrouter-agent', '30', '10', obj['name'], endTime);
}, parser: "parseProcessMemCPUData", plotOnLoad: true, lineChartId: 'vrouter-sparklines', showWidgetIds: ['vrouter-chart-box'], hideWidgetIds: ['system-chart-box'], titles: {memTitle:'Memory',cpuTitle: infraDetailsPageCPUChartTitle}}), 110);
}, parser: "parseProcessMemCPUData", plotOnLoad: true, lineChartId: 'vrouter-sparklines', showWidgetIds: ['vrouter-chart-box'], hideWidgetIds: ['system-chart-box'], titles: {memTitle:'Memory',cpuTitle:'% CPU Utilization'}}), 110);
$('#system-chart').initMemCPULineChart($.extend({url:function() {
return contrail.format(monitorInfraUrls['FLOWSERIES_CPU'], 'contrail-vrouter-agent', '30', '10', obj['name'], endTime);
}, parser: "parseSystemMemCPUData", plotOnLoad: false, lineChartId: 'system-sparklines', showWidgetIds: ['system-chart-box'], hideWidgetIds: ['vrouter-chart-box'], titles: {memTitle:'Memory',cpuTitle:'Avg CPU Load'}}),110);
Expand Down
2 changes: 1 addition & 1 deletion webroot/monitor/infra/vrouter/ui/views/monitor_infra_vrouter.view
View file
Expand Up @@ -80,7 +80,7 @@
<div id="vrouter-sparklines" class="span4 vrouter-chart-link sparklines-box">
<p class="sparkline-title">vRouter Agent</p>
<div class="row-fluid">
<span class="span6"><small>{{getInfraDetailsPageCPUChartTitle}}</small></span> <span id="cpu_share_sparkline" class="span6 pull-right"></span>
<span class="span6"><small>CPU Utilization</small></span> <span id="cpu_share_sparkline" class="span6 pull-right"></span>
</div>
<div class="row-fluid">
<span class="span6"><small>Memory</small></span> <span id="virt_mem_sparkline" class="span6 pull-right"></span>
Expand Down

0 comments on commit a510925

Please sign in to comment.