You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sr...@apache.org on 2014/12/09 22:50:15 UTC
ambari git commit: AMBARI-8619. Remove experimental flag for Alerts
when the feature is stabilized
Repository: ambari
Updated Branches:
refs/heads/trunk 6ed4fe450 -> 1a04f7c7d
AMBARI-8619. Remove experimental flag for Alerts when the feature is stabilized
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1a04f7c7
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1a04f7c7
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1a04f7c7
Branch: refs/heads/trunk
Commit: 1a04f7c7d077a94484afd42a159213966ed73c26
Parents: 6ed4fe4
Author: Srimanth Gunturi <sg...@hortonworks.com>
Authored: Tue Dec 9 13:42:27 2014 -0800
Committer: Srimanth Gunturi <sg...@hortonworks.com>
Committed: Tue Dec 9 13:42:27 2014 -0800
----------------------------------------------------------------------
ambari-web/app/config.js | 1 -
.../controllers/global/cluster_controller.js | 23 +++++++-------------
.../app/controllers/global/update_controller.js | 11 +++++-----
ambari-web/app/views/main/host/menu.js | 14 +++++-------
ambari-web/app/views/main/menu.js | 9 +++-----
5 files changed, 22 insertions(+), 36 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/1a04f7c7/ambari-web/app/config.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/config.js b/ambari-web/app/config.js
index 2b50b26..0f66017 100644
--- a/ambari-web/app/config.js
+++ b/ambari-web/app/config.js
@@ -59,7 +59,6 @@ App.enableExperimental = false;
App.supports = {
stackUpgrade: false,
autoRollbackHA: false,
- alerts: true,
alwaysEnableManagedMySQLForHive: false,
automatedKerberos: false,
customizeAgentUserAccount: false
http://git-wip-us.apache.org/repos/asf/ambari/blob/1a04f7c7/ambari-web/app/controllers/global/cluster_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/global/cluster_controller.js b/ambari-web/app/controllers/global/cluster_controller.js
index e04adfb..bbc088c 100644
--- a/ambari-web/app/controllers/global/cluster_controller.js
+++ b/ambari-web/app/controllers/global/cluster_controller.js
@@ -347,24 +347,17 @@ App.ClusterController = Em.Controller.extend({
});
self.updateLoadStatus('serviceMetrics');
- if (App.get('supports.alerts')) {
- updater.updateAlertGroups(function () {
- updater.updateAlertDefinitions(function() {
- updater.updateAlertDefinitionSummary(function () {
- updater.updateUnhealthyAlertInstances(function () {
- self.updateLoadStatus('alertGroups');
- self.updateLoadStatus('alertDefinitions');
- self.updateLoadStatus('alertInstancesUnhealthy');
- });
+ updater.updateAlertGroups(function () {
+ updater.updateAlertDefinitions(function() {
+ updater.updateAlertDefinitionSummary(function () {
+ updater.updateUnhealthyAlertInstances(function () {
+ self.updateLoadStatus('alertGroups');
+ self.updateLoadStatus('alertDefinitions');
+ self.updateLoadStatus('alertInstancesUnhealthy');
});
});
});
- }
- else {
- self.updateLoadStatus('alertGroups');
- self.updateLoadStatus('alertDefinitions');
- self.updateLoadStatus('alertInstancesUnhealthy');
- }
+ });
});
});
self.loadRootService().done(function (data) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/1a04f7c7/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 5d8aa58..754421c 100644
--- a/ambari-web/app/controllers/global/update_controller.js
+++ b/ambari-web/app/controllers/global/update_controller.js
@@ -128,12 +128,11 @@ App.UpdateController = Em.Controller.extend({
App.updater.run(this, 'updateComponentsState', 'isWorking', App.componentsUpdateInterval);
App.updater.run(this, 'graphsUpdate', 'isWorking');
App.updater.run(this, 'updateComponentConfig', 'isWorking');
- if (App.get('supports.alerts')) {
- App.updater.run(this, 'updateAlertGroups', 'isWorking', App.alertGroupsUpdateInterval);
- App.updater.run(this, 'updateAlertDefinitions', 'isWorking', App.alertDefinitionsUpdateInterval);
- App.updater.run(this, 'updateAlertDefinitionSummary', 'isWorking', App.alertDefinitionsUpdateInterval);
- App.updater.run(this, 'updateUnhealthyAlertInstances', 'isWorking', App.alertInstancesUpdateInterval);
- }
+
+ App.updater.run(this, 'updateAlertGroups', 'isWorking', App.alertGroupsUpdateInterval);
+ App.updater.run(this, 'updateAlertDefinitions', 'isWorking', App.alertDefinitionsUpdateInterval);
+ App.updater.run(this, 'updateAlertDefinitionSummary', 'isWorking', App.alertDefinitionsUpdateInterval);
+ App.updater.run(this, 'updateUnhealthyAlertInstances', 'isWorking', App.alertInstancesUpdateInterval);
}
}.observes('isWorking'),
/**
http://git-wip-us.apache.org/repos/asf/ambari/blob/1a04f7c7/ambari-web/app/views/main/host/menu.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/host/menu.js b/ambari-web/app/views/main/host/menu.js
index ef247b3..9a7fbae 100644
--- a/ambari-web/app/views/main/host/menu.js
+++ b/ambari-web/app/views/main/host/menu.js
@@ -40,14 +40,12 @@ App.MainHostMenuView = Em.CollectionView.extend({
routing: 'stackVersions'
});
}
- if (App.get('supports.alerts')) {
- array.push({
- label: 'Alerts',
- routing: 'alerts',
- badgeText: '0',
- badgeClasses: 'label '
- });
- }
+ array.push({
+ label: 'Alerts',
+ routing: 'alerts',
+ badgeText: '0',
+ badgeClasses: 'label '
+ });
return array;
}.property(''),
http://git-wip-us.apache.org/repos/asf/ambari/blob/1a04f7c7/ambari-web/app/views/main/menu.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/menu.js b/ambari-web/app/views/main/menu.js
index 509d416..8f6d2ad 100644
--- a/ambari-web/app/views/main/menu.js
+++ b/ambari-web/app/views/main/menu.js
@@ -39,13 +39,10 @@ App.MainMenuView = Em.CollectionView.extend({
result.push(
{ label: Em.I18n.t('menu.item.dashboard'), routing: 'dashboard', active: 'active'},
{ label: Em.I18n.t('menu.item.services'), routing: 'services'},
- { label: Em.I18n.t('menu.item.hosts'), routing: 'hosts', hasAlertsLabel: true}
+ { label: Em.I18n.t('menu.item.hosts'), routing: 'hosts', hasAlertsLabel: true},
+ { label: Em.I18n.t('menu.item.alerts'), routing: 'alerts'}
);
- if (App.get('supports.alerts')) {
- result.push({ label: Em.I18n.t('menu.item.alerts'), routing: 'alerts'});
- }
-
if (!App.get('isHadoop2Stack')) {
result.push({ label: Em.I18n.t('menu.item.jobs'), routing: 'apps'});
}
@@ -58,7 +55,7 @@ App.MainMenuView = Em.CollectionView.extend({
}
return result;
}.property('App.router.loggedIn', 'views.length',
- 'App.router.clusterController.isLoaded', 'App.router.clusterInstallCompleted', 'App.supports.alerts'),
+ 'App.router.clusterController.isLoaded', 'App.router.clusterInstallCompleted'),
itemViewClass: Em.View.extend({