diff --git a/webroot/monitor/infra/analyticsnode/ui/js/monitor_infra_analyticsnode_details.js b/webroot/monitor/infra/analyticsnode/ui/js/monitor_infra_analyticsnode_details.js index 7687bcb1b..5eb64527c 100644 --- a/webroot/monitor/infra/analyticsnode/ui/js/monitor_infra_analyticsnode_details.js +++ b/webroot/monitor/infra/analyticsnode/ui/js/monitor_infra_analyticsnode_details.js @@ -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 = []; diff --git a/webroot/monitor/infra/confignode/ui/js/monitor_infra_confignode_details.js b/webroot/monitor/infra/confignode/ui/js/monitor_infra_confignode_details.js index 388289afb..804d36637 100644 --- a/webroot/monitor/infra/confignode/ui/js/monitor_infra_confignode_details.js +++ b/webroot/monitor/infra/confignode/ui/js/monitor_infra_confignode_details.js @@ -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]; diff --git a/webroot/monitor/infra/controlnode/ui/js/monitor_infra_controlnode_details.js b/webroot/monitor/infra/controlnode/ui/js/monitor_infra_controlnode_details.js index b40b29717..8c0b0053a 100644 --- a/webroot/monitor/infra/controlnode/ui/js/monitor_infra_controlnode_details.js +++ b/webroot/monitor/infra/controlnode/ui/js/monitor_infra_controlnode_details.js @@ -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 = []; diff --git a/webroot/monitor/infra/vrouter/ui/js/monitor_infra_vrouter_details.js b/webroot/monitor/infra/vrouter/ui/js/monitor_infra_vrouter_details.js index bccc4cdf1..840a1864d 100644 --- a/webroot/monitor/infra/vrouter/ui/js/monitor_infra_vrouter_details.js +++ b/webroot/monitor/infra/vrouter/ui/js/monitor_infra_vrouter_details.js @@ -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 = [];