Return-Path: X-Original-To: apmail-ambari-commits-archive@www.apache.org Delivered-To: apmail-ambari-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 50130197E1 for ; Tue, 5 Apr 2016 17:28:40 +0000 (UTC) Received: (qmail 83393 invoked by uid 500); 5 Apr 2016 17:28:40 -0000 Delivered-To: apmail-ambari-commits-archive@ambari.apache.org Received: (qmail 83366 invoked by uid 500); 5 Apr 2016 17:28:40 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 83357 invoked by uid 99); 5 Apr 2016 17:28:40 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 Apr 2016 17:28:40 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E4E84DFC72; Tue, 5 Apr 2016 17:28:39 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: zhewang@apache.org To: commits@ambari.apache.org Message-Id: <61e1e1398023406db909c2e1c17b0cbf@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: ambari git commit: AMBARI-15605 UI Changes To Expose Alert Repeat Tolerance Counts (zhewang) Date: Tue, 5 Apr 2016 17:28:39 +0000 (UTC) Repository: ambari Updated Branches: refs/heads/trunk 79c0a4f35 -> a2c6ea46f AMBARI-15605 UI Changes To Expose Alert Repeat Tolerance Counts (zhewang) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a2c6ea46 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a2c6ea46 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a2c6ea46 Branch: refs/heads/trunk Commit: a2c6ea46f0f180f75b1e76dc2adff2bd53258d36 Parents: 79c0a4f Author: Zhe (Joe) Wang Authored: Tue Apr 5 10:27:43 2016 -0700 Committer: Zhe (Joe) Wang Committed: Tue Apr 5 10:28:09 2016 -0700 ---------------------------------------------------------------------- .../app/controllers/global/update_controller.js | 2 +- ambari-web/app/mappers/alert_instances_mapper.js | 4 +++- ambari-web/app/messages.js | 1 + ambari-web/app/models/alerts/alert_instance.js | 10 ++++++++++ .../templates/common/modal_popups/alerts_popup.hbs | 5 +---- .../templates/main/alerts/alert_instance/status.hbs | 10 ++++++++-- .../templates/main/alerts/definition_details.hbs | 6 +----- .../views/main/alerts/definition_details_view.js | 16 ++++++++++++++++ 8 files changed, 41 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/a2c6ea46/ambari-web/app/controllers/global/update_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/global/update_controller.js b/ambari-web/app/controllers/global/update_controller.js index dcef1a2..dc0f7cf 100644 --- a/ambari-web/app/controllers/global/update_controller.js +++ b/ambari-web/app/controllers/global/update_controller.js @@ -560,7 +560,7 @@ App.UpdateController = Em.Controller.extend({ var realUrl = '/alerts?fields=' + 'Alert/component_name,Alert/definition_id,Alert/definition_name,Alert/host_name,Alert/id,Alert/instance,' + 'Alert/label,Alert/latest_timestamp,Alert/maintenance_state,Alert/original_timestamp,Alert/scope,' + - 'Alert/service_name,Alert/state,Alert/text' + + 'Alert/service_name,Alert/state,Alert/text,Alert/repeat_tolerance,Alert/repeat_tolerance_remaining' + '&Alert/state.in(CRITICAL,WARNING)&Alert/maintenance_state.in(OFF)&from=' + queryParams.from + '&page_size=' + queryParams.page_size; var url = this.getUrl(testUrl, realUrl); http://git-wip-us.apache.org/repos/asf/ambari/blob/a2c6ea46/ambari-web/app/mappers/alert_instances_mapper.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/mappers/alert_instances_mapper.js b/ambari-web/app/mappers/alert_instances_mapper.js index 349d94d..269941b 100644 --- a/ambari-web/app/mappers/alert_instances_mapper.js +++ b/ambari-web/app/mappers/alert_instances_mapper.js @@ -40,7 +40,9 @@ App.alertInstanceMapper = App.QuickDataMapper.create({ maintenance_state: 'Alert.maintenance_state', instance: 'Alert.instance', state: 'Alert.state', - text: 'Alert.text' + text: 'Alert.text', + repeat_tolerance: 'Alert.repeat_tolerance', + repeat_tolerance_remaining: 'Alert.repeat_tolerance_remaining' }, map: function(json) { http://git-wip-us.apache.org/repos/asf/ambari/blob/a2c6ea46/ambari-web/app/messages.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js index 1653eeb..f68d97a 100644 --- a/ambari-web/app/messages.js +++ b/ambari-web/app/messages.js @@ -326,6 +326,7 @@ Em.I18n.translations = { 'models.alert_instance.tiggered.verbose': "Occurred on {0}
Checked on {1}", 'models.alert_definition.triggered.verbose': "Occurred on {0}", 'models.alert_definition.triggered.checked': "Status Changed: {0}\nLast Checked: {1}", + 'models.alert_definition.check.retry': "Retried {0} out of {1} alerts before sending notifications", 'passiveState.turnOn':'Turn On Maintenance Mode', 'passiveState.turnOff':'Turn Off Maintenance Mode', http://git-wip-us.apache.org/repos/asf/ambari/blob/a2c6ea46/ambari-web/app/models/alerts/alert_instance.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/models/alerts/alert_instance.js b/ambari-web/app/models/alerts/alert_instance.js index d8710a0..b366802 100644 --- a/ambari-web/app/models/alerts/alert_instance.js +++ b/ambari-web/app/models/alerts/alert_instance.js @@ -37,6 +37,8 @@ App.AlertInstance = DS.Model.extend({ instance: DS.attr('string'), state: DS.attr('string'), text: DS.attr('string'), + repeatTolerance: DS.attr('number'), + repeatToleranceRemaining: DS.attr('number'), notification: DS.hasMany('App.AlertNotification'), /** @@ -145,6 +147,14 @@ App.AlertInstance = DS.Model.extend({ 'DISABLED': 'icon-off' }, + repeatToleranceReceived: function () { + return this.get('repeatTolerance') - this.get('repeatToleranceRemaining'); + }.property('repeatToleranceRemaining', 'repeatTolerance'), + + retryText: function () { + return this.get('state') === 'OK' ? '' : Em.I18n.t('models.alert_definition.check.retry').format(this.get('repeatToleranceReceived'), this.get('repeatTolerance')); + }.property('state','repeatToleranceRemaining', 'repeatTolerance'), + /** * Define if definition serviceName is Ambari * Used in some logic in templates to distinguish definitions with Ambari serviceName http://git-wip-us.apache.org/repos/asf/ambari/blob/a2c6ea46/ambari-web/app/templates/common/modal_popups/alerts_popup.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/common/modal_popups/alerts_popup.hbs b/ambari-web/app/templates/common/modal_popups/alerts_popup.hbs index 4debe10..2382de7 100644 --- a/ambari-web/app/templates/common/modal_popups/alerts_popup.hbs +++ b/ambari-web/app/templates/common/modal_popups/alerts_popup.hbs @@ -43,10 +43,7 @@
- {{template "templates/main/alerts/alert_instance/status"}} - - - + {{view App.AlertInstanceStateView instanceBinding="instance"}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/a2c6ea46/ambari-web/app/templates/main/alerts/alert_instance/status.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/alerts/alert_instance/status.hbs b/ambari-web/app/templates/main/alerts/alert_instance/status.hbs index d82bc7b..73cb1e1 100644 --- a/ambari-web/app/templates/main/alerts/alert_instance/status.hbs +++ b/ambari-web/app/templates/main/alerts/alert_instance/status.hbs @@ -22,5 +22,11 @@ {{#if instance.isMaintenanceStateOn}} {{/if}} - {{instance.shortStateMsg}} - \ No newline at end of file + + {{instance.shortStateMsg}} + + + \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/a2c6ea46/ambari-web/app/templates/main/alerts/definition_details.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/alerts/definition_details.hbs b/ambari-web/app/templates/main/alerts/definition_details.hbs index 14b749d..0048226 100644 --- a/ambari-web/app/templates/main/alerts/definition_details.hbs +++ b/ambari-web/app/templates/main/alerts/definition_details.hbs @@ -212,11 +212,7 @@ {{/if}} - {{template "templates/main/alerts/alert_instance/status"}} - + {{view App.AlertInstanceStateView instanceBinding="instance"}} {{view view.parentView.lastDayCount hostNameBinding="instance.hostName"}} http://git-wip-us.apache.org/repos/asf/ambari/blob/a2c6ea46/ambari-web/app/views/main/alerts/definition_details_view.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/main/alerts/definition_details_view.js b/ambari-web/app/views/main/alerts/definition_details_view.js index 2fc75c1..656021c 100644 --- a/ambari-web/app/views/main/alerts/definition_details_view.js +++ b/ambari-web/app/views/main/alerts/definition_details_view.js @@ -318,4 +318,20 @@ App.AlertInstanceServiceHostView = Em.View.extend({ */ showSeparator: Em.computed.and('instance.serviceDisplayName', 'instance.hostName') +}); + +App.AlertInstanceStateView = Em.View.extend({ + + templateName: require('templates/main/alerts/alert_instance/status'), + + didInsertElement: function () { + App.tooltip(this.$("[rel='StateTooltip']")); + App.tooltip(this.$("[rel='tooltip']")); + }, + + willDestroyElement: function() { + this.$("[rel='StateTooltip']").remove(); + this.$("[rel='tooltip']").remove(); + } + }); \ No newline at end of file