diff --git a/webroot/monitor/infrastructure/common/ui/js/models/AnalyticsNodeListModel.js b/webroot/monitor/infrastructure/common/ui/js/models/AnalyticsNodeListModel.js index d781942ff..e9912f5af 100644 --- a/webroot/monitor/infrastructure/common/ui/js/models/AnalyticsNodeListModel.js +++ b/webroot/monitor/infrastructure/common/ui/js/models/AnalyticsNodeListModel.js @@ -11,18 +11,7 @@ define(['contrail-list-model'], function(ContrailListModel) { dataParser : monitorInfraParsers.parseAnalyticsNodesDashboardData }, vlRemoteConfig : { - vlRemoteList : [{ - getAjaxConfig : function() { - return monitorInfraUtils - .getGeneratorsAjaxConfigForInfraNodes( - 'analyticsNodeDS'); - }, - successCallback : function(response, contrailListModel) { - monitorInfraUtils - .parseAndMergeGeneratorWithPrimaryDataForInfraNodes( - response, contrailListModel); - } - }, + vlRemoteList : [ { getAjaxConfig : function() { var postData = diff --git a/webroot/monitor/infrastructure/common/ui/js/models/ConfigNodeListModel.js b/webroot/monitor/infrastructure/common/ui/js/models/ConfigNodeListModel.js index 46456544c..bb1176486 100644 --- a/webroot/monitor/infrastructure/common/ui/js/models/ConfigNodeListModel.js +++ b/webroot/monitor/infrastructure/common/ui/js/models/ConfigNodeListModel.js @@ -7,17 +7,6 @@ define([ ], function (ContrailListModel) { var vlRemoteList = [ - { - getAjaxConfig: function() { - return monitorInfraUtils - .getGeneratorsAjaxConfigForInfraNodes('configNodeDS'); - }, - successCallback: function(response,contrailListModel) { - monitorInfraUtils - .parseAndMergeGeneratorWithPrimaryDataForInfraNodes( - response,contrailListModel); - } - }, { getAjaxConfig: function(responseJSON) { return monitorInfraUtils.getAjaxConfigForInfraNodesCpuStats( diff --git a/webroot/monitor/infrastructure/common/ui/js/models/ControlNodeListModel.js b/webroot/monitor/infrastructure/common/ui/js/models/ControlNodeListModel.js index 0b4b81a19..fe2dfaa54 100644 --- a/webroot/monitor/infrastructure/common/ui/js/models/ControlNodeListModel.js +++ b/webroot/monitor/infrastructure/common/ui/js/models/ControlNodeListModel.js @@ -6,17 +6,6 @@ define([ 'contrail-list-model' ], function (ContrailListModel) { var vlRemoteConfig = [ - { - getAjaxConfig: function() { - return monitorInfraUtils - .getGeneratorsAjaxConfigForInfraNodes('controlNodeDS'); - }, - successCallback: function(response,contrailListModel) { - monitorInfraUtils - .parseAndMergeGeneratorWithPrimaryDataForInfraNodes( - response,contrailListModel); - } - }, { getAjaxConfig: function(responseJSON) { return monitorInfraUtils.getAjaxConfigForInfraNodesCpuStats( diff --git a/webroot/monitor/infrastructure/common/ui/js/models/VRouterListModel.js b/webroot/monitor/infrastructure/common/ui/js/models/VRouterListModel.js index 2b0286758..03fbb9154 100644 --- a/webroot/monitor/infrastructure/common/ui/js/models/VRouterListModel.js +++ b/webroot/monitor/infrastructure/common/ui/js/models/VRouterListModel.js @@ -5,16 +5,7 @@ define(['contrail-list-model'], function(ContrailListModel) { var VRouterListModel = function() { var vlRemoteConfig = { - vlRemoteList: [{ - getAjaxConfig: function(responseJSON) { - return monitorInfraUtils.getGeneratorsAjaxConfigForInfraNodes( - 'computeNodeDS',responseJSON); - }, - successCallback: function(response, contrailListModel) { - monitorInfraUtils.parseAndMergeGeneratorWithPrimaryDataForInfraNodes( - response, contrailListModel); - } - }, + vlRemoteList: [ { getAjaxConfig: function(responseJSON) { return monitorInfraUtils.getAjaxConfigForInfraNodesCpuStats( diff --git a/webroot/monitor/infrastructure/common/ui/js/utils/monitor.infra.parsers.js b/webroot/monitor/infrastructure/common/ui/js/utils/monitor.infra.parsers.js index a707be488..101ed1a31 100644 --- a/webroot/monitor/infrastructure/common/ui/js/utils/monitor.infra.parsers.js +++ b/webroot/monitor/infrastructure/common/ui/js/utils/monitor.infra.parsers.js @@ -39,14 +39,9 @@ define( ifNull(jsonPath(d,'$..bgp_router_ip_list')[0],[]); obj['configIP'] = ifNull(jsonPath(d, '$..ConfigData..bgp_router_parameters.address')[0],'-'); - obj['isConfigMissing'] = $.isEmptyObject(jsonPath(d, - '$..ConfigData')[0]) ? true : false; obj['configuredBgpPeerCnt'] = ifNull(jsonPath(d,'$.value.ConfigData.bgp-router.'+ 'bgp_router_refs')[0],[]).length; - obj['isUveMissing'] = - $.isEmptyObject(jsonPath(d,'$..BgpRouterState')[0]) ? - true : false; obj['ip'] = ifNull(jsonPath(d,'$..bgp_router_ip_list[0]')[0],'-'); //If iplist is empty will display the config ip @@ -70,8 +65,8 @@ define( } } }; - obj['version'] = ifEmpty(self.getNodeVersion(jsonPath(d, - '$.value.BgpRouterState.build_info')[0]),'-'); + obj['version'] = self.getNodeVersion( + getValueByJsonPath(d,"value;NodeStatus;build_info","-")); obj['totalPeerCount'] = ifNull(jsonPath(d,'$..num_bgp_peer')[0],0) + ifNull(jsonPath(d,'$..num_xmpp_peer')[0],0); @@ -107,23 +102,15 @@ define( } else { obj['downXMPPPeerCntText'] = ""; } - obj['isPartialUveMissing'] = false; obj['isIfmapDown'] = false; - if(obj['isUveMissing'] == false) { - obj['isPartialUveMissing'] = - (memCpuUsage == null || cowu.isEmptyObject(memCpuUsage) || cowu.isEmptyObject( - jsonPath(d,'$.value.BgpRouterState.build_info')[0]) || - (obj['configIP'] == '-') || obj['uveIP'].length == 0) - ? true : false; - var ifmapObj = - jsonPath(d,'$.value.BgpRouterState.ifmap_info')[0]; - if(ifmapObj != undefined && + var ifmapObj = + getValueByJsonPath(d,'value;BgpRouterState;ifmap_info'); + if(ifmapObj != null && ifmapObj['connection_status'] != 'Up'){ obj['isIfmapDown'] = true; obj['ifmapDownAt'] = ifNull(ifmapObj['connection_status_change_at'],'-'); } - } obj['isNTPUnsynced'] = monitorInfraUtils.isNTPUnsynced(jsonPath(d,'$..NodeStatus')[0]); if(obj['downBgpPeerCnt'] > 0){ @@ -132,43 +119,21 @@ define( } else { obj['downBgpPeerCntText'] = ""; } - obj['uveCfgIPMisMatch'] = false; - if(obj['isUveMissing'] == false && - obj['isConfigMissing'] == false && - obj['isPartialUveMissing'] == false) { - if(obj['uveIP'].indexOf(obj['configIP']) <= -1){ - obj['uveCfgIPMisMatch'] = true; - } - } obj['type'] = 'controlNode'; obj['display_type'] = 'Control Node'; - var upTime = new XDate(jsonPath(d,'$..uptime')[0]/1000); - var currTime = new XDate(); - var procStateList; try{ obj['status'] = getOverallNodeStatus(d,"control"); }catch(e){ obj['status'] = 'Down'; } - obj['processAlerts'] = - infraMonitorAlertUtils.getProcessAlerts(d,obj); - obj['nodeAlerts'] = - infraMonitorAlertUtils.processControlNodeAlerts(obj); var alarms = getValueByJsonPath(d,'value;UVEAlarms;alarms',[]); - if(cowu.getAlarmsFromAnalytics) { obj['alerts'] = coreAlarmUtils.getAlertsFromAnalytics( { data:obj, alarms:alarms, nodeType:'control-node' -// processPath:processPath }); - } else { - obj['alerts'] = - obj['nodeAlerts'].concat(obj['processAlerts']) - .sort(dashboardUtils.sortInfraAlerts); - } obj['color'] = monitorInfraUtils.getControlNodeColor(d,obj); obj['isGeneratorRetrieved'] = false; @@ -218,12 +183,6 @@ define( if (obj['ip'] != '-') iplist.push(obj['ip']); obj['uveIP'] = iplist; - obj['isConfigMissing'] = $.isEmptyObject(getValueByJsonPath( - dValue, 'ConfigData')) ? true : false; - obj['isUveMissing'] = ($.isEmptyObject(getValueByJsonPath( - dValue, 'VrouterAgent')) && $.isEmptyObject( - getValueByJsonPath(dValue, 'VrouterStatsAgent'))) ? - true : false; obj['isNTPUnsynced'] = monitorInfraUtils.isNTPUnsynced(jsonPath(dValue, '$..NodeStatus')[0]); @@ -309,61 +268,35 @@ define( obj['vnCnt'] = getValueByJsonPath(dValue, 'VrouterAgent;vn_count', 0); - obj['version'] = ifNullOrEmpty(self.getNodeVersion( - getValueByJsonPath(dValue, - 'VrouterAgent;build_info')), noDataStr); + obj['version'] = self.getNodeVersion( + getValueByJsonPath(d,"value;NodeStatus;build_info", noDataStr)); obj['type'] = 'vRouter'; obj['display_type'] = 'Virtual Router'; - obj['isPartialUveMissing'] = false; obj['errorIntfCnt'] = 0; - if (obj['isUveMissing'] == false) { - var xmppPeers = getValueByJsonPath(dValue, - 'VrouterAgent;xmpp_peer_list', []); - obj['xmppPeerDownCnt'] = 0; - $.each(xmppPeers, function(idx, currPeer) { - if (currPeer['status'] != true) { - obj['xmppPeerDownCnt']++; - } - }); - obj['isPartialUveMissing'] = $.isEmptyObject( - getValueByJsonPath(d, - 'value;NodeStatus;process_mem_cpu_usage;contrail-vrouter-agent')) || - $.isEmptyObject(getValueByJsonPath(dValue, - 'VrouterAgent;build_info')) || - obj['uveIP'].length == 0 ? true : false; - obj['errorIntfCnt'] = getValueByJsonPath(dValue, - 'VrouterAgent;down_interface_count', 0); - } + var xmppPeers = getValueByJsonPath(dValue, + 'VrouterAgent;xmpp_peer_list', []); + obj['xmppPeerDownCnt'] = 0; + $.each(xmppPeers, function(idx, currPeer) { + if (currPeer['status'] != true) { + obj['xmppPeerDownCnt']++; + } + }); + obj['errorIntfCnt'] = getValueByJsonPath(dValue, + 'VrouterAgent;down_interface_count', 0); if (obj['errorIntfCnt'] > 0) { obj['errorIntfCntText'] = ", " + obj['errorIntfCnt'] + " Down"; } else { obj['errorIntfCntText'] = ""; } - obj['uveCfgIPMisMatch'] = false; - if (obj['isUveMissing'] == false && obj['isConfigMissing'] == - false && obj['isPartialUveMissing'] == false) { - obj['uveCfgIPMisMatch'] = (obj['uveIP'].indexOf(obj[ - 'configIP']) == -1 && obj['configIP'] != '-') ? - true : false; - } - obj['processAlerts'] = infraMonitorAlertUtils.getProcessAlerts( - d, obj, 'NodeStatus;process_info'); obj['isGeneratorRetrieved'] = false; - obj['nodeAlerts'] = infraMonitorAlertUtils.processvRouterAlerts( - obj); var alarms = getValueByJsonPath(d,'value;UVEAlarms;alarms',[]); - if(cowu.getAlarmsFromAnalytics) { - obj['alerts'] = coreAlarmUtils.getAlertsFromAnalytics( - { - data:obj, - alarms:alarms, - nodeType:'vrouter', - }); - } else { - obj['alerts'] = obj['nodeAlerts'].concat(obj['processAlerts']).sort( - dashboardUtils.sortInfraAlerts); - } + obj['alerts'] = coreAlarmUtils.getAlertsFromAnalytics( + { + data:obj, + alarms:alarms, + nodeType:'vrouter', + }); //Decide color based on parameters obj['color'] = monitorInfraUtils.getvRouterColor(d, obj); obj['cores'] = self.getCores(d); @@ -400,8 +333,8 @@ define( obj['shape'] = 'circle'; obj['type'] = 'analyticsNode'; obj['display_type'] = 'Analytics Node'; - obj['version'] = ifEmpty(self.getNodeVersion(jsonPath(d, - '$.value.CollectorState.build_info')[0]), '-'); + obj['version'] = self.getNodeVersion( + getValueByJsonPath(d,"value;NodeStatus;build_info","-")); try { obj['status'] = getOverallNodeStatus(d, "analytics"); } catch(e) { @@ -440,22 +373,8 @@ define( "$.value.ModuleCpuState.error_strings")[0], []); obj['isNTPUnsynced'] = monitorInfraUtils.isNTPUnsynced(jsonPath(d,'$..NodeStatus')[0]); - var isConfigDataAvailable = $.isEmptyObject(jsonPath(d, - '$..ConfigData')[0]) ? false : true; - obj['isUveMissing'] = - ($.isEmptyObject(jsonPath(d,'$..CollectorState')[0]) - && isConfigDataAvailable) ? true : false; obj['processAlerts'] = infraMonitorAlertUtils.getProcessAlerts(d, obj); - obj['isPartialUveMissing'] = false; - if (obj['isUveMissing'] == false) { - if (cowu.isEmptyObject(getValueByJsonPath(d, - 'value;NodeStatus;process_mem_cpu_usage;contrail-collector')) - || cowu.isEmptyObject(jsonPath(d, - '$.value.CollectorState.build_info')[0])) { - obj['isPartialUveMissing'] = true; - } - } obj['isGeneratorRetrieved'] = false; var genInfos = ifNull(jsonPath(d, '$.value.CollectorState.generator_infos')[0], []); @@ -465,17 +384,12 @@ define( var alarms = getValueByJsonPath(d,'value;UVEAlarms;alarms',[]); alarms = coreAlarmUtils. checkAndAddAnalyticsDownOrAlarmProcessDownAlarms(d,alarms); - if(cowu.getAlarmsFromAnalytics) { - obj['alerts'] = coreAlarmUtils.getAlertsFromAnalytics( - { - data:obj, - alarms:alarms, - nodeType:'analytics-node' - }); - } else { - obj['alerts'] = obj['nodeAlerts'].concat(obj['processAlerts']) - .sort(dashboardUtils.sortInfraAlerts); - } + obj['alerts'] = coreAlarmUtils.getAlertsFromAnalytics( + { + data:obj, + alarms:alarms, + nodeType:'analytics-node' + }); obj['color'] = monitorInfraUtils.getAnalyticsNodeColor(d, obj); obj['cores'] = self.getCores(d); var rawData = $.extend({},d.value,true); @@ -510,8 +424,8 @@ define( obj['y'] = $.isNumeric(obj['y']) ? obj['y'] : 0; //Re-visit once average response time added for config nodes obj['size'] = 0; - obj['version'] = ifEmpty(self.getNodeVersion(jsonPath(d, - '$.value.ModuleCpuState.build_info')[0]),'-'); + obj['version'] = self.getNodeVersion( + getValueByJsonPath(d,"value;NodeStatus;build_info","-")); obj['shape'] = 'circle'; obj['type'] = 'configNode'; obj['display_type'] = 'Config Node'; @@ -530,15 +444,8 @@ define( }; obj['isNTPUnsynced'] = monitorInfraUtils.isNTPUnsynced(jsonPath(d,'$..NodeStatus')[0]); - obj['isConfigMissing'] = - $.isEmptyObject(getValueByJsonPath(d, - 'value;ConfigData')) ? true : false; - obj['isUveMissing'] = - ($.isEmptyObject(getValueByJsonPath(d,'value;configNode'))) - ? true : false; obj['processAlerts'] = infraMonitorAlertUtils.getProcessAlerts(d,obj); - obj['isPartialUveMissing'] = false; try{ obj['status'] = getOverallNodeStatus(d,"config"); }catch(e){ @@ -560,29 +467,16 @@ define( }); obj['summaryIps'] = ipString; } - if(cowu.isEmptyObject(jsonPath(d, - '$.value.NodeStatus.process_mem_cpu_usage'+ - '[?(@="^contrail-api")]')[0]) || - cowu.isEmptyObject(jsonPath(d, - '$.value.ModuleCpuState.build_info')[0])) { - obj['isPartialUveMissing'] = true; - } obj['isGeneratorRetrieved'] = false; obj['nodeAlerts'] = infraMonitorAlertUtils.processConfigNodeAlerts(obj); var alarms = getValueByJsonPath(d,'value;UVEAlarms;alarms',[]); - if(cowu.getAlarmsFromAnalytics) { - obj['alerts'] = coreAlarmUtils.getAlertsFromAnalytics( - { - data:obj, - alarms:alarms, - nodeType:'config-node' - }); - } else { - obj['alerts'] = - obj['nodeAlerts'].concat(obj['processAlerts']) - .sort(dashboardUtils.sortInfraAlerts); - } + obj['alerts'] = coreAlarmUtils.getAlertsFromAnalytics( + { + data:obj, + alarms:alarms, + nodeType:'config-node' + }); obj['color'] = monitorInfraUtils.getConfigNodeColor(d,obj); obj['cores'] = self.getCores(d); var rawData = $.extend({},d.value,true); @@ -617,19 +511,11 @@ define( obj['y'] = $.isNumeric(dbSpaceUsed)? dbSpaceUsed / 1024 / 1024 : 0; - obj['isConfigMissing'] = $.isEmptyObject(getValueByJsonPath(d, - 'value;derived-uve;ConfigData')) ? true : false; - obj['isUveMissing'] = ($.isEmptyObject(getValueByJsonPath(d, - 'value;databaseNode'))) ? true : false; - obj['version'] = ifEmpty(self.getNodeVersion(getValueByJsonPath(d, - 'value;NodeStatus;build_info')),'-'); + obj['version'] = self.getNodeVersion( + getValueByJsonPath(d,"value;NodeStatus;build_info","-")); var configData; - if(!obj['isConfigMissing']){ - configData = getValueByJsonPath(d,'value;derived-uve;ConfigData'); - obj['ip'] = configData.database_node_ip_address; - } else { - obj['ip'] = noDataStr; - } + configData = getValueByJsonPath(d,'value;derived-uve;ConfigData'); + obj['ip'] = getValueByJsonPath(configData,"database_node_ip_address",noDataStr); obj['dbSpaceAvailable'] = dbSpaceAvailable; obj['dbSpaceUsed'] = dbSpaceUsed; obj['analyticsDbSize'] = analyticsDbSize; @@ -665,8 +551,6 @@ define( } } }; - obj['processAlerts'] = - infraMonitorAlertUtils.getProcessAlerts(d,obj); obj['isPartialUveMissing'] = false; try{ obj['status'] = getOverallNodeStatus(d,"db"); @@ -678,17 +562,12 @@ define( obj['nodeAlerts'] = infraMonitorAlertUtils.processDbNodeAlerts(obj); var alarms = getValueByJsonPath(d,'value;UVEAlarms;alarms',[]); - if(cowu.getAlarmsFromAnalytics) { - obj['alerts'] = coreAlarmUtils.getAlertsFromAnalytics( - { - data:obj, - alarms:alarms, - nodeType:'database-node', - }); - } else { - obj['alerts'] = obj['nodeAlerts'].concat(obj['processAlerts']) - .sort(dashboardUtils.sortInfraAlerts); - } + obj['alerts'] = coreAlarmUtils.getAlertsFromAnalytics( + { + data:obj, + alarms:alarms, + nodeType:'database-node', + }); obj['color'] = monitorInfraUtils.getDatabaseNodeColor(d,obj); obj['cores'] = self.getCores(d); var rawData = $.extend({},d.value,true); diff --git a/webroot/monitor/infrastructure/common/ui/js/utils/monitor.infra.utils.js b/webroot/monitor/infrastructure/common/ui/js/utils/monitor.infra.utils.js index 451f5a1c2..aa86ab93c 100644 --- a/webroot/monitor/infrastructure/common/ui/js/utils/monitor.infra.utils.js +++ b/webroot/monitor/infrastructure/common/ui/js/utils/monitor.infra.utils.js @@ -219,55 +219,24 @@ define([ msg: infraAlertMsgs['NTP_UNSYNCED_ERROR'] }, infoObj)); } - if(obj['isUveMissing'] == true) - alertsList.push($.extend({}, { + //ifmap down alerts for control node + if(obj['isIfmapDown']) { + alertsList.push($.extend({ sevLevel: sevLevels['ERROR'], - msg: infraAlertMsgs['UVE_MISSING'] + msg: infraAlertMsgs['IFMAP_DOWN'], + timeStamp: obj['ifmapDownAt'] }, infoObj)); - if(obj['isConfigMissing'] == true) + } + if(obj['downXMPPPeerCnt'] > 0) alertsList.push($.extend({}, { - sevLevel: sevLevels['ERROR'], - msg: infraAlertMsgs['CONFIG_MISSING'] + sevLevel: sevLevels['WARNING'], + msg: infraAlertMsgs['XMPP_PEER_DOWN'].format(obj['downXMPPPeerCnt']) + }, infoObj)); + if(obj['downBgpPeerCnt'] > 0) + alertsList.push($.extend({}, { + sevLevel: sevLevels['WARNING'], + msg: infraAlertMsgs['BGP_PEER_DOWN'].format(obj['downBgpPeerCnt']) }, infoObj)); - if(obj['isUveMissing'] == false) { - //ifmap down alerts for control node - if(obj['isIfmapDown']) { - alertsList.push($.extend({ - sevLevel: sevLevels['ERROR'], - msg: infraAlertMsgs['IFMAP_DOWN'], - timeStamp: obj['ifmapDownAt'] - }, infoObj)); - } - if(obj['isPartialUveMissing'] == true) - alertsList.push($.extend({}, { - sevLevel: sevLevels['INFO'], - msg: infraAlertMsgs['PARTIAL_UVE_MISSING'] - }, infoObj)); - if(obj['downXMPPPeerCnt'] > 0) - alertsList.push($.extend({}, { - sevLevel: sevLevels['WARNING'], - msg: infraAlertMsgs['XMPP_PEER_DOWN'].format(obj['downXMPPPeerCnt']) - }, infoObj)); - if(obj['downBgpPeerCnt'] > 0) - alertsList.push($.extend({}, { - sevLevel: sevLevels['WARNING'], - msg: infraAlertMsgs['BGP_PEER_DOWN'].format(obj['downBgpPeerCnt']) - }, infoObj)); - } - //Alerts that are applicable only when both UVE and config data are present - if(obj['isUveMissing'] == false && obj['isConfigMissing'] == false) { - if(typeof(obj['totalBgpPeerCnt']) == "number" && - obj['configuredBgpPeerCnt'] != obj['totalBgpPeerCnt']) - alertsList.push($.extend({}, { - sevLevel: sevLevels['WARNING'], - msg: infraAlertMsgs['BGP_CONFIG_MISMATCH'] - }, infoObj)); - if(obj['uveCfgIPMisMatch']) - alertsList.push($.extend({}, { - sevLevel: sevLevels['ERROR'], - msg: infraAlertMsgs['CONFIG_IP_MISMATCH'] - }, infoObj)); - } return alertsList.sort(dashboardUtils.sortInfraAlerts); }, processConfigNodeAlerts : function(obj) { @@ -283,20 +252,6 @@ define([ sevLevel: sevLevels['ERROR'], msg: infraAlertMsgs['NTP_UNSYNCED_ERROR'] }, infoObj)); - if(obj['isUveMissing'] == true) - alertsList.push($.extend({}, { - sevLevel: sevLevels['ERROR'], - msg: infraAlertMsgs['UVE_MISSING'] - }, infoObj)); - // if(obj['isConfigMissing'] == true) - // alertsList.push($.extend({},{sevLevel:sevLevels['ERROR'],msg:infraAlertMsgs['CONFIG_MISSING']},infoObj)); - if(obj['isUveMissing'] == false){ - if(obj['isPartialUveMissing'] == true) - alertsList.push($.extend({}, { - sevLevel: sevLevels['INFO'], - msg: infraAlertMsgs['PARTIAL_UVE_MISSING'] - }, infoObj)); - } return alertsList.sort(dashboardUtils.sortInfraAlerts); }, processAnalyticsNodeAlerts : function(obj) { @@ -313,20 +268,6 @@ define([ msg: infraAlertMsgs['NTP_UNSYNCED_ERROR'] }, infoObj)); } - if(obj['isUveMissing'] == true){ - alertsList.push($.extend({}, { - sevLevel: sevLevels['ERROR'], - msg: infraAlertMsgs['UVE_MISSING'] - }, infoObj)); - } - if(obj['isUveMissing'] == false) { - if(obj['isPartialUveMissing'] == true){ - alertsList.push($.extend({}, { - sevLevel: sevLevels['INFO'], - msg: infraAlertMsgs['PARTIAL_UVE_MISSING'] - }, infoObj)); - } - } if(obj['errorStrings'] != null && obj['errorStrings'].length > 0){ $.each(obj['errorStrings'],function(idx,errorString){ alertsList.push($.extend({}, { @@ -352,21 +293,6 @@ define([ msg: infraAlertMsgs['NTP_UNSYNCED_ERROR'] }, infoObj)); } - if(obj['isUveMissing'] == true){ - alertsList.push($.extend({}, { - sevLevel: sevLevels['ERROR'], - msg: infraAlertMsgs['UVE_MISSING'] - }, infoObj)); - } - // if(obj['isConfigMissing'] == true){ - // alertsList.push($.extend({},{sevLevel:sevLevels['ERROR'],msg:infraAlertMsgs['CONFIG_MISSING']},infoObj)); - // } - if(obj['isUveMissing'] == false && obj['isPartialUveMissing'] == true){ - alertsList.push($.extend({}, { - sevLevel: sevLevels['INFO'], - msg: infraAlertMsgs['PARTIAL_UVE_MISSING'] - }, infoObj)); - } if(obj['usedPercentage'] >= 70 && obj['usedPercentage'] < 90){ alertsList.push($.extend({}, { sevLevel: sevLevels['WARNING'], @@ -519,12 +445,7 @@ define([ self.getConfigNodeColor = function (d,obj) { obj= ifNull(obj,{}); - var nodeColor; - if(cowu.getAlarmsFromAnalytics) { - nodeColor = coreAlarmUtils.getNodeColor(obj); - } else { - nodeColor = coreAlarmUtils.getNodeColor(obj); - } + var nodeColor = coreAlarmUtils.getNodeColor(obj); if(nodeColor != false) return nodeColor; return cowc.COLOR_SEVERITY_MAP['blue']; @@ -532,12 +453,7 @@ define([ self.getControlNodeColor = function (d,obj) { obj= ifNull(obj,{}); - var nodeColor; - if(cowu.getAlarmsFromAnalytics) { - nodeColor = coreAlarmUtils.getNodeColor(obj); - } else { - nodeColor = coreAlarmUtils.getNodeColor(obj); - } + var nodeColor = coreAlarmUtils.getNodeColor(obj); if(nodeColor != false) return nodeColor; //If connected to atleast one XMPP Peer @@ -549,12 +465,7 @@ define([ self.getDatabaseNodeColor = function (d,obj) { obj= ifNull(obj,{}); - var nodeColor; - if(cowu.getAlarmsFromAnalytics) { - nodeColor = coreAlarmUtils.getNodeColor(obj); - } else { - nodeColor = coreAlarmUtils.getNodeColor(obj); - } + var nodeColor = coreAlarmUtils.getNodeColor(obj); if(nodeColor != false) return nodeColor; return cowc.COLOR_SEVERITY_MAP['blue']; @@ -563,23 +474,14 @@ define([ self.getAnalyticsNodeColor = function (d, obj) { obj= ifNull(obj,{}); var nodeColor; - if(cowu.getAlarmsFromAnalytics) { - nodeColor = coreAlarmUtils.getNodeColor(obj); - } else { - nodeColor = coreAlarmUtils.getNodeColor(obj); - } + var nodeColor = coreAlarmUtils.getNodeColor(obj); if(nodeColor != false) return nodeColor; return cowc.COLOR_SEVERITY_MAP['blue']; }; self.getvRouterColor = function(d,obj) { - var nodeColor; - if(cowu.getAlarmsFromAnalytics) { - nodeColor = coreAlarmUtils.getNodeColor(obj); - } else { - nodeColor = coreAlarmUtils.getNodeColor(obj); - } + var nodeColor = coreAlarmUtils.getNodeColor(obj); if(nodeColor != false) return nodeColor; obj = ifNull(obj,{}); diff --git a/webroot/monitor/infrastructure/vrouter/api/vrouternode.api.js b/webroot/monitor/infrastructure/vrouter/api/vrouternode.api.js index a6734a68a..1dd2958ae 100644 --- a/webroot/monitor/infrastructure/vrouter/api/vrouternode.api.js +++ b/webroot/monitor/infrastructure/vrouter/api/vrouternode.api.js @@ -269,7 +269,7 @@ function getvRouterDetails (req, res, appData) 'VrouterAgent:build_info', 'VrouterAgent:platform', 'VrouterStatsAgent', 'NodeStatus', - 'UVEAlarms']; + 'UVEAlarms','ContrailConfig']; } opApiServer.apiPost(url, postData, appData,