ambari git commit: AMBARI-13316. Stack Advisor for hive.security.authorization.manager with Ranger enabled is not specific enough (gautam)

[gautam]

Repository: ambari
Updated Branches:
  refs/heads/trunk 7d6b2d74d -> e9389246d


AMBARI-13316. Stack Advisor for hive.security.authorization.manager with
Ranger enabled is not specific enough (gautam)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e9389246
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e9389246
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e9389246

Branch: refs/heads/trunk
Commit: e9389246dc3dbe98eccf32e8ad89eca808e6438f
Parents: 7d6b2d7
Author: Gautam Borad 
Authored: Mon Oct 5 18:54:12 2015 +0530
Committer: Gautam Borad 
Committed: Thu Oct 8 11:50:43 2015 +0530

--
 .../stacks/HDP/2.2/services/stack_advisor.py| 49 
 .../RANGER/configuration/ranger-ugsync-site.xml |  7 ++-
 .../stacks/HDP/2.3/services/stack_advisor.py| 11 -
 .../stacks/2.2/common/test_stack_advisor.py |  2 +-
 4 files changed, 24 insertions(+), 45 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/e9389246/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py 
b/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py
index 6ccd7eb..71fa5ab 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py
@@ -1006,14 +1006,21 @@ class HDP22StackAdvisor(HDP21StackAdvisor):
   validationItems.append({"config-name": prop_name,
   "item": self.getWarnItem(
   "If Ranger Hive Plugin is enabled."\
-  " {0} needs to be set to 
{1}".format(prop_name,prop_val))})
+  " {0} under hiveserver2-site needs to be set 
to {1}".format(prop_name,prop_val))})
 prop_name = 'hive.security.authenticator.manager'
 prop_val = 
"org.apache.hadoop.hive.ql.security.SessionStateUserAuthenticator"
 if prop_name not in hive_server2 or hive_server2[prop_name] != 
prop_val:
   validationItems.append({"config-name": prop_name,
   "item": self.getWarnItem(
   "If Ranger Hive Plugin is enabled."\
-  " {0} needs to be set to 
{1}".format(prop_name,prop_val))})
+  " {0} under hiveserver2-site needs to be set 
to {1}".format(prop_name,prop_val))})
+prop_name = 'hive.security.authorization.enabled'
+prop_val = 'true'
+if prop_name in hive_server2 and hive_server2[prop_name] != prop_val:
+  validationItems.append({"config-name": prop_name,
+  "item": self.getWarnItem(
+  "If Ranger Hive Plugin is enabled."\
+  " {0} under hiveserver2-site needs to be set 
to {1}".format(prop_name, prop_val))})
   ##Add stack validations for  Ranger plugin disabled.
   elif not ranger_plugin_enabled:
 prop_name = 'hive.security.authorization.manager'
@@ -1049,44 +1056,6 @@ class HDP22StackAdvisor(HDP21StackAdvisor):
 parentValidationProblems = super(HDP22StackAdvisor, 
self).validateHiveConfigurations(properties, recommendedDefaults, 
configurations, services, hosts)
 hive_site = properties
 validationItems = []
-#Adding Ranger Plugin logic here
-ranger_plugin_properties = getSiteProperties(configurations, 
"ranger-hive-plugin-properties")
-hive_env_properties = getSiteProperties(configurations, "hive-env")
-ranger_plugin_enabled = hive_env_properties \
-and 'hive_security_authorization' in 
hive_env_properties \
-and 
hive_env_properties['hive_security_authorization'].lower() == 'ranger'
-servicesList = [service["StackServices"]["service_name"] for service in 
services["services"]]
-##Add stack validations only if Ranger is enabled.
-if ("RANGER" in servicesList):
-  ##Add stack validations for  Ranger plugin enabled.
-  if ranger_plugin_enabled:
-prop_name = 'hive.security.authorization.enabled'
-prop_val = 'true'
-if hive_site and \
-prop_name in hive_site and \
-  hive_site[prop_name] != prop_val:
-  validationItems.append({"config-name": prop_name,
-  "item": self.getWarnItem(
-"If Ranger Hive Plugin is enabled." \
-" {0} needs to be set to 

[1/2] ambari git commit: Revert "Revert "AMBARI-13307. Agent instance memory footprint likely gradually growing (aonishuk)""

[aonishuk]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 7ac3e529f -> 8ef722dc3


Revert "Revert "AMBARI-13307. Agent instance memory footprint likely gradually 
growing (aonishuk)""

This reverts commit 68395ded0d2f6174b9f13a6b6ad0c800308b7d74.


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/dee7089b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/dee7089b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/dee7089b

Branch: refs/heads/branch-2.1
Commit: dee7089b1cbec527c56bdd8925fae9e421ef7b10
Parents: 7ac3e52
Author: Andrew Onishuk 
Authored: Thu Oct 8 11:58:20 2015 +0300
Committer: Andrew Onishuk 
Committed: Thu Oct 8 11:58:20 2015 +0300

--
 ambari-common/src/main/python/resource_management/core/logger.py | 4 
 1 file changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/dee7089b/ambari-common/src/main/python/resource_management/core/logger.py
--
diff --git a/ambari-common/src/main/python/resource_management/core/logger.py 
b/ambari-common/src/main/python/resource_management/core/logger.py
index 7642c6d..0ea34ff 100644
--- a/ambari-common/src/main/python/resource_management/core/logger.py
+++ b/ambari-common/src/main/python/resource_management/core/logger.py
@@ -37,6 +37,10 @@ class Logger:
   @staticmethod
   def initialize_logger(name='resource_management', 
logging_level=logging.INFO, format='%(asctime)s - %(message)s'):
 # set up logging (two separate loggers for stderr and stdout with 
different loglevels)
+
+if Logger.logger:
+  return
+
 logger = logging.getLogger(name)
 logger.setLevel(logging_level)
 formatter = logging.Formatter(format)

[2/2] ambari git commit: AMBARI-13352. JobHistoryServer start fails with bad permissions on state directory. (aonishuk)

[aonishuk]

AMBARI-13352. JobHistoryServer start fails with bad permissions on state 
directory. (aonishuk)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d685062f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d685062f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d685062f

Branch: refs/heads/branch-2.1
Commit: d685062f9084614b17d29fccc624181320a465c1
Parents: 8ef722d
Author: Andrew Onishuk 
Authored: Thu Oct 8 13:11:26 2015 +0300
Committer: Andrew Onishuk 
Committed: Thu Oct 8 13:11:26 2015 +0300

--
 .../common-services/YARN/2.1.0.2.0/package/scripts/yarn.py | 3 +++
 .../src/test/python/stacks/2.0.6/YARN/test_historyserver.py| 6 ++
 2 files changed, 9 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/d685062f/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/yarn.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/yarn.py
 
b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/yarn.py
index 542a5fe..b1b8ded 100644
--- 
a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/yarn.py
+++ 
b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/yarn.py
@@ -96,6 +96,9 @@ def yarn(name = None):
   recursive=True,
   cd_access="a",
   )
+Execute(("chown", "-R", format("{mapred_user}:{user_group}"), 
params.jhs_leveldb_state_store_dir),
+sudo = True,
+)
 
   if name == "nodemanager":
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/d685062f/ambari-server/src/test/python/stacks/2.0.6/YARN/test_historyserver.py
--
diff --git 
a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_historyserver.py 
b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_historyserver.py
index 45c7978..6901f62 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_historyserver.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_historyserver.py
@@ -253,6 +253,9 @@ class TestHistoryServer(RMFTestCase):
   recursive = True,
   cd_access = 'a',
 )
+self.assertResourceCalled('Execute', ('chown', '-R', u'mapred:hadoop', 
'/hadoop/mapreduce/jhs'),
+sudo = True,
+)
 self.assertResourceCalled('Directory', '/var/run/hadoop-yarn',
   owner = 'yarn',
   group = 'hadoop',
@@ -476,6 +479,9 @@ class TestHistoryServer(RMFTestCase):
   recursive = True,
   cd_access = 'a',
 )
+self.assertResourceCalled('Execute', ('chown', '-R', u'mapred:hadoop', 
'/hadoop/mapreduce/jhs'),
+sudo = True,
+)
 self.assertResourceCalled('Directory', '/var/run/hadoop-yarn',
   owner = 'yarn',
   group = 'hadoop',

ambari git commit: AMBARI-13307. Agent instance memory footprint likely gradually growing (aonishuk)

[aonishuk]

Repository: ambari
Updated Branches:
  refs/heads/trunk e9389246d -> c6303b67b


AMBARI-13307. Agent instance memory footprint likely gradually growing 
(aonishuk)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c6303b67
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c6303b67
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c6303b67

Branch: refs/heads/trunk
Commit: c6303b67b363790128eea12f99e7d8ad14ecb6d7
Parents: e938924
Author: Andrew Onishuk 
Authored: Thu Oct 8 13:08:54 2015 +0300
Committer: Andrew Onishuk 
Committed: Thu Oct 8 13:08:54 2015 +0300

--
 .../main/python/resource_management/core/logger.py   |  4 ++--
 .../resource_management/libraries/script/script.py   | 15 +--
 2 files changed, 7 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/c6303b67/ambari-common/src/main/python/resource_management/core/logger.py
--
diff --git a/ambari-common/src/main/python/resource_management/core/logger.py 
b/ambari-common/src/main/python/resource_management/core/logger.py
index 7642c6d..f126f1e 100644
--- a/ambari-common/src/main/python/resource_management/core/logger.py
+++ b/ambari-common/src/main/python/resource_management/core/logger.py
@@ -36,6 +36,8 @@ class Logger:
   
   @staticmethod
   def initialize_logger(name='resource_management', 
logging_level=logging.INFO, format='%(asctime)s - %(message)s'):
+if Logger.logger:
+  return
 # set up logging (two separate loggers for stderr and stdout with 
different loglevels)
 logger = logging.getLogger(name)
 logger.setLevel(logging_level)
@@ -51,8 +53,6 @@ class Logger:
 logger.addHandler(chout)
 
 Logger.logger = logger
-
-return logger, chout, cherr
 
   @staticmethod
   def error(text):

http://git-wip-us.apache.org/repos/asf/ambari/blob/c6303b67/ambari-common/src/main/python/resource_management/libraries/script/script.py
--
diff --git 
a/ambari-common/src/main/python/resource_management/libraries/script/script.py 
b/ambari-common/src/main/python/resource_management/libraries/script/script.py
index fc0428d..3e15898 100644
--- 
a/ambari-common/src/main/python/resource_management/libraries/script/script.py
+++ 
b/ambari-common/src/main/python/resource_management/libraries/script/script.py
@@ -96,7 +96,6 @@ class Script(object):
   basedir = ""
   stroutfile = ""
   logging_level = ""
-  logger = None
 
   # Class variable
   tmp_dir = ""
@@ -117,7 +116,7 @@ class Script(object):
 Script.structuredOut = json.load(fp)
   except Exception:
 errMsg = 'Unable to read structured output from ' + self.stroutfile
-self.logger.warn(errMsg)
+Logging.logger.exception(errMsg)
 pass
 
 # version is only set in a specific way and should not be carried
@@ -178,15 +177,12 @@ class Script(object):
 Sets up logging;
 Parses command parameters and executes method relevant to command type
 """
-logger, chout, cherr = Logger.initialize_logger(__name__)
-
 # parse arguments
 if len(sys.argv) < 7:
- logger.error("Script expects at least 6 arguments")
+ print "Script expects at least 6 arguments"
  print USAGE.format(os.path.basename(sys.argv[0])) # print to stdout
  sys.exit(1)
-
-self.logger = logger
+ 
 self.command_name = str.lower(sys.argv[1])
 self.command_data_file = sys.argv[2]
 self.basedir = sys.argv[3]
@@ -196,8 +192,7 @@ class Script(object):
 Script.tmp_dir = sys.argv[6]
 
 logging_level_str = logging._levelNames[self.logging_level]
-chout.setLevel(logging_level_str)
-logger.setLevel(logging_level_str)
+Logger.initialize_logger(__name__, logging_level=logging_level_str)
 
 # on windows we need to reload some of env variables manually because 
there is no default paths for configs(like
 # /etc/something/conf on linux. When this env vars created by one of the 
Script execution, they can not be updated
@@ -216,7 +211,7 @@ class Script(object):
 Script.passwords[get_path_from_configuration(k, Script.config)] = 
get_path_from_configuration(v, Script.config)
 
 except IOError:
-  logger.exception("Can not read json file with command parameters: ")
+  Logging.logger.exception("Can not read json file with command 
parameters: ")
   sys.exit(1)
 
 # Run class method depending on a command type

ambari git commit: AMBARI-13353 Add Service wizard: Browser refresh on Assign Master page loses all installed service components. (atkach)

[atkach]

Repository: ambari
Updated Branches:
  refs/heads/trunk 3c9a79e67 -> ef7b9aa29


AMBARI-13353 Add Service wizard: Browser refresh on Assign Master page loses 
all installed service components. (atkach)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ef7b9aa2
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ef7b9aa2
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ef7b9aa2

Branch: refs/heads/trunk
Commit: ef7b9aa29eb7dfafd23eacdf10b2af08e0ef2c01
Parents: 3c9a79e
Author: Andrii Tkach 
Authored: Thu Oct 8 15:09:23 2015 +0300
Committer: Andrii Tkach 
Committed: Thu Oct 8 15:09:23 2015 +0300

--
 .../mixins/wizard/assign_master_components.js   | 76 +---
 1 file changed, 33 insertions(+), 43 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/ef7b9aa2/ambari-web/app/mixins/wizard/assign_master_components.js
--
diff --git a/ambari-web/app/mixins/wizard/assign_master_components.js 
b/ambari-web/app/mixins/wizard/assign_master_components.js
index 1eec8ae..14d0184 100644
--- a/ambari-web/app/mixins/wizard/assign_master_components.js
+++ b/ambari-web/app/mixins/wizard/assign_master_components.js
@@ -649,76 +649,66 @@ App.AssignMasterComponents = Em.Mixin.create({
* @return {Object[]}
*/
   createComponentInstallationObjects: function() {
-var self = this;
-
-var masterComponents = [];
-if (self.get('isInstallerWizard')) {
-  masterComponents = 
App.StackServiceComponent.find().filterProperty('isShownOnInstallerAssignMasterPage');
-} else {
-  masterComponents = 
App.StackServiceComponent.find().filter(function(component){
-return component.get('isShownOnAddServiceAssignMasterPage') || 
self.get('mastersToShow').contains(component.get('componentName'));
-  });
-}
-var masterComponentsMap = {};
-masterComponents.forEach(function(masterComponent) {
-  masterComponentsMap[masterComponent.get('componentName')] = 
masterComponent;
-});
-
-var masterHosts = self.get('content.masterComponentHosts'); //saved to 
local storage info
-var selectedNotInstalledServices = 
self.get('content.services').filterProperty('isSelected').filterProperty('isInstalled',
 false).mapProperty('serviceName');
-var recommendations = this.get('content.recommendations');
-
-var resultComponents = [];
-var multipleComponentHasBeenAdded = {};
-
-var existingHostComponentsMap = {};
-App.HostComponent.find().forEach(function(c) {
-  existingHostComponentsMap[c.get('componentName')] = c;
-});
+var stackMasterComponentsMap = {},
+masterHosts = this.get('content.masterComponentHosts'), //saved to 
local storage info
+servicesToAdd = 
this.get('content.services').filterProperty('isSelected').filterProperty('isInstalled',
 false).mapProperty('serviceName'),
+recommendations = this.get('content.recommendations'),
+resultComponents = [],
+multipleComponentHasBeenAdded = {},
+hostGroupsMap = {};
+
+App.StackServiceComponent.find().forEach(function(component) {
+  if (this.get('isInstallerWizard')) {
+if (component.get('isShownOnInstallerAssignMasterPage')) {
+  stackMasterComponentsMap[component.get('componentName')] = component;
+}
+  } else {
+if (component.get('isShownOnAddServiceAssignMasterPage') || 
this.get('mastersToShow').contains(component.get('componentName'))) {
+  stackMasterComponentsMap[component.get('componentName')] = component;
+}
+  }
+}, this);
 
-var hostGroupsMap = {};
 
recommendations.blueprint_cluster_binding.host_groups.forEach(function(group) {
   hostGroupsMap[group.name] = group;
 });
+
 recommendations.blueprint.host_groups.forEach(function(host_group) {
   var hosts = hostGroupsMap[host_group.name] ? 
hostGroupsMap[host_group.name].hosts : [];
 
   hosts.forEach(function(host) {
 host_group.components.forEach(function(component) {
-  var willBeAdded = true;
-  //var fullComponent = masterComponents.findProperty('componentName', 
component.name);
-  var fullComponent = masterComponentsMap[component.name];
-  // If it's master component which should be shown
-  if (fullComponent) {
+  var willBeDisplayed = true;
+  var stackMasterComponent = stackMasterComponentsMap[component.name];
+  if (stackMasterComponent) {
 // If service is already installed and not being added as a new 
service then render on UI only those master components
 // that have already installed hostComponents.
 // NOTE: On upgrade there might 

ambari git commit: AMBARI-13353 Add Service wizard: Browser refresh on Assign Master page loses all installed service components. (atkach)

[atkach]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 7d40f5da3 -> 7ae6e4892


AMBARI-13353 Add Service wizard: Browser refresh on Assign Master page loses 
all installed service components. (atkach)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7ae6e489
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7ae6e489
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7ae6e489

Branch: refs/heads/branch-2.1
Commit: 7ae6e48929af996cd53c8b2532f7caaf6bb8ea28
Parents: 7d40f5d
Author: Andrii Tkach 
Authored: Thu Oct 8 13:34:50 2015 +0300
Committer: Andrii Tkach 
Committed: Thu Oct 8 15:07:43 2015 +0300

--
 .../mixins/wizard/assign_master_components.js   | 76 +---
 1 file changed, 33 insertions(+), 43 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/7ae6e489/ambari-web/app/mixins/wizard/assign_master_components.js
--
diff --git a/ambari-web/app/mixins/wizard/assign_master_components.js 
b/ambari-web/app/mixins/wizard/assign_master_components.js
index d416c35..7dc267e 100644
--- a/ambari-web/app/mixins/wizard/assign_master_components.js
+++ b/ambari-web/app/mixins/wizard/assign_master_components.js
@@ -649,76 +649,66 @@ App.AssignMasterComponents = Em.Mixin.create({
* @return {Object[]}
*/
   createComponentInstallationObjects: function() {
-var self = this;
-
-var masterComponents = [];
-if (self.get('isInstallerWizard')) {
-  masterComponents = 
App.StackServiceComponent.find().filterProperty('isShownOnInstallerAssignMasterPage');
-} else {
-  masterComponents = 
App.StackServiceComponent.find().filter(function(component){
-return component.get('isShownOnAddServiceAssignMasterPage') || 
self.get('mastersToShow').contains(component.get('componentName'));
-  });
-}
-var masterComponentsMap = {};
-masterComponents.forEach(function(masterComponent) {
-  masterComponentsMap[masterComponent.get('componentName')] = 
masterComponent;
-});
-
-var masterHosts = self.get('content.masterComponentHosts'); //saved to 
local storage info
-var selectedNotInstalledServices = 
self.get('content.services').filterProperty('isSelected').filterProperty('isInstalled',
 false).mapProperty('serviceName');
-var recommendations = this.get('content.recommendations');
-
-var resultComponents = [];
-var multipleComponentHasBeenAdded = {};
-
-var existingHostComponentsMap = {};
-App.HostComponent.find().forEach(function(c) {
-  existingHostComponentsMap[c.get('componentName')] = c;
-});
+var stackMasterComponentsMap = {},
+masterHosts = this.get('content.masterComponentHosts'), //saved to 
local storage info
+servicesToAdd = 
this.get('content.services').filterProperty('isSelected').filterProperty('isInstalled',
 false).mapProperty('serviceName'),
+recommendations = this.get('content.recommendations'),
+resultComponents = [],
+multipleComponentHasBeenAdded = {},
+hostGroupsMap = {};
+
+App.StackServiceComponent.find().forEach(function(component) {
+  if (this.get('isInstallerWizard')) {
+if (component.get('isShownOnInstallerAssignMasterPage')) {
+  stackMasterComponentsMap[component.get('componentName')] = component;
+}
+  } else {
+if (component.get('isShownOnAddServiceAssignMasterPage') || 
this.get('mastersToShow').contains(component.get('componentName'))) {
+  stackMasterComponentsMap[component.get('componentName')] = component;
+}
+  }
+}, this);
 
-var hostGroupsMap = {};
 
recommendations.blueprint_cluster_binding.host_groups.forEach(function(group) {
   hostGroupsMap[group.name] = group;
 });
+
 recommendations.blueprint.host_groups.forEach(function(host_group) {
   var hosts = hostGroupsMap[host_group.name] ? 
hostGroupsMap[host_group.name].hosts : [];
 
   hosts.forEach(function(host) {
 host_group.components.forEach(function(component) {
-  var willBeAdded = true;
-  //var fullComponent = masterComponents.findProperty('componentName', 
component.name);
-  var fullComponent = masterComponentsMap[component.name];
-  // If it's master component which should be shown
-  if (fullComponent) {
+  var willBeDisplayed = true;
+  var stackMasterComponent = stackMasterComponentsMap[component.name];
+  if (stackMasterComponent) {
 // If service is already installed and not being added as a new 
service then render on UI only those master components
 // that have already installed hostComponents.
 // NOTE: On upgrade 

[2/2] ambari git commit: AMBARI-13354. Ambari is not able to run Oozie Server which configured with different username than oozie (dlysnichenko)

[dmitriusan]

AMBARI-13354. Ambari is not able to run Oozie Server which configured with 
different username than oozie (dlysnichenko)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3c9a79e6
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3c9a79e6
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3c9a79e6

Branch: refs/heads/trunk
Commit: 3c9a79e67082edc5b731fb42eed9fbadc54ca848
Parents: be01031
Author: Lisnichenko Dmitro 
Authored: Thu Oct 8 14:28:56 2015 +0300
Committer: Lisnichenko Dmitro 
Committed: Thu Oct 8 14:29:40 2015 +0300

--
 .../OOZIE/4.0.0.2.0/package/scripts/params_linux.py| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/3c9a79e6/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py
 
b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py
index 60713e5..d27d10a 100644
--- 
a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py
+++ 
b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py
@@ -230,7 +230,7 @@ if sqla_db_used:
   libs_path_in_archive = format("{tmp_dir}/sqla-client-jdbc/native/lib64/*")
   downloaded_custom_connector = format("{tmp_dir}/sqla-client-jdbc.tar.gz")
 
-hdfs_share_dir = "/user/oozie/share"
+hdfs_share_dir = format("{oozie_hdfs_user_dir}/share")
 ambari_server_hostname = config['clusterHostInfo']['ambari_server_host'][0]
 falcon_host = default("/clusterHostInfo/falcon_server_hosts", [])
 has_falcon_host = not len(falcon_host)  == 0

[1/2] ambari git commit: AMBARI-13354. Ambari is not able to run Oozie Server which configured with different username than oozie (dlysnichenko)

[dmitriusan]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 d685062f9 -> 7d40f5da3
  refs/heads/trunk be01031a3 -> 3c9a79e67


AMBARI-13354. Ambari is not able to run Oozie Server which configured with 
different username than oozie (dlysnichenko)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7d40f5da
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7d40f5da
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7d40f5da

Branch: refs/heads/branch-2.1
Commit: 7d40f5da307e0e67680e9fb73515d9235010c7ba
Parents: d685062
Author: Lisnichenko Dmitro 
Authored: Thu Oct 8 14:28:56 2015 +0300
Committer: Lisnichenko Dmitro 
Committed: Thu Oct 8 14:28:56 2015 +0300

--
 .../OOZIE/4.0.0.2.0/package/scripts/params_linux.py| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/7d40f5da/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py
 
b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py
index 8b255fd..779c792 100644
--- 
a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py
+++ 
b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py
@@ -230,7 +230,7 @@ if sqla_db_used:
   libs_path_in_archive = format("{tmp_dir}/sqla-client-jdbc/native/lib64/*")
   downloaded_custom_connector = format("{tmp_dir}/sqla-client-jdbc.tar.gz")
 
-hdfs_share_dir = "/user/oozie/share"
+hdfs_share_dir = format("{oozie_hdfs_user_dir}/share")
 ambari_server_hostname = config['clusterHostInfo']['ambari_server_host'][0]
 falcon_host = default("/clusterHostInfo/falcon_server_hosts", [])
 has_falcon_host = not len(falcon_host)  == 0

ambari git commit: AMBARI-13332. User Timezone setting fixes (onechiporenko)

[onechiporenko]

Repository: ambari
Updated Branches:
  refs/heads/trunk 77281dd58 -> e28dce4d5


AMBARI-13332. User Timezone setting fixes (onechiporenko)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e28dce4d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e28dce4d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e28dce4d

Branch: refs/heads/trunk
Commit: e28dce4d502119b280ebc9c3e8071f15e2eb3284
Parents: 77281dd
Author: Oleg Nechiporenko 
Authored: Thu Oct 8 16:47:43 2015 +0300
Committer: Oleg Nechiporenko 
Committed: Thu Oct 8 16:47:43 2015 +0300

--
 ambari-web/app/assets/test/tests.js |  1 +
 ambari-web/app/config.js|  3 +-
 ambari-web/app/controllers.js   |  1 +
 .../step7/pre_install_checks_controller.js  | 95 
 .../app/controllers/wizard/step7_controller.js  | 40 ++---
 ambari-web/app/messages.js  |  7 ++
 ambari-web/app/routes/installer.js  | 47 ++
 ambari-web/app/templates/wizard/step7.hbs   |  9 +-
 .../step7/pre_install_checks_controller_test.js | 84 +
 .../test/controllers/wizard/step7_test.js   | 13 ++-
 10 files changed, 285 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/e28dce4d/ambari-web/app/assets/test/tests.js
--
diff --git a/ambari-web/app/assets/test/tests.js 
b/ambari-web/app/assets/test/tests.js
index 06f1d2e..dc86bcf 100644
--- a/ambari-web/app/assets/test/tests.js
+++ b/ambari-web/app/assets/test/tests.js
@@ -115,6 +115,7 @@ var files = [
   'test/controllers/wizard/step5_test',
   'test/controllers/wizard/step6_test',
   'test/controllers/wizard/step7_test',
+  'test/controllers/wizard/step7/pre_install_checks_controller_test',
   'test/controllers/wizard/step8_test',
   'test/controllers/wizard/step9_test',
   'test/controllers/wizard/step10_test',

http://git-wip-us.apache.org/repos/asf/ambari/blob/e28dce4d/ambari-web/app/config.js
--
diff --git a/ambari-web/app/config.js b/ambari-web/app/config.js
index 0a53fdf..26f0553 100644
--- a/ambari-web/app/config.js
+++ b/ambari-web/app/config.js
@@ -76,7 +76,8 @@ App.supports = {
   enhancedConfigs: true,
   showPageLoadTime: false,
   skipComponentStartAfterInstall: false,
-  storeKDCCredentials: false
+  storeKDCCredentials: false,
+  preInstallChecks: false
 };
 
 if (App.enableExperimental) {

http://git-wip-us.apache.org/repos/asf/ambari/blob/e28dce4d/ambari-web/app/controllers.js
--
diff --git a/ambari-web/app/controllers.js b/ambari-web/app/controllers.js
index 33d37dc..55b68a4 100644
--- a/ambari-web/app/controllers.js
+++ b/ambari-web/app/controllers.js
@@ -127,6 +127,7 @@ require('controllers/wizard/step4_controller');
 require('controllers/wizard/step5_controller');
 require('controllers/wizard/step6_controller');
 require('controllers/wizard/step7_controller');
+require('controllers/wizard/step7/pre_install_checks_controller');
 require('controllers/wizard/step8_controller');
 require('controllers/wizard/step9_controller');
 require('controllers/wizard/step10_controller');

http://git-wip-us.apache.org/repos/asf/ambari/blob/e28dce4d/ambari-web/app/controllers/wizard/step7/pre_install_checks_controller.js
--
diff --git 
a/ambari-web/app/controllers/wizard/step7/pre_install_checks_controller.js 
b/ambari-web/app/controllers/wizard/step7/pre_install_checks_controller.js
new file mode 100644
index 000..493b39e
--- /dev/null
+++ b/ambari-web/app/controllers/wizard/step7/pre_install_checks_controller.js
@@ -0,0 +1,95 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+var App = require('app');
+
+/**
+ * @class PreInstallChecksController
+ * @type 

ambari git commit: AMBARI-13205 SNMP MIB for Alerts (Paul Codding via dsen)

[dsen]

Repository: ambari
Updated Branches:
  refs/heads/trunk ef7b9aa29 -> 77281dd58


AMBARI-13205 SNMP MIB for Alerts (Paul Codding via dsen)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/77281dd5
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/77281dd5
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/77281dd5

Branch: refs/heads/trunk
Commit: 77281dd5826ce8860c26c8b79b3afe5e30832414
Parents: ef7b9aa
Author: Dmytro Sen 
Authored: Thu Oct 8 16:20:44 2015 +0300
Committer: Dmytro Sen 
Committed: Thu Oct 8 16:20:44 2015 +0300

--
 contrib/alert-snmp-mib/APACHE-AMBARI-MIB.txt | 206 ++
 contrib/alert-snmp-mib/README.md |  73 
 contrib/alert-snmp-mib/snmp_mib_script.sh|  35 
 3 files changed, 314 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/77281dd5/contrib/alert-snmp-mib/APACHE-AMBARI-MIB.txt
--
diff --git a/contrib/alert-snmp-mib/APACHE-AMBARI-MIB.txt 
b/contrib/alert-snmp-mib/APACHE-AMBARI-MIB.txt
new file mode 100644
index 000..85ec3cd
--- /dev/null
+++ b/contrib/alert-snmp-mib/APACHE-AMBARI-MIB.txt
@@ -0,0 +1,206 @@
+-- Licensed to the Apache Software Foundation (ASF) under one
+-- or more contributor license agreements.  See the NOTICE file
+-- distributed with this work for additional information
+-- regarding copyright ownership.  The ASF licenses this file
+-- to you under the Apache License, Version 2.0 (the
+-- "License"); you may not use this file except in compliance
+-- with the License.  You may obtain a copy of the License at
+-- 
+--  http://www.apache.org/licenses/LICENSE-2.0
+-- 
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+
+
+APACHE-AMBARI-MIB DEFINITIONS ::= BEGIN
+
+IMPORTS
+MODULE-IDENTITY, OBJECT-TYPE, NOTIFICATION-TYPE, Integer32, enterprises
+FROM SNMPv2-SMI
+MODULE-COMPLIANCE, OBJECT-GROUP, NOTIFICATION-GROUP
+FROM SNMPv2-CONF
+TEXTUAL-CONVENTION
+FROM SNMPv2-TC
+;
+
+apacheAmbari MODULE-IDENTITY
+LAST-UPDATED "20150831Z"
+ORGANIZATION "ambari.apache.org"
+CONTACT-INFO
+"email: u...@ambari.apache.org"
+DESCRIPTION
+"Apache Ambari MIB Module"
+-- Revisions
+REVISION "20150831Z"
+DESCRIPTION
+"First Apache Ambari MIB"
+::= { apache 16 }
+
+apache OBJECT IDENTIFIER ::= { enterprises 18060 }
+apacheAmbariTraps OBJECT IDENTIFIER ::= { apacheAmbari 0 }
+apacheAmbariAlerts OBJECT IDENTIFIER ::= { apacheAmbari 1 }
+
+AlertStateType ::= TEXTUAL-CONVENTION
+  STATUS current
+  DESCRIPTION
+"A string indicating the state of the Alert."
+  SYNTAX INTEGER {
+ok(0),
+unknown(1),
+warning(2),
+critical(3)
+  }
+
+apacheAmbariAlertTable OBJECT-TYPE 
+  SYNTAX  SEQUENCE OF AlertEntry
+  MAX-ACCESS  not-accessible
+  STATUS  current
+  DESCRIPTION
+"Table of Apache Ambari Alerts"
+  ::= { apacheAmbariAlerts 1 }
+
+AlertEntry ::= SEQUENCE {
+  alertDefinitionIdInteger32,
+  alertDefinitionName  OCTET STRING,
+  alertDefinitionHash  OCTET STRING,
+  alertNameOCTET STRING,
+  alertTextOCTET STRING,
+  alertState   AlertStateType,
+  alertHostOCTET STRING,
+  alertService OCTET STRING,
+  alertComponent   OCTET STRING  
+  }
+  
+apacheAmbariAlertEntry  OBJECT-TYPE
+  SYNTAX  AlertEntry
+  MAX-ACCESS  not-accessible
+  STATUS  current
+  DESCRIPTION
+"Each Alert Event"
+  INDEX { alertDefinitionId }
+  ::= { apacheAmbariAlertTable 1 }
+
+alertDefinitionId OBJECT-TYPE
+SYNTAX  Integer32 (-2147483648..2147483647)
+MAX-ACCESS  not-accessible
+STATUS  current
+DESCRIPTION
+"ID of the Alert"
+::= { apacheAmbariAlertEntry 1 }
+
+alertDefinitionName OBJECT-TYPE
+SYNTAX  OCTET STRING
+MAX-ACCESS  accessible-for-notify
+STATUS  current
+DESCRIPTION
+"Alert Definition Name"
+::= { apacheAmbariAlertEntry 2 }
+
+alertDefinitionHash OBJECT-TYPE
+SYNTAX  OCTET STRING
+MAX-ACCESS  accessible-for-notify
+STATUS  current
+DESCRIPTION
+"Alert Definition Hash"
+::= { apacheAmbariAlertEntry 3 }
+
+alertName OBJECT-TYPE
+SYNTAX  OCTET STRING
+ 

ambari git commit: AMBARI-13356 Manual commands given by Ambari are incorrect when yarn.timeline-service.leveldb-timeline-store.path is non-default. (atkach)

[atkach]

Repository: ambari
Updated Branches:
  refs/heads/trunk e28dce4d5 -> 361f0a49d


AMBARI-13356 Manual commands given by Ambari are incorrect when 
yarn.timeline-service.leveldb-timeline-store.path is non-default. (atkach)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/361f0a49
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/361f0a49
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/361f0a49

Branch: refs/heads/trunk
Commit: 361f0a49da0f8b64e8421ed3b0eed40e54d793d7
Parents: e28dce4
Author: Andrii Tkach 
Authored: Thu Oct 8 17:17:29 2015 +0300
Committer: Andrii Tkach 
Committed: Thu Oct 8 17:17:29 2015 +0300

--
 ambari-web/app/messages.js   |  6 +++---
 ambari-web/app/views/main/service/reassign/step5_view.js | 10 ++
 2 files changed, 9 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/361f0a49/ambari-web/app/messages.js
--
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index e4a9ba2..33ec751 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -1984,10 +1984,10 @@ Em.I18n.translations = {
 '',
   'services.reassign.step5.body.app_timeline_server': '' +
   '' +
-  'Copy /hadoop/yarn/timeline/leveldb-timeline-store.ldb from the 
source host {1} to 
/hadoop/yarn/timeline/leveldb-timeline-store.ldb on the target host 
{2}.' +
+  'Copy {7}/leveldb-timeline-store.ldb from the source host 
{1} to {7}/leveldb-timeline-store.ldb on the target host 
{2}.' +
   'Login to the target host {2} and change permissions by running:' 
+
-  'chown -R {3}:{5} 
/hadoop/yarn/timeline/leveldb-timeline-store.ldb' +
-  'chmod -R 700 
/hadoop/yarn/timeline/leveldb-timeline-store.ldb' +
+  'chown -R {3}:{5} 
{7}/leveldb-timeline-store.ldb' +
+  'chmod -R 700 
{7}/leveldb-timeline-store.ldb' +
   '' +
   '',
   'services.reassign.step5.body.securityNotice': '  Note:  Secure 
cluster' +

http://git-wip-us.apache.org/repos/asf/ambari/blob/361f0a49/ambari-web/app/views/main/service/reassign/step5_view.js
--
diff --git a/ambari-web/app/views/main/service/reassign/step5_view.js 
b/ambari-web/app/views/main/service/reassign/step5_view.js
index cc7805f..5eeba14 100644
--- a/ambari-web/app/views/main/service/reassign/step5_view.js
+++ b/ambari-web/app/views/main/service/reassign/step5_view.js
@@ -32,18 +32,20 @@ App.ReassignMasterWizardStep5View = Em.View.extend({
 var sourceHost = this.get('controller.content.reassignHosts.source');
 var targetHost = this.get('controller.content.reassignHosts.target');
 var ha = '';
+var user = this.get('controller.content.hdfsUser'), path;
+
 if (this.get('controller.content.reassign.component_name') === 'NAMENODE' 
&& App.get('isHaEnabled')) {
   ha = '_ha';
   var nnStartedHost = 
this.get('controller.content.masterComponentHosts').filterProperty('component', 
'NAMENODE').mapProperty('hostName').without(sourceHost);
 }
 
-var user = this.get('controller.content.hdfsUser');
-
-if(this.get('controller.content.reassign.component_name') === 
'APP_TIMELINE_SERVER') {
+if (this.get('controller.content.reassign.component_name') === 
'APP_TIMELINE_SERVER') {
   user = 
this.get('controller.content.serviceProperties.yarn-env.yarn_user');
+  path = 
this.get('controller.content.serviceProperties.yarn-site')['yarn.timeline-service.leveldb-timeline-store.path'];
 }
 
-return Em.I18n.t('services.reassign.step5.body.' + 
this.get('controller.content.reassign.component_name').toLowerCase() + 
ha).format(componentDir, sourceHost, targetHost, user, 
nnStartedHost,this.get('controller.content.group'), componentDirCmd);
+return Em.I18n.t('services.reassign.step5.body.' + 
this.get('controller.content.reassign.component_name').toLowerCase() + ha).
+  format(componentDir, sourceHost, targetHost, user, 
nnStartedHost,this.get('controller.content.group'), componentDirCmd, path);
   }.property('controller.content.reassign.component_name', 
'controller.content.componentDir', 'controller.content.masterComponentHosts', 
'controller.content.reassign.host_id', 'controller.content.hdfsUser'),
 
   /**

ambari git commit: AMBARI-13205 SNMP MIB for Alerts (Paul Codding via dsen)

[dsen]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 7ae6e4892 -> e3eb378be


AMBARI-13205 SNMP MIB for Alerts (Paul Codding via dsen)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e3eb378b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e3eb378b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e3eb378b

Branch: refs/heads/branch-2.1
Commit: e3eb378bee7c2be1b437ad356fe60c367f6f665b
Parents: 7ae6e48
Author: Dmytro Sen 
Authored: Thu Oct 8 16:20:44 2015 +0300
Committer: Dmytro Sen 
Committed: Thu Oct 8 16:22:18 2015 +0300

--
 contrib/alert-snmp-mib/APACHE-AMBARI-MIB.txt | 206 ++
 contrib/alert-snmp-mib/README.md |  73 
 contrib/alert-snmp-mib/snmp_mib_script.sh|  35 
 3 files changed, 314 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/e3eb378b/contrib/alert-snmp-mib/APACHE-AMBARI-MIB.txt
--
diff --git a/contrib/alert-snmp-mib/APACHE-AMBARI-MIB.txt 
b/contrib/alert-snmp-mib/APACHE-AMBARI-MIB.txt
new file mode 100644
index 000..85ec3cd
--- /dev/null
+++ b/contrib/alert-snmp-mib/APACHE-AMBARI-MIB.txt
@@ -0,0 +1,206 @@
+-- Licensed to the Apache Software Foundation (ASF) under one
+-- or more contributor license agreements.  See the NOTICE file
+-- distributed with this work for additional information
+-- regarding copyright ownership.  The ASF licenses this file
+-- to you under the Apache License, Version 2.0 (the
+-- "License"); you may not use this file except in compliance
+-- with the License.  You may obtain a copy of the License at
+-- 
+--  http://www.apache.org/licenses/LICENSE-2.0
+-- 
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+
+
+APACHE-AMBARI-MIB DEFINITIONS ::= BEGIN
+
+IMPORTS
+MODULE-IDENTITY, OBJECT-TYPE, NOTIFICATION-TYPE, Integer32, enterprises
+FROM SNMPv2-SMI
+MODULE-COMPLIANCE, OBJECT-GROUP, NOTIFICATION-GROUP
+FROM SNMPv2-CONF
+TEXTUAL-CONVENTION
+FROM SNMPv2-TC
+;
+
+apacheAmbari MODULE-IDENTITY
+LAST-UPDATED "20150831Z"
+ORGANIZATION "ambari.apache.org"
+CONTACT-INFO
+"email: u...@ambari.apache.org"
+DESCRIPTION
+"Apache Ambari MIB Module"
+-- Revisions
+REVISION "20150831Z"
+DESCRIPTION
+"First Apache Ambari MIB"
+::= { apache 16 }
+
+apache OBJECT IDENTIFIER ::= { enterprises 18060 }
+apacheAmbariTraps OBJECT IDENTIFIER ::= { apacheAmbari 0 }
+apacheAmbariAlerts OBJECT IDENTIFIER ::= { apacheAmbari 1 }
+
+AlertStateType ::= TEXTUAL-CONVENTION
+  STATUS current
+  DESCRIPTION
+"A string indicating the state of the Alert."
+  SYNTAX INTEGER {
+ok(0),
+unknown(1),
+warning(2),
+critical(3)
+  }
+
+apacheAmbariAlertTable OBJECT-TYPE 
+  SYNTAX  SEQUENCE OF AlertEntry
+  MAX-ACCESS  not-accessible
+  STATUS  current
+  DESCRIPTION
+"Table of Apache Ambari Alerts"
+  ::= { apacheAmbariAlerts 1 }
+
+AlertEntry ::= SEQUENCE {
+  alertDefinitionIdInteger32,
+  alertDefinitionName  OCTET STRING,
+  alertDefinitionHash  OCTET STRING,
+  alertNameOCTET STRING,
+  alertTextOCTET STRING,
+  alertState   AlertStateType,
+  alertHostOCTET STRING,
+  alertService OCTET STRING,
+  alertComponent   OCTET STRING  
+  }
+  
+apacheAmbariAlertEntry  OBJECT-TYPE
+  SYNTAX  AlertEntry
+  MAX-ACCESS  not-accessible
+  STATUS  current
+  DESCRIPTION
+"Each Alert Event"
+  INDEX { alertDefinitionId }
+  ::= { apacheAmbariAlertTable 1 }
+
+alertDefinitionId OBJECT-TYPE
+SYNTAX  Integer32 (-2147483648..2147483647)
+MAX-ACCESS  not-accessible
+STATUS  current
+DESCRIPTION
+"ID of the Alert"
+::= { apacheAmbariAlertEntry 1 }
+
+alertDefinitionName OBJECT-TYPE
+SYNTAX  OCTET STRING
+MAX-ACCESS  accessible-for-notify
+STATUS  current
+DESCRIPTION
+"Alert Definition Name"
+::= { apacheAmbariAlertEntry 2 }
+
+alertDefinitionHash OBJECT-TYPE
+SYNTAX  OCTET STRING
+MAX-ACCESS  accessible-for-notify
+STATUS  current
+DESCRIPTION
+"Alert Definition Hash"
+::= { apacheAmbariAlertEntry 3 }
+
+alertName OBJECT-TYPE
+SYNTAX  

ambari git commit: AMBARI-13274. Define a new API to refresh HDP.repo files using the provided repo baseurl.(vbrodetskyi)

[vbrodetskyi]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 165eed044 -> 3c5d1ee74


AMBARI-13274. Define a new API to refresh HDP.repo files using the provided 
repo baseurl.(vbrodetskyi)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3c5d1ee7
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3c5d1ee7
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3c5d1ee7

Branch: refs/heads/branch-2.1
Commit: 3c5d1ee74c25e40dbef4e5b384fdc7950a24fc00
Parents: 165eed0
Author: Vitaly Brodetskyi 
Authored: Thu Oct 8 18:40:10 2015 +0300
Committer: Vitaly Brodetskyi 
Committed: Thu Oct 8 18:40:10 2015 +0300

--
 .../controller/AmbariActionExecutionHelper.java | 78 -
 .../system_action_definitions.xml   | 10 +++
 .../custom_actions/scripts/update_repo.py   | 71 
 .../python/custom_actions/TestUpdateRepo.py | 89 
 4 files changed, 227 insertions(+), 21 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/3c5d1ee7/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariActionExecutionHelper.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariActionExecutionHelper.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariActionExecutionHelper.java
index 1c110fc..a379a75 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariActionExecutionHelper.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariActionExecutionHelper.java
@@ -18,18 +18,10 @@
 
 package org.apache.ambari.server.controller;
 
-import static 
org.apache.ambari.server.agent.ExecutionCommand.KeyNames.COMMAND_TIMEOUT;
-import static 
org.apache.ambari.server.agent.ExecutionCommand.KeyNames.COMPONENT_CATEGORY;
-import static org.apache.ambari.server.agent.ExecutionCommand.KeyNames.SCRIPT;
-import static 
org.apache.ambari.server.agent.ExecutionCommand.KeyNames.SCRIPT_TYPE;
-
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeMap;
-
+import com.google.gson.JsonArray;
+import com.google.gson.JsonObject;
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
 import org.apache.ambari.server.AmbariException;
 import org.apache.ambari.server.ObjectNotFoundException;
 import org.apache.ambari.server.Role;
@@ -43,6 +35,10 @@ import org.apache.ambari.server.api.services.AmbariMetaInfo;
 import org.apache.ambari.server.configuration.Configuration;
 import org.apache.ambari.server.controller.internal.RequestResourceFilter;
 import org.apache.ambari.server.customactions.ActionDefinition;
+import org.apache.ambari.server.orm.dao.ClusterVersionDAO;
+import org.apache.ambari.server.orm.entities.ClusterVersionEntity;
+import org.apache.ambari.server.orm.entities.OperatingSystemEntity;
+import org.apache.ambari.server.orm.entities.RepositoryEntity;
 import org.apache.ambari.server.state.Cluster;
 import org.apache.ambari.server.state.Clusters;
 import org.apache.ambari.server.state.ComponentInfo;
@@ -55,8 +51,17 @@ import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.inject.Inject;
-import com.google.inject.Singleton;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeMap;
+
+import static 
org.apache.ambari.server.agent.ExecutionCommand.KeyNames.COMMAND_TIMEOUT;
+import static 
org.apache.ambari.server.agent.ExecutionCommand.KeyNames.COMPONENT_CATEGORY;
+import static org.apache.ambari.server.agent.ExecutionCommand.KeyNames.SCRIPT;
+import static 
org.apache.ambari.server.agent.ExecutionCommand.KeyNames.SCRIPT_TYPE;
 
 /**
  * Helper class containing logic to process custom action execution requests
@@ -77,6 +82,8 @@ public class AmbariActionExecutionHelper {
   private MaintenanceStateHelper maintenanceStateHelper;
   @Inject
   private Configuration configs;
+  @Inject
+  private ClusterVersionDAO clusterVersionDAO;
 
   /**
* Validates the request to execute an action.
@@ -195,13 +202,14 @@ public class AmbariActionExecutionHelper {
   }
 }
 
-if (TargetHostType.SPECIFIC.equals(actionDef.getTargetType())
-  || (targetService.isEmpty() && targetComponent.isEmpty())) {
-  if (resourceFilter == null || resourceFilter.getHostNames().size() == 0) 
{
-throw new AmbariException("Action " + actionRequest.getActionName() + 
" requires explicit target host(s)" +
-  " that is not provided.");
-  }
-}
+

ambari git commit: AMBARI-13274. Define a new API to refresh HDP.repo files using the provided repo baseurl.(vbrodetskyi)

[vbrodetskyi]

Repository: ambari
Updated Branches:
  refs/heads/trunk 664bde1c6 -> b434f1891


AMBARI-13274. Define a new API to refresh HDP.repo files using the provided 
repo baseurl.(vbrodetskyi)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b434f189
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b434f189
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b434f189

Branch: refs/heads/trunk
Commit: b434f18915954a725c1f8cd81b71907c2a9f5174
Parents: 664bde1
Author: Vitaly Brodetskyi 
Authored: Thu Oct 8 18:41:07 2015 +0300
Committer: Vitaly Brodetskyi 
Committed: Thu Oct 8 18:41:07 2015 +0300

--
 .../controller/AmbariActionExecutionHelper.java | 78 -
 .../system_action_definitions.xml   | 10 +++
 .../custom_actions/scripts/update_repo.py   | 71 
 .../python/custom_actions/TestUpdateRepo.py | 89 
 4 files changed, 227 insertions(+), 21 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/b434f189/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariActionExecutionHelper.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariActionExecutionHelper.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariActionExecutionHelper.java
index 1c110fc..a379a75 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariActionExecutionHelper.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariActionExecutionHelper.java
@@ -18,18 +18,10 @@
 
 package org.apache.ambari.server.controller;
 
-import static 
org.apache.ambari.server.agent.ExecutionCommand.KeyNames.COMMAND_TIMEOUT;
-import static 
org.apache.ambari.server.agent.ExecutionCommand.KeyNames.COMPONENT_CATEGORY;
-import static org.apache.ambari.server.agent.ExecutionCommand.KeyNames.SCRIPT;
-import static 
org.apache.ambari.server.agent.ExecutionCommand.KeyNames.SCRIPT_TYPE;
-
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeMap;
-
+import com.google.gson.JsonArray;
+import com.google.gson.JsonObject;
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
 import org.apache.ambari.server.AmbariException;
 import org.apache.ambari.server.ObjectNotFoundException;
 import org.apache.ambari.server.Role;
@@ -43,6 +35,10 @@ import org.apache.ambari.server.api.services.AmbariMetaInfo;
 import org.apache.ambari.server.configuration.Configuration;
 import org.apache.ambari.server.controller.internal.RequestResourceFilter;
 import org.apache.ambari.server.customactions.ActionDefinition;
+import org.apache.ambari.server.orm.dao.ClusterVersionDAO;
+import org.apache.ambari.server.orm.entities.ClusterVersionEntity;
+import org.apache.ambari.server.orm.entities.OperatingSystemEntity;
+import org.apache.ambari.server.orm.entities.RepositoryEntity;
 import org.apache.ambari.server.state.Cluster;
 import org.apache.ambari.server.state.Clusters;
 import org.apache.ambari.server.state.ComponentInfo;
@@ -55,8 +51,17 @@ import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.inject.Inject;
-import com.google.inject.Singleton;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeMap;
+
+import static 
org.apache.ambari.server.agent.ExecutionCommand.KeyNames.COMMAND_TIMEOUT;
+import static 
org.apache.ambari.server.agent.ExecutionCommand.KeyNames.COMPONENT_CATEGORY;
+import static org.apache.ambari.server.agent.ExecutionCommand.KeyNames.SCRIPT;
+import static 
org.apache.ambari.server.agent.ExecutionCommand.KeyNames.SCRIPT_TYPE;
 
 /**
  * Helper class containing logic to process custom action execution requests
@@ -77,6 +82,8 @@ public class AmbariActionExecutionHelper {
   private MaintenanceStateHelper maintenanceStateHelper;
   @Inject
   private Configuration configs;
+  @Inject
+  private ClusterVersionDAO clusterVersionDAO;
 
   /**
* Validates the request to execute an action.
@@ -195,13 +202,14 @@ public class AmbariActionExecutionHelper {
   }
 }
 
-if (TargetHostType.SPECIFIC.equals(actionDef.getTargetType())
-  || (targetService.isEmpty() && targetComponent.isEmpty())) {
-  if (resourceFilter == null || resourceFilter.getHostNames().size() == 0) 
{
-throw new AmbariException("Action " + actionRequest.getActionName() + 
" requires explicit target host(s)" +
-  " that is not provided.");
-  }
-}
+// decided 

ambari git commit: AMBARI-13307. Agent instance memory footprint likely gradually growing (aonishuk)

[aonishuk]

Repository: ambari
Updated Branches:
  refs/heads/trunk 361f0a49d -> 664bde1c6


AMBARI-13307. Agent instance memory footprint likely gradually growing 
(aonishuk)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/664bde1c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/664bde1c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/664bde1c

Branch: refs/heads/trunk
Commit: 664bde1c6e15961b39eb673b337be9f7bc6a50d2
Parents: 361f0a4
Author: Andrew Onishuk 
Authored: Thu Oct 8 18:22:20 2015 +0300
Committer: Andrew Onishuk 
Committed: Thu Oct 8 18:22:20 2015 +0300

--
 .../python/resource_management/libraries/script/script.py| 4 ++--
 .../src/test/python/stacks/2.0.6/FLUME/test_flume.py | 8 +++-
 2 files changed, 5 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/664bde1c/ambari-common/src/main/python/resource_management/libraries/script/script.py
--
diff --git 
a/ambari-common/src/main/python/resource_management/libraries/script/script.py 
b/ambari-common/src/main/python/resource_management/libraries/script/script.py
index 3e15898..e647c11 100644
--- 
a/ambari-common/src/main/python/resource_management/libraries/script/script.py
+++ 
b/ambari-common/src/main/python/resource_management/libraries/script/script.py
@@ -116,7 +116,7 @@ class Script(object):
 Script.structuredOut = json.load(fp)
   except Exception:
 errMsg = 'Unable to read structured output from ' + self.stroutfile
-Logging.logger.exception(errMsg)
+Logger.logger.exception(errMsg)
 pass
 
 # version is only set in a specific way and should not be carried
@@ -211,7 +211,7 @@ class Script(object):
 Script.passwords[get_path_from_configuration(k, Script.config)] = 
get_path_from_configuration(v, Script.config)
 
 except IOError:
-  Logging.logger.exception("Can not read json file with command 
parameters: ")
+  Logger.logger.exception("Can not read json file with command parameters: 
")
   sys.exit(1)
 
 # Run class method depending on a command type

http://git-wip-us.apache.org/repos/asf/ambari/blob/664bde1c/ambari-server/src/test/python/stacks/2.0.6/FLUME/test_flume.py
--
diff --git a/ambari-server/src/test/python/stacks/2.0.6/FLUME/test_flume.py 
b/ambari-server/src/test/python/stacks/2.0.6/FLUME/test_flume.py
index 28b0802..6642603 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/FLUME/test_flume.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/FLUME/test_flume.py
@@ -163,20 +163,18 @@ class TestFlumeHandler(RMFTestCase):
 
self.assertFalse("version" in script.structuredOut)
 
-  @patch("resource_management.libraries.script.Script.logger", autospec = True)
-  def test_bad_struct_out(self, logger_mock):
+  def test_bad_struct_out(self):
   from resource_management.libraries.script import Script
-
-  logger_mock.warn = MagicMock()
+  from resource_management.core.logger import Logger
 
   configs_path = os.path.join(RMFTestCase.get_src_folder(),
   "test/python/stacks", self.STACK_VERSION, 
"configs")
 
+  Logger.initialize_logger()
   script = Script()
   script.stroutfile = os.path.join(configs_path, 
"structured-out-status-bad.json")
   script.load_structured_out()
 
-  self.assertTrue(logger_mock.warn.called)
   self.assertTrue(script.structuredOut == {})
 
   @patch("resource_management.libraries.script.Script.put_structured_out")

[1/2] ambari git commit: AMBARI-13360. Redundant links to Ganglia Web UI

[alexantonenko]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 3c5d1ee74 -> c5075f016


AMBARI-13360. Redundant links to Ganglia Web UI


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c5075f01
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c5075f01
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c5075f01

Branch: refs/heads/branch-2.1
Commit: c5075f016c8ef0704d9f3f232e018c83d75c782a
Parents: b6a31c5
Author: Alex Antonenko 
Authored: Thu Oct 8 19:46:51 2015 +0300
Committer: Alex Antonenko 
Committed: Thu Oct 8 19:48:52 2015 +0300

--
 ambari-web/app/messages.js  |   1 -
 .../app/templates/main/dashboard/widgets.hbs|   7 -
 ambari-web/app/templates/main/host/summary.hbs  |   9 -
 .../app/templates/main/service/info/summary.hbs |   3 -
 .../main/dashboard/cluster_metrics/memory.js|  10 +-
 ambari-web/app/views/main/dashboard/widgets.js  |   7 -
 ambari-web/app/views/main/host/summary.js   |   6 -
 .../app/views/main/service/info/summary.js  |  19 --
 .../app/views/main/service/services/flume.js|   2 -
 .../dashboard/cluster_metrics/memory_test.js| 197 +++
 .../test/views/main/dashboard/widgets_test.js   |  13 --
 11 files changed, 29 insertions(+), 245 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/c5075f01/ambari-web/app/messages.js
--
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index f4134a9..74d569d 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -2378,7 +2378,6 @@ Em.I18n.translations = {
   'dashboard.button.switch': 'Switch to classic dashboard',
   'dashboard.button.switchShort': 'Switch',
   'dashboard.button.reset': 'Reset all widgets to default ',
-  'dashboard.button.gangliaLink': 'View metrics in Ganglia',
   'dashboard.widgets.actions.title': 'Metric Actions',
   'dashboard.widgets.create': 'Create Widget',
   'dashboard.widgets.actions.browse': 'Browse Widgets',

http://git-wip-us.apache.org/repos/asf/ambari/blob/c5075f01/ambari-web/app/templates/main/dashboard/widgets.hbs
--
diff --git a/ambari-web/app/templates/main/dashboard/widgets.hbs 
b/ambari-web/app/templates/main/dashboard/widgets.hbs
index f55b9b9..57ab38d 100644
--- a/ambari-web/app/templates/main/dashboard/widgets.hbs
+++ b/ambari-web/app/templates/main/dashboard/widgets.hbs
@@ -35,13 +35,6 @@
 {{t dashboard.button.reset}}
 
   
-  {{#if App.router.clusterController.isGangliaInstalled}}
-
-  
-  {{t 
dashboard.button.gangliaLink}}
-  
-
-  {{/if}}
 
   
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/c5075f01/ambari-web/app/templates/main/host/summary.hbs
--
diff --git a/ambari-web/app/templates/main/host/summary.hbs 
b/ambari-web/app/templates/main/host/summary.hbs
index dace65a..681154d 100644
--- a/ambari-web/app/templates/main/host/summary.hbs
+++ b/ambari-web/app/templates/main/host/summary.hbs
@@ -174,15 +174,6 @@
 
   
 {{t hosts.host.summary.hostMetrics}}
-{{#if App.router.clusterController.isGangliaInstalled}}
-  
-{{#if App.router.clusterController.isGangliaUrlLoaded}}
-  
-{{else}}
-  
-{{/if}}
-  
-{{/if}}
 {{view view.timeRangeListView}}
   
   

http://git-wip-us.apache.org/repos/asf/ambari/blob/c5075f01/ambari-web/app/templates/main/service/info/summary.hbs
--
diff --git a/ambari-web/app/templates/main/service/info/summary.hbs 
b/ambari-web/app/templates/main/service/info/summary.hbs
index 9326623..af8078d 100644
--- a/ambari-web/app/templates/main/service/info/summary.hbs
+++ b/ambari-web/app/templates/main/service/info/summary.hbs
@@ -160,9 +160,6 @@
 
 {{collapsedSection.header}}
   
-  
-
-  
 
   
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/c5075f01/ambari-web/app/views/main/dashboard/cluster_metrics/memory.js
--
diff --git a/ambari-web/app/views/main/dashboard/cluster_metrics/memory.js 
b/ambari-web/app/views/main/dashboard/cluster_metrics/memory.js
index 510c6b0..db1988e 100644
--- a/ambari-web/app/views/main/dashboard/cluster_metrics/memory.js
+++ 

[2/2] ambari git commit: AMBARI-13359. Export formats dropdown menu on graph thumbnail is open after downloading data from detailed view popup

[alexantonenko]

AMBARI-13359. Export formats dropdown menu on graph thumbnail is open after 
downloading data from detailed view popup


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3588fc79
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3588fc79
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3588fc79

Branch: refs/heads/trunk
Commit: 3588fc790a05b36c6d02b7d239af48bad5dc1bd8
Parents: b434f18
Author: Alex Antonenko 
Authored: Thu Oct 8 19:33:09 2015 +0300
Committer: Alex Antonenko 
Committed: Thu Oct 8 19:52:43 2015 +0300

--
 .../common/widgets/export_metrics_mixin.js  | 11 +++--
 .../app/templates/common/chart/linear_time.hbs  |  5 +--
 .../templates/common/export_metrics_menu.hbs| 22 +
 .../templates/common/widget/graph_widget.hbs|  5 +--
 .../app/templates/main/charts/linear_time.hbs   |  5 +--
 .../main/dashboard/widgets/cluster_metrics.hbs  |  5 +--
 ambari-web/app/utils/file_utils.js  |  2 -
 ambari-web/app/views.js |  1 +
 .../app/views/common/chart/linear_time.js   | 10 +++--
 .../views/common/export_metrics_menu_view.js| 27 +++
 .../views/common/widget/graph_widget_view.js|  7 +--
 .../dashboard/widgets/cluster_metrics_widget.js |  3 +-
 .../common/widgets/export_metrics_mixin_test.js | 47 
 13 files changed, 110 insertions(+), 40 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/3588fc79/ambari-web/app/mixins/common/widgets/export_metrics_mixin.js
--
diff --git a/ambari-web/app/mixins/common/widgets/export_metrics_mixin.js 
b/ambari-web/app/mixins/common/widgets/export_metrics_mixin.js
index 395557e..e49d7bc 100644
--- a/ambari-web/app/mixins/common/widgets/export_metrics_mixin.js
+++ b/ambari-web/app/mixins/common/widgets/export_metrics_mixin.js
@@ -18,22 +18,27 @@
 
 var App = require('app');
 
+require('views/common/export_metrics_menu_view');
 var stringUtils = require('utils/string_utils');
 var fileUtils = require('utils/file_utils');
 
 App.ExportMetricsMixin = Em.Mixin.create({
 
   /**
-   * Used as argument passed from template to indicate that resulting format 
is CSV, not JSON
+   * Used as argument passed from template to indicate that resulting format 
is CSV instead of JSON
*/
   exportToCSVArgument: true,
 
+  isMenuHidden: true,
+
+  exportMetricsMenuView: App.ExportMetricsMenuView.extend(),
+
   toggleFormatsList: function () {
-this.$('.export-graph-list').toggle();
+this.toggleProperty('isMenuHidden');
   },
 
   exportGraphData: function () {
-this.toggleFormatsList();
+this.set('isMenuHidden', true);
   },
 
   exportGraphDataSuccessCallback: function (response, request, params) {

http://git-wip-us.apache.org/repos/asf/ambari/blob/3588fc79/ambari-web/app/templates/common/chart/linear_time.hbs
--
diff --git a/ambari-web/app/templates/common/chart/linear_time.hbs 
b/ambari-web/app/templates/common/chart/linear_time.hbs
index 35a3f3f..1dd6f5f 100644
--- a/ambari-web/app/templates/common/chart/linear_time.hbs
+++ b/ambari-web/app/templates/common/chart/linear_time.hbs
@@ -23,10 +23,7 @@
 
   
 
-
-  {{t 
common.csv}}
-  {{t 
common.json}}
-
+{{view view.exportMetricsMenuView}}
   {{/if}}
 
 {{#if view.isTimePagingEnable}}

http://git-wip-us.apache.org/repos/asf/ambari/blob/3588fc79/ambari-web/app/templates/common/export_metrics_menu.hbs
--
diff --git a/ambari-web/app/templates/common/export_metrics_menu.hbs 
b/ambari-web/app/templates/common/export_metrics_menu.hbs
new file mode 100644
index 000..c48065a
--- /dev/null
+++ b/ambari-web/app/templates/common/export_metrics_menu.hbs
@@ -0,0 +1,22 @@
+{{!
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+}}
+
+
+  {{t common.csv}}
+  {{t 
common.json}}
+

[1/2] ambari git commit: AMBARI-13360. Redundant links to Ganglia Web UI

[alexantonenko]

Repository: ambari
Updated Branches:
  refs/heads/trunk b434f1891 -> 588d43138


AMBARI-13360. Redundant links to Ganglia Web UI


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/588d4313
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/588d4313
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/588d4313

Branch: refs/heads/trunk
Commit: 588d4313819a85c87ba66761134bcb8ba66a53a3
Parents: 3588fc7
Author: Alex Antonenko 
Authored: Thu Oct 8 19:46:51 2015 +0300
Committer: Alex Antonenko 
Committed: Thu Oct 8 19:52:43 2015 +0300

--
 ambari-web/app/messages.js  |   1 -
 .../app/templates/main/dashboard/widgets.hbs|   7 -
 ambari-web/app/templates/main/host/summary.hbs  |   9 -
 .../app/templates/main/service/info/summary.hbs |   3 -
 .../main/dashboard/cluster_metrics/memory.js|  10 +-
 ambari-web/app/views/main/dashboard/widgets.js  |   7 -
 ambari-web/app/views/main/host/summary.js   |   6 -
 .../app/views/main/service/info/summary.js  |  19 --
 .../app/views/main/service/services/flume.js|   2 -
 .../dashboard/cluster_metrics/memory_test.js| 197 +++
 .../test/views/main/dashboard/widgets_test.js   |  13 --
 11 files changed, 29 insertions(+), 245 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/588d4313/ambari-web/app/messages.js
--
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 33ec751..79f190a 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -2354,7 +2354,6 @@ Em.I18n.translations = {
   'dashboard.button.switch': 'Switch to classic dashboard',
   'dashboard.button.switchShort': 'Switch',
   'dashboard.button.reset': 'Reset all widgets to default ',
-  'dashboard.button.gangliaLink': 'View metrics in Ganglia',
   'dashboard.widgets.actions.title': 'Metric Actions',
   'dashboard.widgets.create': 'Create Widget',
   'dashboard.widgets.actions.browse': 'Browse Widgets',

http://git-wip-us.apache.org/repos/asf/ambari/blob/588d4313/ambari-web/app/templates/main/dashboard/widgets.hbs
--
diff --git a/ambari-web/app/templates/main/dashboard/widgets.hbs 
b/ambari-web/app/templates/main/dashboard/widgets.hbs
index f55b9b9..57ab38d 100644
--- a/ambari-web/app/templates/main/dashboard/widgets.hbs
+++ b/ambari-web/app/templates/main/dashboard/widgets.hbs
@@ -35,13 +35,6 @@
 {{t dashboard.button.reset}}
 
   
-  {{#if App.router.clusterController.isGangliaInstalled}}
-
-  
-  {{t 
dashboard.button.gangliaLink}}
-  
-
-  {{/if}}
 
   
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/588d4313/ambari-web/app/templates/main/host/summary.hbs
--
diff --git a/ambari-web/app/templates/main/host/summary.hbs 
b/ambari-web/app/templates/main/host/summary.hbs
index 02cbcd1..85f43f0 100644
--- a/ambari-web/app/templates/main/host/summary.hbs
+++ b/ambari-web/app/templates/main/host/summary.hbs
@@ -174,15 +174,6 @@
 
   
 {{t hosts.host.summary.hostMetrics}}
-{{#if App.router.clusterController.isGangliaInstalled}}
-  
-{{#if App.router.clusterController.isGangliaUrlLoaded}}
-  
-{{else}}
-  
-{{/if}}
-  
-{{/if}}
 {{view view.timeRangeListView}}
   
   

http://git-wip-us.apache.org/repos/asf/ambari/blob/588d4313/ambari-web/app/templates/main/service/info/summary.hbs
--
diff --git a/ambari-web/app/templates/main/service/info/summary.hbs 
b/ambari-web/app/templates/main/service/info/summary.hbs
index 9326623..af8078d 100644
--- a/ambari-web/app/templates/main/service/info/summary.hbs
+++ b/ambari-web/app/templates/main/service/info/summary.hbs
@@ -160,9 +160,6 @@
 
 {{collapsedSection.header}}
   
-  
-
-  
 
   
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/588d4313/ambari-web/app/views/main/dashboard/cluster_metrics/memory.js
--
diff --git a/ambari-web/app/views/main/dashboard/cluster_metrics/memory.js 
b/ambari-web/app/views/main/dashboard/cluster_metrics/memory.js
index 510c6b0..db1988e 100644
--- a/ambari-web/app/views/main/dashboard/cluster_metrics/memory.js
+++ 

[2/2] ambari git commit: AMBARI-13359. Export formats dropdown menu on graph thumbnail is open after downloading data from detailed view popup

[alexantonenko]

AMBARI-13359. Export formats dropdown menu on graph thumbnail is open after 
downloading data from detailed view popup


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b6a31c5d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b6a31c5d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b6a31c5d

Branch: refs/heads/branch-2.1
Commit: b6a31c5d97cf47fd07c713866192e1a6c8b8caaf
Parents: 3c5d1ee
Author: Alex Antonenko 
Authored: Thu Oct 8 19:33:09 2015 +0300
Committer: Alex Antonenko 
Committed: Thu Oct 8 19:48:52 2015 +0300

--
 .../common/widgets/export_metrics_mixin.js  | 11 +++--
 .../app/templates/common/chart/linear_time.hbs  |  5 +--
 .../templates/common/export_metrics_menu.hbs| 22 +
 .../templates/common/widget/graph_widget.hbs|  5 +--
 .../app/templates/main/charts/linear_time.hbs   |  5 +--
 .../main/dashboard/widgets/cluster_metrics.hbs  |  5 +--
 ambari-web/app/utils/file_utils.js  |  2 -
 ambari-web/app/views.js |  1 +
 .../app/views/common/chart/linear_time.js   | 10 +++--
 .../views/common/export_metrics_menu_view.js| 27 +++
 .../views/common/widget/graph_widget_view.js|  7 +--
 .../dashboard/widgets/cluster_metrics_widget.js |  3 +-
 .../common/widgets/export_metrics_mixin_test.js | 47 
 13 files changed, 110 insertions(+), 40 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/b6a31c5d/ambari-web/app/mixins/common/widgets/export_metrics_mixin.js
--
diff --git a/ambari-web/app/mixins/common/widgets/export_metrics_mixin.js 
b/ambari-web/app/mixins/common/widgets/export_metrics_mixin.js
index 395557e..e49d7bc 100644
--- a/ambari-web/app/mixins/common/widgets/export_metrics_mixin.js
+++ b/ambari-web/app/mixins/common/widgets/export_metrics_mixin.js
@@ -18,22 +18,27 @@
 
 var App = require('app');
 
+require('views/common/export_metrics_menu_view');
 var stringUtils = require('utils/string_utils');
 var fileUtils = require('utils/file_utils');
 
 App.ExportMetricsMixin = Em.Mixin.create({
 
   /**
-   * Used as argument passed from template to indicate that resulting format 
is CSV, not JSON
+   * Used as argument passed from template to indicate that resulting format 
is CSV instead of JSON
*/
   exportToCSVArgument: true,
 
+  isMenuHidden: true,
+
+  exportMetricsMenuView: App.ExportMetricsMenuView.extend(),
+
   toggleFormatsList: function () {
-this.$('.export-graph-list').toggle();
+this.toggleProperty('isMenuHidden');
   },
 
   exportGraphData: function () {
-this.toggleFormatsList();
+this.set('isMenuHidden', true);
   },
 
   exportGraphDataSuccessCallback: function (response, request, params) {

http://git-wip-us.apache.org/repos/asf/ambari/blob/b6a31c5d/ambari-web/app/templates/common/chart/linear_time.hbs
--
diff --git a/ambari-web/app/templates/common/chart/linear_time.hbs 
b/ambari-web/app/templates/common/chart/linear_time.hbs
index 35a3f3f..1dd6f5f 100644
--- a/ambari-web/app/templates/common/chart/linear_time.hbs
+++ b/ambari-web/app/templates/common/chart/linear_time.hbs
@@ -23,10 +23,7 @@
 
   
 
-
-  {{t 
common.csv}}
-  {{t 
common.json}}
-
+{{view view.exportMetricsMenuView}}
   {{/if}}
 
 {{#if view.isTimePagingEnable}}

http://git-wip-us.apache.org/repos/asf/ambari/blob/b6a31c5d/ambari-web/app/templates/common/export_metrics_menu.hbs
--
diff --git a/ambari-web/app/templates/common/export_metrics_menu.hbs 
b/ambari-web/app/templates/common/export_metrics_menu.hbs
new file mode 100644
index 000..c48065a
--- /dev/null
+++ b/ambari-web/app/templates/common/export_metrics_menu.hbs
@@ -0,0 +1,22 @@
+{{!
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+}}
+
+
+  {{t common.csv}}
+  {{t 
common.json}}
+

ambari git commit: AMBARI-13283 Class not found exception while running step "ambari-server upgradestack HDP-2.3" for upgrade path 2.2 -> 2.3.2 Amabri DB is Oracle (dsen)

[dsen]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 c5075f016 -> 527df0256


AMBARI-13283 Class not found exception while running step "ambari-server 
upgradestack HDP-2.3" for upgrade path 2.2 -> 2.3.2 Amabri DB is Oracle (dsen)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/527df025
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/527df025
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/527df025

Branch: refs/heads/branch-2.1
Commit: 527df0256969966bca1ec5b1938e92ced79dedbd
Parents: c5075f0
Author: Dmytro Sen 
Authored: Thu Oct 8 20:24:42 2015 +0300
Committer: Dmytro Sen 
Committed: Thu Oct 8 20:24:42 2015 +0300

--
 ambari-server/src/main/python/ambari-server.py  |   4 +-
 .../python/ambari_server/serverClassPath.py | 115 +++
 .../python/ambari_server/serverConfiguration.py |  42 +--
 .../main/python/ambari_server/serverSetup.py|  10 +-
 .../main/python/ambari_server/serverUpgrade.py  |  27 ++---
 .../main/python/ambari_server/setupSecurity.py  |  18 +--
 .../src/main/python/ambari_server_main.py   |  28 +
 .../src/test/python/TestAmbariServer.py |  85 +-
 .../src/test/python/TestServerClassPath.py  |  89 ++
 9 files changed, 275 insertions(+), 143 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/527df025/ambari-server/src/main/python/ambari-server.py
--
diff --git a/ambari-server/src/main/python/ambari-server.py 
b/ambari-server/src/main/python/ambari-server.py
index 4ac1af8..88df81a 100755
--- a/ambari-server/src/main/python/ambari-server.py
+++ b/ambari-server/src/main/python/ambari-server.py
@@ -189,7 +189,7 @@ def refresh_stack_hash_action():
 def create_setup_security_actions(args):
   action_list = [
   ['Enable HTTPS for Ambari server.', UserActionRestart(setup_https, 
args)],
-  ['Encrypt passwords stored in ambari.properties file.', 
UserAction(setup_master_key)],
+  ['Encrypt passwords stored in ambari.properties file.', 
UserAction(setup_master_key, args)],
   ['Setup Ambari kerberos JAAS configuration.', 
UserAction(setup_ambari_krb5_jaas)],
   ['Setup truststore.', UserActionRestart(setup_truststore)],
   ['Import certificate to truststore.', 
UserActionRestart(setup_truststore, True)],
@@ -200,7 +200,7 @@ def create_setup_security_actions(args):
 def create_setup_security_actions(args):
   action_list = [
   ['Enable HTTPS for Ambari server.', UserActionRestart(setup_https, 
args)],
-  ['Encrypt passwords stored in ambari.properties file.', 
UserAction(setup_master_key)],
+  ['Encrypt passwords stored in ambari.properties file.', 
UserAction(setup_master_key, args)],
   ['Setup Ambari kerberos JAAS configuration.', 
UserAction(setup_ambari_krb5_jaas)],
   ['Setup truststore.', UserActionRestart(setup_truststore)],
   ['Import certificate to truststore.', 
UserActionRestart(setup_truststore, True)],

http://git-wip-us.apache.org/repos/asf/ambari/blob/527df025/ambari-server/src/main/python/ambari_server/serverClassPath.py
--
diff --git a/ambari-server/src/main/python/ambari_server/serverClassPath.py 
b/ambari-server/src/main/python/ambari_server/serverClassPath.py
new file mode 100644
index 000..d3ade3e
--- /dev/null
+++ b/ambari-server/src/main/python/ambari_server/serverClassPath.py
@@ -0,0 +1,115 @@
+#!/usr/bin/env python
+
+'''
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+'''
+
+import datetime
+import glob
+import os
+import re
+import shutil
+import stat
+import string
+import sys
+import tempfile
+
+import ambari_server
+from ambari_commons.logging_utils import print_info_msg
+from resource_management.core.shell import quote_bash_args
+AMBARI_CONF_VAR = "AMBARI_CONF_DIR"
+SERVER_CLASSPATH_KEY = "SERVER_CLASSPATH"
+LIBRARY_PATH_KEY = "LD_LIBRARY_PATH"
+AMBARI_SERVER_LIB = "AMBARI_SERVER_LIB"
+JDBC_DRIVER_PATH_PROPERTY = 

ambari git commit: AMBARI-13283 Class not found exception while running step "ambari-server upgradestack HDP-2.3" for upgrade path 2.2 -> 2.3.2 Amabri DB is Oracle (dsen)

[dsen]

Repository: ambari
Updated Branches:
  refs/heads/trunk 588d43138 -> 7bb91551e


AMBARI-13283 Class not found exception while running step "ambari-server 
upgradestack HDP-2.3" for upgrade path 2.2 -> 2.3.2 Amabri DB is Oracle (dsen)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7bb91551
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7bb91551
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7bb91551

Branch: refs/heads/trunk
Commit: 7bb91551e772756c4ffcc12a79114aa074145130
Parents: 588d431
Author: Dmytro Sen 
Authored: Thu Oct 8 20:21:54 2015 +0300
Committer: Dmytro Sen 
Committed: Thu Oct 8 20:21:54 2015 +0300

--
 ambari-server/src/main/python/ambari-server.py  |   4 +-
 .../python/ambari_server/serverClassPath.py | 115 +++
 .../python/ambari_server/serverConfiguration.py |  42 +--
 .../main/python/ambari_server/serverSetup.py|  10 +-
 .../main/python/ambari_server/serverUpgrade.py  |  27 ++---
 .../main/python/ambari_server/setupSecurity.py  |  18 +--
 .../src/main/python/ambari_server_main.py   |  28 +
 .../src/test/python/TestAmbariServer.py |  73 +---
 .../src/test/python/TestServerClassPath.py  |  89 ++
 9 files changed, 274 insertions(+), 132 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/7bb91551/ambari-server/src/main/python/ambari-server.py
--
diff --git a/ambari-server/src/main/python/ambari-server.py 
b/ambari-server/src/main/python/ambari-server.py
index 7d46f69..7e07497 100755
--- a/ambari-server/src/main/python/ambari-server.py
+++ b/ambari-server/src/main/python/ambari-server.py
@@ -189,7 +189,7 @@ def refresh_stack_hash_action():
 def create_setup_security_actions(args):
   action_list = [
   ['Enable HTTPS for Ambari server.', UserActionRestart(setup_https, 
args)],
-  ['Encrypt passwords stored in ambari.properties file.', 
UserAction(setup_master_key)],
+  ['Encrypt passwords stored in ambari.properties file.', 
UserAction(setup_master_key, args)],
   ['Setup Ambari kerberos JAAS configuration.', 
UserAction(setup_ambari_krb5_jaas)],
   ['Setup truststore.', UserActionRestart(setup_truststore)],
   ['Import certificate to truststore.', 
UserActionRestart(setup_truststore, True)],
@@ -200,7 +200,7 @@ def create_setup_security_actions(args):
 def create_setup_security_actions(args):
   action_list = [
   ['Enable HTTPS for Ambari server.', UserActionRestart(setup_https, 
args)],
-  ['Encrypt passwords stored in ambari.properties file.', 
UserAction(setup_master_key)],
+  ['Encrypt passwords stored in ambari.properties file.', 
UserAction(setup_master_key, args)],
   ['Setup Ambari kerberos JAAS configuration.', 
UserAction(setup_ambari_krb5_jaas)],
   ['Setup truststore.', UserActionRestart(setup_truststore)],
   ['Import certificate to truststore.', 
UserActionRestart(setup_truststore, True)],

http://git-wip-us.apache.org/repos/asf/ambari/blob/7bb91551/ambari-server/src/main/python/ambari_server/serverClassPath.py
--
diff --git a/ambari-server/src/main/python/ambari_server/serverClassPath.py 
b/ambari-server/src/main/python/ambari_server/serverClassPath.py
new file mode 100644
index 000..d3ade3e
--- /dev/null
+++ b/ambari-server/src/main/python/ambari_server/serverClassPath.py
@@ -0,0 +1,115 @@
+#!/usr/bin/env python
+
+'''
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+'''
+
+import datetime
+import glob
+import os
+import re
+import shutil
+import stat
+import string
+import sys
+import tempfile
+
+import ambari_server
+from ambari_commons.logging_utils import print_info_msg
+from resource_management.core.shell import quote_bash_args
+AMBARI_CONF_VAR = "AMBARI_CONF_DIR"
+SERVER_CLASSPATH_KEY = "SERVER_CLASSPATH"
+LIBRARY_PATH_KEY = "LD_LIBRARY_PATH"
+AMBARI_SERVER_LIB = "AMBARI_SERVER_LIB"
+JDBC_DRIVER_PATH_PROPERTY = 

ambari git commit: AMBARI-13314. Add tooltips for status icon in Upgrade Wizard.(xiwang)

[xiwang]

Repository: ambari
Updated Branches:
  refs/heads/trunk 7bb91551e -> 992124379


AMBARI-13314. Add tooltips for status icon in Upgrade Wizard.(xiwang)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/99212437
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/99212437
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/99212437

Branch: refs/heads/trunk
Commit: 992124379b4bbaf1f35eaa337595657c5f9f79d7
Parents: 7bb9155
Author: Xi Wang 
Authored: Mon Oct 5 17:50:18 2015 -0700
Committer: Xi Wang 
Committed: Thu Oct 8 13:46:44 2015 -0700

--
 ambari-web/app/utils/helper.js | 10 ++
 1 file changed, 10 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/99212437/ambari-web/app/utils/helper.js
--
diff --git a/ambari-web/app/utils/helper.js b/ambari-web/app/utils/helper.js
index 332e9cb..0baaba1 100644
--- a/ambari-web/app/utils/helper.js
+++ b/ambari-web/app/utils/helper.js
@@ -841,6 +841,16 @@ App.registerBoundHelper('statusIcon', Em.View.extend({
   },
 
   classNameBindings: ['iconClass'],
+  attributeBindings: ['data-original-title'],
+
+  didInsertElement: function () {
+App.tooltip($(this.get('element')));
+  },
+
+  'data-original-title': function() {
+return this.get('content').toCapital();
+  }.property('content'),
+
   /**
* @type {string}
*/

ambari git commit: AMBARI-13274. Define a new API to refresh HDP.repo files using the provided repo baseurl. Test fix.(vbrodetskyi)

[vbrodetskyi]

Repository: ambari
Updated Branches:
  refs/heads/trunk 992124379 -> cfe3c8041


AMBARI-13274. Define a new API to refresh HDP.repo files using the provided 
repo baseurl. Test fix.(vbrodetskyi)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/cfe3c804
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/cfe3c804
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/cfe3c804

Branch: refs/heads/trunk
Commit: cfe3c8041fd53162f8c7393dfb38299f17508141
Parents: 9921243
Author: Vitaly Brodetskyi 
Authored: Fri Oct 9 00:02:55 2015 +0300
Committer: Vitaly Brodetskyi 
Committed: Fri Oct 9 00:02:55 2015 +0300

--
 .../AmbariManagementControllerTest.java | 87 ++--
 1 file changed, 42 insertions(+), 45 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/cfe3c804/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java
--
diff --git 
a/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java
 
b/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java
index 6318552..0a86fe3 100644
--- 
a/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java
+++ 
b/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java
@@ -18,41 +18,13 @@
 
 package org.apache.ambari.server.controller;
 
-import static org.easymock.EasyMock.capture;
-import static org.easymock.EasyMock.createNiceMock;
-import static org.easymock.EasyMock.createStrictMock;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.replay;
-import static org.easymock.EasyMock.verify;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.io.StringReader;
-import java.lang.reflect.Type;
-import java.net.ConnectException;
-import java.net.MalformedURLException;
-import java.net.UnknownHostException;
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-
-import javax.persistence.EntityManager;
-
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
+import com.google.inject.AbstractModule;
+import com.google.inject.Guice;
+import com.google.inject.Injector;
+import com.google.inject.persist.PersistService;
+import junit.framework.Assert;
 import org.apache.ambari.server.AmbariException;
 import org.apache.ambari.server.ClusterNotFoundException;
 import org.apache.ambari.server.DuplicateResourceException;
@@ -146,14 +118,39 @@ import org.junit.rules.ExpectedException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.gson.Gson;
-import com.google.gson.reflect.TypeToken;
-import com.google.inject.AbstractModule;
-import com.google.inject.Guice;
-import com.google.inject.Injector;
-import com.google.inject.persist.PersistService;
+import javax.persistence.EntityManager;
+import java.io.StringReader;
+import java.lang.reflect.Type;
+import java.net.ConnectException;
+import java.net.MalformedURLException;
+import java.net.UnknownHostException;
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
 
-import junit.framework.Assert;
+import static org.easymock.EasyMock.capture;
+import static org.easymock.EasyMock.createNiceMock;
+import static org.easymock.EasyMock.createStrictMock;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.verify;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+import 

ambari git commit: AMBARI-13314. Add tooltips for status icon in Upgrade Wizard.(xiwang)

[xiwang]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 527df0256 -> e8daa654b


AMBARI-13314. Add tooltips for status icon in Upgrade Wizard.(xiwang)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e8daa654
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e8daa654
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e8daa654

Branch: refs/heads/branch-2.1
Commit: e8daa654b95caa34fce1fe9ba7d44db779046284
Parents: 527df02
Author: Xi Wang 
Authored: Mon Oct 5 17:50:18 2015 -0700
Committer: Xi Wang 
Committed: Thu Oct 8 13:48:20 2015 -0700

--
 ambari-web/app/utils/helper.js | 10 ++
 1 file changed, 10 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/e8daa654/ambari-web/app/utils/helper.js
--
diff --git a/ambari-web/app/utils/helper.js b/ambari-web/app/utils/helper.js
index 5ccc0a2..a6a51af 100644
--- a/ambari-web/app/utils/helper.js
+++ b/ambari-web/app/utils/helper.js
@@ -835,6 +835,16 @@ App.registerBoundHelper('statusIcon', Em.View.extend({
   },
 
   classNameBindings: ['iconClass'],
+  attributeBindings: ['data-original-title'],
+
+  didInsertElement: function () {
+App.tooltip($(this.get('element')));
+  },
+
+  'data-original-title': function() {
+return this.get('content').toCapital();
+  }.property('content'),
+
   /**
* @type {string}
*/

ambari git commit: AMBARI-13274. Define a new API to refresh HDP.repo files using the provided repo baseurl. Test fix.(vbrodetskyi)

[vbrodetskyi]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 e8daa654b -> 46db8ff3d


AMBARI-13274. Define a new API to refresh HDP.repo files using the provided 
repo baseurl. Test fix.(vbrodetskyi)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/46db8ff3
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/46db8ff3
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/46db8ff3

Branch: refs/heads/branch-2.1
Commit: 46db8ff3df0c1949a9b5d2a51bb3e1d44d5e2b48
Parents: e8daa65
Author: Vitaly Brodetskyi 
Authored: Fri Oct 9 00:00:26 2015 +0300
Committer: Vitaly Brodetskyi 
Committed: Fri Oct 9 00:00:26 2015 +0300

--
 .../AmbariManagementControllerTest.java | 87 ++--
 1 file changed, 42 insertions(+), 45 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/46db8ff3/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java
--
diff --git 
a/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java
 
b/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java
index a322064..fa485e3 100644
--- 
a/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java
+++ 
b/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java
@@ -18,41 +18,13 @@
 
 package org.apache.ambari.server.controller;
 
-import static org.easymock.EasyMock.capture;
-import static org.easymock.EasyMock.createNiceMock;
-import static org.easymock.EasyMock.createStrictMock;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.replay;
-import static org.easymock.EasyMock.verify;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.io.StringReader;
-import java.lang.reflect.Type;
-import java.net.ConnectException;
-import java.net.MalformedURLException;
-import java.net.UnknownHostException;
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-
-import javax.persistence.EntityManager;
-
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
+import com.google.inject.AbstractModule;
+import com.google.inject.Guice;
+import com.google.inject.Injector;
+import com.google.inject.persist.PersistService;
+import junit.framework.Assert;
 import org.apache.ambari.server.AmbariException;
 import org.apache.ambari.server.ClusterNotFoundException;
 import org.apache.ambari.server.DuplicateResourceException;
@@ -146,14 +118,39 @@ import org.junit.rules.ExpectedException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.gson.Gson;
-import com.google.gson.reflect.TypeToken;
-import com.google.inject.AbstractModule;
-import com.google.inject.Guice;
-import com.google.inject.Injector;
-import com.google.inject.persist.PersistService;
+import javax.persistence.EntityManager;
+import java.io.StringReader;
+import java.lang.reflect.Type;
+import java.net.ConnectException;
+import java.net.MalformedURLException;
+import java.net.UnknownHostException;
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
 
-import junit.framework.Assert;
+import static org.easymock.EasyMock.capture;
+import static org.easymock.EasyMock.createNiceMock;
+import static org.easymock.EasyMock.createStrictMock;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.verify;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertThat;
+import static