Repository: ambari Updated Branches: refs/heads/trunk 0613eeb01 -> 2fe5a5c9f
AMBARI-9146. Alerts UI: service alerts badge not respecting maint. mode. (akovalenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2fe5a5c9 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2fe5a5c9 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2fe5a5c9 Branch: refs/heads/trunk Commit: 2fe5a5c9fd914edebf2fdc0c808cbd1445ad6e57 Parents: 0613eeb Author: Aleksandr Kovalenko <[email protected]> Authored: Thu Jan 15 15:46:02 2015 +0200 Committer: Aleksandr Kovalenko <[email protected]> Committed: Thu Jan 15 16:19:23 2015 +0200 ---------------------------------------------------------------------- ambari-web/app/models/alert_definition.js | 9 +++++---- ambari-web/test/models/alert_definition_test.js | 2 ++ 2 files changed, 7 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/2fe5a5c9/ambari-web/app/models/alert_definition.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/models/alert_definition.js b/ambari-web/app/models/alert_definition.js index aa293f0..b525273 100644 --- a/ambari-web/app/models/alert_definition.js +++ b/ambari-web/app/models/alert_definition.js @@ -59,7 +59,7 @@ App.AlertDefinition = DS.Model.extend({ * count: 0, * maintenanceCount: 0 * }, - * "WARN": { + * "WARNING": { * count: 1, * maintenanceCount: 1 * } @@ -185,12 +185,13 @@ App.AlertDefinition = DS.Model.extend({ }.property('type'), /** - * if this definition is in state: CRIT / WARNING, if true, will show up in alerts fast access popup + * if this definition is in state: CRITICAL / WARNING, if true, will show up in alerts fast access popup + * instances with maintenance mode ON are ignored * @type {boolean} */ isCriticalOrWarning: function () { - return this.get('isCritical') || this.get('isWarning'); - }.property('isCritical', 'isWarning'), + return !!(this.get('summary.CRITICAL.count') || this.get('summary.WARNING.count')); + }.property('summary'), /** * if this definition is in state: CRIT http://git-wip-us.apache.org/repos/asf/ambari/blob/2fe5a5c9/ambari-web/test/models/alert_definition_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/models/alert_definition_test.js b/ambari-web/test/models/alert_definition_test.js index 7af42ea..1e349b1 100644 --- a/ambari-web/test/models/alert_definition_test.js +++ b/ambari-web/test/models/alert_definition_test.js @@ -76,6 +76,8 @@ describe('App.AlertDefinition', function () { Em.A([ {summary: {CRITICAL: {count: 1, maintenanceCount: 0}}, e: true}, + {summary: {CRITICAL: {count: 0, maintenanceCount: 1}}, e: false}, + {summary: {CRITICAL: {count: 1, maintenanceCount: 1}}, e: true}, {summary: {WARNING: {count: 1, maintenanceCount: 0}}, e: true}, {summary: {OK: {count: 1, maintenanceCount: 0}}, e: false}, {summary: {UNKNOWN: {count: 1, maintenanceCount: 0}}, e: false},
