You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by al...@apache.org on 2015/04/21 14:53:45 UTC
ambari git commit: AMBARI-10625. UI Improvements For Server Side
Alerts (alexantonenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 26e376ae9 -> 48942574e
AMBARI-10625. UI Improvements For Server Side Alerts (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/48942574
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/48942574
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/48942574
Branch: refs/heads/trunk
Commit: 48942574e16040c0dac6f393ad2a5fad2739107c
Parents: 26e376a
Author: Alex Antonenko <hi...@gmail.com>
Authored: Tue Apr 21 15:15:39 2015 +0300
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Tue Apr 21 15:53:40 2015 +0300
----------------------------------------------------------------------
.../main/alerts/add_alert_definition/step1_controller.js | 3 ++-
ambari-web/app/models/alert_definition.js | 3 ++-
ambari-web/app/views/main/alert_definitions_view.js | 6 +++++-
3 files changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/48942574/ambari-web/app/controllers/main/alerts/add_alert_definition/step1_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/alerts/add_alert_definition/step1_controller.js b/ambari-web/app/controllers/main/alerts/add_alert_definition/step1_controller.js
index a00592f..addb120 100644
--- a/ambari-web/app/controllers/main/alerts/add_alert_definition/step1_controller.js
+++ b/ambari-web/app/controllers/main/alerts/add_alert_definition/step1_controller.js
@@ -31,7 +31,8 @@ App.AddAlertDefinitionStep1Controller = Em.Controller.extend({
Em.Object.create({value: 'METRIC', isActive: false, icon: 'icon-bolt'}),
Em.Object.create({value: 'WEB', isActive: false, icon: 'icon-globe'}),
Em.Object.create({value: 'AGGREGATE', isActive: false, icon: 'icon-plus-sign-alt'}),
- Em.Object.create({value: 'SCRIPT', isActive: false, icon: 'icon-code'})
+ Em.Object.create({value: 'SCRIPT', isActive: false, icon: 'icon-code'}),
+ Em.Object.create({value: 'SERVER', isActive: false, icon: 'icon-desktop'})
],
/**
http://git-wip-us.apache.org/repos/asf/ambari/blob/48942574/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 d8b774f..d1310ff 100644
--- a/ambari-web/app/models/alert_definition.js
+++ b/ambari-web/app/models/alert_definition.js
@@ -272,7 +272,8 @@ App.AlertDefinition = DS.Model.extend({
'SCRIPT': 'icon-file-text',
'WEB': 'icon-globe',
'PORT': 'icon-signin',
- 'AGGREGATE': 'icon-plus'
+ 'AGGREGATE': 'icon-plus',
+ 'SERVER': 'icon-desktop'
},
/**
http://git-wip-us.apache.org/repos/asf/ambari/blob/48942574/ambari-web/app/views/main/alert_definitions_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/alert_definitions_view.js b/ambari-web/app/views/main/alert_definitions_view.js
index 28d15df..b20beb3 100644
--- a/ambari-web/app/views/main/alert_definitions_view.js
+++ b/ambari-web/app/views/main/alert_definitions_view.js
@@ -292,6 +292,10 @@ App.MainAlertDefinitionsView = App.TableView.extend({
{
value: 'AGGREGATE',
label: 'AGGREGATE'
+ },
+ {
+ value: 'SERVER',
+ label: 'SERVER'
}
],
onChangeValue: function(){
@@ -524,4 +528,4 @@ App.MainAlertDefinitionsView = App.TableView.extend({
this.tooltipsUpdater();
}
-});
\ No newline at end of file
+});