You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by xi...@apache.org on 2015/01/06 02:50:36 UTC
[1/2] ambari git commit: AMBARI-8843. Fix the warn counts for HBase
in Ambari for dashboard widgets.(xiwang)
Repository: ambari
Updated Branches:
refs/heads/trunk 1d1ebb487 -> ab7d4630a
AMBARI-8843. Fix the warn counts for HBase in Ambari for dashboard widgets.(xiwang)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ab7d4630
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ab7d4630
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ab7d4630
Branch: refs/heads/trunk
Commit: ab7d4630ae83efdca9e7a03ef9afefba15913f36
Parents: c6ccbf4
Author: Xi Wang <xi...@apache.org>
Authored: Mon Jan 5 17:48:54 2015 -0800
Committer: Xi Wang <xi...@apache.org>
Committed: Mon Jan 5 17:49:01 2015 -0800
----------------------------------------------------------------------
ambari-web/app/views/main/dashboard/widgets.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/ab7d4630/ambari-web/app/views/main/dashboard/widgets.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/dashboard/widgets.js b/ambari-web/app/views/main/dashboard/widgets.js
index eb7af97..8e1ca51 100644
--- a/ambari-web/app/views/main/dashboard/widgets.js
+++ b/ambari-web/app/views/main/dashboard/widgets.js
@@ -505,7 +505,7 @@ App.MainDashboardWidgetsView = Em.View.extend(App.UserPref, App.LocalStorage, {
dashboardVersion: 'new',
visible: [],
hidden: [],
- threshold: {1: [80, 90], 2: [85, 95], 3: [90, 95], 4: [80, 90], 5: [1000, 3000], 6: [], 7: [], 8: [], 9: [], 10: [], 11: [], 12: [], 13: [70, 90], 14: [10, 19.2], 15: [3, 10], 16: [],
+ threshold: {1: [80, 90], 2: [85, 95], 3: [90, 95], 4: [80, 90], 5: [1000, 3000], 6: [], 7: [], 8: [], 9: [], 10: [], 11: [], 12: [], 13: [70, 90], 14: [150, 250], 15: [3, 10], 16: [],
17: [70, 90], 18: [], 19: [50, 75], 20: [50, 75], 21: [85, 95], 22: [85, 95], 23: []} // id:[thresh1, thresh2]
}),
[2/2] ambari git commit: AMBARI-8697-2. Alerts UI: thresholds
validation.(xiwang)
Posted by xi...@apache.org.
AMBARI-8697-2. Alerts UI: thresholds validation.(xiwang)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c6ccbf42
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c6ccbf42
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c6ccbf42
Branch: refs/heads/trunk
Commit: c6ccbf427843e42eea8797e2834974ae6e5c0713
Parents: 1d1ebb4
Author: Xi Wang <xi...@apache.org>
Authored: Mon Jan 5 17:15:27 2015 -0800
Committer: Xi Wang <xi...@apache.org>
Committed: Mon Jan 5 17:49:01 2015 -0800
----------------------------------------------------------------------
ambari-web/app/models/alert_config.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/c6ccbf42/ambari-web/app/models/alert_config.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/models/alert_config.js b/ambari-web/app/models/alert_config.js
index 990963f..c20ac48 100644
--- a/ambari-web/app/models/alert_config.js
+++ b/ambari-web/app/models/alert_config.js
@@ -355,7 +355,7 @@ App.AlertConfigProperties = {
valueWasChanged: function () {
var displayValue = this.get('displayValue');
var newDisplayValue = this.getNewValue();
- if (newDisplayValue != displayValue) {
+ if (Math.abs(newDisplayValue - displayValue) > 0.000001) {
this.set('displayValue', newDisplayValue);
}
}.observes('value'),
@@ -372,7 +372,7 @@ App.AlertConfigProperties = {
displayValueWasChanged: function () {
var value = this.get('value');
var newValue = this.getNewDisplayValue();
- if (newValue != value) {
+ if (Math.abs(newValue - value) > 0.000001) {
this.set('value', newValue);
}
}.observes('displayValue')