Skip to content

Commit

Permalink
Merge "Closes-Bug: #1609563 - Fixed the issue where alarms were not b…
Browse files Browse the repository at this point in the history
…eing reported in the scatter chart or the grid for config and database node." into R3.1
  • Loading branch information
Zuul authored and opencontrail-ci-admin committed Aug 8, 2016
2 parents d5e7c97 + 3e07b93 commit 232487c
Showing 1 changed file with 2 additions and 2 deletions.
Expand Up @@ -562,7 +562,7 @@ define(
obj['isGeneratorRetrieved'] = false;
obj['nodeAlerts'] =
infraMonitorAlertUtils.processConfigNodeAlerts(obj);
var alarms = getValueByJsonPath(d,'value;configNode;UVEAlarms;alarms',[]);
var alarms = getValueByJsonPath(d,'value;UVEAlarms;alarms',[]);
if(cowu.getAlarmsFromAnalytics) {
obj['alerts'] = coreAlarmUtils.getAlertsFromAnalytics(
{
Expand Down Expand Up @@ -669,7 +669,7 @@ define(
monitorInfraUtils.isNTPUnsynced(jsonPath(d,'$..NodeStatus')[0]);
obj['nodeAlerts'] =
infraMonitorAlertUtils.processDbNodeAlerts(obj);
var alarms = getValueByJsonPath(d,'value;databaseNode;UVEAlarms;alarms',[]);
var alarms = getValueByJsonPath(d,'value;UVEAlarms;alarms',[]);
if(cowu.getAlarmsFromAnalytics) {
obj['alerts'] = coreAlarmUtils.getAlertsFromAnalytics(
{
Expand Down

0 comments on commit 232487c

Please sign in to comment.