Skip to content

Commit

Permalink
Merge "Related-Bug: #1457610 - Changes to ignore the config data miss…
Browse files Browse the repository at this point in the history
…ing for config and db nodes."
  • Loading branch information
Zuul authored and opencontrail-ci-admin committed May 25, 2015
2 parents 1aa9e66 + 770b6f7 commit bac29c8
Showing 1 changed file with 6 additions and 7 deletions.
13 changes: 6 additions & 7 deletions webroot/monitor/infra/common/ui/js/monitor_infra_utils.js
Expand Up @@ -258,8 +258,8 @@ var infraMonitorAlertUtils = {
alertsList.push($.extend({},{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['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));
Expand Down Expand Up @@ -297,11 +297,10 @@ var infraMonitorAlertUtils = {
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){
// 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){
Expand Down

0 comments on commit bac29c8

Please sign in to comment.