Skip to content

Commit

Permalink
Merge "Related-Bug:#1419725 Bug is because of row expansion changes i…
Browse files Browse the repository at this point in the history 
…n infra summary page changes id of the chart got changed,so chart click events are failing,now we corrected the ids" into R2.1
  • Loading branch information
@opencontrail-ci-admin
Zuul authored and opencontrail-ci-admin committed Feb 10, 2015
2 parents 236bc5f + a4f0d80 commit a13f88a
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
6 changes: 3 additions & 3 deletions webroot/monitor/infra/analyticsnode/ui/js/monitor_infra_analyticsnode_details.js
View file
Expand Up @@ -54,13 +54,13 @@ monitorInfraAnalyticsDetailsClass = (function() {
endWidgetLoading('analytics-sparklines' + '_' + obj.name);
$('#collector-chart' + '_' + obj.name).initMemCPULineChart($.extend({url:function() {
return contrail.format(monitorInfraUrls['FLOWSERIES_CPU'], 'contrail-collector', '30', '10', obj['name'], endTime);
}, parser: "parseProcessMemCPUData", plotOnLoad: true, showWidgetIds: ['collector-chart' + '_' + obj.name + '-box'], hideWidgetIds: ['queryengine-chart' + '_' + obj.name + '-box', 'opServer-chart' + '_' + obj.name + '-box'], titles: {memTitle:'Memory',cpuTitle:'% CPU Utilization'}}),110);
}, 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() {
return contrail.format(monitorInfraUrls['FLOWSERIES_CPU'], 'contrail-query-engine', '30', '10', obj['name'], endTime);
}, parser: "parseProcessMemCPUData", plotOnLoad: false, showWidgetIds: ['queryengine-chart' + '_' + obj.name + '-box'], hideWidgetIds: ['collector-chart' + '_' + obj.name + '-box', 'opServer-chart' + '_' + obj.name + '-box'], titles: {memTitle:'Memory',cpuTitle:'% CPU Utilization'}}),110);
}, 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() {
return contrail.format(monitorInfraUrls['FLOWSERIES_CPU'], 'contrail-analytics-api', '30', '10', obj['name'], endTime);
}, parser: "parseProcessMemCPUData", plotOnLoad: false, 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' + '_' + 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);
});
var procStateList, overallStatus = noDataStr;
var analyticsProcessStatusList = [];
Expand Down
6 changes: 3 additions & 3 deletions webroot/monitor/infra/confignode/ui/js/monitor_infra_confignode_details.js
View file
Expand Up @@ -49,13 +49,13 @@ monitorInfraConfigDetailsClass = (function() {
endWidgetLoading('config-sparklines' + '_' + obj.name);
$('#apiServer-chart' + '_' + obj.name).initMemCPULineChart($.extend({url:function() {
return contrail.format(monitorInfraUrls['FLOWSERIES_CPU'], 'contrail-api', '30', '10', obj['name'], endTime);
}, parser: "parseProcessMemCPUData", parser: "parseProcessMemCPUData", plotOnLoad: true, showWidgetIds: ['apiServer-chart' + '_' + obj.name + '-box'], hideWidgetIds: ['serviceMonitor-chart' + '_' + obj.name + '-box', 'schema-chart' + '_' + obj.name + '-box'], titles: {memTitle:'Memory',cpuTitle:'% CPU Utilization'}}),110);
}, 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() {
return contrail.format(monitorInfraUrls['FLOWSERIES_CPU'], 'contrail-svc-monitor', '30', '10', obj['name'], endTime);
}, parser: "parseProcessMemCPUData", plotOnLoad: false, showWidgetIds: ['serviceMonitor-chart' + '_' + obj.name + '-box'], hideWidgetIds: ['apiServer-chart' + '_' + obj.name + '-box', 'schema-chart' + '_' + obj.name + '-box'], titles: {memTitle:'Memory',cpuTitle:'% CPU Utilization'}}),110);
}, 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() {
return contrail.format(monitorInfraUrls['FLOWSERIES_CPU'], 'contrail-schema', '30', '10', obj['name'], endTime);
}, parser: "parseProcessMemCPUData", plotOnLoad: false, 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' + '_' + 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);
});
confNodeData = result;
var parsedData = infraMonitorUtils.parseConfigNodesDashboardData([{name:obj['name'],value:confNodeData}])[0];
Expand Down
2 changes: 1 addition & 1 deletion webroot/monitor/infra/controlnode/ui/js/monitor_infra_controlnode_details.js
View file
Expand Up @@ -44,7 +44,7 @@ monitorInfraControlDetailsClass = (function() {
endWidgetLoading('control-sparklines' + '_' + obj.name);
$('#control-chart' + '_' + obj.name).initMemCPULineChart($.extend({url:function() {
return contrail.format(monitorInfraUrls['FLOWSERIES_CPU'], 'contrail-control', '30', '10', obj['name'], endTime);
}, parser: "parseProcessMemCPUData", plotOnLoad: true, showWidgetIds: [], hideWidgetIds: [], titles: {memTitle:'Memory',cpuTitle:'% CPU Utilization'}}),110);
}, parser: "parseProcessMemCPUData", plotOnLoad: true, lineChartId: 'control-sparklines' + '_' + obj.name, showWidgetIds: [], hideWidgetIds: [], titles: {memTitle:'Memory',cpuTitle:'% CPU Utilization'}}),110);
});
var procStateList, overallStatus = noDataStr;
var controlProcessStatusList = [];
Expand Down
4 changes: 2 additions & 2 deletions webroot/monitor/infra/vrouter/ui/js/monitor_infra_vrouter_details.js
View file
Expand Up @@ -51,10 +51,10 @@ monitorInfraComputeDetailsClass = (function() {
endWidgetLoading('vrouter-sparklines' + '_' + obj.name);
$('#vrouter-chart' + '_' + obj.name).initMemCPULineChart($.extend({url:function() {
return contrail.format(monitorInfraUrls['FLOWSERIES_CPU'], 'contrail-vrouter-agent', '30', '10', obj['name'], endTime);
}, parser: "parseProcessMemCPUData", plotOnLoad: true, showWidgetIds: ['vrouter-chart' + '_' + obj.name + '-box'], hideWidgetIds: ['system-chart' + '_' + obj.name + '-box'], titles: {memTitle:'Memory',cpuTitle:'% CPU Utilization'}}), 110);
}, parser: "parseProcessMemCPUData", plotOnLoad: true, lineChartId: 'vrouter-sparklines' + '_' + obj.name, showWidgetIds: ['vrouter-chart' + '_' + obj.name + '-box'], hideWidgetIds: ['system-chart' + '_' + obj.name + '-box'], titles: {memTitle:'Memory',cpuTitle:'% CPU Utilization'}}), 110);
$('#system-chart' + '_' + obj.name).initMemCPULineChart($.extend({url:function() {
return contrail.format(monitorInfraUrls['FLOWSERIES_CPU'], 'contrail-vrouter-agent', '30', '10', obj['name'], endTime);
}, parser: "parseSystemMemCPUData", plotOnLoad: false, showWidgetIds: ['system-chart' + '_' + obj.name + '-box'], hideWidgetIds: ['vrouter-chart' + '_' + obj.name + '-box'], titles: {memTitle:'Memory',cpuTitle:'Avg CPU Load'}}),110);
}, parser: "parseSystemMemCPUData", plotOnLoad: false, lineChartId: 'system-sparklines' + '_' + obj.name, showWidgetIds: ['system-chart' + '_' + obj.name + '-box'], hideWidgetIds: ['vrouter-chart' + '_' + obj.name + '-box'], titles: {memTitle:'Memory',cpuTitle:'Avg CPU Load'}}),110);
});
var procStateList, overallStatus = noDataStr;
var vRouterProcessStatusList = [];
Expand Down

0 comments on commit a13f88a

Please sign in to comment.