ambari git commit: AMBARI-14987: assign_master_component.js does not show recommendations while adding master component for a service which is already installed (mithmatt via jaoki)

[jaoki]

Repository: ambari
Updated Branches:
  refs/heads/trunk 529c588ad -> e4800e1c9


AMBARI-14987: assign_master_component.js does not show recommendations while 
adding master component for a service which is already installed (mithmatt via 
jaoki)


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

Branch: refs/heads/trunk
Commit: e4800e1c97709e8218989080fceb0df406e744ea
Parents: 529c588
Author: Jun Aoki 
Authored: Tue Feb 16 16:43:39 2016 -0800
Committer: Jun Aoki 
Committed: Tue Feb 16 16:43:39 2016 -0800

--
 ambari-web/app/assets/test/tests.js |   1 +
 .../mixins/wizard/assign_master_components.js   |  58 ++-
 .../wizard/assign_master_components_test.js | 154 +++
 3 files changed, 212 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/e4800e1c/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 44fb4f4..0695d06 100644
--- a/ambari-web/app/assets/test/tests.js
+++ b/ambari-web/app/assets/test/tests.js
@@ -157,6 +157,7 @@ var files = [
   'test/mixins/main/service/configs/config_overridable_test',
   'test/mixins/routers/redirections_test',
   'test/mixins/wizard/addSeccurityConfigs_test',
+  'test/mixins/wizard/assign_master_components_test',
   'test/mixins/wizard/wizard_menu_view_test',
   'test/mixins/wizard/wizardProgressPageController_test',
   'test/mixins/wizard/wizardEnableDone_test',

http://git-wip-us.apache.org/repos/asf/ambari/blob/e4800e1c/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 a2440a4..645c996 100644
--- a/ambari-web/app/mixins/wizard/assign_master_components.js
+++ b/ambari-web/app/mixins/wizard/assign_master_components.js
@@ -95,6 +95,22 @@ App.AssignMasterComponents = Em.Mixin.create({
   showInstalledMastersFirst: false,
 
   /**
+   * Map of component name to list of hostnames for that component
+   * format:
+   * {
+   *   NAMENODE: [
+   * 'c6401.ambari.apache.org'
+   *   ],
+   *   DATANODE: [
+   * 'c6402.ambari.apache.org',
+   * 'c6403.ambari.apache.org',
+   *   ]
+   * }
+   * @type {Object}
+   */
+  recommendedHostsForComponents: {},
+
+  /**
* Array of servicesMasters objects, that will be shown on the 
page
* Are filtered using mastersToShow
* @type {Array}
@@ -731,7 +747,31 @@ App.AssignMasterComponents = Em.Mixin.create({
* @method loadRecommendationsSuccessCallback
*/
   loadRecommendationsSuccessCallback: function (data) {
-this.set('content.recommendations', data.resources[0].recommendations);
+var recommendations = data.resources[0].recommendations;
+this.set('content.recommendations', recommendations);
+
+var recommendedHostsForComponent = {};
+var hostsForHostGroup = {};
+
+
recommendations.blueprint_cluster_binding.host_groups.forEach(function(hostGroup)
 {
+  hostsForHostGroup[hostGroup.name] = hostGroup.hosts.map(function(host) {
+return host.fqdn;
+  });
+});
+
+recommendations.blueprint.host_groups.forEach(function (hostGroup) {
+  var components = hostGroup.components.map(function (component) {
+return component.name;
+  });
+  components.forEach(function (componentName) {
+var hostList = recommendedHostsForComponent[componentName] || [];
+var hostNames = hostsForHostGroup[hostGroup.name] || [];
+Array.prototype.push.apply(hostList, hostNames);
+recommendedHostsForComponent[componentName] = hostList;
+  });
+});
+
+this.set('content.recommendedHostsForComponents', 
recommendedHostsForComponent);
   },
 
   /**
@@ -817,6 +857,21 @@ App.AssignMasterComponents = Em.Mixin.create({
* @returns {*}
*/
   getHostForMaster: function (master, allMasters) {
+var masterHostList = [];
+
+allMasters.forEach(function (component) {
+  if (component.component_name === master) {
+masterHostList.push(component.selectedHost);
+  }
+});
+
+var recommendedHostsForMaster = 
this.get('content.recommendedHostsForComponents')[master] || [];
+for (var k = 0; k < recommendedHostsForMaster.length; k++) {
+  if(!masterHostList.contains(recommendedHostsForMaster[k])) {
+return recommendedHostsForMaster[k];
+  }
+}
+
 var usedHosts = 

ambari git commit: AMBARI-14987: assign_master_component.js does not show recommendations while adding master component for a service which is already installed (mithmatt via jaoki)

[jaoki]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.2 2daca3ca6 -> 94129bbc8


AMBARI-14987: assign_master_component.js does not show recommendations while 
adding master component for a service which is already installed (mithmatt via 
jaoki)


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

Branch: refs/heads/branch-2.2
Commit: 94129bbc8289647c3e1b9e0d21d84f5d156d13ca
Parents: 2daca3c
Author: Jun Aoki 
Authored: Tue Feb 16 16:42:32 2016 -0800
Committer: Jun Aoki 
Committed: Tue Feb 16 16:42:32 2016 -0800

--
 ambari-web/app/assets/test/tests.js |   1 +
 .../mixins/wizard/assign_master_components.js   |  58 ++-
 .../wizard/assign_master_components_test.js | 154 +++
 3 files changed, 212 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/94129bbc/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 9d5cbc1..25c3f43 100644
--- a/ambari-web/app/assets/test/tests.js
+++ b/ambari-web/app/assets/test/tests.js
@@ -157,6 +157,7 @@ var files = ['test/init_model_test',
   'test/mixins/main/service/configs/widget_popover_support_test',
   'test/mixins/routers/redirections_test',
   'test/mixins/wizard/addSeccurityConfigs_test',
+  'test/mixins/wizard/assign_master_components_test',
   'test/mixins/wizard/wizard_menu_view_test',
   'test/mixins/wizard/wizardProgressPageController_test',
   'test/mixins/wizard/wizardEnableDone_test',

http://git-wip-us.apache.org/repos/asf/ambari/blob/94129bbc/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 f6d1b1a..62efdac 100644
--- a/ambari-web/app/mixins/wizard/assign_master_components.js
+++ b/ambari-web/app/mixins/wizard/assign_master_components.js
@@ -95,6 +95,22 @@ App.AssignMasterComponents = Em.Mixin.create({
   showInstalledMastersFirst: false,
 
   /**
+   * Map of component name to list of hostnames for that component
+   * format:
+   * {
+   *   NAMENODE: [
+   * 'c6401.ambari.apache.org'
+   *   ],
+   *   DATANODE: [
+   * 'c6402.ambari.apache.org',
+   * 'c6403.ambari.apache.org',
+   *   ]
+   * }
+   * @type {Object}
+   */
+  recommendedHostsForComponents: {},
+
+  /**
* Array of servicesMasters objects, that will be shown on the 
page
* Are filtered using mastersToShow
* @type {Array}
@@ -738,7 +754,31 @@ App.AssignMasterComponents = Em.Mixin.create({
* @method loadRecommendationsSuccessCallback
*/
   loadRecommendationsSuccessCallback: function (data) {
-this.set('content.recommendations', data.resources[0].recommendations);
+var recommendations = data.resources[0].recommendations;
+this.set('content.recommendations', recommendations);
+
+var recommendedHostsForComponent = {};
+var hostsForHostGroup = {};
+
+
recommendations.blueprint_cluster_binding.host_groups.forEach(function(hostGroup)
 {
+  hostsForHostGroup[hostGroup.name] = hostGroup.hosts.map(function(host) {
+return host.fqdn;
+  });
+});
+
+recommendations.blueprint.host_groups.forEach(function (hostGroup) {
+  var components = hostGroup.components.map(function (component) {
+return component.name;
+  });
+  components.forEach(function (componentName) {
+var hostList = recommendedHostsForComponent[componentName] || [];
+var hostNames = hostsForHostGroup[hostGroup.name] || [];
+Array.prototype.push.apply(hostList, hostNames);
+recommendedHostsForComponent[componentName] = hostList;
+  });
+});
+
+this.set('content.recommendedHostsForComponents', 
recommendedHostsForComponent);
   },
 
   /**
@@ -820,6 +860,21 @@ App.AssignMasterComponents = Em.Mixin.create({
* @returns {*}
*/
   getHostForMaster: function (master, allMasters) {
+var masterHostList = [];
+
+allMasters.forEach(function (component) {
+  if (component.component_name === master) {
+masterHostList.push(component.selectedHost);
+  }
+});
+
+var recommendedHostsForMaster = 
this.get('content.recommendedHostsForComponents')[master] || [];
+for (var k = 0; k < recommendedHostsForMaster.length; k++) {
+  if(!masterHostList.contains(recommendedHostsForMaster[k])) {
+return recommendedHostsForMaster[k];
+  }
+}
+
 var usedHosts 

ambari git commit: AMBARI-14997: Update gpcheck.cnf to hawq_check.cnf file as recommended in HAWQ documentation (bhuvnesh2703 via jaoki)

[jaoki]

Repository: ambari
Updated Branches:
  refs/heads/trunk d412ca11c -> 529c588ad


AMBARI-14997: Update gpcheck.cnf to hawq_check.cnf file as recommended in HAWQ 
documentation (bhuvnesh2703 via jaoki)


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

Branch: refs/heads/trunk
Commit: 529c588add78ce4d0a82542144ba94f89c80299e
Parents: d412ca1
Author: Jun Aoki 
Authored: Tue Feb 16 16:27:02 2016 -0800
Committer: Jun Aoki 
Committed: Tue Feb 16 16:27:02 2016 -0800

--
 .../HAWQ/2.0.0/configuration/gpcheck-env.xml| 89 
 .../HAWQ/2.0.0/configuration/hawq-check-env.xml | 89 
 .../common-services/HAWQ/2.0.0/metainfo.xml |  2 +-
 .../2.0.0/package/scripts/hawq_constants.py |  2 +-
 .../HAWQ/2.0.0/package/scripts/master_helper.py |  2 +-
 .../HAWQ/2.0.0/package/scripts/params.py|  2 +-
 .../stacks/2.3/common/services-hawq-1-host.json |  2 +-
 .../2.3/common/services-hawq-3-hosts.json   |  2 +-
 .../2.3/common/services-hawq-pxf-hdfs.json  |  4 +-
 .../services-master_ambari_colo-3-hosts.json|  2 +-
 .../services-master_standby_colo-3-hosts.json   |  2 +-
 .../common/services-normal-hawq-3-hosts.json|  2 +-
 .../services-standby_ambari_colo-3-hosts.json   |  2 +-
 ambari-web/app/data/HDP2.3/site_properties.js   |  4 +-
 ambari-web/app/models/stack_service.js  |  4 +-
 15 files changed, 105 insertions(+), 105 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/529c588a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/gpcheck-env.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/gpcheck-env.xml
 
b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/gpcheck-env.xml
deleted file mode 100755
index 309a0c7..000
--- 
a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/gpcheck-env.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-
-
-
-
-
-  
-
-  content
-  Content
-  Contents of the configuration file 
/usr/local/hawq/etc/gpcheck.cnf. This file is used by 'hawq check' command, 
which can be run manually by gpadmin user on the HAWQ master host. This command 
validates the system parameters and HDFS parameters mentioned in this file to 
ensure optimal HAWQ operation.
-
-[global]
-configfile_version = 4
-
-[linux.mount]
-mount.points = /
-
-[linux.sysctl]
-sysctl.kernel.shmmax = 5
-sysctl.kernel.shmmni = 4096
-sysctl.kernel.shmall = 40
-sysctl.kernel.sem = 250 512000 100 2048
-sysctl.kernel.sysrq = 1
-sysctl.kernel.core_uses_pid = 1
-sysctl.kernel.msgmnb = 65536
-sysctl.kernel.msgmax = 65536
-sysctl.kernel.msgmni = 2048
-sysctl.net.ipv4.tcp_syncookies = 0
-sysctl.net.ipv4.ip_forward = 0
-sysctl.net.ipv4.conf.default.accept_source_route = 0
-sysctl.net.ipv4.tcp_tw_recycle = 1
-sysctl.net.ipv4.tcp_max_syn_backlog = 20
-sysctl.net.ipv4.conf.all.arp_filter = 1
-sysctl.net.ipv4.ip_local_port_range = 1281 65535
-sysctl.net.core.netdev_max_backlog = 20
-sysctl.vm.overcommit_memory = 2
-sysctl.fs.nr_open = 300
-sysctl.kernel.threads-max = 798720
-sysctl.kernel.pid_max = 798720
-# increase network
-sysctl.net.core.rmem_max = 2097152
-sysctl.net.core.wmem_max = 2097152
-
-[linux.limits]
-soft.nofile = 290
-hard.nofile = 290
-soft.nproc  = 131072
-hard.nproc  = 131072
-
-[linux.diskusage]
-diskusage.monitor.mounts = /
-diskusage.monitor.usagemax = 90%
-
-[hdfs]
-dfs.mem.namenode.heap = 40960
-dfs.mem.datanode.heap = 6144
-# in hdfs-site.xml
-dfs.support.append = true
-dfs.client.enable.read.from.local = true
-dfs.block.local-path-access.user = gpadmin
-dfs.datanode.max.transfer.threads = 40960
-dfs.client.socket-timeout = 3
-dfs.datanode.socket.write.timeout = 720
-dfs.namenode.handler.count = 60
-ipc.server.handler.queue.size = 3300
-dfs.datanode.handler.count = 60
-ipc.client.connection.maxidletime = 360
-dfs.namenode.accesstime.precision = -1
-
-
-content
-
-  
-

http://git-wip-us.apache.org/repos/asf/ambari/blob/529c588a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-check-env.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-check-env.xml
 
b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-check-env.xml
new file mode 100755
index 000..185d175
--- /dev/null
+++ 

ambari git commit: AMBARI-15063 : Metrics monitor fails on restart (avijayan)

[avijayan]

Repository: ambari
Updated Branches:
  refs/heads/trunk 21fd70c9b -> d412ca11c


AMBARI-15063 : Metrics monitor fails on restart (avijayan)


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

Branch: refs/heads/trunk
Commit: d412ca11c8347fb89e7a5318c72a7dc24d0c2ff9
Parents: 21fd70c
Author: Aravindan Vijayan 
Authored: Tue Feb 16 14:41:00 2016 -0800
Committer: Aravindan Vijayan 
Committed: Tue Feb 16 14:41:00 2016 -0800

--
 .../conf/unix/ambari-metrics-monitor   | 6 +++---
 .../conf/unix/ambari-metrics-collector | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/d412ca11/ambari-metrics/ambari-metrics-host-monitoring/conf/unix/ambari-metrics-monitor
--
diff --git 
a/ambari-metrics/ambari-metrics-host-monitoring/conf/unix/ambari-metrics-monitor
 
b/ambari-metrics/ambari-metrics-host-monitoring/conf/unix/ambari-metrics-monitor
index 815b3e4..aa4ae02 100644
--- 
a/ambari-metrics/ambari-metrics-host-monitoring/conf/unix/ambari-metrics-monitor
+++ 
b/ambari-metrics/ambari-metrics-host-monitoring/conf/unix/ambari-metrics-monitor
@@ -131,7 +131,7 @@ case "$1" in
 echo "Checking for previously running Metric Monitor..."
 if [ -f ${PIDFILE} ]; then
   PID=`cat ${PIDFILE}`
-  if [ -z "`ps ax -o pid | grep ${PID}`" ]; then
+  if [ -z "`ps ax -o pid | grep -w ${PID} | grep resource_monitoring`" ]; 
then
 echo "${PIDFILE} found with no process. Removing ${PID}..."
 rm -f ${PIDFILE}
   else
@@ -152,7 +152,7 @@ case "$1" in
 sleep 2
 
 echo "Verifying ${METRIC_MONITOR} process status..."
-if [ -z "`ps ax -o pid | grep ${PID}`" ]; then
+if [ -z "`ps ax -o pid | grep -w ${PID} | grep resource_monitoring`" ]; 
then
   if [ -s ${OUTFILE} ]; then
 echo "ERROR: ${METRIC_MONITOR} start failed. For more details, see 
${OUTFILE}:"
 echo ""
@@ -173,7 +173,7 @@ case "$1" in
 if [ -f ${PIDFILE} ]; then
   PID=`cat ${PIDFILE}`
   echo "Found ${METRIC_MONITOR} PID: $PID"
-  if [ -z "`ps ax -o pid | grep ${PID}`" ]; then
+  if [ -z "`ps ax -o pid | grep -w ${PID} | grep resource_monitoring`" ]; 
then
 echo "${METRIC_MONITOR} not running. Stale PID File at: $PIDFILE"
 retcode=2
   else

http://git-wip-us.apache.org/repos/asf/ambari/blob/d412ca11/ambari-metrics/ambari-metrics-timelineservice/conf/unix/ambari-metrics-collector
--
diff --git 
a/ambari-metrics/ambari-metrics-timelineservice/conf/unix/ambari-metrics-collector
 
b/ambari-metrics/ambari-metrics-timelineservice/conf/unix/ambari-metrics-collector
index f83af50..e319d73 100644
--- 
a/ambari-metrics/ambari-metrics-timelineservice/conf/unix/ambari-metrics-collector
+++ 
b/ambari-metrics/ambari-metrics-timelineservice/conf/unix/ambari-metrics-collector
@@ -267,7 +267,7 @@ function start()
   sleep 2
 
   echo "Verifying ${METRIC_COLLECTOR} process status..." | tee -a $STARTUPFILE
-  if [ -z "`ps ax -o pid | grep ${PID}`" ]; then
+  if [ -z "`ps ax | grep -w ${PID} | grep ApplicationHistoryServer`" ]; then
 if [ -s ${OUTFILE} ]; then
   echo "ERROR: ${METRIC_COLLECTOR} start failed. For more details, see 
${OUTFILE}:" | tee -a $STARTUPFILE
   echo ""

ambari git commit: AMBARI-15063 : Metrics monitor fails on restart (avijayan)

[avijayan]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.2 3ed2eb1c2 -> 2daca3ca6


AMBARI-15063 : Metrics monitor fails on restart (avijayan)


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

Branch: refs/heads/branch-2.2
Commit: 2daca3ca63461fc33681efc8d9a3148ed864c00d
Parents: 3ed2eb1
Author: Aravindan Vijayan 
Authored: Tue Feb 16 14:34:31 2016 -0800
Committer: Aravindan Vijayan 
Committed: Tue Feb 16 14:34:31 2016 -0800

--
 .../conf/unix/ambari-metrics-monitor   | 6 +++---
 .../conf/unix/ambari-metrics-collector | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/2daca3ca/ambari-metrics/ambari-metrics-host-monitoring/conf/unix/ambari-metrics-monitor
--
diff --git 
a/ambari-metrics/ambari-metrics-host-monitoring/conf/unix/ambari-metrics-monitor
 
b/ambari-metrics/ambari-metrics-host-monitoring/conf/unix/ambari-metrics-monitor
index 815b3e4..aa4ae02 100644
--- 
a/ambari-metrics/ambari-metrics-host-monitoring/conf/unix/ambari-metrics-monitor
+++ 
b/ambari-metrics/ambari-metrics-host-monitoring/conf/unix/ambari-metrics-monitor
@@ -131,7 +131,7 @@ case "$1" in
 echo "Checking for previously running Metric Monitor..."
 if [ -f ${PIDFILE} ]; then
   PID=`cat ${PIDFILE}`
-  if [ -z "`ps ax -o pid | grep ${PID}`" ]; then
+  if [ -z "`ps ax -o pid | grep -w ${PID} | grep resource_monitoring`" ]; 
then
 echo "${PIDFILE} found with no process. Removing ${PID}..."
 rm -f ${PIDFILE}
   else
@@ -152,7 +152,7 @@ case "$1" in
 sleep 2
 
 echo "Verifying ${METRIC_MONITOR} process status..."
-if [ -z "`ps ax -o pid | grep ${PID}`" ]; then
+if [ -z "`ps ax -o pid | grep -w ${PID} | grep resource_monitoring`" ]; 
then
   if [ -s ${OUTFILE} ]; then
 echo "ERROR: ${METRIC_MONITOR} start failed. For more details, see 
${OUTFILE}:"
 echo ""
@@ -173,7 +173,7 @@ case "$1" in
 if [ -f ${PIDFILE} ]; then
   PID=`cat ${PIDFILE}`
   echo "Found ${METRIC_MONITOR} PID: $PID"
-  if [ -z "`ps ax -o pid | grep ${PID}`" ]; then
+  if [ -z "`ps ax -o pid | grep -w ${PID} | grep resource_monitoring`" ]; 
then
 echo "${METRIC_MONITOR} not running. Stale PID File at: $PIDFILE"
 retcode=2
   else

http://git-wip-us.apache.org/repos/asf/ambari/blob/2daca3ca/ambari-metrics/ambari-metrics-timelineservice/conf/unix/ambari-metrics-collector
--
diff --git 
a/ambari-metrics/ambari-metrics-timelineservice/conf/unix/ambari-metrics-collector
 
b/ambari-metrics/ambari-metrics-timelineservice/conf/unix/ambari-metrics-collector
index f83af50..e319d73 100644
--- 
a/ambari-metrics/ambari-metrics-timelineservice/conf/unix/ambari-metrics-collector
+++ 
b/ambari-metrics/ambari-metrics-timelineservice/conf/unix/ambari-metrics-collector
@@ -267,7 +267,7 @@ function start()
   sleep 2
 
   echo "Verifying ${METRIC_COLLECTOR} process status..." | tee -a $STARTUPFILE
-  if [ -z "`ps ax -o pid | grep ${PID}`" ]; then
+  if [ -z "`ps ax | grep -w ${PID} | grep ApplicationHistoryServer`" ]; then
 if [ -s ${OUTFILE} ]; then
   echo "ERROR: ${METRIC_COLLECTOR} start failed. For more details, see 
${OUTFILE}:" | tee -a $STARTUPFILE
   echo ""

ambari git commit: AMBARI-14986 Combo Search: Create auto suggest for Serivce Component filters (Joe Wang via rzang)

[rzang]

Repository: ambari
Updated Branches:
  refs/heads/trunk 1e510f590 -> 21fd70c9b


AMBARI-14986 Combo Search: Create auto suggest for Serivce Component filters 
(Joe Wang via rzang)


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

Branch: refs/heads/trunk
Commit: 21fd70c9bf911d56a91cad514a033fbff3c5bcb4
Parents: 1e510f5
Author: Richard Zang 
Authored: Tue Feb 16 14:27:47 2016 -0800
Committer: Richard Zang 
Committed: Tue Feb 16 14:27:47 2016 -0800

--
 ambari-web/app/controllers/main/host/combo_search_box.js | 7 ++-
 1 file changed, 2 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/21fd70c9/ambari-web/app/controllers/main/host/combo_search_box.js
--
diff --git a/ambari-web/app/controllers/main/host/combo_search_box.js 
b/ambari-web/app/controllers/main/host/combo_search_box.js
index 1c2a87f..d835e97 100644
--- a/ambari-web/app/controllers/main/host/combo_search_box.js
+++ b/ambari-web/app/controllers/main/host/combo_search_box.js
@@ -82,13 +82,10 @@ App.MainHostComboSearchBoxController = 
Em.Controller.extend({
   ]);
   break;
 case 'service':
-  callback(App.Service.find().toArray().mapProperty('serviceName'));
+  callback(App.Service.find().toArray().mapProperty('serviceName'), 
{preserveOrder: true});
   break;
 case 'component':
-  
callback(App.MasterComponent.find().toArray().mapProperty('componentName')
-  
.concat(App.SlaveComponent.find().toArray().mapProperty('componentName'))
-  
.concat(App.ClientComponent.find().toArray().mapProperty('componentName'))
-,{preserveOrder: true});
+  
callback(App.HostComponent.find().toArray().mapProperty('componentName').uniq(),
 {preserveOrder: true});
   break;
 case 'state':
   callback([

ambari git commit: AMBARI-15058 - Schema changes for component history (jonathanhurley)

[jonathanhurley]

Repository: ambari
Updated Branches:
  refs/heads/branch-dev-patch-upgrade 718f2ea18 -> e4d1475ea


AMBARI-15058 - Schema changes for component history (jonathanhurley)


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

Branch: refs/heads/branch-dev-patch-upgrade
Commit: e4d1475eab7be09baeed6624447b122f2bf7853c
Parents: 718f2ea
Author: Jonathan Hurley 
Authored: Tue Feb 16 13:40:47 2016 -0500
Committer: Jonathan Hurley 
Committed: Tue Feb 16 15:54:39 2016 -0500

--
 .../dao/ServiceComponentDesiredStateDAO.java|  53 +
 .../ServiceComponentDesiredStateEntity.java |  40 
 .../entities/ServiceComponentHistoryEntity.java | 219 +++
 .../main/resources/Ambari-DDL-Derby-CREATE.sql  |  34 ++-
 .../main/resources/Ambari-DDL-MySQL-CREATE.sql  |  26 ++-
 .../main/resources/Ambari-DDL-Oracle-CREATE.sql |  26 ++-
 .../resources/Ambari-DDL-Postgres-CREATE.sql|  31 ++-
 .../Ambari-DDL-Postgres-EMBEDDED-CREATE.sql |  28 ++-
 .../resources/Ambari-DDL-SQLAnywhere-CREATE.sql |  29 ++-
 .../resources/Ambari-DDL-SQLServer-CREATE.sql   |  29 ++-
 .../src/main/resources/META-INF/persistence.xml |   1 +
 .../server/state/ServiceComponentTest.java  | 140 
 12 files changed, 599 insertions(+), 57 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/e4d1475e/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ServiceComponentDesiredStateDAO.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ServiceComponentDesiredStateDAO.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ServiceComponentDesiredStateDAO.java
index b8c2fcc..4c906cc 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ServiceComponentDesiredStateDAO.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ServiceComponentDesiredStateDAO.java
@@ -20,12 +20,14 @@ package org.apache.ambari.server.orm.dao;
 
 import java.util.List;
 
+import javax.persistence.CascadeType;
 import javax.persistence.EntityManager;
 import javax.persistence.NoResultException;
 import javax.persistence.TypedQuery;
 
 import org.apache.ambari.server.orm.RequiresSession;
 import 
org.apache.ambari.server.orm.entities.ServiceComponentDesiredStateEntity;
+import org.apache.ambari.server.orm.entities.ServiceComponentHistoryEntity;
 
 import com.google.inject.Inject;
 import com.google.inject.Provider;
@@ -125,4 +127,55 @@ public class ServiceComponentDesiredStateDAO {
   entityManagerProvider.get().remove(entity);
 }
   }
+
+  /**
+   * Creates a service component upgrade/downgrade historical event.
+   *
+   * @param serviceComponentHistoryEntity
+   */
+  @Transactional
+  public void create(ServiceComponentHistoryEntity 
serviceComponentHistoryEntity) {
+entityManagerProvider.get().persist(serviceComponentHistoryEntity);
+  }
+
+  /**
+   * Merges a service component upgrade/downgrade historical event, creating it
+   * in the process if it does not already exist. The associated
+   * {@link ServiceComponentDesiredStateEntity} is automatically merged via its
+   * {@link CascadeType}.
+   *
+   * @param serviceComponentHistoryEntity
+   * @return
+   */
+  @Transactional
+  public ServiceComponentHistoryEntity merge(
+  ServiceComponentHistoryEntity serviceComponentHistoryEntity) {
+return entityManagerProvider.get().merge(serviceComponentHistoryEntity);
+  }
+
+  /**
+   * Gets the history for a component.
+   *
+   * @param clusterId
+   *  the component's cluster.
+   * @param serviceName
+   *  the component's service (not {@code null}).
+   * @param componentName
+   *  the component's name (not {@code null}).
+   * @return
+   */
+  @RequiresSession
+  public List findHistory(long clusterId, 
String serviceName,
+  String componentName) {
+EntityManager entityManager = entityManagerProvider.get();
+TypedQuery query = 
entityManager.createNamedQuery(
+"ServiceComponentHistoryEntity.findByComponent", 
ServiceComponentHistoryEntity.class);
+
+query.setParameter("clusterId", clusterId);
+query.setParameter("serviceName", serviceName);
+query.setParameter("componentName", componentName);
+
+ServiceComponentDesiredStateEntity entity = null;
+return daoUtils.selectList(query);
+  }
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/e4d1475e/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ServiceComponentDesiredStateEntity.java

ambari git commit: AMBARI-14999. Multi-host option for Templated Dashboards. (Prajwal Rao via yusaku)

[yusaku]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.2 8a8f16a41 -> 3ed2eb1c2


AMBARI-14999. Multi-host option for Templated Dashboards. (Prajwal Rao via 
yusaku)


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

Branch: refs/heads/branch-2.2
Commit: 3ed2eb1c2f59812bcd450df6fc02dc97a43088a2
Parents: 8a8f16a
Author: Yusaku Sako 
Authored: Tue Feb 16 12:15:43 2016 -0800
Committer: Yusaku Sako 
Committed: Tue Feb 16 12:16:34 2016 -0800

--
 ambari-metrics/ambari-metrics-grafana/README.md |  22 -
 .../ambari-metrics/datasource.js|  49 +++
 .../screenshots/21-multi-templating.png | Bin 0 -> 92034 bytes
 3 files changed, 60 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/3ed2eb1c/ambari-metrics/ambari-metrics-grafana/README.md
--
diff --git a/ambari-metrics/ambari-metrics-grafana/README.md 
b/ambari-metrics/ambari-metrics-grafana/README.md
index 7eb84a7..af2b5cb 100644
--- a/ambari-metrics/ambari-metrics-grafana/README.md
+++ b/ambari-metrics/ambari-metrics-grafana/README.md
@@ -33,10 +33,12 @@ Use **ambari-metrics** to visualize metrics exposed via AMS 
in Grafana.
  - [Save Dashboard](#savedash)
  - [Time Ranges](#timerange)
  - [Edit Panel/Graph](#editpanel)
+ - [Templated Dashboards](#templating)
+- [Multi Host Templated Dashboards](#multi-templating)
 
 
 --
-![enter image description here](screenshots/full-dashboard.png)
+![Full Dashboard](screenshots/full-dashboard.png)
 
 --
 
@@ -257,7 +259,23 @@ http://GRAFANA_HOST:3000
 > 10. When you now add a graph, and select your component and metric, the 
 > plotted graph will show you metrics for the selected hostname from the 
 > dropdown.
 > 11. The legend on the graph will also now update with the selected host.
 
-**Templalted dashboards do support multiple metrics in a single graph.** 
+**Templated dashboards do support multiple metrics in a single graph.** 
 
 
 ![Templating](screenshots/20-templating.png)
+
+---
+
+
+### Multi Host Templated Dashboards.
+
+**Templated dashboards now have the ability to filter graphs based on a single 
host or multiple hosts.**
+
+> 1. Once you've created your templated dashboard, you can edit it gain by 
clicking on the "cog" on the top, select "Templating".
+> 2. Click on "Edit" for your templating variable.
+> 3. To be able to select Multiiple Hosts, set multi-value selection to 
"enable" and leave multi-format set to "glob".
+> 4. To have an option for All hosts, select All Value, and set it to "*" and 
All format to "wildcard".
+> 5. Hit Update and close the templating variables options and you should be 
now able to select multiple hosts from the dropdown (or "all" hosts at once.)
+
+
+![Multi Host Templating](screenshots/21-multi-templating.png)

http://git-wip-us.apache.org/repos/asf/ambari/blob/3ed2eb1c/ambari-metrics/ambari-metrics-grafana/ambari-metrics/datasource.js
--
diff --git a/ambari-metrics/ambari-metrics-grafana/ambari-metrics/datasource.js 
b/ambari-metrics/ambari-metrics-grafana/ambari-metrics/datasource.js
index e89ad0e..ca7ea65 100644
--- a/ambari-metrics/ambari-metrics-grafana/ambari-metrics/datasource.js
+++ b/ambari-metrics/ambari-metrics-grafana/ambari-metrics/datasource.js
@@ -38,6 +38,7 @@ define([
 }
 var allMetrics = [];
 var appIds = [];
+//We get a list of components and their associated metrics.
 AmbariMetricsDatasource.prototype.initMetricAppidMapping = function () 
{
   backendSrv.get(this.url + '/ws/v1/timeline/metrics/metadata')
 .then(function (items) {
@@ -73,7 +74,7 @@ define([
   }
 
   options.url = this.url + options.url;
-  options.inspect = {type: 'discovery'};
+  options.inspect = {type: 'ambarimetrics'};
 
   return backendSrv.datasourceRequest(options);
 };
@@ -82,6 +83,7 @@ define([
  * AMS Datasource  Query
  */
 AmbariMetricsDatasource.prototype.query = function (options) {
+
   var emptyData = function (metric) {
 return {
   data: {
@@ -99,6 +101,7 @@ define([
   }
   var series = [];
   var metricData = res.metrics[0].metrics;
+  // Added hostname to legend for templated dashboards.
   var hostLegend = res.metrics[0].hostname ? ' on ' + 
res.metrics[0].hostname : '';
   var timeSeries = {};
  

ambari git commit: AMBARI-14999. Multi-host option for Templated Dashboards. (Prajwal Rao via yusaku)

[yusaku]

Repository: ambari
Updated Branches:
  refs/heads/trunk f41fccfc8 -> 1e510f590


AMBARI-14999. Multi-host option for Templated Dashboards. (Prajwal Rao via 
yusaku)


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

Branch: refs/heads/trunk
Commit: 1e510f590f9caa9ef7fb4e71e9badd54cb36b5c0
Parents: f41fccf
Author: Yusaku Sako 
Authored: Tue Feb 16 12:15:43 2016 -0800
Committer: Yusaku Sako 
Committed: Tue Feb 16 12:15:43 2016 -0800

--
 ambari-metrics/ambari-metrics-grafana/README.md |  22 -
 .../ambari-metrics/datasource.js|  49 +++
 .../screenshots/21-multi-templating.png | Bin 0 -> 92034 bytes
 3 files changed, 60 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/1e510f59/ambari-metrics/ambari-metrics-grafana/README.md
--
diff --git a/ambari-metrics/ambari-metrics-grafana/README.md 
b/ambari-metrics/ambari-metrics-grafana/README.md
index 7eb84a7..af2b5cb 100644
--- a/ambari-metrics/ambari-metrics-grafana/README.md
+++ b/ambari-metrics/ambari-metrics-grafana/README.md
@@ -33,10 +33,12 @@ Use **ambari-metrics** to visualize metrics exposed via AMS 
in Grafana.
  - [Save Dashboard](#savedash)
  - [Time Ranges](#timerange)
  - [Edit Panel/Graph](#editpanel)
+ - [Templated Dashboards](#templating)
+- [Multi Host Templated Dashboards](#multi-templating)
 
 
 --
-![enter image description here](screenshots/full-dashboard.png)
+![Full Dashboard](screenshots/full-dashboard.png)
 
 --
 
@@ -257,7 +259,23 @@ http://GRAFANA_HOST:3000
 > 10. When you now add a graph, and select your component and metric, the 
 > plotted graph will show you metrics for the selected hostname from the 
 > dropdown.
 > 11. The legend on the graph will also now update with the selected host.
 
-**Templalted dashboards do support multiple metrics in a single graph.** 
+**Templated dashboards do support multiple metrics in a single graph.** 
 
 
 ![Templating](screenshots/20-templating.png)
+
+---
+
+
+### Multi Host Templated Dashboards.
+
+**Templated dashboards now have the ability to filter graphs based on a single 
host or multiple hosts.**
+
+> 1. Once you've created your templated dashboard, you can edit it gain by 
clicking on the "cog" on the top, select "Templating".
+> 2. Click on "Edit" for your templating variable.
+> 3. To be able to select Multiiple Hosts, set multi-value selection to 
"enable" and leave multi-format set to "glob".
+> 4. To have an option for All hosts, select All Value, and set it to "*" and 
All format to "wildcard".
+> 5. Hit Update and close the templating variables options and you should be 
now able to select multiple hosts from the dropdown (or "all" hosts at once.)
+
+
+![Multi Host Templating](screenshots/21-multi-templating.png)

http://git-wip-us.apache.org/repos/asf/ambari/blob/1e510f59/ambari-metrics/ambari-metrics-grafana/ambari-metrics/datasource.js
--
diff --git a/ambari-metrics/ambari-metrics-grafana/ambari-metrics/datasource.js 
b/ambari-metrics/ambari-metrics-grafana/ambari-metrics/datasource.js
index e89ad0e..ca7ea65 100644
--- a/ambari-metrics/ambari-metrics-grafana/ambari-metrics/datasource.js
+++ b/ambari-metrics/ambari-metrics-grafana/ambari-metrics/datasource.js
@@ -38,6 +38,7 @@ define([
 }
 var allMetrics = [];
 var appIds = [];
+//We get a list of components and their associated metrics.
 AmbariMetricsDatasource.prototype.initMetricAppidMapping = function () 
{
   backendSrv.get(this.url + '/ws/v1/timeline/metrics/metadata')
 .then(function (items) {
@@ -73,7 +74,7 @@ define([
   }
 
   options.url = this.url + options.url;
-  options.inspect = {type: 'discovery'};
+  options.inspect = {type: 'ambarimetrics'};
 
   return backendSrv.datasourceRequest(options);
 };
@@ -82,6 +83,7 @@ define([
  * AMS Datasource  Query
  */
 AmbariMetricsDatasource.prototype.query = function (options) {
+
   var emptyData = function (metric) {
 return {
   data: {
@@ -99,6 +101,7 @@ define([
   }
   var series = [];
   var metricData = res.metrics[0].metrics;
+  // Added hostname to legend for templated dashboards.
   var hostLegend = res.metrics[0].hostname ? ' on ' + 
res.metrics[0].hostname : '';
   var timeSeries = {};
   if 

ambari git commit: AMBARI-15022: Add Custom action to sync Standby with Master (goutamtadi via jaoki)

[jaoki]

Repository: ambari
Updated Branches:
  refs/heads/trunk f18601c7c -> f41fccfc8


AMBARI-15022: Add Custom action to sync Standby with Master (goutamtadi via 
jaoki)


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

Branch: refs/heads/trunk
Commit: f41fccfc829919546fcb8e2a79a36a4b477affa6
Parents: f18601c
Author: Jun Aoki 
Authored: Tue Feb 16 11:33:30 2016 -0800
Committer: Jun Aoki 
Committed: Tue Feb 16 11:33:30 2016 -0800

--
 .../common-services/HAWQ/2.0.0/metainfo.xml | 14 --
 .../HAWQ/2.0.0/package/scripts/hawqmaster.py|  2 +-
 .../HAWQ/2.0.0/package/scripts/hawqsegment.py   |  2 +-
 .../HAWQ/2.0.0/package/scripts/hawqstandby.py   | 10 -
 .../hawq/activateStandby/step3_controller.js|  2 +-
 ambari-web/app/controllers/main/service/item.js | 46 ++--
 ambari-web/app/messages.js  |  5 ++-
 ambari-web/app/models/host_component.js | 27 
 ambari-web/app/utils/helper.js  | 14 ++
 ambari-web/app/views/main/service/item.js   | 41 +
 10 files changed, 104 insertions(+), 59 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/f41fccfc/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/metainfo.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/metainfo.xml 
b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/metainfo.xml
index 7a71604..fd145f4 100644
--- a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/metainfo.xml
+++ b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/metainfo.xml
@@ -39,7 +39,7 @@
   
   
 
-  IMMEDIATE_STOP_CLUSTER
+  IMMEDIATE_STOP_HAWQ_SERVICE
   
 scripts/hawqmaster.py
 PYTHON
@@ -78,7 +78,15 @@
   
   
 
-  ACTIVATE_STANDBY
+  ACTIVATE_HAWQ_STANDBY
+  
+scripts/hawqstandby.py
+PYTHON
+1200
+  
+
+
+  RESYNC_HAWQ_STANDBY
   
 scripts/hawqstandby.py
 PYTHON
@@ -110,7 +118,7 @@
   
   
 
-  IMMEDIATE_STOP
+  IMMEDIATE_STOP_HAWQ_SEGMENT
   
 scripts/hawqsegment.py
 PYTHON

http://git-wip-us.apache.org/repos/asf/ambari/blob/f41fccfc/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/hawqmaster.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/hawqmaster.py
 
b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/hawqmaster.py
index 8c7b0b5..d2f9ad0 100644
--- 
a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/hawqmaster.py
+++ 
b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/hawqmaster.py
@@ -51,7 +51,7 @@ class HawqMaster(Script):
 from hawqstatus import get_pid_file
 check_process_status(get_pid_file())
 
-  def immediate_stop_cluster(self, env):
+  def immediate_stop_hawq_service(self, env):
 master_helper.stop(hawq_constants.IMMEDIATE, hawq_constants.CLUSTER)
 
 if __name__ == "__main__":

http://git-wip-us.apache.org/repos/asf/ambari/blob/f41fccfc/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/hawqsegment.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/hawqsegment.py
 
b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/hawqsegment.py
index 6bc9802..0a597b6 100644
--- 
a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/hawqsegment.py
+++ 
b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/hawqsegment.py
@@ -73,7 +73,7 @@ class HawqSegment(Script):
 from hawqstatus import get_pid_file
 check_process_status(get_pid_file())
 
-  def immediate_stop(self, env):
+  def immediate_stop_hawq_segment(self, env):
 self.stop(env, mode=hawq_constants.IMMEDIATE)
 
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/f41fccfc/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/hawqstandby.py
--
diff --git 

ambari git commit: AMBARI-15022: Add Custom action to sync Standby with Master (goutamtadi via jaoki)

[jaoki]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.2 b6c8e5dce -> 8a8f16a41


AMBARI-15022: Add Custom action to sync Standby with Master (goutamtadi via 
jaoki)


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

Branch: refs/heads/branch-2.2
Commit: 8a8f16a41343dedca7441255591552b2ba115259
Parents: b6c8e5d
Author: Jun Aoki 
Authored: Tue Feb 16 11:32:27 2016 -0800
Committer: Jun Aoki 
Committed: Tue Feb 16 11:32:27 2016 -0800

--
 .../common-services/HAWQ/2.0.0/metainfo.xml | 14 --
 .../HAWQ/2.0.0/package/scripts/hawqmaster.py|  2 +-
 .../HAWQ/2.0.0/package/scripts/hawqsegment.py   |  2 +-
 .../HAWQ/2.0.0/package/scripts/hawqstandby.py   | 10 -
 .../hawq/activateStandby/step3_controller.js|  2 +-
 ambari-web/app/controllers/main/service/item.js | 46 ++--
 ambari-web/app/messages.js  |  5 ++-
 ambari-web/app/models/host_component.js | 28 
 ambari-web/app/utils/helper.js  | 15 +++
 ambari-web/app/views/main/service/item.js   | 45 ++-
 10 files changed, 109 insertions(+), 60 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/8a8f16a4/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/metainfo.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/metainfo.xml 
b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/metainfo.xml
index 7a71604..780a327 100644
--- a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/metainfo.xml
+++ b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/metainfo.xml
@@ -39,7 +39,7 @@
   
   
 
-  IMMEDIATE_STOP_CLUSTER
+  IMMEDIATE_STOP_HAWQ_SERVICE
   
 scripts/hawqmaster.py
 PYTHON
@@ -77,8 +77,16 @@
   600
   
   
+   
+  ACTIVATE_HAWQ_STANDBY
+  
+scripts/hawqstandby.py
+PYTHON
+1200
+  
+
 
-  ACTIVATE_STANDBY
+  RESYNC_HAWQ_STANDBY
   
 scripts/hawqstandby.py
 PYTHON
@@ -110,7 +118,7 @@
   
   
 
-  IMMEDIATE_STOP
+  IMMEDIATE_STOP_HAWQ_SEGMENT
   
 scripts/hawqsegment.py
 PYTHON

http://git-wip-us.apache.org/repos/asf/ambari/blob/8a8f16a4/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/hawqmaster.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/hawqmaster.py
 
b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/hawqmaster.py
index 8c7b0b5..d2f9ad0 100644
--- 
a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/hawqmaster.py
+++ 
b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/hawqmaster.py
@@ -51,7 +51,7 @@ class HawqMaster(Script):
 from hawqstatus import get_pid_file
 check_process_status(get_pid_file())
 
-  def immediate_stop_cluster(self, env):
+  def immediate_stop_hawq_service(self, env):
 master_helper.stop(hawq_constants.IMMEDIATE, hawq_constants.CLUSTER)
 
 if __name__ == "__main__":

http://git-wip-us.apache.org/repos/asf/ambari/blob/8a8f16a4/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/hawqsegment.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/hawqsegment.py
 
b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/hawqsegment.py
index 6bc9802..0a597b6 100644
--- 
a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/hawqsegment.py
+++ 
b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/hawqsegment.py
@@ -73,7 +73,7 @@ class HawqSegment(Script):
 from hawqstatus import get_pid_file
 check_process_status(get_pid_file())
 
-  def immediate_stop(self, env):
+  def immediate_stop_hawq_segment(self, env):
 self.stop(env, mode=hawq_constants.IMMEDIATE)
 
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/8a8f16a4/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/hawqstandby.py

ambari git commit: AMBARI-15037. When saving a SCRIPT edit, it loses the script path (Joe Wang via rzang)

[rzang]

Repository: ambari
Updated Branches:
  refs/heads/trunk b900d03a9 -> d036fc017


AMBARI-15037. When saving a SCRIPT edit, it loses the script path (Joe Wang via 
rzang)


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

Branch: refs/heads/trunk
Commit: d036fc0170521a46b4b8977ef5d2d71f3daacfb7
Parents: b900d03
Author: Richard Zang 
Authored: Tue Feb 16 11:09:09 2016 -0800
Committer: Richard Zang 
Committed: Tue Feb 16 11:09:09 2016 -0800

--
 .../app/controllers/main/alerts/definition_configs_controller.js | 4 ++--
 .../main/alerts/definitions_configs_controller_test.js   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/d036fc01/ambari-web/app/controllers/main/alerts/definition_configs_controller.js
--
diff --git 
a/ambari-web/app/controllers/main/alerts/definition_configs_controller.js 
b/ambari-web/app/controllers/main/alerts/definition_configs_controller.js
index ec5680c..130434f 100644
--- a/ambari-web/app/controllers/main/alerts/definition_configs_controller.js
+++ b/ambari-web/app/controllers/main/alerts/definition_configs_controller.js
@@ -542,10 +542,10 @@ App.MainAlertDefinitionConfigsController = 
Em.Controller.extend({
 
 // `source.parameters` is an array and should be updated separately from 
other configs
 if (this.get('content.parameters.length')) {
-  propertiesToUpdate['AlertDefinition/source/parameters'] = 
this.get('content.rawSourceData.parameters');
+  propertiesToUpdate['AlertDefinition/source'] = 
this.get('content.rawSourceData');
   var parameterConfigs = this.get('configs').filterProperty('name', 
'parameter');
   parameterConfigs.forEach(function (parameter) {
-
propertiesToUpdate['AlertDefinition/source/parameters'].findProperty('name', 
parameter.get('apiProperty')).value = parameter.get('apiFormattedValue');
+
propertiesToUpdate['AlertDefinition/source'].parameters.findProperty('name', 
parameter.get('apiProperty')).value = parameter.get('apiFormattedValue');
   });
 }
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/d036fc01/ambari-web/test/controllers/main/alerts/definitions_configs_controller_test.js
--
diff --git 
a/ambari-web/test/controllers/main/alerts/definitions_configs_controller_test.js
 
b/ambari-web/test/controllers/main/alerts/definitions_configs_controller_test.js
index c957efd..f3cf28c 100644
--- 
a/ambari-web/test/controllers/main/alerts/definitions_configs_controller_test.js
+++ 
b/ambari-web/test/controllers/main/alerts/definitions_configs_controller_test.js
@@ -537,8 +537,8 @@ describe('App.MainAlertDefinitionConfigsController', 
function () {
   });
 
   it('should update parameters', function () {
-
expect(this.result['AlertDefinition/source/parameters']).to.have.property('length').equal(4);
-
expect(this.result['AlertDefinition/source/parameters'].mapProperty('value')).to.be.eql(['v11',
 'v21', 'v31', 'v41']);
+
expect(this.result['AlertDefinition/source'].parameters).to.have.property('length').equal(4);
+
expect(this.result['AlertDefinition/source'].parameters.mapProperty('value')).to.be.eql(['v11',
 'v21', 'v31', 'v41']);
   });
 
 });

svn commit: r1730729 [2/2] - in /ambari/site: index.html install-0.9.html install.html irc.html issue-tracking.html license.html mail-lists.html privacy-policy.html project-info.html team-list.html wh

[yusaku]

Modified: ambari/site/team-list.html
URL: 
http://svn.apache.org/viewvc/ambari/site/team-list.html?rev=1730729=1730728=1730729=diff
==
--- ambari/site/team-list.html (original)
+++ ambari/site/team-list.html Tue Feb 16 18:40:01 2016
@@ -1,15 +1,15 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
   
 
 
-
+
 
-Team list
+Ambari - Team list
 
 
 
@@ -311,7 +311,7 @@
 
 
 
-  Last Published: 
2016-02-07 |
+  Last Published: 
2016-02-16 |
   Version: 2.2.1
 
 
@@ -765,7 +765,686 @@
 
 
   
-The TeamA successful project requires many people to play many 
roles. Some members write code or documentation, while others are valuable as 
testers, submitting patches and suggestions.The team is comprised of 
Members and Contributors. Members have direct access to the source of a project 
and actively evolve the code-base. Contributors improve the project through 
submission of patches and suggestions to the Members. The number of 
Contributors to the project is unbounded. Get involved today. All contributions 
to the project are greatly appreciated.MembersThe following is a list of 
developers with commit privileges that have directly contributed to the project 
in one way or another.IdNameEmailOrganizationRo
 lesTime ZoneActual Time (GMT)ababiichukAndrii Babiichukmailto:ababiic...@apache.org;>ababiic...@apache.orgHortonworksPMC+2+2abaranchukArtem Baranchukmailto:abaranc...@apache.org;>abaranc...@apache.orgHortonworksCommitter+2+2alejandroAlejandro Fernandezmailto:alejan...@apache.org;>alejan...@apache.orgHortonworksPMC-8-8aonishukAndrew Onischukmailto:aonis...@apache.org
 
">aonis...@apache.orgHortonworksCommitter+2+2atkachAndrii Tkachmailto:atk...@apache.org;>atk...@apache.orgHortonworksPMC+2+2akovalenkoAleksandr Kovalenkomailto:akovale...@apache.org;>akovale...@apache.orgHortonworksPMC+2+2alexantonenkoAlex Antonenkomailto:alexantone...@apache.org;>alexantone...@apache.orgHortonworksPMC+2+2berndfBernd Fondermannmailto:ber...@apache.org;>ber...@apache.org-PMC+1+1billieBillie Rinaldimailto:bil...@apache.org;>bil...@apache.orgHortonworksPMC-8-8crobertsChad Robertsmailto:crobe...@apache.org;>crobe...@apache.orgRed 
HatPMC--ddasDevaraj Dasmailto:d...@hortonworks.com;>d...@hortonworks.comHortonworksPMC-8-8ddoraiDilli Arumugammailto:ddo...@hortonworks.com;>ddo...@hortonworks.comHortonworksCommitter-8-8dmitriusanDmitry Lysnichenkomailto:dmitriu...@apache.org;>dmitriu...@apache.orgHortonworksPMC+2+2dsenDmitry Senmailto:d...@apache.org;>d...@apache.orgHortonworksPMC+2+2eyangEric Yangmailto:ey...@apache.org;>ey...@apache.orgIBMPMC-8-8eboydErin A. Boydmailto:eb...@apache.org;>eb...@apache.orgRed 
HatCommitter-8-8fbarcaFlorian Barcamailto:fba...@apache.org;>fba...@apache.orgHortonworksCommitter-8-8hiteshHitesh Shahmailto:hit...@apache.org;>hit...@apache.orgHortonworksPMC-8-8jaganeJagane Sundarmailto:jag...@apache.org;>jag...@apache.orgWANdiscoPMC-8-8jaokiJun Aokimailto:ja...@apache.org;>ja...@apache.orgPivotalCommitter-8-8jaiminJaimin Jetlymailto:jai...@apache.org;>jai...@apache.orgHortonworksPMC-8-8jitendraJitendra Pandeymailto:jiten...@apache.org;>jiten...@apache.orgHortonworksPMC-8-8jluniyaJayush Luniyamailto:jlun...@apache.org;>jlun...@apache.orgHortonworksPMC-8-8jonathanhurleyJonathan Hurley
 mailto:jonathanhur...@apache.org;>jonathanhur...@apache.orgHortonworksPMC-8-8jspeidelJohn Speidelmailto:jspei...@apache.org;>jspei...@apache.orgHortonworksPMC-8-8kzhangKan Zhangmailto:kanzhangm...@yahoo.com;>kanzhangm...@yahoo.comIBMPMC-8-8mahadevMahadev Konarmailto:maha...@apache.org;>maha...@apache.orgHortonworksPMC-8-8matyixJa
 nos Matyasmailto:mat...@apache.org;>mat...@apache.orgSequenceIQCommitter+2+2mpapirkovskyyMyroslav Papyrkovskyymailto:mpapirkovs...@apache.org;>mpapirkovs...@apache.orgHortonworksPMC+2+2ncoleNate Colemailto:nc...@apache.org;>nc...@apache.orgHortonworksPMC-8-8odiachenkoOleksandr Diachenkomailto:odiache...@apache.org;>odiache...@apache.orgHortonworksPMC+2+2omalleyOwen O'Malleymailto:omal...@apache.org;>omal...@apache.orgHortonworksPMC-8-8onechiporenkoOleg Nechiporenkomailto:onechipore...@apache.org;>onechipore...@apache.orgHortonworksPMC+2+2ramyaRamya Sunilmailto:ra...@apache.org;>ra...@apache.orgHortonworksPMC-8-8reznorVarun Kapoormailto:rez...@apache.org;>rez...@apache.org-PMC-8-8rlevasRobert 
Levasmailto:rle...@apache.org;>rle...@apache.orgHortonworksCommitter-8-8rnettletonBob Nettletonmailto:rnettle...@apache.org;>rnettle...@apache.orgHortonworksCommitter-8-8screeleyScott Creeleymailto:scree...@apache.org;>scree...@apache.orgRed 
HatCommitter-8-8smohantySumit Mohantymailto:smoha...@apache.org;>smoha...@apache.orgHortonworksPMC-8
 -8sposettiJeff 

ambari git commit: Updated version for the website. (yusaku)

[yusaku]

Repository: ambari
Updated Branches:
  refs/heads/trunk be1b6b9b1 -> b900d03a9


Updated version for the website. (yusaku)


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

Branch: refs/heads/trunk
Commit: b900d03a9a4bef2292f1ad0857edf6d73f7abb24
Parents: be1b6b9
Author: Yusaku Sako 
Authored: Tue Feb 16 10:38:56 2016 -0800
Committer: Yusaku Sako 
Committed: Tue Feb 16 10:38:56 2016 -0800

--
 docs/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/b900d03a/docs/pom.xml
--
diff --git a/docs/pom.xml b/docs/pom.xml
index c3bb326..d6e04e3 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -28,7 +28,7 @@
 4.0.0
 
 org.apache.ambari
-2.2.0
+2.2.1
 ambari
 pom
 
@@ -42,7 +42,7 @@
 /var/run/ambari
 1
 tar.gz
-2.2.0
+2.2.1
 ${project.artifactId}-${ambari.version}
 
 

ambari git commit: Updated team page. (yusaku)

[yusaku]

Repository: ambari
Updated Branches:
  refs/heads/trunk 0ce5fea6d -> be1b6b9b1


Updated team page. (yusaku)


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

Branch: refs/heads/trunk
Commit: be1b6b9b1cb419725edb8e647d61d48756d184e4
Parents: 0ce5fea
Author: Yusaku Sako 
Authored: Tue Feb 16 10:30:42 2016 -0800
Committer: Yusaku Sako 
Committed: Tue Feb 16 10:30:42 2016 -0800

--
 docs/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/be1b6b9b/docs/pom.xml
--
diff --git a/docs/pom.xml b/docs/pom.xml
index a1b0c79..c3bb326 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -433,7 +433,7 @@
 
 kzhang
 Kan Zhang
-kanzhangm...@yahoo.com
+kzh...@apache.org
 -8
 
 PMC

[49/50] [abbrv] ambari git commit: AMBARI-15057. Oozie untar and prepare-war should be only done exclusively in preupload.py (aonishuk)

[jonathanhurley]

AMBARI-15057. Oozie untar and prepare-war should be only done exclusively in 
preupload.py (aonishuk)


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

Branch: refs/heads/branch-dev-patch-upgrade
Commit: 0ce5fea6dc47085b75ca83de455f059d7ffc6976
Parents: a4f8a95
Author: Andrew Onishuk 
Authored: Tue Feb 16 19:40:10 2016 +0200
Committer: Andrew Onishuk 
Committed: Tue Feb 16 19:40:10 2016 +0200

--
 .../OOZIE/4.0.0.2.0/package/scripts/oozie.py| 11 +---
 .../main/resources/scripts/Ambaripreupload.py   | 59 
 .../stacks/2.0.6/OOZIE/test_oozie_server.py | 33 ++-
 3 files changed, 57 insertions(+), 46 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/0ce5fea6/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py
 
b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py
index 7591bad..2dd362a 100644
--- 
a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py
+++ 
b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py
@@ -17,7 +17,6 @@ See the License for the specific language governing 
permissions and
 limitations under the License.
 
 """
-import hashlib
 import os
 
 from resource_management.core.resources.service import ServiceConfig
@@ -228,11 +227,7 @@ def prepare_war():
 
   if run_prepare_war:
 # Time-consuming to run
-Execute(command,
-user=params.oozie_user
-)
-
-return_code, output = shell.call(command, user=params.oozie_user, 
logoutput=False, quiet=False)
+return_code, output = shell.call(command, user=params.oozie_user)
 if output is None:
   output = ""
 
@@ -273,8 +268,7 @@ def oozie_server_specific():
   )
   
   hashcode_file = format("{oozie_home}/.hashcode")
-  hashcode = 
hashlib.md5(format('{oozie_home}/oozie-sharelib.tar.gz')).hexdigest()
-  skip_recreate_sharelib = format("test -f {hashcode_file} && test -d 
{oozie_home}/share && [[ `cat {hashcode_file}` == '{hashcode}' ]]")
+  skip_recreate_sharelib = format("test -f {hashcode_file} && test -d 
{oozie_home}/share")
 
   untar_sharelib = 
('tar','-xvf',format('{oozie_home}/oozie-sharelib.tar.gz'),'-C',params.oozie_home)
 
@@ -319,7 +313,6 @@ def oozie_server_specific():
   prepare_war()
 
   File(hashcode_file,
-   content = hashcode,
mode = 0644,
   )
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/0ce5fea6/ambari-server/src/main/resources/scripts/Ambaripreupload.py
--
diff --git a/ambari-server/src/main/resources/scripts/Ambaripreupload.py 
b/ambari-server/src/main/resources/scripts/Ambaripreupload.py
index 5a20698..61db286 100644
--- a/ambari-server/src/main/resources/scripts/Ambaripreupload.py
+++ b/ambari-server/src/main/resources/scripts/Ambaripreupload.py
@@ -26,7 +26,6 @@ sys.path.append("/usr/lib/python2.6/site-packages")
 import glob
 from logging import thread
 import re
-import hashlib
 import tempfile
 import time
 import functools
@@ -143,6 +142,7 @@ with Environment() as env:
 hdfs_site = ConfigDictionary({'dfs.webhdfs.enabled':False, 
 })
 fs_default = get_fs_root()
+oozie_secure = ''
 oozie_env_sh_template = \
   '''
   #!/bin/bash
@@ -232,14 +232,13 @@ with Environment() as env:
 source_and_dest_pairs = [(component_tar_source_file, destination_file), ]
 return _copy_files(source_and_dest_pairs, file_owner, group_owner, 
kinit_if_needed)
 
-
-
   env.set_params(params)
   hadoop_conf_dir = params.hadoop_conf_dir

   oozie_libext_dir = format("/usr/hdp/{hdp_version}/oozie/libext")
   oozie_home=format("/usr/hdp/{hdp_version}/oozie")
   oozie_setup_sh=format("/usr/hdp/{hdp_version}/oozie/bin/oozie-setup.sh")
+  oozie_setup_sh_current="/usr/hdp/current/oozie-server/bin/oozie-setup.sh"
   oozie_tmp_dir = "/var/tmp/oozie"
   configure_cmds = []
   configure_cmds.append(('tar','-xvf', oozie_home + 
'/oozie-sharelib.tar.gz','-C', oozie_home))
@@ -254,22 +253,62 @@ with Environment() as env:
   )
 
   hashcode_file = format("{oozie_home}/.hashcode")
-  hashcode = 
hashlib.md5(format('{oozie_home}/oozie-sharelib.tar.gz')).hexdigest()
-  skip_recreate_sharelib = format("test -f {hashcode_file} && test -d 
{oozie_home}/share && [[ `cat {hashcode_file}` == '{hashcode}' ]]")
+  skip_recreate_sharelib = format("test 

[28/50] [abbrv] ambari git commit: AMBARI-15031. Duplicate key violation during ldap sync (Oliver Szabo via rlevas)

[jonathanhurley]

AMBARI-15031. Duplicate key violation during ldap sync  (Oliver Szabo via 
rlevas)


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

Branch: refs/heads/branch-dev-patch-upgrade
Commit: e18755393326d10564f7d68c2d025572fed25d63
Parents: ed55354
Author: Oliver Szabo 
Authored: Fri Feb 12 16:26:31 2016 -0500
Committer: Robert Levas 
Committed: Fri Feb 12 16:26:35 2016 -0500

--
 .../ambari/server/security/ldap/AmbariLdapDataPopulator.java| 5 -
 .../org/apache/ambari/server/security/ldap/LdapBatchDto.java| 5 +
 .../server/security/ldap/AmbariLdapDataPopulatorTest.java   | 4 
 3 files changed, 13 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/e1875539/ambari-server/src/main/java/org/apache/ambari/server/security/ldap/AmbariLdapDataPopulator.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/security/ldap/AmbariLdapDataPopulator.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/security/ldap/AmbariLdapDataPopulator.java
index 21492cf..801e43e 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/security/ldap/AmbariLdapDataPopulator.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/security/ldap/AmbariLdapDataPopulator.java
@@ -485,8 +485,11 @@ public class AmbariLdapDataPopulator {
 batchInfo.getGroupsToBecomeLdap().add(groupName);
   }
   internalGroupsMap.remove(groupName);
+  batchInfo.getGroupsProcessedInternal().add(groupName);
 } else {
-  batchInfo.getGroupsToBeCreated().add(groupName);
+  if (!batchInfo.getGroupsProcessedInternal().contains(groupName)) {
+batchInfo.getGroupsToBeCreated().add(groupName);
+  }
 }
   }
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/e1875539/ambari-server/src/main/java/org/apache/ambari/server/security/ldap/LdapBatchDto.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/security/ldap/LdapBatchDto.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/security/ldap/LdapBatchDto.java
index 9247f38..bb9c5ee 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/security/ldap/LdapBatchDto.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/security/ldap/LdapBatchDto.java
@@ -27,6 +27,7 @@ public class LdapBatchDto {
   private final Set groupsToBecomeLdap = new HashSet();
   private final Set groupsToBeCreated = new HashSet();
   private final Set groupsToBeRemoved = new HashSet();
+  private final Set groupsProcessedInternal = new HashSet<>();
   private final Set usersToBecomeLdap = new HashSet();
   private final Set usersToBeCreated = new HashSet();
   private final Set usersToBeRemoved = new HashSet();
@@ -64,4 +65,8 @@ public class LdapBatchDto {
   public Set getUsersToBeRemoved() {
 return usersToBeRemoved;
   }
+
+  public Set getGroupsProcessedInternal() {
+return groupsProcessedInternal;
+  }
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/e1875539/ambari-server/src/test/java/org/apache/ambari/server/security/ldap/AmbariLdapDataPopulatorTest.java
--
diff --git 
a/ambari-server/src/test/java/org/apache/ambari/server/security/ldap/AmbariLdapDataPopulatorTest.java
 
b/ambari-server/src/test/java/org/apache/ambari/server/security/ldap/AmbariLdapDataPopulatorTest.java
index be92871..8ce6c5b 100644
--- 
a/ambari-server/src/test/java/org/apache/ambari/server/security/ldap/AmbariLdapDataPopulatorTest.java
+++ 
b/ambari-server/src/test/java/org/apache/ambari/server/security/ldap/AmbariLdapDataPopulatorTest.java
@@ -348,6 +348,10 @@ public class AmbariLdapDataPopulatorTest {
 assertTrue(result.getMembershipToRemove().isEmpty());
 assertTrue(result.getUsersToBecomeLdap().isEmpty());
 assertTrue(result.getUsersToBeRemoved().isEmpty());
+assertTrue(result.getGroupsProcessedInternal().contains("group1"));
+assertTrue(result.getGroupsProcessedInternal().contains("group2"));
+assertTrue(!result.getGroupsProcessedInternal().contains("xgroup1"));
+assertTrue(!result.getGroupsProcessedInternal().contains("xgroup2"));
 verify(populator.loadLdapTemplate(), populator);
   }
 

[46/50] [abbrv] ambari git commit: AMBARI-15050 Https Support for Metrics System (dsen)

[jonathanhurley]

AMBARI-15050 Https Support for Metrics System (dsen)


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

Branch: refs/heads/branch-dev-patch-upgrade
Commit: 7e75e52a91568d7ed0dd2bdaafbd60b37a3e7dc8
Parents: 0868a0f
Author: Dmytro Sen 
Authored: Tue Feb 16 17:53:11 2016 +0200
Committer: Dmytro Sen 
Committed: Tue Feb 16 17:53:11 2016 +0200

--
 .../timeline/AbstractTimelineMetricsSink.java   |   92 +-
 .../src/main/conf/flume-metrics2.properties.j2  |3 +-
 .../sink/flume/FlumeTimelineMetricsSink.java|   11 +-
 .../conf/hadoop-metrics2-hbase.properties.j2|8 +-
 .../src/main/conf/hadoop-metrics2.properties.j2 |   22 +-
 .../timeline/HadoopTimelineMetricsSink.java |   13 +-
 .../timeline/HadoopTimelineMetricsSinkTest.java |6 +-
 .../conf/unix/metric_monitor.ini|1 +
 .../src/main/python/core/config_reader.py   |6 +-
 .../src/main/python/core/emitter.py |   18 +-
 .../kafka/KafkaTimelineMetricsReporter.java |   17 +-
 .../kafka/KafkaTimelineMetricsReporterTest.java |2 +-
 .../storm/StormTimelineMetricsReporter.java |   24 +-
 .../sink/storm/StormTimelineMetricsSink.java|8 +-
 .../ApplicationHistoryServer.java   |   11 +-
 .../loadsimulator/net/RestMetricsSender.java|6 +-
 .../timeline/TimelineMetricConfiguration.java   |6 +-
 .../ComponentSSLConfiguration.java  |   14 +-
 .../server/configuration/Configuration.java |6 +-
 .../ganglia/GangliaPropertyProvider.java|2 +-
 .../ganglia/GangliaReportPropertyProvider.java  |2 +-
 .../metrics/timeline/AMSPropertyProvider.java   |8 +-
 .../timeline/AMSReportPropertyProvider.java |2 +-
 .../ACCUMULO/1.6.1.2.2.0/metainfo.xml   |1 +
 .../1.6.1.2.2.0/package/scripts/params.py   |7 +
 .../hadoop-metrics2-accumulo.properties.j2  |7 +-
 .../0.1.0/configuration/ams-site.xml|   12 +-
 .../0.1.0/configuration/ams-ssl-client.xml  |   37 +
 .../0.1.0/configuration/ams-ssl-server.xml  |   64 +
 .../AMBARI_METRICS/0.1.0/metainfo.xml   |2 +
 .../AMBARI_METRICS/0.1.0/package/scripts/ams.py |8 +
 .../package/scripts/metrics_grafana_util.py |2 +-
 .../0.1.0/package/scripts/params.py |   10 +
 .../0.1.0/package/scripts/service_check.py  |   17 +-
 .../hadoop-metrics2-hbase.properties.j2 |7 +-
 .../package/templates/metric_monitor.ini.j2 |1 +
 .../FLUME/1.4.0.2.0/metainfo.xml|1 +
 .../FLUME/1.4.0.2.0/package/scripts/params.py   |7 +
 .../templates/flume-metrics2.properties.j2  |8 +-
 .../common-services/HAWQ/2.0.0/metainfo.xml |1 +
 .../HBASE/0.96.0.2.0/metainfo.xml   |1 +
 .../0.96.0.2.0/package/scripts/params_linux.py  |8 +
 ...-metrics2-hbase.properties-GANGLIA-MASTER.j2 |7 +-
 ...doop-metrics2-hbase.properties-GANGLIA-RS.j2 |7 +-
 .../common-services/HDFS/2.1.0.2.0/metainfo.xml |1 +
 .../0.8.1.2.2/configuration/kafka-broker.xml|   21 +
 .../KAFKA/0.8.1.2.2/metainfo.xml|1 +
 .../KAFKA/0.8.1.2.2/package/scripts/kafka.py|4 +
 .../KAFKA/0.8.1.2.2/package/scripts/params.py   |   10 +-
 .../STORM/0.9.1.2.1/metainfo.xml|1 +
 .../0.9.1.2.1/package/scripts/params_linux.py   |   11 +-
 .../0.9.1.2.1/package/templates/config.yaml.j2  |8 +-
 .../templates/storm-metrics2.properties.j2  |   10 +-
 .../common-services/YARN/2.1.0.2.0/metainfo.xml |2 +
 .../2.0.6/hooks/before-START/scripts/params.py  |8 +
 .../templates/hadoop-metrics2.properties.j2 |   25 +-
 .../ComponentSSLConfigurationTest.java  |6 +-
 .../ganglia/GangliaPropertyProviderTest.java|   26 +-
 .../GangliaReportPropertyProviderTest.java  |2 +-
 .../timeline/AMSPropertyProviderTest.java   |   30 +-
 .../timeline/AMSReportPropertyProviderTest.java |4 +-
 .../AMBARI_METRICS/test_metrics_collector.py|8 +
 .../python/stacks/2.0.6/configs/default.json| 1146 +-
 .../2.0.6/configs/default_ams_embedded.json |7 +
 64 files changed, 1113 insertions(+), 721 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/7e75e52a/ambari-metrics/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/AbstractTimelineMetricsSink.java
--
diff --git 
a/ambari-metrics/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/AbstractTimelineMetricsSink.java
 

[36/50] [abbrv] ambari git commit: AMBARI-15049 Sometimes background operations have incorrect order. (atkach)

[jonathanhurley]

AMBARI-15049 Sometimes background operations have incorrect order. (atkach)


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

Branch: refs/heads/branch-dev-patch-upgrade
Commit: 7f3928bad958f9c57bb21afd43634e3d9ddfedff
Parents: c86964b
Author: Andrii Tkach 
Authored: Mon Feb 15 17:24:48 2016 +0200
Committer: Andrii Tkach 
Committed: Mon Feb 15 17:48:35 2016 +0200

--
 .../global/background_operations_controller.js  | 15 +++
 ambari-web/app/utils/host_progress_popup.js | 10 ++
 .../global/background_operations_test.js| 16 
 3 files changed, 33 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/7f3928ba/ambari-web/app/controllers/global/background_operations_controller.js
--
diff --git 
a/ambari-web/app/controllers/global/background_operations_controller.js 
b/ambari-web/app/controllers/global/background_operations_controller.js
index 76c517c..4156e46 100644
--- a/ambari-web/app/controllers/global/background_operations_controller.js
+++ b/ambari-web/app/controllers/global/background_operations_controller.js
@@ -261,19 +261,26 @@ App.BackgroundOperationsController = 
Em.Controller.extend({
 this.set('isShowMoreAvailable', countGot >= countIssued);
 this.set('serviceTimestamp', App.dateTimeWithTimeZone());
   },
+
   isShowMoreAvailable: null,
+
   /**
* remove old requests
* as API returns 10, or  20 , or 30 ...etc latest request, the requests 
that absent in response should be removed
* @param currentRequestIds
*/
   removeOldRequests: function (currentRequestIds) {
-this.get('services').forEach(function (service, index, services) {
-  if (!currentRequestIds.contains(service.id)) {
-services.splice(index, 1);
+var services = this.get('services');
+
+for (var i = 0, l = services.length; i < l; i++) {
+  if (!currentRequestIds.contains(services[i].id)) {
+services.splice(i, 1);
+i--;
+l--;
   }
-});
+}
   },
+
   /**
* identify whether request is running by task counters
* @param request

http://git-wip-us.apache.org/repos/asf/ambari/blob/7f3928ba/ambari-web/app/utils/host_progress_popup.js
--
diff --git a/ambari-web/app/utils/host_progress_popup.js 
b/ambari-web/app/utils/host_progress_popup.js
index 726a96a..395afb5 100644
--- a/ambari-web/app/utils/host_progress_popup.js
+++ b/ambari-web/app/utils/host_progress_popup.js
@@ -523,11 +523,13 @@ App.HostPopup = Em.Object.create({
* @method removeOldServices
*/
   removeOldServices: function (services, currentServicesIds) {
-services.forEach(function (service, index, services) {
-  if (!currentServicesIds.contains(service.id)) {
-services.removeAt(index, 1);
+for (var i = 0, l = services.length; i < l; i++) {
+  if (!currentServicesIds.contains(services[i].id)) {
+services.splice(i, 1);
+i--;
+l--;
   }
-});
+}
   },
 
   /**

http://git-wip-us.apache.org/repos/asf/ambari/blob/7f3928ba/ambari-web/test/controllers/global/background_operations_test.js
--
diff --git a/ambari-web/test/controllers/global/background_operations_test.js 
b/ambari-web/test/controllers/global/background_operations_test.js
index 445eeb0..b22c105 100644
--- a/ambari-web/test/controllers/global/background_operations_test.js
+++ b/ambari-web/test/controllers/global/background_operations_test.js
@@ -310,6 +310,22 @@ describe('App.BackgroundOperationsController', function () 
{
 result: [
   {id: 2}
 ]
+  },
+  {
+title: 'two old request and two current',
+content: {
+  currentRequestIds: [3, 4],
+  services: [
+{id: 1},
+{id: 2},
+{id: 3},
+{id: 4}
+  ]
+},
+result: [
+  {id: 3},
+  {id: 4}
+]
   }
 ];
 

[08/50] [abbrv] ambari git commit: AMBARI-14976 Add Grafana QuickLinks for AMS Service in Ambari Web. (atkach)

[jonathanhurley]

AMBARI-14976 Add Grafana QuickLinks for AMS Service in Ambari Web. (atkach)


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

Branch: refs/heads/branch-dev-patch-upgrade
Commit: a638ccb5345cb7f34e2c42b075c33cf3814565db
Parents: 7d1ab29
Author: Andrii Tkach 
Authored: Wed Feb 10 16:19:33 2016 +0200
Committer: Andrii Tkach 
Committed: Thu Feb 11 21:19:13 2016 +0200

--
 .../AMBARI_METRICS/0.1.0/metainfo.xml   |  7 
 .../0.1.0/quickLinks/quicklinks.json| 34 
 .../app/mappers/service_metrics_mapper.js   |  3 +-
 ambari-web/app/models/quick_links.js| 12 +++
 .../app/views/common/quick_view_link_view.js|  3 ++
 .../test/views/common/quick_link_view_test.js   |  5 +++
 6 files changed, 63 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/a638ccb5/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/metainfo.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/metainfo.xml
 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/metainfo.xml
index 3a832eb..67a93a5 100644
--- 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/metainfo.xml
+++ 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/metainfo.xml
@@ -161,6 +161,13 @@
 storm-site
   
 
+  
+
+  quicklinks.json
+  true
+
+  
+
 
   
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/a638ccb5/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/quickLinks/quicklinks.json
--
diff --git 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/quickLinks/quicklinks.json
 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/quickLinks/quicklinks.json
new file mode 100644
index 000..09e7de5
--- /dev/null
+++ 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/quickLinks/quicklinks.json
@@ -0,0 +1,34 @@
+{
+  "name": "default",
+  "description": "default quick links configuration",
+  "configuration": {
+"protocol":
+{
+  "type":"https",
+  "checks":[
+{
+  "property":"protocol",
+  "desired":"https",
+  "site":"ams-grafana-ini"
+}
+  ]
+},
+"links": [
+  {
+"name": "metrics_ui_server",
+"label": "Metrics UI Server",
+"requires_user_name": "false",
+"url":"%@://%@:%@",
+"template":"%@://%@:%@",
+"port":{
+  "http_property": "port",
+  "http_default_port": "3000",
+  "https_property": "port",
+  "https_default_port": "3000",
+  "regex": "^(\\d+)$",
+  "site": "ams-grafana-ini"
+}
+  }
+]
+  }
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/a638ccb5/ambari-web/app/mappers/service_metrics_mapper.js
--
diff --git a/ambari-web/app/mappers/service_metrics_mapper.js 
b/ambari-web/app/mappers/service_metrics_mapper.js
index 1ac2b54..80e86c6 100644
--- a/ambari-web/app/mappers/service_metrics_mapper.js
+++ b/ambari-web/app/mappers/service_metrics_mapper.js
@@ -387,7 +387,8 @@ App.serviceMetricsMapper = App.QuickDataMapper.create({
   RANGER: [33],
   SPARK: [34],
   ACCUMULO: [35],
-  ATLAS: [36]
+  ATLAS: [36],
+  AMBARI_METRICS: [37]
 };
 if (quickLinks[item.ServiceInfo.service_name])
   finalJson.quick_links = quickLinks[item.ServiceInfo.service_name];

http://git-wip-us.apache.org/repos/asf/ambari/blob/a638ccb5/ambari-web/app/models/quick_links.js
--
diff --git a/ambari-web/app/models/quick_links.js 
b/ambari-web/app/models/quick_links.js
index eb9dfd6..f6c1fb5 100644
--- a/ambari-web/app/models/quick_links.js
+++ b/ambari-web/app/models/quick_links.js
@@ -343,6 +343,18 @@ App.QuickLinks.FIXTURES = [
 regex: '^(\\d+)$',
 default_http_port: 21000,
 default_https_port: 21443
+  },
+  {
+id:37,
+label:'Metrics UI Server',
+url:'%@://%@:%@',
+service_id: 'AMBARI_METRICS',
+template:'%@://%@:%@',
+http_config: 'port',
+site: 'ams-grafana-ini',
+regex: '^(\\d+)$',
+default_http_port: 3000,
+default_https_port: 3000
   }
 
 ];

[42/50] [abbrv] ambari git commit: AMBARI-15013. Ldap Sync: Concurrent modification exception (Oliver Szabo via rlevas)

[jonathanhurley]

AMBARI-15013. Ldap Sync: Concurrent modification exception  (Oliver Szabo via 
rlevas)


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

Branch: refs/heads/branch-dev-patch-upgrade
Commit: 0868a0fc1bce5a5d58ac44eba1af2aaa4c161ef6
Parents: 47c8d94
Author: Oliver Szabo 
Authored: Tue Feb 16 10:28:27 2016 -0500
Committer: Robert Levas 
Committed: Tue Feb 16 10:28:34 2016 -0500

--
 .../security/ldap/AmbariLdapDataPopulator.java  |  6 ++-
 .../ldap/AmbariLdapDataPopulatorTest.java   | 53 
 2 files changed, 58 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/0868a0fc/ambari-server/src/main/java/org/apache/ambari/server/security/ldap/AmbariLdapDataPopulator.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/security/ldap/AmbariLdapDataPopulator.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/security/ldap/AmbariLdapDataPopulator.java
index 801e43e..75df9cc 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/security/ldap/AmbariLdapDataPopulator.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/security/ldap/AmbariLdapDataPopulator.java
@@ -38,6 +38,8 @@ import org.apache.ambari.server.security.authorization.User;
 import org.apache.ambari.server.security.authorization.Users;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+
+import com.google.common.collect.Sets;
 import org.springframework.ldap.control.PagedResultsDirContextProcessor;
 import org.springframework.ldap.core.AttributesMapper;
 import org.springframework.ldap.core.ContextMapper;
@@ -293,7 +295,9 @@ public class AmbariLdapDataPopulator {
 final Map internalGroupsMap = getInternalGroups();
 final Map internalUsersMap = getInternalUsers();
 
-for (Group group : internalGroupsMap.values()) {
+final Set internalGroupSet = 
Sets.newHashSet(internalGroupsMap.values());
+
+for (Group group : internalGroupSet) {
   if (group.isLdapGroup()) {
 Set groupDtos = getLdapGroups(group.getGroupName());
 if (groupDtos.isEmpty()) {

http://git-wip-us.apache.org/repos/asf/ambari/blob/0868a0fc/ambari-server/src/test/java/org/apache/ambari/server/security/ldap/AmbariLdapDataPopulatorTest.java
--
diff --git 
a/ambari-server/src/test/java/org/apache/ambari/server/security/ldap/AmbariLdapDataPopulatorTest.java
 
b/ambari-server/src/test/java/org/apache/ambari/server/security/ldap/AmbariLdapDataPopulatorTest.java
index 8ce6c5b..3ea 100644
--- 
a/ambari-server/src/test/java/org/apache/ambari/server/security/ldap/AmbariLdapDataPopulatorTest.java
+++ 
b/ambari-server/src/test/java/org/apache/ambari/server/security/ldap/AmbariLdapDataPopulatorTest.java
@@ -17,6 +17,7 @@
  */
 package org.apache.ambari.server.security.ldap;
 
+import com.google.common.collect.Sets;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -274,6 +275,58 @@ public class AmbariLdapDataPopulatorTest {
   }
 
   @Test
+  public void testSynchronizeExistingLdapGroups_removeDuringIteration() throws 
Exception {
+// GIVEN
+Group group1 = createNiceMock(Group.class);
+expect(group1.getGroupId()).andReturn(1).anyTimes();
+expect(group1.getGroupName()).andReturn("group1").anyTimes();
+expect(group1.isLdapGroup()).andReturn(true).anyTimes();
+
+Group group2 = createNiceMock(Group.class);
+expect(group2.getGroupId()).andReturn(2).anyTimes();
+expect(group2.getGroupName()).andReturn("group2").anyTimes();
+expect(group2.isLdapGroup()).andReturn(true).anyTimes();
+
+Configuration configuration = createNiceMock(Configuration.class);
+Users users = createNiceMock(Users.class);
+expect(users.getAllGroups()).andReturn(Arrays.asList(group1, group2));
+expect(users.getAllUsers()).andReturn(Collections.EMPTY_LIST);
+expect(configuration.getLdapServerProperties()).andReturn(new 
LdapServerProperties()).anyTimes();
+
+Set groupDtos = Sets.newHashSet();
+LdapGroupDto group1Dto = new LdapGroupDto();
+group1Dto.setGroupName("group1");
+group1Dto.setMemberAttributes(Sets.newHashSet("group2"));
+
+LdapGroupDto group2Dto = new LdapGroupDto();
+group2Dto.setGroupName("group2");
+group2Dto.setMemberAttributes(Collections.EMPTY_SET);
+groupDtos.add(group1Dto);
+groupDtos.add(group2Dto);
+
+LdapBatchDto batchInfo = new LdapBatchDto();
+

[18/50] [abbrv] ambari git commit: AMBARI-15021. Set AMBARI_METRICS as the default datasource. (Prajwal Rao via yusaku)

[jonathanhurley]

AMBARI-15021. Set AMBARI_METRICS as the default datasource. (Prajwal Rao via 
yusaku)


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

Branch: refs/heads/branch-dev-patch-upgrade
Commit: c47fff3576382e0e4efcd9f8b952b7362cec4390
Parents: 6eed333
Author: Yusaku Sako 
Authored: Thu Feb 11 19:12:39 2016 -0800
Committer: Yusaku Sako 
Committed: Thu Feb 11 19:12:39 2016 -0800

--
 .../0.1.0/package/templates/metrics_grafana_datasource.json.j2   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/c47fff35/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/templates/metrics_grafana_datasource.json.j2
--
diff --git 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/templates/metrics_grafana_datasource.json.j2
 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/templates/metrics_grafana_datasource.json.j2
index a803da5..da04668 100644
--- 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/templates/metrics_grafana_datasource.json.j2
+++ 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/templates/metrics_grafana_datasource.json.j2
@@ -28,6 +28,6 @@
   "basicAuthUser": "",
   "basicAuthPassword": "",
   "withCredentials": false,
-  "isDefault": false,
+  "isDefault": true,
   "jsonData": {}
-}
\ No newline at end of file
+}

[41/50] [abbrv] ambari git commit: AMBARI-15007. Make amazon2015 to be part of redhat6 family (aonishuk)

[jonathanhurley]

AMBARI-15007. Make amazon2015 to be part of redhat6 family (aonishuk)


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

Branch: refs/heads/branch-dev-patch-upgrade
Commit: 47c8d94fa7df92ccad6a27a4b52a25b9a94c1db7
Parents: ea699bb
Author: Andrew Onishuk 
Authored: Tue Feb 16 16:55:11 2016 +0200
Committer: Andrew Onishuk 
Committed: Tue Feb 16 16:55:11 2016 +0200

--
 .../org/apache/ambari/server/stack/KerberosDescriptorTest.java   | 2 ++
 .../java/org/apache/ambari/server/stack/StackManagerTest.java| 4 
 2 files changed, 6 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/47c8d94f/ambari-server/src/test/java/org/apache/ambari/server/stack/KerberosDescriptorTest.java
--
diff --git 
a/ambari-server/src/test/java/org/apache/ambari/server/stack/KerberosDescriptorTest.java
 
b/ambari-server/src/test/java/org/apache/ambari/server/stack/KerberosDescriptorTest.java
index 54f9ad6..c7f802f 100644
--- 
a/ambari-server/src/test/java/org/apache/ambari/server/stack/KerberosDescriptorTest.java
+++ 
b/ambari-server/src/test/java/org/apache/ambari/server/stack/KerberosDescriptorTest.java
@@ -21,6 +21,7 @@ package org.apache.ambari.server.stack;
 import org.apache.ambari.server.state.kerberos.KerberosDescriptor;
 import org.apache.ambari.server.state.kerberos.KerberosDescriptorFactory;
 import org.junit.BeforeClass;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.springframework.util.Assert;
 
@@ -32,6 +33,7 @@ import java.net.URL;
  * KerberosDescriptorTest tests the stack- and service-level descriptors for 
certain stacks
  * and services
  */
+@Ignore
 public class KerberosDescriptorTest {
   private static final KerberosDescriptorFactory KERBEROS_DESCRIPTOR_FACTORY = 
new KerberosDescriptorFactory();
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/47c8d94f/ambari-server/src/test/java/org/apache/ambari/server/stack/StackManagerTest.java
--
diff --git 
a/ambari-server/src/test/java/org/apache/ambari/server/stack/StackManagerTest.java
 
b/ambari-server/src/test/java/org/apache/ambari/server/stack/StackManagerTest.java
index b690a6f..455652b 100644
--- 
a/ambari-server/src/test/java/org/apache/ambari/server/stack/StackManagerTest.java
+++ 
b/ambari-server/src/test/java/org/apache/ambari/server/stack/StackManagerTest.java
@@ -40,6 +40,7 @@ import java.util.Map;
 
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
+
 import org.apache.ambari.server.AmbariException;
 import org.apache.ambari.server.Role;
 import org.apache.ambari.server.RoleCommand;
@@ -59,6 +60,7 @@ import org.apache.ambari.server.state.stack.OsFamily;
 import org.apache.ambari.server.state.stack.StackRoleCommandOrder;
 import org.apache.commons.lang.StringUtils;
 import org.junit.BeforeClass;
+import org.junit.Ignore;
 import org.junit.Test;
 
 /**
@@ -639,6 +641,7 @@ public class StackManagerTest {
 stack.getKerberosDescriptorFileLocation());
   }
 
+  @Ignore
   @Test
   public void testMetricsLoaded() throws Exception {
 
@@ -679,6 +682,7 @@ public class StackManagerTest {
 }
   }
 
+  @Ignore
   @Test
   public void testServicesWithRangerPluginRoleCommandOrder() throws 
AmbariException {
 // Given

[20/50] [abbrv] ambari git commit: AMBARI-15016 Cover hosts views with unit tests. (atkach)

[jonathanhurley]

AMBARI-15016 Cover hosts views with unit tests. (atkach)


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

Branch: refs/heads/branch-dev-patch-upgrade
Commit: 30438e9052d5782d8e2b5fe4b28c6adf9d78c5d7
Parents: c47fff3
Author: Andrii Tkach 
Authored: Thu Feb 11 21:19:34 2016 +0200
Committer: Andrii Tkach 
Committed: Fri Feb 12 12:09:23 2016 +0200

--
 ambari-web/app/assets/test/tests.js |   4 +
 .../app/controllers/wizard/step7_controller.js  |   4 +-
 .../utils/configs/rm_ha_config_initializer.js   |   2 +-
 .../admin/highAvailability/progress_view.js |   4 +-
 ambari-web/app/views/main/host/add_view.js  |   3 +
 .../app/views/main/host/configs_service.js  |   3 +
 ambari-web/app/views/main/host/menu.js  |   6 +-
 ambari-web/app/views/main/host/summary.js   |   9 +-
 .../highAvailability/progress_view_test.js  |   4 +-
 .../test/views/main/host/add_view_test.js   | 141 ++
 .../views/main/host/combo_search_box_test.js|  42 +++
 .../views/main/host/config_service_menu_test.js | 140 ++
 .../test/views/main/host/config_service_test.js |  46 +++
 .../views/main/host/host_alerts_view_test.js| 140 +-
 ambari-web/test/views/main/host/menu_test.js|  43 ++-
 ambari-web/test/views/main/host/summary_test.js | 277 +--
 16 files changed, 772 insertions(+), 96 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/30438e90/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 ecf55f7..44fb4f4 100644
--- a/ambari-web/app/assets/test/tests.js
+++ b/ambari-web/app/assets/test/tests.js
@@ -253,6 +253,10 @@ var files = [
   'test/views/main/host/menu_test',
   'test/views/main/host/stack_versions_view_test',
   'test/views/main/host/host_alerts_view_test',
+  'test/views/main/host/combo_search_box_test',
+  'test/views/main/host/config_service_test',
+  'test/views/main/host/add_view_test',
+  'test/views/main/host/config_service_menu_test',
   'test/views/main/host/details/host_component_view_test',
   'test/views/main/host/details/host_component_views/decommissionable_test',
   'test/views/main/host/details/host_component_views/datanode_view_test',

http://git-wip-us.apache.org/repos/asf/ambari/blob/30438e90/ambari-web/app/controllers/wizard/step7_controller.js
--
diff --git a/ambari-web/app/controllers/wizard/step7_controller.js 
b/ambari-web/app/controllers/wizard/step7_controller.js
index c6f4689..7e96845 100644
--- a/ambari-web/app/controllers/wizard/step7_controller.js
+++ b/ambari-web/app/controllers/wizard/step7_controller.js
@@ -867,8 +867,8 @@ App.WizardStep7Controller = 
Em.Controller.extend(App.ServerValidatorMixin, App.E
* @returns {Object[]} existing configs + additional config parameters in 
yarn-client.xml
*/
   addHawqConfigsOnRMHa: function(configs) {
-rmHost1 = configs.findProperty('id', 
'yarn.resourcemanager.hostname.rm1__yarn-site').value ;
-rmHost2 = configs.findProperty('id', 
'yarn.resourcemanager.hostname.rm2__yarn-site').value ;
+var rmHost1 = configs.findProperty('id', 
'yarn.resourcemanager.hostname.rm1__yarn-site').value ;
+var rmHost2 = configs.findProperty('id', 
'yarn.resourcemanager.hostname.rm2__yarn-site').value ;
 var yarnConfigToBeAdded = [
   {
 name: 'yarn.resourcemanager.ha',

http://git-wip-us.apache.org/repos/asf/ambari/blob/30438e90/ambari-web/app/utils/configs/rm_ha_config_initializer.js
--
diff --git a/ambari-web/app/utils/configs/rm_ha_config_initializer.js 
b/ambari-web/app/utils/configs/rm_ha_config_initializer.js
index 9c36323..dac68d9 100644
--- a/ambari-web/app/utils/configs/rm_ha_config_initializer.js
+++ b/ambari-web/app/utils/configs/rm_ha_config_initializer.js
@@ -89,7 +89,7 @@ App.RmHaConfigInitializer = 
App.HaConfigInitializerClass.create(App.HostsBasedIn
*/
   _initRmHaHostsWithPort: function (configProperty, localDB, dependencies, 
initializer) {
 var rmHosts = localDB.masterComponentHosts.filterProperty('component', 
'RESOURCEMANAGER').getEach('hostName');
-for (rmHost in rmHosts) {
+for (var rmHost in rmHosts) {
   rmHosts[rmHost] = rmHosts[rmHost] + ":" + initializer.port;
 }
 var value = rmHosts.join(',');

[21/50] [abbrv] ambari git commit: AMBARI-15025. Hosts page: Filtering works incorrectly with multiple filters applied (onechiporenko)

[jonathanhurley]

AMBARI-15025. Hosts page: Filtering works incorrectly with multiple filters 
applied (onechiporenko)


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

Branch: refs/heads/branch-dev-patch-upgrade
Commit: ddba3c5d4e2dbd7f0edf07429df4fa24bbaa2d21
Parents: 30438e9
Author: Oleg Nechiporenko 
Authored: Fri Feb 12 12:21:25 2016 +0200
Committer: Oleg Nechiporenko 
Committed: Fri Feb 12 12:23:04 2016 +0200

--
 ambari-web/app/controllers/main/host.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/ddba3c5d/ambari-web/app/controllers/main/host.js
--
diff --git a/ambari-web/app/controllers/main/host.js 
b/ambari-web/app/controllers/main/host.js
index 047e19f..a38b2db 100644
--- a/ambari-web/app/controllers/main/host.js
+++ b/ambari-web/app/controllers/main/host.js
@@ -106,7 +106,7 @@ App.MainHostController = 
Em.ArrayController.extend(App.TableServerMixin, {
 },
 {
   name: 'criticalWarningAlertsCount',
-  key: 'alerts_summary/CRITICAL{0}|alerts_summary/WARNING{1}',
+  key: '(alerts_summary/CRITICAL{0}|alerts_summary/WARNING{1})',
   type: 'CUSTOM'
 },
 {

[16/50] [abbrv] ambari git commit: AMBARI-14945. Some options have not been applied on Ambari Metrics Collector. (Masahiro TANAKA via swagle)

[jonathanhurley]

AMBARI-14945. Some options have not been applied on Ambari Metrics Collector. 
(Masahiro TANAKA via swagle)


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

Branch: refs/heads/branch-dev-patch-upgrade
Commit: 6ffe51450d359a9ad076083a0db8976d6d95c74f
Parents: 1ead250
Author: Siddharth Wagle 
Authored: Thu Feb 11 17:17:36 2016 -0800
Committer: Siddharth Wagle 
Committed: Thu Feb 11 17:17:36 2016 -0800

--
 .../conf/unix/ambari-metrics-collector | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/6ffe5145/ambari-metrics/ambari-metrics-timelineservice/conf/unix/ambari-metrics-collector
--
diff --git 
a/ambari-metrics/ambari-metrics-timelineservice/conf/unix/ambari-metrics-collector
 
b/ambari-metrics/ambari-metrics-timelineservice/conf/unix/ambari-metrics-collector
index bf2fc47..f83af50 100644
--- 
a/ambari-metrics/ambari-metrics-timelineservice/conf/unix/ambari-metrics-collector
+++ 
b/ambari-metrics/ambari-metrics-timelineservice/conf/unix/ambari-metrics-collector
@@ -261,7 +261,7 @@ function start()
 rm -f "${PIDFILE}" >/dev/null 2>&1
   fi
 
-  nohup "${JAVA}" "-Xms$AMS_COLLECTOR_HEAPSIZE" "-Xmx$AMS_COLLECTOR_HEAPSIZE" 
"${AMS_COLLECTOR_OPTS}" "-cp" 
"/usr/lib/ambari-metrics-collector/*:${COLLECTOR_CONF_DIR}" 
"-Djava.net.preferIPv4Stack=true" "-Dams.log.dir=${AMS_COLLECTOR_LOG_DIR}" 
"-Dproc_${DAEMON_NAME}" "${CLASS}" "$@" > $OUTFILE 2>&1 &
+  nohup "${JAVA}" "-Xms$AMS_COLLECTOR_HEAPSIZE" "-Xmx$AMS_COLLECTOR_HEAPSIZE" 
${AMS_COLLECTOR_OPTS} "-cp" 
"/usr/lib/ambari-metrics-collector/*:${COLLECTOR_CONF_DIR}" 
"-Djava.net.preferIPv4Stack=true" "-Dams.log.dir=${AMS_COLLECTOR_LOG_DIR}" 
"-Dproc_${DAEMON_NAME}" "${CLASS}" "$@" > $OUTFILE 2>&1 &
   PID=$!
   write_pidfile "${PIDFILE}"
   sleep 2

[38/50] [abbrv] ambari git commit: AMBARI-15026 Hadoop metrics emit interval seems to be 1 minute instead of 10 seconds default (dsen)

[jonathanhurley]

AMBARI-15026 Hadoop metrics emit interval seems to be 1 minute instead of 10 
seconds default (dsen)


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

Branch: refs/heads/branch-dev-patch-upgrade
Commit: f3e693194dff06513d425d5189a72d3c2169f8ab
Parents: c985826
Author: Dmytro Sen 
Authored: Tue Feb 16 14:03:09 2016 +0200
Committer: Dmytro Sen 
Committed: Tue Feb 16 14:03:09 2016 +0200

--
 .../common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/params.py | 2 +-
 .../AMBARI_METRICS/0.1.0/configuration/ams-site.xml| 2 +-
 .../common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py | 2 +-
 .../common-services/FLUME/1.4.0.2.0/package/scripts/params.py  | 2 +-
 .../HBASE/0.96.0.2.0/package/scripts/params_linux.py   | 2 +-
 .../STORM/0.9.1.2.1/package/scripts/params_linux.py| 2 +-
 .../stacks/HDP/2.0.6/hooks/before-START/scripts/params.py  | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/f3e69319/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/params.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/params.py
 
b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/params.py
index c415f6e..a9626b6 100644
--- 
a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/params.py
+++ 
b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/params.py
@@ -133,7 +133,7 @@ if has_metric_collector:
   metric_collector_port = '6188'
   pass
 metrics_report_interval = 
default("/configurations/ams-site/timeline.metrics.sink.report.interval", 60)
-metrics_collection_period = 
default("/configurations/ams-site/timeline.metrics.sink.collection.period", 60)
+metrics_collection_period = 
default("/configurations/ams-site/timeline.metrics.sink.collection.period", 10)
 
 # if accumulo is selected accumulo_tserver_hosts should not be empty, but 
still default just in case
 if 'slave_hosts' in config['clusterHostInfo']:

http://git-wip-us.apache.org/repos/asf/ambari/blob/f3e69319/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-site.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-site.xml
 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-site.xml
index 180b43b..ab9593d 100644
--- 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-site.xml
+++ 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-site.xml
@@ -495,7 +495,7 @@
   
   
 timeline.metrics.sink.collection.period
-60
+10
 
   The interval between two service metrics data exports.
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/f3e69319/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py
 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py
index 8193737..89a60f7 100644
--- 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py
+++ 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py
@@ -117,7 +117,7 @@ java_version = 
int(config['hostLevelParams']['java_version'])
 metrics_collector_heapsize = 
default('/configurations/ams-env/metrics_collector_heapsize', "512")
 host_sys_prepped = default("/hostLevelParams/host_sys_prepped", False)
 metrics_report_interval = 
default("/configurations/ams-site/timeline.metrics.sink.report.interval", 60)
-metrics_collection_period = 
default("/configurations/ams-site/timeline.metrics.sink.collection.period", 60)
+metrics_collection_period = 
default("/configurations/ams-site/timeline.metrics.sink.collection.period", 10)
 
 hbase_log_dir = config['configurations']['ams-hbase-env']['hbase_log_dir']
 hbase_classpath_additional = 
default("/configurations/ams-hbase-env/hbase_classpath_additional", None)

[15/50] [abbrv] ambari git commit: AMBARI-15028. Critical alert for Kafka when using custom port(stack 2.3 and higher).(vbrodetskyi)

[jonathanhurley]

AMBARI-15028. Critical alert for Kafka when using custom port(stack 2.3 and 
higher).(vbrodetskyi)


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

Branch: refs/heads/branch-dev-patch-upgrade
Commit: 0a9a3aa514f4859f2f4560fd3bd6c6036b173de8
Parents: b22aa2e
Author: Vitaly Brodetskyi 
Authored: Fri Feb 12 03:10:15 2016 +0200
Committer: Vitaly Brodetskyi 
Committed: Fri Feb 12 03:10:15 2016 +0200

--
 .../python/ambari_agent/alerts/port_alert.py|  2 +-
 .../stacks/HDP/2.3/services/KAFKA/alerts.json   | 32 
 2 files changed, 33 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/0a9a3aa5/ambari-agent/src/main/python/ambari_agent/alerts/port_alert.py
--
diff --git a/ambari-agent/src/main/python/ambari_agent/alerts/port_alert.py 
b/ambari-agent/src/main/python/ambari_agent/alerts/port_alert.py
index 848da65..92d28ad 100644
--- a/ambari-agent/src/main/python/ambari_agent/alerts/port_alert.py
+++ b/ambari-agent/src/main/python/ambari_agent/alerts/port_alert.py
@@ -102,7 +102,7 @@ class PortAlert(BaseAlert):
 
 
 host = BaseAlert.get_host_from_url(uri_value)
-if host is None:
+if host is None or host == "localhost" or host == "0.0.0.0":
   host = self.host_name
 
 try:

http://git-wip-us.apache.org/repos/asf/ambari/blob/0a9a3aa5/ambari-server/src/main/resources/stacks/HDP/2.3/services/KAFKA/alerts.json
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.3/services/KAFKA/alerts.json 
b/ambari-server/src/main/resources/stacks/HDP/2.3/services/KAFKA/alerts.json
new file mode 100644
index 000..04fb583
--- /dev/null
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/KAFKA/alerts.json
@@ -0,0 +1,32 @@
+{
+  "KAFKA": {
+"service": [],
+"KAFKA_BROKER": [
+  {
+"name": "kafka_broker_process",
+"label": "Kafka Broker Process",
+"description": "This host-level alert is triggered if the Kafka Broker 
cannot be determined to be up.",
+"interval": 1,
+"scope": "HOST",
+"source": {
+  "type": "PORT",
+  "uri": "{{kafka-broker/listeners}}",
+  "default_port": 6667,
+  "reporting": {
+"ok": {
+  "text": "TCP OK - {0:.3f}s response on port {1}"
+},
+"warning": {
+  "text": "TCP OK - {0:.3f}s response on port {1}",
+  "value": 1.5
+},
+"critical": {
+  "text": "Connection failed: {0} to {1}:{2}",
+  "value": 5.0
+}
+  }
+}
+  }
+]
+  }
+}

[12/50] [abbrv] ambari git commit: AMBARI-15003: Add dependency in RCO for HAWQ and PXF pre-requisites (bhuvnesh2703 via jaoki)

[jonathanhurley]

AMBARI-15003: Add dependency in RCO for HAWQ and PXF pre-requisites 
(bhuvnesh2703 via jaoki)


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

Branch: refs/heads/branch-dev-patch-upgrade
Commit: 6c6ec6304a8acf2876113cd4f930922a183aed2d
Parents: 9fdaf4e
Author: Jun Aoki 
Authored: Thu Feb 11 16:07:31 2016 -0800
Committer: Jun Aoki 
Committed: Thu Feb 11 16:07:31 2016 -0800

--
 .../src/main/resources/stacks/HDP/2.3/role_command_order.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/6c6ec630/ambari-server/src/main/resources/stacks/HDP/2.3/role_command_order.json
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.3/role_command_order.json 
b/ambari-server/src/main/resources/stacks/HDP/2.3/role_command_order.json
index f164ab2..5b3882f 100755
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/role_command_order.json
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/role_command_order.json
@@ -13,7 +13,8 @@
 "HAWQMASTER-START" : ["NAMENODE-START", "DATANODE-START", 
"NODEMANAGER-START"],
 "HAWQSTANDBY-START" : ["HAWQMASTER-START"],
 "HAWQSEGMENT-START" : ["HAWQMASTER-START", "HAWQSTANDBY-START"],
-"HAWQ_SERVICE_CHECK-SERVICE_CHECK" : ["HAWQSEGMENT-START", 
"HDFS_SERVICE_CHECK-SERVICE_CHECK", "YARN_SERVICE_CHECK-SERVICE_CHECK"],
+"HAWQ_SERVICE_CHECK-SERVICE_CHECK" : ["HAWQSEGMENT-START", 
"HDFS_SERVICE_CHECK-SERVICE_CHECK", "YARN_SERVICE_CHECK-SERVICE_CHECK", 
"PXF_SERVICE_CHECK-SERVICE_CHECK"],
+"PXF_SERVICE_CHECK-SERVICE_CHECK" : ["HDFS_SERVICE_CHECK-SERVICE_CHECK", 
"HBASE_SERVICE_CHECK-SERVICE_CHECK", "HIVE_SERVICE_CHECK-SERVICE_CHECK"],
 "KNOX_GATEWAY-START" : ["RANGER_USERSYNC-START", "NAMENODE-START"],
 "KAFKA_BROKER-START" : ["ZOOKEEPER_SERVER-START", "RANGER_USERSYNC-START", 
"NAMENODE-START"],
 "NIMBUS-START" : ["ZOOKEEPER_SERVER-START", "RANGER_USERSYNC-START", 
"NAMENODE-START"],

[06/50] [abbrv] ambari git commit: AMBARI-14998: Server 500 error on trying to extract a blueprint for all clusters

[jonathanhurley]

AMBARI-14998: Server 500 error on trying to extract a blueprint for all clusters


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

Branch: refs/heads/branch-dev-patch-upgrade
Commit: f247ddcfa6c7cc48508cbcfa1e681169dce3b495
Parents: 2871d67
Author: Nahappan Somasundaram 
Authored: Wed Feb 10 14:41:12 2016 -0800
Committer: Nahappan Somasundaram 
Committed: Thu Feb 11 10:35:00 2016 -0800

--
 .../server/controller/AmbariManagementControllerImpl.java  | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/f247ddcf/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
index 69b3348..0b26f61 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
@@ -1018,7 +1018,11 @@ public class AmbariManagementControllerImpl implements 
AmbariManagementControlle
 //   If the user is authorized to view information about this cluster, add 
it to the response
 //   if (AuthorizationHelper.isAuthorized(ResourceType.CLUSTER, 
c.getResourceId(),
 //RoleAuthorization.AUTHORIZATIONS_VIEW_CLUSTER)) {
-  response.add(c.convertToResponse());
+  ClusterResponse cr = c.convertToResponse();
+  cr.setDesiredConfigs(c.getDesiredConfigs());
+  cr.setDesiredServiceConfigVersions(c.getActiveServiceConfigVersions());
+  
cr.setCredentialStoreServiceProperties(getCredentialStoreServiceProperties());
+  response.add(cr);
 //   }
 }
 StringBuilder builder = new StringBuilder();

[22/50] [abbrv] ambari git commit: AMBARI-14936. Tweaks to reduce build time (aonishuk)

[jonathanhurley]

AMBARI-14936. Tweaks to reduce build time (aonishuk)


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

Branch: refs/heads/branch-dev-patch-upgrade
Commit: 77daca7a62abb3f6caa8f4be349aee704a1d7267
Parents: ddba3c5
Author: Andrew Onishuk 
Authored: Fri Feb 12 16:17:36 2016 +0200
Committer: Andrew Onishuk 
Committed: Fri Feb 12 16:17:36 2016 +0200

--
 ambari-agent/pom.xml  | 6 +++---
 ambari-server/pom.xml | 6 +++---
 ambari-web/pom.xml| 3 ++-
 pom.xml   | 1 +
 4 files changed, 9 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/77daca7a/ambari-agent/pom.xml
--
diff --git a/ambari-agent/pom.xml b/ambari-agent/pom.xml
index bb7cc34..c2c993f 100644
--- a/ambari-agent/pom.xml
+++ b/ambari-agent/pom.xml
@@ -267,7 +267,7 @@
 
   
 build-tarball
-package
+${assemblyPhase}
 
   single
 
@@ -347,7 +347,7 @@
   
   
 copy-repo-resources
-package
+${assemblyPhase}
 
   copy-resources
 
@@ -391,7 +391,7 @@
 
   
 rename-file
-package
+${assemblyPhase}
 
   rename
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/77daca7a/ambari-server/pom.xml
--
diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml
index 33b5501..b0794c9 100644
--- a/ambari-server/pom.xml
+++ b/ambari-server/pom.xml
@@ -134,7 +134,7 @@
 
   
 build-tarball
-package
+${assemblyPhase}
 
   single
 
@@ -173,7 +173,7 @@
   
   
 copy-repo-resources
-package
+${assemblyPhase}
 
   copy-resources
 
@@ -217,7 +217,7 @@
 
   
 rename-file
-package
+${assemblyPhase}
 
   rename
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/77daca7a/ambari-web/pom.xml
--
diff --git a/ambari-web/pom.xml b/ambari-web/pom.xml
index 761a3f0..6304b3d 100644
--- a/ambari-web/pom.xml
+++ b/ambari-web/pom.xml
@@ -32,6 +32,7 @@
   
 ${project.parent.parent.basedir}
 UTF-8
+node_modules 
   
   
 
@@ -100,7 +101,7 @@
 
   ${executable.rmdir}
   ${basedir}
-  ${args.rm.clean} public 
node_modules
+  ${args.rm.clean} public 
${nodemodules.dir}
   
 0
 1

http://git-wip-us.apache.org/repos/asf/ambari/blob/77daca7a/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 57c6de7..cf9993b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,6 +60,7 @@
 apache.staging.https
 Apache Release Distribution 
Repository
 
https://repository.apache.org/service/local/staging/deploy/maven2
+package 
   
   
 

[50/50] [abbrv] ambari git commit: Merge branch 'trunk' into branch-dev-patch-upgrade

[jonathanhurley]

Merge branch 'trunk' into branch-dev-patch-upgrade


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

Branch: refs/heads/branch-dev-patch-upgrade
Commit: 718f2ea1832eb10f666fd0519c0cf0c7005b6d4a
Parents: 1e89d1d 0ce5fea
Author: Jonathan Hurley 
Authored: Tue Feb 16 13:29:05 2016 -0500
Committer: Jonathan Hurley 
Committed: Tue Feb 16 13:29:05 2016 -0500

--
 .../main/resources/ui/admin-web/app/index.html  |1 +
 .../loginActivities/HomeDirectoryCtrl.js|   31 +
 .../stackVersions/StackVersionsCreateCtrl.js|1 +
 .../stackVersions/StackVersionsEditCtrl.js  |1 +
 .../ui/admin-web/app/scripts/i18n.config.js |   13 +-
 .../resources/ui/admin-web/app/styles/main.css  |3 +
 .../views/loginActivities/homeDirectory.html|   63 +-
 .../app/views/loginActivities/loginMessage.html |2 +-
 .../views/stackVersions/stackVersionPage.html   |8 +
 .../src/main/python/ambari_agent/ActionQueue.py |3 +-
 .../python/ambari_agent/alerts/port_alert.py|2 +-
 .../test/python/ambari_agent/TestActionQueue.py |   59 +
 .../timeline/AbstractTimelineMetricsSink.java   |   92 +-
 .../src/main/conf/flume-metrics2.properties.j2  |3 +-
 .../sink/flume/FlumeTimelineMetricsSink.java|   11 +-
 .../conf/hadoop-metrics2-hbase.properties.j2|8 +-
 .../src/main/conf/hadoop-metrics2.properties.j2 |   22 +-
 .../timeline/HadoopTimelineMetricsSink.java |   13 +-
 .../timeline/HadoopTimelineMetricsSinkTest.java |6 +-
 .../conf/unix/metric_monitor.ini|1 +
 .../src/main/python/core/config_reader.py   |6 +-
 .../src/main/python/core/emitter.py |   18 +-
 .../kafka/KafkaTimelineMetricsReporter.java |   17 +-
 .../kafka/KafkaTimelineMetricsReporterTest.java |2 +-
 .../storm/StormTimelineMetricsReporter.java |   24 +-
 .../sink/storm/StormTimelineMetricsSink.java|8 +-
 .../conf/unix/ambari-metrics-collector  |2 +-
 .../ApplicationHistoryServer.java   |   11 +-
 .../loadsimulator/net/RestMetricsSender.java|6 +-
 .../timeline/TimelineMetricConfiguration.java   |6 +-
 ambari-server/etc/init/ambari-server.conf   |   33 +
 ambari-server/pom.xml   |   12 +-
 ambari-server/sbin/ambari-server|6 +-
 ambari-server/src/main/assemblies/server.xml|4 +
 .../server/checks/CheckDatabaseHelper.java  |  473 
 .../ComponentSSLConfiguration.java  |   14 +-
 .../server/configuration/Configuration.java |6 +-
 .../AmbariManagementControllerImpl.java |6 +-
 .../BlueprintConfigurationProcessor.java|4 +-
 .../internal/HostResourceProvider.java  |   12 +-
 .../internal/PermissionResourceProvider.java|3 +
 .../internal/ScaleClusterRequest.java   |   28 +-
 .../ganglia/GangliaPropertyProvider.java|2 +-
 .../ganglia/GangliaReportPropertyProvider.java  |2 +-
 .../metrics/timeline/AMSPropertyProvider.java   |8 +-
 .../timeline/AMSReportPropertyProvider.java |2 +-
 .../server/orm/entities/PermissionEntity.java   |   35 +-
 .../security/ldap/AmbariLdapDataPopulator.java  |   11 +-
 .../server/security/ldap/LdapBatchDto.java  |5 +
 .../upgrades/RangerConfigCalculation.java   |   14 +-
 .../server/state/cluster/ClusterImpl.java   |   12 +-
 .../state/stack/upgrade/ClusterGrouping.java|7 +
 .../state/stack/upgrade/ExecuteHostType.java|7 +
 .../state/stack/upgrade/TaskWrapperBuilder.java |   15 +-
 .../server/topology/ClusterTopologyImpl.java|   51 +-
 .../server/upgrade/UpgradeCatalog230.java   |1 +
 .../server/upgrade/UpgradeCatalog240.java   |   32 +-
 ambari-server/src/main/python/ambari-server.py  |7 +-
 .../main/python/ambari_server/checkDatabase.py  |   80 +
 .../main/python/ambari_server/setupActions.py   |1 +
 .../src/main/python/ambari_server/utils.py  |4 +-
 .../src/main/python/ambari_server_main.py   |   19 +-
 .../main/resources/Ambari-DDL-Derby-CREATE.sql  |   17 +-
 .../main/resources/Ambari-DDL-MySQL-CREATE.sql  |   17 +-
 .../main/resources/Ambari-DDL-Oracle-CREATE.sql |   19 +-
 .../resources/Ambari-DDL-Postgres-CREATE.sql|   17 +-
 .../Ambari-DDL-Postgres-EMBEDDED-CREATE.sql |   17 +-
 .../resources/Ambari-DDL-SQLAnywhere-CREATE.sql |   17 +-
 .../resources/Ambari-DDL-SQLServer-CREATE.sql   |   17 +-
 .../ACCUMULO/1.6.1.2.2.0/metainfo.xml   |1 +
 .../1.6.1.2.2.0/package/scripts/params.py   |9 +-
 .../hadoop-metrics2-accumulo.properties.j2  |7 +-
 .../0.1.0/configuration/ams-hbase-env.xml   |6 +-
 

[27/50] [abbrv] ambari git commit: AMBARI-15027 Sometimes Yarn graphs, Heatmaps take longer to load. (atkach)

[jonathanhurley]

AMBARI-15027 Sometimes Yarn graphs,Heatmaps take longer to load. (atkach)


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

Branch: refs/heads/branch-dev-patch-upgrade
Commit: ed55354abaa8bf53ad0c1fda0d935976baf4c53d
Parents: aac5389
Author: Andrii Tkach 
Authored: Fri Feb 12 16:11:18 2016 +0200
Committer: Andrii Tkach 
Committed: Fri Feb 12 22:38:32 2016 +0200

--
 .../app/mixins/common/widgets/widget_mixin.js   | 29 
 .../views/common/widget/graph_widget_view.js| 18 +++-
 .../test/mixins/common/widget_mixin_test.js |  2 +-
 3 files changed, 30 insertions(+), 19 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/ed55354a/ambari-web/app/mixins/common/widgets/widget_mixin.js
--
diff --git a/ambari-web/app/mixins/common/widgets/widget_mixin.js 
b/ambari-web/app/mixins/common/widgets/widget_mixin.js
index b6fe353..6d65c33 100644
--- a/ambari-web/app/mixins/common/widgets/widget_mixin.js
+++ b/ambari-web/app/mixins/common/widgets/widget_mixin.js
@@ -204,7 +204,9 @@ App.WidgetMixin = Ember.Mixin.create({
   },
 
   /**
-   *  aggregate all metric names in the query. Add time range and step to 
temporal queries
+   * aggregate all metric names in the query. Add time range and step to 
temporal queries
+   * @param {Array} metricPaths
+   * @returns {string}
*/
   prepareMetricPaths: function(metricPaths) {
 var temporalMetrics = metricPaths.filterProperty('metric_type', 
'TEMPORAL');
@@ -225,15 +227,20 @@ App.WidgetMixin = Ember.Mixin.create({
* @returns {$.ajax}
*/
   getHostComponentMetrics: function (request) {
-return App.ajax.send({
-  name: 'widgets.hostComponent.metrics.get',
-  sender: this,
-  data: {
-componentName: request.component_name,
-metricPaths: this.prepareMetricPaths(request.metric_paths),
-hostComponentCriteria: this.computeHostComponentCriteria(request)
-  }
-});
+var metricPaths = this.prepareMetricPaths(request.metric_paths);
+
+if (metricPaths.length) {
+  return App.ajax.send({
+name: 'widgets.hostComponent.metrics.get',
+sender: this,
+data: {
+  componentName: request.component_name,
+  metricPaths: this.prepareMetricPaths(request.metric_paths),
+  hostComponentCriteria: this.computeHostComponentCriteria(request)
+}
+  });
+}
+return jQuery.Deferred().reject().promise();
   },
 
   getHostComponentMetricsSuccessCallback: function (data) {
@@ -771,7 +778,7 @@ App.WidgetLoadAggregator = Em.Object.create({
 subRequest.errorCallback.call(subRequest.context, xhr, 
textStatus, errorThrown);
   }
 }, this);
-  }).complete(function () {
+  }).always(function () {
   _request.subRequests.forEach(function (subRequest) {
 subRequest.completeCallback.call(subRequest.context);
   }, this);

http://git-wip-us.apache.org/repos/asf/ambari/blob/ed55354a/ambari-web/app/views/common/widget/graph_widget_view.js
--
diff --git a/ambari-web/app/views/common/widget/graph_widget_view.js 
b/ambari-web/app/views/common/widget/graph_widget_view.js
index 6feaa28..30eb658 100644
--- a/ambari-web/app/views/common/widget/graph_widget_view.js
+++ b/ambari-web/app/views/common/widget/graph_widget_view.js
@@ -211,13 +211,17 @@ App.GraphWidgetView = Em.View.extend(App.WidgetMixin, 
App.ExportMetricsMixin, {
   step = this.get('timeStep'),
   timeRange = this.get('timeRange'),
   result = [],
-  targetView = this.get('exportTargetView.isPopup') ? 
this.get('exportTargetView') : this.get('parentView'),
-  customStartTime = targetView.get('customStartTime'),
-  customEndTime = targetView.get('customEndTime');
-if (timeRange === 0 && !Em.isNone(customStartTime) && 
!Em.isNone(customEndTime)) {
-  // Custom start and end time is specified by user
-  toSeconds = customEndTime / 1000;
-  fromSeconds = customStartTime / 1000;
+  targetView = this.get('exportTargetView.isPopup') ? 
this.get('exportTargetView') : this.get('parentView');
+
+//if view destroyed then no metrics should be asked
+if (Em.isNone(targetView)) return result;
+
+if (timeRange === 0 &&
+  !Em.isNone(targetView.get('customStartTime')) &&
+  !Em.isNone(targetView.get('customEndTime'))) {
+  // Custom start/end time is specified by user
+  toSeconds = 

[04/50] [abbrv] ambari git commit: AMBARI-14980. Provide explicit ordering for roles (rlevas)

[jonathanhurley]

AMBARI-14980. Provide explicit ordering for roles (rlevas)


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

Branch: refs/heads/branch-dev-patch-upgrade
Commit: 2871d674f57f46220c2448c6e5dbcb456f04878f
Parents: e049216
Author: Robert Levas 
Authored: Thu Feb 11 12:59:00 2016 -0500
Committer: Robert Levas 
Committed: Thu Feb 11 12:59:04 2016 -0500

--
 .../internal/PermissionResourceProvider.java|  3 ++
 .../server/orm/entities/PermissionEntity.java   | 35 +++-
 .../server/upgrade/UpgradeCatalog240.java   | 32 ++-
 .../main/resources/Ambari-DDL-Derby-CREATE.sql  | 17 +++---
 .../main/resources/Ambari-DDL-MySQL-CREATE.sql  | 17 +++---
 .../main/resources/Ambari-DDL-Oracle-CREATE.sql | 19 +++
 .../resources/Ambari-DDL-Postgres-CREATE.sql| 17 +++---
 .../Ambari-DDL-Postgres-EMBEDDED-CREATE.sql | 17 +++---
 .../resources/Ambari-DDL-SQLAnywhere-CREATE.sql | 17 +++---
 .../resources/Ambari-DDL-SQLServer-CREATE.sql   | 17 +++---
 .../PermissionResourceProviderTest.java |  2 +
 .../server/upgrade/UpgradeCatalog240Test.java   | 57 ++--
 12 files changed, 187 insertions(+), 63 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/2871d674/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/PermissionResourceProvider.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/PermissionResourceProvider.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/PermissionResourceProvider.java
index 640123e..86f8321 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/PermissionResourceProvider.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/PermissionResourceProvider.java
@@ -52,6 +52,7 @@ public class PermissionResourceProvider extends 
AbstractResourceProvider {
   public static final String PERMISSION_NAME_PROPERTY_ID = 
"PermissionInfo/permission_name";
   public static final String PERMISSION_LABEL_PROPERTY_ID = 
"PermissionInfo/permission_label";
   public static final String RESOURCE_NAME_PROPERTY_ID   = 
"PermissionInfo/resource_name";
+  public static final String SORT_ORDER_PROPERTY_ID   = 
"PermissionInfo/sort_order";
 
 
   /**
@@ -71,6 +72,7 @@ public class PermissionResourceProvider extends 
AbstractResourceProvider {
 propertyIds.add(PERMISSION_NAME_PROPERTY_ID);
 propertyIds.add(PERMISSION_LABEL_PROPERTY_ID);
 propertyIds.add(RESOURCE_NAME_PROPERTY_ID);
+propertyIds.add(SORT_ORDER_PROPERTY_ID);
   }
 
 
@@ -156,6 +158,7 @@ public class PermissionResourceProvider extends 
AbstractResourceProvider {
 setResourceProperty(resource, PERMISSION_NAME_PROPERTY_ID, 
entity.getPermissionName(), requestedIds);
 setResourceProperty(resource, PERMISSION_LABEL_PROPERTY_ID, 
entity.getPermissionLabel(), requestedIds);
 setResourceProperty(resource, RESOURCE_NAME_PROPERTY_ID, 
entity.getResourceType().getName(), requestedIds);
+setResourceProperty(resource, SORT_ORDER_PROPERTY_ID, 
entity.getSortOrder(), requestedIds);
 
 return resource;
   }

http://git-wip-us.apache.org/repos/asf/ambari/blob/2871d674/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/PermissionEntity.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/PermissionEntity.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/PermissionEntity.java
index a692730..43fd71b 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/PermissionEntity.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/PermissionEntity.java
@@ -57,8 +57,11 @@ public class PermissionEntity {
* Admin permission name constants.
*/
   public static final String AMBARI_ADMINISTRATOR_PERMISSION_NAME = 
"AMBARI.ADMINISTRATOR";
-  public static final String CLUSTER_USER_PERMISSION_NAME = "CLUSTER.USER";
   public static final String CLUSTER_ADMINISTRATOR_PERMISSION_NAME = 
"CLUSTER.ADMINISTRATOR";
+  public static final String CLUSTER_OPERATOR_PERMISSION_NAME = 
"CLUSTER.OPERATOR";
+  public static final String SERVICE_ADMINISTRATOR_PERMISSION_NAME = 
"SERVICE.ADMINISTRATOR";
+  public static final String SERVICE_OPERATOR_PERMISSION_NAME = 
"SERVICE.OPERATOR";
+  public static final String CLUSTER_USER_PERMISSION_NAME = "CLUSTER.USER";
   public static final String 

[33/50] [abbrv] ambari git commit: AMBARI-14023. Agents should not ask for auto-start command details if it has the details (smohanty)

[jonathanhurley]

AMBARI-14023. Agents should not ask for auto-start command details if it has 
the details (smohanty)


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

Branch: refs/heads/branch-dev-patch-upgrade
Commit: 230c1d662d5322623e5402fee3f5d766bf985e6f
Parents: 604040f
Author: Sumit Mohanty 
Authored: Sun Feb 14 11:07:20 2016 -0800
Committer: Sumit Mohanty 
Committed: Sun Feb 14 11:07:20 2016 -0800

--
 .../src/main/python/ambari_agent/ActionQueue.py |  3 +-
 .../test/python/ambari_agent/TestActionQueue.py | 59 
 2 files changed, 61 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/230c1d66/ambari-agent/src/main/python/ambari_agent/ActionQueue.py
--
diff --git a/ambari-agent/src/main/python/ambari_agent/ActionQueue.py 
b/ambari-agent/src/main/python/ambari_agent/ActionQueue.py
index a4c433d..bf7b5d9 100644
--- a/ambari-agent/src/main/python/ambari_agent/ActionQueue.py
+++ b/ambari-agent/src/main/python/ambari_agent/ActionQueue.py
@@ -451,7 +451,8 @@ class ActionQueue(threading.Thread):
 if self.controller.recovery_manager.enabled() \
 and 
self.controller.recovery_manager.configured_for_recovery(component):
   self.controller.recovery_manager.update_current_status(component, 
component_status)
-  request_execution_cmd = 
self.controller.recovery_manager.requires_recovery(component)
+  request_execution_cmd = 
self.controller.recovery_manager.requires_recovery(component) and \
+not 
self.controller.recovery_manager.command_exists(component, 
ActionQueue.EXECUTION_COMMAND)
 
   if component_status_result.has_key('structuredOut'):
 component_extra = component_status_result['structuredOut']

http://git-wip-us.apache.org/repos/asf/ambari/blob/230c1d66/ambari-agent/src/test/python/ambari_agent/TestActionQueue.py
--
diff --git a/ambari-agent/src/test/python/ambari_agent/TestActionQueue.py 
b/ambari-agent/src/test/python/ambari_agent/TestActionQueue.py
index f7e2894..3d7acbc 100644
--- a/ambari-agent/src/test/python/ambari_agent/TestActionQueue.py
+++ b/ambari-agent/src/test/python/ambari_agent/TestActionQueue.py
@@ -682,6 +682,65 @@ class TestActionQueue(TestCase):
 self.assertEqual(report['componentStatus'][0], expected)
 self.assertTrue(requestComponentStatus_mock.called)
 
+  @patch.object(RecoveryManager, "command_exists")
+  @patch.object(RecoveryManager, "requires_recovery")
+  @patch.object(OSCheck, "os_distribution", new = MagicMock(return_value = 
os_distro_value))
+  @patch.object(ActionQueue, "status_update_callback")
+  @patch.object(StackVersionsFileHandler, "read_stack_version")
+  @patch.object(CustomServiceOrchestrator, "requestComponentStatus")
+  @patch.object(CustomServiceOrchestrator, "requestComponentSecurityState")
+  @patch.object(ActionQueue, "execute_command")
+  @patch.object(LiveStatus, "build")
+  @patch.object(CustomServiceOrchestrator, "__init__")
+  def test_execute_status_command_recovery(self, 
CustomServiceOrchestrator_mock,
+  build_mock, execute_command_mock, 
requestComponentSecurityState_mock,
+  requestComponentStatus_mock, 
read_stack_version_mock,
+  status_update_callback, 
requires_recovery_mock,
+  command_exists_mock):
+CustomServiceOrchestrator_mock.return_value = None
+dummy_controller = MagicMock()
+actionQueue = ActionQueue(AmbariConfig(), dummy_controller)
+
+build_mock.return_value = {'dummy report': '' }
+requires_recovery_mock.return_value = True
+command_exists_mock.return_value = False
+
+dummy_controller.recovery_manager = RecoveryManager(tempfile.mktemp(), 
True, False)
+
+requestComponentStatus_mock.reset_mock()
+requestComponentStatus_mock.return_value = {'exitcode': 0 }
+
+requestComponentSecurityState_mock.reset_mock()
+requestComponentSecurityState_mock.return_value = 'UNKNOWN'
+
+actionQueue.execute_status_command(self.status_command)
+report = actionQueue.result()
+expected = {'dummy report': '',
+'securityState' : 'UNKNOWN',
+'sendExecCmdDet': 'True'}
+
+self.assertEqual(len(report['componentStatus']), 1)
+self.assertEqual(report['componentStatus'][0], expected)
+self.assertTrue(requestComponentStatus_mock.called)
+
+requires_recovery_mock.return_value = True
+ 

[35/50] [abbrv] ambari git commit: AMBARI-15047. Add UI option to make Red Hat Satellite work (onechiporenko)

[jonathanhurley]

AMBARI-15047. Add UI option to make Red Hat Satellite work (onechiporenko)


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

Branch: refs/heads/branch-dev-patch-upgrade
Commit: c86964b542c5ac64c0f05ecf12fa1b2677e4ece8
Parents: 0ff86b1
Author: Oleg Nechiporenko 
Authored: Mon Feb 15 14:08:48 2016 +0200
Committer: Oleg Nechiporenko 
Committed: Mon Feb 15 14:38:15 2016 +0200

--
 .../controllers/stackVersions/StackVersionsCreateCtrl.js | 1 +
 .../controllers/stackVersions/StackVersionsEditCtrl.js   | 1 +
 .../main/resources/ui/admin-web/app/scripts/i18n.config.js   | 3 +++
 .../admin-web/app/views/stackVersions/stackVersionPage.html  | 8 
 ambari-web/app/config.js | 3 ++-
 ambari-web/app/controllers/wizard/step1_controller.js| 2 ++
 ambari-web/app/messages.js   | 2 ++
 .../templates/main/admin/stack_upgrade/edit_repositories.hbs | 7 +++
 ambari-web/app/templates/wizard/step1.hbs| 7 +++
 .../main/admin/stack_upgrade/upgrade_version_box_view.js | 8 ++--
 ambari-web/test/views/common/log_file_search_view_test.js| 2 +-
 11 files changed, 40 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/c86964b5/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsCreateCtrl.js
--
diff --git 
a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsCreateCtrl.js
 
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsCreateCtrl.js
index 532e5f4..002d393 100644
--- 
a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsCreateCtrl.js
+++ 
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsCreateCtrl.js
@@ -23,6 +23,7 @@ angular.module('ambariAdminConsole')
   $scope.createController = true;
   $scope.osList = [];
   $scope.skipValidation = false;
+  $scope.useRedhatSatellite = false;
   $scope.selectedOS = 0;
   $scope.repoSubversion = "";
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/c86964b5/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsEditCtrl.js
--
diff --git 
a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsEditCtrl.js
 
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsEditCtrl.js
index 39a6700..3c38444 100644
--- 
a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsEditCtrl.js
+++ 
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsEditCtrl.js
@@ -23,6 +23,7 @@ angular.module('ambariAdminConsole')
   $scope.editController = true;
   $scope.osList = [];
   $scope.skipValidation = false;
+  $scope.useRedhatSatellite = false;
   $scope.selectedOS = 0;
 
   $scope.loadStackVersionInfo = function () {

http://git-wip-us.apache.org/repos/asf/ambari/blob/c86964b5/ambari-admin/src/main/resources/ui/admin-web/app/scripts/i18n.config.js
--
diff --git 
a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/i18n.config.js 
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/i18n.config.js
index 91a1645..327ae03 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/i18n.config.js
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/i18n.config.js
@@ -304,6 +304,8 @@ angular.module('ambariAdminConsole')
   'os': 'OS',
   'baseURL': 'Base URL',
   'skipValidation': 'Skip Repository Base URL validation (Advanced)',
+  'useRedhatSatellite': 'Use RedHat Satellite/Spacewalk',
+
 
   'changeBaseURLConfirmation': {
 'title': 'Confirm Base URL Change',
@@ -314,6 +316,7 @@ angular.module('ambariAdminConsole')
 'baseURLs': 'Provide Base URLs for the Operating Systems you are 
configuring. Uncheck all other Operating Systems.',
 'validationFailed': 'Some of the repositories failed validation. Make 
changes to the base url or skip validation if you are sure that urls are 
correct',
 'skipValidationWarning': 'Warning: This is for advanced users 
only. Use this option if you want to skip validation for Repository Base URLs.',
+

[01/50] [abbrv] ambari git commit: Revert "AMBARI-14936. Tweaks to reduce build time (aonishuk)"

[jonathanhurley]

Repository: ambari
Updated Branches:
  refs/heads/branch-dev-patch-upgrade 1e89d1d57 -> 718f2ea18


Revert "AMBARI-14936. Tweaks to reduce build time (aonishuk)"

This reverts commit dc8e5c3c68d25e74ab875a87f66959fc86a9631c.


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

Branch: refs/heads/branch-dev-patch-upgrade
Commit: 58fe67c199b9dde7cd0963c9567e728db983def0
Parents: fdb101b
Author: Alex Antonenko 
Authored: Thu Feb 11 18:14:51 2016 +0200
Committer: Alex Antonenko 
Committed: Thu Feb 11 18:17:50 2016 +0200

--
 ambari-agent/pom.xml | 40 +++
 ambari-server/pom.xml|  6 ++--
 ambari-server/src/main/assemblies/server.xml |  2 +-
 ambari-web/pom.xml   |  3 +-
 pom.xml  | 18 +-
 5 files changed, 42 insertions(+), 27 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/58fe67c1/ambari-agent/pom.xml
--
diff --git a/ambari-agent/pom.xml b/ambari-agent/pom.xml
index c2c993f..23d2969 100644
--- a/ambari-agent/pom.xml
+++ b/ambari-agent/pom.xml
@@ -86,6 +86,24 @@
 3.0
   
   
+maven-assembly-plugin
+
+  gnu
+  
+src/packages/tarball/all.xml
+  
+
+
+  
+build-tarball
+prepare-package
+
+  single
+
+  
+
+  
+  
 org.apache.maven.plugins
 maven-surefire-plugin
 
@@ -257,24 +275,6 @@
 
   
   
-maven-assembly-plugin
-
-  gnu
-  
-src/packages/tarball/all.xml
-  
-
-
-  
-build-tarball
-${assemblyPhase}
-
-  single
-
-  
-
-  
-  
 maven-resources-plugin
 2.6
 
@@ -347,7 +347,7 @@
   
   
 copy-repo-resources
-${assemblyPhase}
+package
 
   copy-resources
 
@@ -391,7 +391,7 @@
 
   
 rename-file
-${assemblyPhase}
+package
 
   rename
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/58fe67c1/ambari-server/pom.xml
--
diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml
index 51fd88b..5a95ec4 100644
--- a/ambari-server/pom.xml
+++ b/ambari-server/pom.xml
@@ -134,7 +134,7 @@
 
   
 build-tarball
-${assemblyPhase}
+package
 
   single
 
@@ -173,7 +173,7 @@
   
   
 copy-repo-resources
-${assemblyPhase}
+package
 
   copy-resources
 
@@ -217,7 +217,7 @@
 
   
 rename-file
-${assemblyPhase}
+package
 
   rename
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/58fe67c1/ambari-server/src/main/assemblies/server.xml
--
diff --git a/ambari-server/src/main/assemblies/server.xml 
b/ambari-server/src/main/assemblies/server.xml
index ca74185..a75de79 100644
--- a/ambari-server/src/main/assemblies/server.xml
+++ b/ambari-server/src/main/assemblies/server.xml
@@ -301,7 +301,7 @@
 
 
   755
-  src/main/resources/stacks/stack_advisor.py
+  target/classes/stacks/stack_advisor.py
   
/var/lib/ambari-server/resources/stacks
 
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/58fe67c1/ambari-web/pom.xml
--
diff --git a/ambari-web/pom.xml b/ambari-web/pom.xml
index 6304b3d..761a3f0 100644
--- a/ambari-web/pom.xml
+++ b/ambari-web/pom.xml
@@ -32,7 +32,6 @@
   
 ${project.parent.parent.basedir}
 UTF-8
-node_modules 
   
   
 
@@ -101,7 +100,7 @@
 
   ${executable.rmdir}
   ${basedir}
-  ${args.rm.clean} public 
${nodemodules.dir}
+  ${args.rm.clean} public 
node_modules
   
 0
 1

http://git-wip-us.apache.org/repos/asf/ambari/blob/58fe67c1/pom.xml
--
diff --git a/pom.xml b/pom.xml

[17/50] [abbrv] ambari git commit: AMBARI-14715. TimelineServer configuration is missing in yarn-env.xml. (Akira Ajisaka via yusaku)

[jonathanhurley]

AMBARI-14715. TimelineServer configuration is missing in yarn-env.xml. (Akira 
Ajisaka via yusaku)


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

Branch: refs/heads/branch-dev-patch-upgrade
Commit: 6eed33322291c90c03386b72806fc3be461df5ec
Parents: 6ffe514
Author: Yusaku Sako 
Authored: Thu Feb 11 19:10:13 2016 -0800
Committer: Yusaku Sako 
Committed: Thu Feb 11 19:10:13 2016 -0800

--
 .../stacks/HDP/2.3/services/YARN/configuration/yarn-env.xml| 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/6eed3332/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-env.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-env.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-env.xml
index e802b24..6bc283d 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-env.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-env.xml
@@ -102,14 +102,14 @@
   # or JAVA_HEAP_MAX with YARN_HEAPMAX as the preferred option of the two.
   export YARN_NODEMANAGER_HEAPSIZE={{nodemanager_heapsize}}
 
-  # Specify the max Heapsize for the HistoryManager using a numerical value
+  # Specify the max Heapsize for the timeline server using a numerical 
value
   # in the scale of MB. For example, to specify an jvm option of 
-Xmx1000m, set
   # the value to 1024.
   # This value will be overridden by an Xmx setting specified in either 
YARN_OPTS
-  # and/or YARN_HISTORYSERVER_OPTS.
+  # and/or YARN_TIMELINESERVER_OPTS.
   # If not specified, the default value will be picked from either 
YARN_HEAPMAX
   # or JAVA_HEAP_MAX with YARN_HEAPMAX as the preferred option of the two.
-  export YARN_HISTORYSERVER_HEAPSIZE={{apptimelineserver_heapsize}}
+  export YARN_TIMELINESERVER_HEAPSIZE={{apptimelineserver_heapsize}}
 
   # Specify the JVM options to be used when starting the NodeManager.
   # These options will be appended to the options specified as YARN_OPTS

[26/50] [abbrv] ambari git commit: AMBARI-15030 : Fix unreasonable default heap settings for AMS HBase heapsize and xmn size (avijayan)

[jonathanhurley]

AMBARI-15030 : Fix unreasonable default heap settings for AMS HBase heapsize 
and xmn size (avijayan)


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

Branch: refs/heads/branch-dev-patch-upgrade
Commit: aac5389fea7867141a3f4f421b2bc0d1e61117f3
Parents: f7055ae
Author: Aravindan Vijayan 
Authored: Fri Feb 12 10:24:44 2016 -0800
Committer: Aravindan Vijayan 
Committed: Fri Feb 12 10:49:22 2016 -0800

--
 .../AMBARI_METRICS/0.1.0/configuration/ams-hbase-env.xml   | 6 +++---
 .../main/resources/stacks/HDP/2.0.6/services/stack_advisor.py  | 2 ++
 .../src/test/python/stacks/2.2/common/test_stack_advisor.py| 3 ++-
 3 files changed, 7 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/aac5389f/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-env.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-env.xml
 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-env.xml
index 191e8b2..90e1307 100644
--- 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-env.xml
+++ 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-env.xml
@@ -47,7 +47,7 @@
   
   
 hbase_regionserver_heapsize
-512
+756
 
 HBase RegionServer Heap Size. In embedded mode, total heap size is
 sum of master and regionserver heap sizes.
@@ -69,7 +69,7 @@
   
   
 regionserver_xmn_size
-256
+128
 HBase RegionServer maximum value for young generation heap 
size.
 
   int
@@ -84,7 +84,7 @@
   
   
 hbase_master_xmn_size
-256
+102
 
   HBase Master maximum value for young generation heap size.
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/aac5389f/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py 
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py
index af21008..7c69ac9 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py
@@ -595,6 +595,7 @@ class HDP206StackAdvisor(DefaultStackAdvisor):
 
 # Distributed mode heap size
 if operatingMode == "distributed":
+  hbase_heapsize = max(hbase_heapsize, 756)
   putHbaseEnvProperty("hbase_master_heapsize", "512")
   putHbaseEnvProperty("hbase_master_xmn_size", "102") #20% of 512 heap size
   putHbaseEnvProperty("hbase_regionserver_heapsize", hbase_heapsize)
@@ -602,6 +603,7 @@ class HDP206StackAdvisor(DefaultStackAdvisor):
 else:
   # Embedded mode heap size : master + regionserver
   hbase_rs_heapsize = 512
+  putHbaseEnvProperty("hbase_regionserver_heapsize", hbase_rs_heapsize)
   putHbaseEnvProperty("hbase_master_heapsize", hbase_heapsize)
   putHbaseEnvProperty("hbase_master_xmn_size", 
round_to_n(0.15*(hbase_heapsize+hbase_rs_heapsize),64))
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/aac5389f/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py
--
diff --git 
a/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py 
b/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py
index d2497fd..14a28d3 100644
--- a/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py
+++ b/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py
@@ -2025,7 +2025,8 @@ class TestHDP22StackAdvisor(TestCase):
   "ams-hbase-env": {
 "properties": {
   "hbase_master_xmn_size": "128",
-  "hbase_master_heapsize": "512"
+  "hbase_master_heapsize": "512",
+  "hbase_regionserver_heapsize": "512"
 }
   },
   "ams-env": {

[03/50] [abbrv] ambari git commit: AMBARI-14800 Alerts: HDFS alerts based on AMS metrics (additional patch) (dsen)

[jonathanhurley]

AMBARI-14800 Alerts: HDFS alerts based on AMS metrics (additional patch) (dsen)


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

Branch: refs/heads/branch-dev-patch-upgrade
Commit: e0492163d060e1840eecc1d463a9e5ddebbf81a5
Parents: 58fe67c
Author: Dmytro Sen 
Authored: Thu Feb 11 19:37:11 2016 +0200
Committer: Dmytro Sen 
Committed: Thu Feb 11 19:37:11 2016 +0200

--
 .../common-services/HDFS/2.1.0.2.0/alerts.json  | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/e0492163/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/alerts.json
--
diff --git 
a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/alerts.json 
b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/alerts.json
index bba6c11..2a6229c 100644
--- 
a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/alerts.json
+++ 
b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/alerts.json
@@ -523,7 +523,7 @@
   },
   {
 "name": "increase_nn_heap_usage_hourly",
-"label": "Hourly increase in NN heap usage",
+"label": "NameNode Heap Usage (Hourly)",
 "description": "This service-level alert is triggered if the NN heap 
usage deviation has grown beyond the specified threshold within a given time 
interval.",
 "interval": 5,
 "scope": "ANY",
@@ -581,7 +581,7 @@
   },
   {
 "name": "namenode_service_rpc_latency_hourly",
-"label": "Hourly Service-RPC latency",
+"label": "NameNode RPC Latency (Hourly)",
 "description": "This service-level alert is triggered if the 
Service-RPC latency deviation has grown beyond the specified threshold within a 
given time interval.",
 "interval": 5,
 "scope": "ANY",
@@ -639,7 +639,7 @@
   },
   {
 "name": "namenode_increase_in_storage_capacity_usage_hourly",
-"label": "Hourly increase in storage capacity usage",
+"label": "HDFS Storage Capacity Usage (Hourly)",
 "description": "This service-level alert is triggered if the increase 
in storage capacity usage deviation has grown beyond the specified threshold 
within a given time interval.",
 "interval": 5,
 "scope": "ANY",
@@ -697,7 +697,7 @@
   },
   {
 "name": "increase_nn_heap_usage_daily",
-"label": "Daily increase in NN heap usage",
+"label": "NameNode Heap Usage (Daily)",
 "description": "This service-level alert is triggered if the NN heap 
usage deviation has grown beyond the specified threshold within a given time 
interval.",
 "interval": 480,
 "scope": "ANY",
@@ -755,7 +755,7 @@
   },
   {
 "name": "namenode_service_rpc_latency_daily",
-"label": "Daily Service-RPC latency",
+"label": "NameNode RPC Latency (Daily)",
 "description": "This service-level alert is triggered if the 
Service-RPC latency deviation has grown beyond the specified threshold within a 
given time interval.",
 "interval": 480,
 "scope": "ANY",
@@ -813,7 +813,7 @@
   },
   {
 "name": "namenode_increase_in_storage_capacity_usage_daily",
-"label": "Daily increase in storage capacity usage",
+"label": "HDFS Storage Capacity Usage (Daily)",
 "description": "This service-level alert is triggered if the increase 
in storage capacity usage deviation has grown beyond the specified threshold 
within a given time interval.",
 "interval": 480,
 "scope": "ANY",
@@ -871,7 +871,7 @@
   },
   {
 "name": "increase_nn_heap_usage_weekly",
-"label": "Weekly increase in NN heap usage",
+"label": "NameNode Heap Usage (Weekly)",
 "description": "This service-level alert is triggered if the NN heap 
usage deviation has grown beyond the specified threshold within a given time 
interval.",
 "interval": 1440,
 "scope": "ANY",
@@ -929,7 +929,7 @@
   },
   {
 "name": "namenode_increase_in_storage_capacity_usage_weekly",
-"label": "Weekly increase in storage capacity usage",
+"label": "HDFS Storage Capacity Usage (Weekly)",
 "description": "This service-level alert is triggered if the increase 
in storage capacity usage deviation has grown beyond the specified threshold 
within a given time interval.",
 "interval": 1440,
 "scope": "ANY",

[45/50] [abbrv] ambari git commit: AMBARI-15050 Https Support for Metrics System (dsen)

[jonathanhurley]

http://git-wip-us.apache.org/repos/asf/ambari/blob/7e75e52a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/metainfo.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/metainfo.xml 
b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/metainfo.xml
index 66286b3..1970113 100644
--- 
a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/metainfo.xml
+++ 
b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/metainfo.xml
@@ -64,6 +64,7 @@
 ranger-kafka-security
 zookeeper-env
 zoo.cfg
+ams-ssl-client
   
   true
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/7e75e52a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/kafka.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/kafka.py
 
b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/kafka.py
index 1c01174..830d0ce 100644
--- 
a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/kafka.py
+++ 
b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/kafka.py
@@ -74,6 +74,10 @@ def kafka(upgrade_type=None):
 if params.has_metric_collector:
   kafka_server_config['kafka.timeline.metrics.host'] = 
params.metric_collector_host
   kafka_server_config['kafka.timeline.metrics.port'] = 
params.metric_collector_port
+  kafka_server_config['kafka.timeline.metrics.protocol'] = 
params.metric_collector_protocol
+  kafka_server_config['kafka.timeline.metrics.truststore.path'] = 
params.metric_truststore_path
+  kafka_server_config['kafka.timeline.metrics.truststore.type'] = 
params.metric_truststore_type
+  kafka_server_config['kafka.timeline.metrics.truststore.password'] = 
params.metric_truststore_password
 
 kafka_data_dir = kafka_server_config['log.dirs']
 kafka_data_dirs = filter(None, kafka_data_dir.split(","))

http://git-wip-us.apache.org/repos/asf/ambari/blob/7e75e52a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/params.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/params.py
 
b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/params.py
index da76952..47af240 100644
--- 
a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/params.py
+++ 
b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/params.py
@@ -106,6 +106,10 @@ else:
 
 metric_collector_host = ""
 metric_collector_port = ""
+metric_collector_protocol = ""
+metric_truststore_path= 
default("/configurations/ams-ssl-client/ssl.client.truststore.location", "")
+metric_truststore_type= 
default("/configurations/ams-ssl-client/ssl.client.truststore.type", "")
+metric_truststore_password= 
default("/configurations/ams-ssl-client/ssl.client.truststore.password", "")
 
 ams_collector_hosts = default("/clusterHostInfo/metrics_collector_hosts", [])
 has_metric_collector = not len(ams_collector_hosts) == 0
@@ -125,6 +129,10 @@ if has_metric_collector:
   metric_collector_port = metric_collector_web_address.split(':')[1]
 else:
   metric_collector_port = '6188'
+  if default("/configurations/ams-site/timeline.metrics.service.http.policy", 
"HTTP_ONLY") == "HTTPS_ONLY":
+metric_collector_protocol = 'https'
+  else:
+metric_collector_protocol = 'http'
   pass
 # Security-related params
 security_enabled = config['configurations']['cluster-env']['security_enabled']
@@ -274,4 +282,4 @@ HdfsResource = functools.partial(
   principal_name = hdfs_principal_name,
   hdfs_site = hdfs_site,
   default_fs = default_fs
-)
\ No newline at end of file
+)

http://git-wip-us.apache.org/repos/asf/ambari/blob/7e75e52a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/metainfo.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/metainfo.xml 
b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/metainfo.xml
index 1468a2f..804374a 100644
--- 
a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/metainfo.xml
+++ 
b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/metainfo.xml
@@ -134,6 +134,7 @@
 ranger-admin-site
 zookeeper-env
 zoo.cfg
+ams-ssl-client
   
   
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/7e75e52a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/params_linux.py
--
diff 

[44/50] [abbrv] ambari git commit: AMBARI-15050 Https Support for Metrics System (dsen)

[jonathanhurley]

http://git-wip-us.apache.org/repos/asf/ambari/blob/7e75e52a/ambari-server/src/test/python/stacks/2.0.6/configs/default.json
--
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/default.json 
b/ambari-server/src/test/python/stacks/2.0.6/configs/default.json
index cb34098..3d3987b 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/default.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/default.json
@@ -1,30 +1,30 @@
 {
-"roleCommand": "SERVICE_CHECK", 
-"clusterName": "c1", 
-"hostname": "c6401.ambari.apache.org", 
+"roleCommand": "SERVICE_CHECK",
+"clusterName": "c1",
+"hostname": "c6401.ambari.apache.org",
 "hostLevelParams": {
-"jdk_location": "http://c6401.ambari.apache.org:8080/resources/;, 
-"ambari_db_rca_password": "mapred", 
+"jdk_location": "http://c6401.ambari.apache.org:8080/resources/;,
+"ambari_db_rca_password": "mapred",
 "ambari_db_rca_url": 
"jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
 "repo_info": 
"[{\"baseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\",\"osType\":\"centos6\",\"repoId\":\"HDP-2.0._\",\"repoName\":\"HDP\",\"defaultBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\"}];,
-"jce_name": "UnlimitedJCEPolicyJDK7.zip", 
+"jce_name": "UnlimitedJCEPolicyJDK7.zip",
 "stack_version": "2.0",
-"stack_name": "HDP", 
-"ambari_db_rca_driver": "org.postgresql.Driver", 
+"stack_name": "HDP",
+"ambari_db_rca_driver": "org.postgresql.Driver",
 "jdk_name": "jdk-7u67-linux-x64.tar.gz",
-"ambari_db_rca_username": "mapred", 
+"ambari_db_rca_username": "mapred",
 "java_home": "/usr/jdk64/jdk1.7.0_45",
 "java_version": "8",
 "db_name": "ambari",
 "group_list": "[\"hadoop\",\"nobody\",\"users\"]",
 "user_list": 
"[\"hive\",\"oozie\",\"nobody\",\"ambari-qa\",\"flume\",\"hdfs\",\"storm\",\"mapred\",\"hbase\",\"tez\",\"zookeeper\",\"falcon\",\"sqoop\",\"yarn\",\"hcat\"]"
-}, 
-"commandType": "EXECUTION_COMMAND", 
-"roleParams": {}, 
+},
+"commandType": "EXECUTION_COMMAND",
+"roleParams": {},
 "serviceName": "HIVE",
 "role": "HIVE_SERVER",
 "commandParams": {
-"command_timeout": "300", 
+"command_timeout": "300",
 "service_package_folder": "OOZIE",
 "script_type": "PYTHON",
 "script": "scripts/service_check.py",
@@ -37,442 +37,443 @@
 "output_file":"HDFS_CLIENT-configs.tar.gz",
 "refresh_topology": "True"
 },
-"taskId": 152, 
-"public_hostname": "c6401.ambari.apache.org", 
+"taskId": 152,
+"public_hostname": "c6401.ambari.apache.org",
 "configurations": {
 "mapred-site": {
-"mapreduce.jobhistory.address": "c6402.ambari.apache.org:10020", 
-"mapreduce.cluster.administrators": " hadoop", 
-"mapreduce.reduce.input.buffer.percent": "0.0", 
-"mapreduce.output.fileoutputformat.compress": "false", 
-"mapreduce.framework.name": "yarn", 
-"mapreduce.map.speculative": "false", 
-"mapreduce.reduce.shuffle.merge.percent": "0.66", 
-"yarn.app.mapreduce.am.resource.mb": "683", 
-"mapreduce.map.java.opts": "-Xmx273m", 
-"mapreduce.application.classpath": 
"$HADOOP_MAPRED_HOME/share/hadoop/mapreduce/*,$HADOOP_MAPRED_HOME/share/hadoop/mapreduce/lib/*",
 
-"mapreduce.job.reduce.slowstart.completedmaps": "0.05", 
-"mapreduce.output.fileoutputformat.compress.type": "BLOCK", 
-"mapreduce.reduce.speculative": "false", 
-"mapreduce.reduce.java.opts": "-Xmx546m", 
-"mapreduce.am.max-attempts": "2", 
-"yarn.app.mapreduce.am.admin-command-opts": 
"-Djava.net.preferIPv4Stack=true -Dhadoop.metrics.log.level=WARN", 
-"mapreduce.reduce.log.level": "INFO", 
-"mapreduce.map.sort.spill.percent": "0.7", 
-"mapreduce.task.timeout": "30", 
-"mapreduce.map.memory.mb": "341", 
-"mapreduce.task.io.sort.factor": "100", 
-"mapreduce.jobhistory.intermediate-done-dir": "/mr-history/tmp", 
-"mapreduce.reduce.memory.mb": "683", 
-"yarn.app.mapreduce.am.log.level": "INFO", 
-"mapreduce.map.log.level": "INFO", 
-"mapreduce.shuffle.port": "13562", 
-"mapreduce.admin.user.env": 
"LD_LIBRARY_PATH=/usr/lib/hadoop/lib/native:/usr/lib/hadoop/lib/native/`$JAVA_HOME/bin/java
 -d32 -version  /dev/null;if [ $? -eq 0 ]; then echo Linux-i386-32; 
else echo Linux-amd64-64;fi`", 
-"mapreduce.map.output.compress": "false", 
-"yarn.app.mapreduce.am.staging-dir": "/user", 
-"mapreduce.reduce.shuffle.parallelcopies": 

[14/50] [abbrv] ambari git commit: AMBARI-15004. RU/EU: Upgrading Oozie database fails since new configs are not yet written to /usr/hdp/current/oozie-server/conf (alejandro)

[jonathanhurley]

AMBARI-15004. RU/EU: Upgrading Oozie database fails since new configs are not 
yet written to /usr/hdp/current/oozie-server/conf (alejandro)


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

Branch: refs/heads/branch-dev-patch-upgrade
Commit: 1ead250562513b38e7f2eb57df7cd4bb1d68f06e
Parents: 8aab632
Author: Alejandro Fernandez 
Authored: Thu Feb 11 13:50:47 2016 -0800
Committer: Alejandro Fernandez 
Committed: Thu Feb 11 17:09:45 2016 -0800

--
 .../state/stack/upgrade/ClusterGrouping.java|  7 
 .../state/stack/upgrade/ExecuteHostType.java|  7 
 .../state/stack/upgrade/TaskWrapperBuilder.java | 15 +++-
 .../4.0.0.2.0/package/scripts/oozie_server.py   | 36 ++--
 .../package/scripts/oozie_server_upgrade.py |  4 ++-
 .../4.0.0.2.0/package/scripts/params_linux.py   |  3 ++
 .../HDP/2.1/upgrades/nonrolling-upgrade-2.3.xml |  3 +-
 .../HDP/2.2/upgrades/nonrolling-upgrade-2.2.xml |  5 ++-
 .../HDP/2.2/upgrades/nonrolling-upgrade-2.3.xml |  5 ++-
 .../HDP/2.2/upgrades/nonrolling-upgrade-2.4.xml |  5 ++-
 .../stacks/HDP/2.2/upgrades/upgrade-2.2.xml |  5 ++-
 .../stacks/HDP/2.2/upgrades/upgrade-2.3.xml |  5 ++-
 .../stacks/HDP/2.2/upgrades/upgrade-2.4.xml |  5 ++-
 .../HDP/2.3/upgrades/nonrolling-upgrade-2.3.xml |  5 ++-
 .../HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml |  5 ++-
 .../stacks/HDP/2.3/upgrades/upgrade-2.3.xml |  5 ++-
 .../stacks/HDP/2.3/upgrades/upgrade-2.4.xml |  5 ++-
 .../HDP/2.4/upgrades/nonrolling-upgrade-2.4.xml |  5 ++-
 .../stacks/HDP/2.4/upgrades/upgrade-2.4.xml |  5 ++-
 19 files changed, 109 insertions(+), 26 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/1ead2505/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ClusterGrouping.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ClusterGrouping.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ClusterGrouping.java
index 5e21da5..8fb6ef5 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ClusterGrouping.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ClusterGrouping.java
@@ -232,6 +232,13 @@ public class ClusterGrouping extends Grouping {
   realHosts = Collections.singleton(hosts.hosts.iterator().next());
 }
 
+// Pick the first host sorted alphabetically (case insensitive)
+if (ExecuteHostType.FIRST == et.hosts && !hosts.hosts.isEmpty()) {
+  List sortedHosts = new ArrayList<>(hosts.hosts);
+  Collections.sort(sortedHosts, String.CASE_INSENSITIVE_ORDER);
+  realHosts = Collections.singleton(sortedHosts.get(0));
+}
+
 // !!! cannot execute against empty hosts (safety net)
 if (realHosts.isEmpty()) {
   return null;

http://git-wip-us.apache.org/repos/asf/ambari/blob/1ead2505/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ExecuteHostType.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ExecuteHostType.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ExecuteHostType.java
index b36dca4..80deb60 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ExecuteHostType.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ExecuteHostType.java
@@ -42,6 +42,13 @@ public enum ExecuteHostType {
   ANY,
 
   /**
+   * Run on a single host that is picked by alphabetically sorting all hosts 
that satisfy the condition of the {@link ExecuteTask}
+   * .
+   */
+  @XmlEnumValue("first")
+  FIRST,
+
+  /**
* Run on all of the hosts.
*/
   @XmlEnumValue("all")

http://git-wip-us.apache.org/repos/asf/ambari/blob/1ead2505/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/TaskWrapperBuilder.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/TaskWrapperBuilder.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/TaskWrapperBuilder.java
index 81a3a4d..f2ef8f0 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/TaskWrapperBuilder.java
+++ 

[43/50] [abbrv] ambari git commit: AMBARI-15050 Https Support for Metrics System (dsen)

[jonathanhurley]

http://git-wip-us.apache.org/repos/asf/ambari/blob/7e75e52a/ambari-server/src/test/python/stacks/2.0.6/configs/default_ams_embedded.json
--
diff --git 
a/ambari-server/src/test/python/stacks/2.0.6/configs/default_ams_embedded.json 
b/ambari-server/src/test/python/stacks/2.0.6/configs/default_ams_embedded.json
index 0ce8e5a..95e931a 100644
--- 
a/ambari-server/src/test/python/stacks/2.0.6/configs/default_ams_embedded.json
+++ 
b/ambari-server/src/test/python/stacks/2.0.6/configs/default_ams_embedded.json
@@ -811,6 +811,9 @@
 "ams-hbase-log4j": {
 "content": "\n"
 },
+"ams-ssl-server": {
+"content": "\n"
+},
 "ams-site": {
 "timeline.metrics.host.aggregator.minute.ttl": "604800",
 
"timeline.metrics.cluster.aggregator.daily.checkpointCutOffMultiplier": "1",
@@ -859,6 +862,7 @@
 "ams-hbase-site": {},
 "ams-hbase-policy": {},
 "ams-hbase-log4j": {},
+"ams-ssl-server": {},
 "ams-site": {},
 "yarn-site": {
 "final": {
@@ -941,6 +945,9 @@
 "ams-site": {
 "tag": "version1"
 },
+"ams-ssl-server": {
+"tag": "version1"
+},
 "ams-hbase-policy": {
 "tag": "version1"
 },

[02/50] [abbrv] ambari git commit: AMBARI-15009. Log Search: Add link to background operations popup navigate to Host Details Logs tab with pre-set condition (alexantonenko)

[jonathanhurley]

AMBARI-15009. Log Search: Add link to background operations popup navigate to 
Host Details Logs tab with pre-set condition (alexantonenko)


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

Branch: refs/heads/branch-dev-patch-upgrade
Commit: fdb101bdd78a4d6d2626008dc4a146374283e8f3
Parents: 754d0fa
Author: Alex Antonenko 
Authored: Thu Feb 11 12:46:33 2016 +0200
Committer: Alex Antonenko 
Committed: Thu Feb 11 18:17:50 2016 +0200

--
 .../main/admin/kerberos/step7_controller.js | 12 ++--
 ambari-web/app/messages.js  |  1 +
 ambari-web/app/styles/application.less  | 12 ++--
 .../templates/common/host_progress_popup.hbs|  5 ++
 ambari-web/app/utils/ajax/ajax.js   | 15 
 ambari-web/app/views/application.js | 22 ++
 .../common/host_progress_popup_body_view.js | 75 +++-
 .../app/views/common/log_file_search_view.js|  2 +-
 ambari-web/app/views/common/modal_popup.js  | 27 +++
 .../modal_popups/log_file_search_popup.js   | 12 +++-
 .../host_progress_popup_body_view_test.js   | 54 +-
 11 files changed, 204 insertions(+), 33 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/fdb101bd/ambari-web/app/controllers/main/admin/kerberos/step7_controller.js
--
diff --git a/ambari-web/app/controllers/main/admin/kerberos/step7_controller.js 
b/ambari-web/app/controllers/main/admin/kerberos/step7_controller.js
index 71e94ca..2a4fb90 100644
--- a/ambari-web/app/controllers/main/admin/kerberos/step7_controller.js
+++ b/ambari-web/app/controllers/main/admin/kerberos/step7_controller.js
@@ -48,13 +48,13 @@ App.KerberosWizardStep7Controller = 
App.KerberosProgressPageController.extend({
   }
 };
 if (isRetry) {
-  // on retry we have to unkerberize cluster
-  this.unkerberizeCluster().always(function() {
-// clear current request object before start of kerberize process
-self.set('request', kerberizeRequest);
-self.clearStage();
-self.loadStep();
+  // on retry send force update
+  self.set('request', {
+name: 'KERBERIZE_CLUSTER',
+ajaxName: 'admin.kerberize.cluster.force'
   });
+  self.clearStage();
+  self.loadStep();
 } else {
   this.set('request', kerberizeRequest);
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/fdb101bd/ambari-web/app/messages.js
--
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 59877a5..909f55c 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -313,6 +313,7 @@ Em.I18n.translations = {
   'common.keywords': 'Keywods',
   'common.levels': 'Levels',
   'common.extension': 'Extension',
+  'common.logs': 'Logs',
 
   'models.alert_instance.tiggered.verbose': "Occurred on {0}  Checked on 
{1}",
   'models.alert_definition.triggered.verbose': "Occurred on {0}",

http://git-wip-us.apache.org/repos/asf/ambari/blob/fdb101bd/ambari-web/app/styles/application.less
--
diff --git a/ambari-web/app/styles/application.less 
b/ambari-web/app/styles/application.less
index 57b7e76..4e2b5d1 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -1861,13 +1861,13 @@ a:focus {
   float: right;
   a {
 cursor: pointer;
-  }
-  .task-detail-copy {
-margin-right: 12px;
 float: left;
-  }
-  .task-detail-open-dialog {
-float: right;
+margin-right: 12px;
+
+&:last-child {
+  margin-right: 0;
+  float: right;
+}
   }
 }
   }

http://git-wip-us.apache.org/repos/asf/ambari/blob/fdb101bd/ambari-web/app/templates/common/host_progress_popup.hbs
--
diff --git a/ambari-web/app/templates/common/host_progress_popup.hbs 
b/ambari-web/app/templates/common/host_progress_popup.hbs
index 00f2e08..fe330f7 100644
--- a/ambari-web/app/templates/common/host_progress_popup.hbs
+++ b/ambari-web/app/templates/common/host_progress_popup.hbs
@@ -195,6 +195,11 @@
 
{{t common.copy}}
+  {{#if App.supports.logSearch}}
+
+   {{t common.logs}}
+
+  {{/if}}
{{t common.open}}
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/fdb101bd/ambari-web/app/utils/ajax/ajax.js

[40/50] [abbrv] ambari git commit: AMBARI-15056. Long hostnames are not truncated in Alerts dialog (alexantonenko)

[jonathanhurley]

AMBARI-15056. Long hostnames are not truncated in Alerts dialog (alexantonenko)


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

Branch: refs/heads/branch-dev-patch-upgrade
Commit: ea699bb9b1be059949fa6f1ddf6f563e52ed4f5f
Parents: 5fcb716
Author: Alex Antonenko 
Authored: Tue Feb 16 14:56:21 2016 +0200
Committer: Alex Antonenko 
Committed: Tue Feb 16 15:32:16 2016 +0200

--
 ambari-web/app/styles/alerts.less   | 25 +---
 .../main/alerts/instance_service_host.hbs   | 30 +++-
 .../main/alerts/definition_details_view.js  |  8 ++
 3 files changed, 39 insertions(+), 24 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/ea699bb9/ambari-web/app/styles/alerts.less
--
diff --git a/ambari-web/app/styles/alerts.less 
b/ambari-web/app/styles/alerts.less
index c4f163d..1b8d5f4 100644
--- a/ambari-web/app/styles/alerts.less
+++ b/ambari-web/app/styles/alerts.less
@@ -70,7 +70,7 @@
 
   .filter-row {
 th {
-  padding: 0px;
+  padding: 0;
   padding-left: 4px;
 }
   }
@@ -253,16 +253,16 @@
   .definition-name {
 .name-text-field{
   margin-left: 2px;
-  margin-bottom: 0px;
+  margin-bottom: 0;
   input {
 width: 99%;
-margin-bottom: 0px;
+margin-bottom: 0;
 margin-top: -4px;
 margin-left: -5px;
   }
 }
 .edit-buttons {
-  margin-bottom: 0px;
+  margin-bottom: 0;
   margin-top: -4px;
   float: left;
   margin-left: 7px;
@@ -407,7 +407,7 @@
 
 #manage-alert-notification-content {
   .notification-info .global-info .global-checkbox {
-margin: 0px;
+margin: 0;
   }
   .input-label {
 font-weight: bold;
@@ -465,7 +465,7 @@
 
 .create-edit-alert-notification-popup {
   .modal {
-margin-top: 0px;
+margin-top: 0;
 top: 5%;
 width: 600px;
   }
@@ -512,10 +512,10 @@
 height: 250px;
   }
   .btn-toolbar {
-margin-top: 0px;
+margin-top: 0;
   }
   .manage-configuration-group-content {
-margin-bottom: 0px;
+margin-bottom: 0;
   }
   .notification-editable-list {
 .title {
@@ -576,12 +576,17 @@
 }
 
 .alerts-popup-wrap {
+  .trim_hostname{
+display: block;
+overflow: hidden;
+text-overflow: ellipsis;
+  }
   .top-wrap {
 width: 100%;
 border-bottom: 1px solid #CCC;
 text-align: center;
 font-size: 15px;
-padding: 0px 0px 20px 0px;
+padding: 0 0 20px 0;
 height: 20px;
 .name-top {
   width: 32%;
@@ -639,7 +644,7 @@
   cursor: pointer;
   border-top: 1px solid #CCC;
   text-align: center;
-  padding: 10px 10px 10px 0px;
+  padding: 10px 10px 10px 0;
   font-size: 16px;
 }
   }

http://git-wip-us.apache.org/repos/asf/ambari/blob/ea699bb9/ambari-web/app/templates/main/alerts/instance_service_host.hbs
--
diff --git a/ambari-web/app/templates/main/alerts/instance_service_host.hbs 
b/ambari-web/app/templates/main/alerts/instance_service_host.hbs
index cff614c..9aca8df 100644
--- a/ambari-web/app/templates/main/alerts/instance_service_host.hbs
+++ b/ambari-web/app/templates/main/alerts/instance_service_host.hbs
@@ -15,18 +15,20 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 }}
-{{#if view.instance.serviceDisplayName}}
-  {{#if view.serviceIsLink}}
-{{view.instance.serviceDisplayName}}
-  {{else}}
-{{view.instance.serviceDisplayName}}
+
+  {{#if view.instance.serviceDisplayName}}
+{{#if view.serviceIsLink}}
+  {{view.instance.serviceDisplayName}}
+{{else}}
+  {{view.instance.serviceDisplayName}}
+{{/if}}
   {{/if}}
-{{/if}}
-{{#if view.showSeparator}}
-  /
-{{/if}}
-{{#if view.instance.hostName}}
-  
-{{view.instance.hostName}}
-  
-{{/if}}
\ No newline at end of file
+  {{#if view.showSeparator}}
+/
+  {{/if}}
+  {{#if view.instance.hostName}}
+
+  {{view.instance.hostName}}
+
+  {{/if}}
+
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/ea699bb9/ambari-web/app/views/main/alerts/definition_details_view.js
--
diff --git a/ambari-web/app/views/main/alerts/definition_details_view.js 
b/ambari-web/app/views/main/alerts/definition_details_view.js
index 7467b0f..2fc75c1 100644
--- a/ambari-web/app/views/main/alerts/definition_details_view.js
+++ b/ambari-web/app/views/main/alerts/definition_details_view.js
@@ -298,6 +298,14 

[07/50] [abbrv] ambari git commit: AMBARI-14885: After exporting blueprint from existing cluster knox_master_secret is exported. (arborkar via dili)

[jonathanhurley]

AMBARI-14885: After exporting blueprint from existing cluster 
knox_master_secret is exported. (arborkar via dili)


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

Branch: refs/heads/branch-dev-patch-upgrade
Commit: 7d1ab29c5860a8cab6f19eb98c0a7bd25529ec5e
Parents: 966f303
Author: Di Li 
Authored: Thu Feb 11 13:54:01 2016 -0500
Committer: Di Li 
Committed: Thu Feb 11 13:54:01 2016 -0500

--
 .../BlueprintConfigurationProcessor.java |  2 +-
 .../BlueprintConfigurationProcessorTest.java | 19 +--
 2 files changed, 18 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/7d1ab29c/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java
index de31a0d..7fb2592 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java
@@ -2605,7 +2605,7 @@ public class BlueprintConfigurationProcessor {
*/
   private static class PasswordPropertyFilter implements PropertyFilter {
 
-private static final Pattern PASSWORD_NAME_REGEX = 
Pattern.compile("\\S+PASSWORD", Pattern.CASE_INSENSITIVE);
+private static final Pattern PASSWORD_NAME_REGEX = 
Pattern.compile("\\S+(PASSWORD|SECRET)", Pattern.CASE_INSENSITIVE);
 
 /**
  * Query to determine if a given property should be included in a 
collection of

http://git-wip-us.apache.org/repos/asf/ambari/blob/7d1ab29c/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessorTest.java
--
diff --git 
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessorTest.java
 
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessorTest.java
index 7a77a25..9c76e8a 100644
--- 
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessorTest.java
+++ 
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessorTest.java
@@ -689,14 +689,21 @@ public class BlueprintConfigurationProcessorTest {
 typeProps.put("test.ssl.password", "test-password-five");
 typeProps.put("test.password.should.be.included", "test-another-pwd");
 
+//Checking functionality for fields marked as SECRET
+Map secretProps = new HashMap();
+secretProps.put("knox_master_secret", "test-secret-one");
+secretProps.put("test.secret.should.be.included", "test-another-secret");
 // create a custom config type, to verify that the filters can
 // be applied across all config types
 Map customProps = new HashMap();
 customProps.put("my_test_PASSWORD", "should be excluded");
 customProps.put("PASSWORD_mytest", "should be included");
 
+customProps.put("my_test_SECRET", "should be excluded");
+customProps.put("SECRET_mytest", "should be included");
 properties.put("ranger-yarn-plugin-properties", typeProps);
 properties.put("custom-test-properties", customProps);
+properties.put("secret-test-properties", secretProps);
 
 Configuration clusterConfig = new Configuration(properties,
   Collections.>>emptyMap());
@@ -721,10 +728,12 @@ public class BlueprintConfigurationProcessorTest {
 configProcessor.doUpdateForBlueprintExport();
 
 
-assertEquals("Exported properties map was not of the expected size", 1,
+assertEquals("Exported properties map was not of the expected size", 2,
   properties.get("custom-test-properties").size());
 assertEquals("ranger-yarn-plugin-properties config type was not properly 
exported", 1,
   properties.get("ranger-yarn-plugin-properties").size());
+assertEquals("Exported secret properties map was not of the expected 
size", 1,
+  properties.get("secret-test-properties").size());
 
 // verify that the following password properties matching the "*_PASSWORD" 
rule have been excluded
 assertFalse("Password property should 

[13/50] [abbrv] ambari git commit: AMBARI-14966: Stack Advisor incorrectly recommends Slave component on a host which does not have it installed during Add service wizard (bhuvnesh2703 via jaoki)

[jonathanhurley]

AMBARI-14966: Stack Advisor incorrectly recommends Slave component on a host 
which does not have it installed during Add service wizard (bhuvnesh2703 via 
jaoki)


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

Branch: refs/heads/branch-dev-patch-upgrade
Commit: 8aab63270ebfe34aa75c47a150fbb4a1838d0ec1
Parents: 6c6ec63
Author: Jun Aoki 
Authored: Thu Feb 11 17:05:46 2016 -0800
Committer: Jun Aoki 
Committed: Thu Feb 11 17:05:46 2016 -0800

--
 .../src/main/resources/stacks/stack_advisor.py  |  3 +-
 .../stacks/2.0.6/common/test_stack_advisor.py   | 59 
 2 files changed, 61 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/8aab6327/ambari-server/src/main/resources/stacks/stack_advisor.py
--
diff --git a/ambari-server/src/main/resources/stacks/stack_advisor.py 
b/ambari-server/src/main/resources/stacks/stack_advisor.py
index d993feb..539bd25 100644
--- a/ambari-server/src/main/resources/stacks/stack_advisor.py
+++ b/ambari-server/src/main/resources/stacks/stack_advisor.py
@@ -409,7 +409,8 @@ class DefaultStackAdvisor(StackAdvisor):
 hostsMin = int(cardinality)
   if hostsMin > len(hostsForComponent):
 
hostsForComponent.extend(freeHosts[0:hostsMin-len(hostsForComponent)])
-else:
+# Components which are already installed, keep the recommendation 
as the existing layout
+elif not componentIsPopulated:
   hostsForComponent.extend(freeHosts)
   if not hostsForComponent:  # hostsForComponent is empty
 hostsForComponent = hostsList[-1:]

http://git-wip-us.apache.org/repos/asf/ambari/blob/8aab6327/ambari-server/src/test/python/stacks/2.0.6/common/test_stack_advisor.py
--
diff --git 
a/ambari-server/src/test/python/stacks/2.0.6/common/test_stack_advisor.py 
b/ambari-server/src/test/python/stacks/2.0.6/common/test_stack_advisor.py
index 22b16bb..4f059ba 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/common/test_stack_advisor.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/common/test_stack_advisor.py
@@ -1941,3 +1941,62 @@ class TestHDP206StackAdvisor(TestCase):
 siteProperties = stack_advisor.getServicesSiteProperties(services, 
"ranger-admin-site")
 self.assertEquals(siteProperties, expected)
 
+  def test_createComponentLayoutRecommendations_addService_1freeHost(self):
+"""
+Test that already installed slaves are not added to any free hosts (not 
having any component installed)
+as part of recommendation received during Add service operation.
+For already installed services, recommendation for installed components 
should match the existing layout
+"""
+
+services = {
+  "services" : [
+ {
+"StackServices" : {
+  "service_name" : "HDFS"
+},
+"components" : [ {
+  "StackServiceComponents" : {
+"cardinality" : "1+",
+"component_category" : "SLAVE",
+"component_name" : "DATANODE",
+"hostnames" : [ "c6401.ambari.apache.org" ]
+  }
+} ]
+ } ]
+  }
+
+hosts = self.prepareHosts(["c6401.ambari.apache.org", 
"c6402.ambari.apache.org"])
+recommendations = 
self.stackAdvisor.createComponentLayoutRecommendations(services, hosts)
+"""
+Recommendation received should be as below:
+   {
+  'blueprint': {
+  'host_groups': [{
+  'name': 'host-group-1',
+  'components': []
+  }, {
+  'name': 'host-group-2',
+  'components': [{
+  'name': 'DATANODE'
+  }]
+  }]
+  },
+  'blueprint_cluster_binding': {
+  'host_groups': [{
+  'hosts': [{
+   

[05/50] [abbrv] ambari git commit: AMBARI-14988: DB consistency - Add consistency check on clusterconfigmapping in ClusterImpl::getDesiredConfigs() for NPE.

[jonathanhurley]

AMBARI-14988: DB consistency - Add consistency check on clusterconfigmapping in 
ClusterImpl::getDesiredConfigs() for NPE.


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

Branch: refs/heads/branch-dev-patch-upgrade
Commit: 966f3031d50b0106dfe5d19abbdd1e3b84d1f059
Parents: f247ddc
Author: Nahappan Somasundaram 
Authored: Wed Feb 10 13:10:28 2016 -0800
Committer: Nahappan Somasundaram 
Committed: Thu Feb 11 10:35:00 2016 -0800

--
 .../apache/ambari/server/state/cluster/ClusterImpl.java | 12 +++-
 1 file changed, 11 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/966f3031/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClusterImpl.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClusterImpl.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClusterImpl.java
index 50e02a5..57941d0 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClusterImpl.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClusterImpl.java
@@ -2267,7 +2267,17 @@ public class ClusterImpl implements Cluster {
 " unknown configType=" + e.getType());
 continue;
   }
-  
c.setVersion(allConfigs.get(e.getType()).get(e.getTag()).getVersion());
+
+  Map configMap = allConfigs.get(e.getType());
+  if(!configMap.containsKey(e.getTag())) {
+LOG.debug("Config inconsistency exists for typeName=" +
+e.getType() +
+", unknown versionTag=" + e.getTag());
+continue;
+  }
+
+  Config config = configMap.get(e.getTag());
+  c.setVersion(config.getVersion());
 
   Set configs = map.get(e.getType());
   if (configs == null) {

[39/50] [abbrv] ambari git commit: AMBARI-15055. RBAC : "Service Operator" role doesn't have "Move to another host" permission, but still gives component movement options for HDFS, YARN, Oozie and Met

[jonathanhurley]

AMBARI-15055. RBAC : "Service Operator" role doesn't have "Move to another 
host" permission, but still gives component movement options for HDFS, YARN, 
Oozie and Metrics Collector (alexantonenko)


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

Branch: refs/heads/branch-dev-patch-upgrade
Commit: 5fcb71602b1c680d143e39f4aca17e1cc5af7889
Parents: f3e6931
Author: Alex Antonenko 
Authored: Tue Feb 16 12:37:22 2016 +0200
Committer: Alex Antonenko 
Committed: Tue Feb 16 15:32:16 2016 +0200

--
 ambari-web/app/models/host_component.js | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/5fcb7160/ambari-web/app/models/host_component.js
--
diff --git a/ambari-web/app/models/host_component.js 
b/ambari-web/app/models/host_component.js
index a081d62..4782190 100644
--- a/ambari-web/app/models/host_component.js
+++ b/ambari-web/app/models/host_component.js
@@ -337,6 +337,7 @@ App.HostComponentActionMap = {
   MOVE_COMPONENT: {
 action: 'reassignMaster',
 context: '',
+isHidden: !App.isAuthorized('SERVICE.MOVE'),
 label: Em.I18n.t('services.service.actions.reassign.master'),
 cssClass: 'icon-share-alt'
   },

[09/50] [abbrv] ambari git commit: AMBARI-15010 YARN metrics not written due to permissions on metrics properties file (dsen)

[jonathanhurley]

AMBARI-15010 YARN metrics not written due to permissions on metrics properties 
file (dsen)


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

Branch: refs/heads/branch-dev-patch-upgrade
Commit: 9419400da987d1a09c17ce511c1fdc307ad7ff65
Parents: a638ccb
Author: Dmytro Sen 
Authored: Thu Feb 11 23:29:27 2016 +0200
Committer: Dmytro Sen 
Committed: Thu Feb 11 23:29:27 2016 +0200

--
 .../0.8/hooks/before-START/scripts/shared_initialization.py  | 1 +
 .../2.0.6/hooks/before-START/scripts/shared_initialization.py| 1 +
 .../python/stacks/2.0.6/hooks/before-START/test_before_start.py  | 4 
 3 files changed, 6 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/9419400d/ambari-server/src/main/resources/stacks/BIGTOP/0.8/hooks/before-START/scripts/shared_initialization.py
--
diff --git 
a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/hooks/before-START/scripts/shared_initialization.py
 
b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/hooks/before-START/scripts/shared_initialization.py
index 2d2331a..265502f 100644
--- 
a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/hooks/before-START/scripts/shared_initialization.py
+++ 
b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/hooks/before-START/scripts/shared_initialization.py
@@ -85,6 +85,7 @@ def setup_hadoop():
 
 File(os.path.join(params.hadoop_conf_dir, "hadoop-metrics2.properties"),
  owner=params.hdfs_user,
+ group=params.user_group,
  content=Template("hadoop-metrics2.properties.j2")
 )
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/9419400d/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/shared_initialization.py
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/shared_initialization.py
 
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/shared_initialization.py
index 85d8fec..21d3b43 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/shared_initialization.py
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/shared_initialization.py
@@ -98,6 +98,7 @@ def setup_hadoop():
 
   File(os.path.join(params.hadoop_conf_dir, "hadoop-metrics2.properties"),
owner=params.hdfs_user,
+   group=params.user_group,
content=Template("hadoop-metrics2.properties.j2")
   )
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/9419400d/ambari-server/src/test/python/stacks/2.0.6/hooks/before-START/test_before_start.py
--
diff --git 
a/ambari-server/src/test/python/stacks/2.0.6/hooks/before-START/test_before_start.py
 
b/ambari-server/src/test/python/stacks/2.0.6/hooks/before-START/test_before_start.py
index da2b87f..90bd968 100644
--- 
a/ambari-server/src/test/python/stacks/2.0.6/hooks/before-START/test_before_start.py
+++ 
b/ambari-server/src/test/python/stacks/2.0.6/hooks/before-START/test_before_start.py
@@ -73,6 +73,7 @@ class TestHookBeforeStart(RMFTestCase):
   )
 self.assertResourceCalled('File', 
'/etc/hadoop/conf/hadoop-metrics2.properties',
   content = 
Template('hadoop-metrics2.properties.j2'),
+  group='hadoop',
   owner = 'hdfs',
   )
 self.assertResourceCalled('File', '/etc/hadoop/conf/task-log4j.properties',
@@ -146,6 +147,7 @@ class TestHookBeforeStart(RMFTestCase):
   )
 self.assertResourceCalled('File', 
'/etc/hadoop/conf/hadoop-metrics2.properties',
   content = 
Template('hadoop-metrics2.properties.j2'),
+  group='hadoop',
   owner = 'hdfs',
   )
 self.assertResourceCalled('File', '/etc/hadoop/conf/task-log4j.properties',
@@ -224,6 +226,7 @@ class TestHookBeforeStart(RMFTestCase):
 )
 self.assertResourceCalled('File', 
'/etc/hadoop/conf/hadoop-metrics2.properties',
   content = 
Template('hadoop-metrics2.properties.j2'),
+  group='hadoop',
   owner = 'hdfs',
   )
 self.assertResourceCalled('File', '/etc/hadoop/conf/task-log4j.properties',
@@ -304,6 +307,7 @@ class 

[29/50] [abbrv] ambari git commit: AMBARI-14701: assign_master_components.js breaks next step in certain case (mithmatt via jaoki)

[jonathanhurley]

AMBARI-14701: assign_master_components.js breaks next step in certain case 
(mithmatt via jaoki)


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

Branch: refs/heads/branch-dev-patch-upgrade
Commit: 9e5dd9f8990956e1c9de650822d52d4fdddaba0a
Parents: e187553
Author: Jun Aoki 
Authored: Fri Feb 12 18:15:15 2016 -0800
Committer: Jun Aoki 
Committed: Fri Feb 12 18:15:15 2016 -0800

--
 .../mixins/wizard/assign_master_components.js   | 37 +---
 1 file changed, 25 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/9e5dd9f8/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 0693507..a2440a4 100644
--- a/ambari-web/app/mixins/wizard/assign_master_components.js
+++ b/ambari-web/app/mixins/wizard/assign_master_components.js
@@ -1084,7 +1084,6 @@ App.AssignMasterComponents = Em.Mixin.create({
 }else{
   App.router.set('nextBtnClickInProgress', false);
 }
-self.set('submitButtonClicked', false);
   };
 
   if (this.get('useServerValidation')) {
@@ -1094,6 +1093,7 @@ App.AssignMasterComponents = Em.Mixin.create({
   } else {
 self.updateIsSubmitDisabled();
 goNextStepIfValid();
+self.set('submitButtonClicked', false);
   }
 }
   },
@@ -1104,18 +1104,31 @@ App.AssignMasterComponents = Em.Mixin.create({
*/
   showValidationIssuesAcceptBox: function(callback) {
 var self = this;
-if (self.get('anyWarning') || self.get('anyError')) {
-  App.ModalPopup.show({
-primary: Em.I18n.t('common.continueAnyway'),
-header: Em.I18n.t('installer.step5.validationIssuesAttention.header'),
-body: Em.I18n.t('installer.step5.validationIssuesAttention'),
-onPrimary: function () {
-  this.hide();
-  callback();
-}
-  });
-} else {
+
+// If there are no warnings and no errors, return
+if (!self.get('anyWarning') && !self.get('anyError')) {
   callback();
+  self.set('submitButtonClicked', false);
+  return;
 }
+
+App.ModalPopup.show({
+  primary: Em.I18n.t('common.continueAnyway'),
+  header: Em.I18n.t('installer.step5.validationIssuesAttention.header'),
+  body: Em.I18n.t('installer.step5.validationIssuesAttention'),
+  onPrimary: function () {
+this._super();
+callback();
+self.set('submitButtonClicked', false);
+  },
+  onSecondary: function () {
+this._super();
+self.set('submitButtonClicked', false);
+  },
+  onClose: function () {
+this._super();
+self.set('submitButtonClicked', false);
+  }
+});
   }
 });

[25/50] [abbrv] ambari git commit: AMBARI-15029. Adding a Service results in deleting Config Group mappings (more than 1 CG present) (akovalenko)

[jonathanhurley]

AMBARI-15029. Adding a Service results in deleting Config Group mappings (more 
than 1 CG present) (akovalenko)


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

Branch: refs/heads/branch-dev-patch-upgrade
Commit: f7055ae76a64f445d2845ce66f6ec925dc94f99d
Parents: 9d8675a
Author: Aleksandr Kovalenko 
Authored: Fri Feb 12 16:55:05 2016 +0200
Committer: Aleksandr Kovalenko 
Committed: Fri Feb 12 20:01:58 2016 +0200

--
 .../controllers/main/service/info/configs.js|  4 +--
 ambari-web/app/controllers/wizard.js|  4 ++-
 .../app/controllers/wizard/step7_controller.js  | 31 +---
 ambari-web/app/routes/add_service_routes.js |  1 +
 ambari-web/test/controllers/wizard_test.js  |  5 ++--
 5 files changed, 29 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/f7055ae7/ambari-web/app/controllers/main/service/info/configs.js
--
diff --git a/ambari-web/app/controllers/main/service/info/configs.js 
b/ambari-web/app/controllers/main/service/info/configs.js
index ae2939e..b6a434c 100644
--- a/ambari-web/app/controllers/main/service/info/configs.js
+++ b/ambari-web/app/controllers/main/service/info/configs.js
@@ -429,8 +429,8 @@ App.MainServiceInfoConfigsController = 
Em.Controller.extend(App.ConfigsLoader, A
   for (var prop in config.properties) {
 var fileName = App.config.getOriginalFileName(config.type);
 var serviceConfig = allConfigs.filterProperty('name', 
prop).findProperty('filename', fileName);
-var value = App.config.formatPropertyValue(serviceConfig, 
config.properties[prop]);
 if (serviceConfig) {
+  var value = App.config.formatPropertyValue(serviceConfig, 
config.properties[prop]);
   var isFinal = !!(config.properties_attributes && 
config.properties_attributes.final && config.properties_attributes.final[prop]);
   if (self.get('selectedConfigGroup.isDefault') || 
configGroup.get('name') == self.get('selectedConfigGroup.name')) {
 var overridePlainObject = {
@@ -444,7 +444,7 @@ App.MainServiceInfoConfigsController = 
Em.Controller.extend(App.ConfigsLoader, A
   }
 } else {
   var isEditable = self.get('canEdit') && configGroup.get('name') 
== self.get('selectedConfigGroup.name');
-  allConfigs.push(App.config.createCustomGroupConfig(prop, 
fileName, value, configGroup, isEditable));
+  allConfigs.push(App.config.createCustomGroupConfig(prop, 
fileName, config.properties[prop], configGroup, isEditable));
 }
   }
 });

http://git-wip-us.apache.org/repos/asf/ambari/blob/f7055ae7/ambari-web/app/controllers/wizard.js
--
diff --git a/ambari-web/app/controllers/wizard.js 
b/ambari-web/app/controllers/wizard.js
index 762149f..05ef68e 100644
--- a/ambari-web/app/controllers/wizard.js
+++ b/ambari-web/app/controllers/wizard.js
@@ -889,11 +889,13 @@ App.WizardController = 
Em.Controller.extend(App.LocalStorage, App.ThemesMappingM
 var installedServiceNames = stepController.get('installedServiceNames') || 
[];
 var installedServiceNamesMap = installedServiceNames.toWickMap();
 stepController.get('stepConfigs').forEach(function (_content) {
-
   if (_content.serviceName === 'YARN') {
 _content.set('configs', 
App.config.textareaIntoFileConfigs(_content.get('configs'), 
'capacity-scheduler.xml'));
   }
   _content.get('configs').forEach(function (_configProperties) {
+if (!Em.isNone(_configProperties.get('group'))) {
+  return false;
+}
 var configProperty = App.config.createDefaultConfig(
   _configProperties.get('name'),
   _configProperties.get('serviceName'),

http://git-wip-us.apache.org/repos/asf/ambari/blob/f7055ae7/ambari-web/app/controllers/wizard/step7_controller.js
--
diff --git a/ambari-web/app/controllers/wizard/step7_controller.js 
b/ambari-web/app/controllers/wizard/step7_controller.js
index 7e96845..ee37427 100644
--- a/ambari-web/app/controllers/wizard/step7_controller.js
+++ b/ambari-web/app/controllers/wizard/step7_controller.js
@@ -479,14 +479,15 @@ App.WizardStep7Controller = 
Em.Controller.extend(App.ServerValidatorMixin, App.E
 
   loadServiceConfigGroupOverridesSuccess: function (data, opt, params) {
 data.items.forEach(function (config) {
+  

[37/50] [abbrv] ambari git commit: AMBARI-15052. Service delete confirmation using Enter key doesn't remove service. (alexantonenko)

[jonathanhurley]

AMBARI-15052. Service delete confirmation using Enter key doesn't remove 
service. (alexantonenko)


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

Branch: refs/heads/branch-dev-patch-upgrade
Commit: c9858260547854f0b1077cdbe09e459ee5a7678b
Parents: 7f3928b
Author: Alex Antonenko 
Authored: Tue Feb 16 01:15:15 2016 +0200
Committer: Alex Antonenko 
Committed: Tue Feb 16 11:21:09 2016 +0200

--
 ambari-web/app/controllers/main/service/item.js | 11 ---
 1 file changed, 8 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/c9858260/ambari-web/app/controllers/main/service/item.js
--
diff --git a/ambari-web/app/controllers/main/service/item.js 
b/ambari-web/app/controllers/main/service/item.js
index 0b8d5d7..a127e92 100644
--- a/ambari-web/app/controllers/main/service/item.js
+++ b/ambari-web/app/controllers/main/service/item.js
@@ -1149,11 +1149,16 @@ App.MainServiceItemController = 
Em.Controller.extend(App.SupportClientConfigsDow
   bodyClass: Em.View.extend({
 confirmKey: confirmKey,
 template: Em.Handlebars.compile(message +
-'' +
+'' +
 '{{t 
common.enter}}{{view.confirmKey}}' +
 '{{view Ember.TextField valueBinding="view.parentView.confirmInput" 
class="input-small"}}' +
-'')
-  })
+'')
+  }),
+
+  enterKeyPressed: function(e) {
+if (this.get('disablePrimary')) return;
+this.onPrimary();
+  }
 });
   },
 

[19/50] [abbrv] ambari git commit: AMBARI-15034. Add checks and alerts when clusterconfigmapping has multiple selected entries for a config type.(vbrodetskyi)

[jonathanhurley]

AMBARI-15034. Add checks and alerts when clusterconfigmapping has multiple 
selected entries for a config type.(vbrodetskyi)


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

Branch: refs/heads/branch-dev-patch-upgrade
Commit: 604040fbf71654c2218baef970c27d71b5f449c1
Parents: 350e9b3
Author: Vitaly Brodetskyi 
Authored: Fri Feb 12 08:06:01 2016 +0200
Committer: Vitaly Brodetskyi 
Committed: Fri Feb 12 08:06:01 2016 +0200

--
 .../ambari/server/checks/CheckDatabaseHelper.java | 18 +-
 .../server/checks/CheckDatabaseHelperTest.java|  5 -
 2 files changed, 13 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/604040fb/ambari-server/src/main/java/org/apache/ambari/server/checks/CheckDatabaseHelper.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/checks/CheckDatabaseHelper.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/checks/CheckDatabaseHelper.java
index a078c8a..9213738 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/checks/CheckDatabaseHelper.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/checks/CheckDatabaseHelper.java
@@ -152,19 +152,23 @@ public class CheckDatabaseHelper {
   * than one selected version it's a bug and we are showing error message for 
user.
   * */
   protected void checkForConfigsSelectedMoreThanOnce() {
-String GET_CONFIGS_SELECTED_MORE_THAN_ONCE_QUERY = "select type_name from 
clusterconfigmapping group by type_name having sum(selected) > 1";
-Set configsSelectedMoreThanOnce = new HashSet<>();
+String GET_CONFIGS_SELECTED_MORE_THAN_ONCE_QUERY = "select 
c.cluster_name,type_name from clusterconfigmapping ccm " +
+"join clusters c on ccm.cluster_id=c.cluster_id " +
+"group by c.cluster_name,type_name " +
+"having sum(selected) > 1";
+Multimap configsSelectedMoreThanOnce = 
HashMultimap.create();
 ResultSet rs = null;
 try {
   Statement statement = 
connection.createStatement(ResultSet.TYPE_SCROLL_SENSITIVE, 
ResultSet.CONCUR_UPDATABLE);
   rs = statement.executeQuery(GET_CONFIGS_SELECTED_MORE_THAN_ONCE_QUERY);
   if (rs != null) {
 while (rs.next()) {
-  configsSelectedMoreThanOnce.add(rs.getString("type_name"));
+  configsSelectedMoreThanOnce.put(rs.getString("cluster_name"), 
rs.getString("type_name"));
 }
   }
-  if (!configsSelectedMoreThanOnce.isEmpty()) {
-LOG.error("You have config(s) that is(are) selected more than once in 
clusterconfigmapping: " + StringUtils.join(configsSelectedMoreThanOnce, ","));
+  for (String clusterName : configsSelectedMoreThanOnce.keySet()) {
+LOG.error(String.format("You have config(s), in cluster %s, that 
is(are) selected more than once in clusterconfigmapping: %s",
+clusterName 
,StringUtils.join(configsSelectedMoreThanOnce.get(clusterName), ",")));
   }
 } catch (SQLException e) {
   LOG.error("Exception occurred during check for config selected more than 
ones procedure: ", e);
@@ -193,10 +197,6 @@ public class CheckDatabaseHelper {
   rs = statement.executeQuery(GET_HOSTS_WITHOUT_STATUS_QUERY);
   if (rs != null) {
 while (rs.next()) {
-  LOG.error(rs.getString("host_name"));
-  LOG.error(rs.getString("HOST_NAME"));
-  System.out.println("ERROR" + rs.getString("HOST_NAME"));
-  System.out.println("ERROR" + rs.getString("host_name"));
   hostsWithoutStatus.add(rs.getString("host_name"));
 }
   }

http://git-wip-us.apache.org/repos/asf/ambari/blob/604040fb/ambari-server/src/test/java/org/apache/ambari/server/checks/CheckDatabaseHelperTest.java
--
diff --git 
a/ambari-server/src/test/java/org/apache/ambari/server/checks/CheckDatabaseHelperTest.java
 
b/ambari-server/src/test/java/org/apache/ambari/server/checks/CheckDatabaseHelperTest.java
index e329ab7..1c2765c 100644
--- 
a/ambari-server/src/test/java/org/apache/ambari/server/checks/CheckDatabaseHelperTest.java
+++ 
b/ambari-server/src/test/java/org/apache/ambari/server/checks/CheckDatabaseHelperTest.java
@@ -111,7 +111,10 @@ public class CheckDatabaseHelperTest {
 
 expect(mockDBDbAccessor.getConnection()).andReturn(mockConnection);
 expect(mockConnection.createStatement(ResultSet.TYPE_SCROLL_SENSITIVE, 
ResultSet.CONCUR_UPDATABLE)).andReturn(mockStatement);
-

[24/50] [abbrv] ambari git commit: AMBARI-14772. Added ability to set rack information in the add host template (Laszlo Puskas via rlevas)

[jonathanhurley]

AMBARI-14772. Added ability to set rack information in the add host template  
(Laszlo Puskas via rlevas)


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

Branch: refs/heads/branch-dev-patch-upgrade
Commit: 9d8675ade510fa9617a48fa761cd7a829c40ef0b
Parents: 0a9a3aa
Author: Laszlo Puskas 
Authored: Fri Feb 12 11:35:32 2016 -0500
Committer: Robert Levas 
Committed: Fri Feb 12 11:35:44 2016 -0500

--
 .../internal/HostResourceProvider.java  | 12 -
 .../internal/ScaleClusterRequest.java   | 28 +--
 .../server/topology/ClusterTopologyImpl.java| 51 +---
 3 files changed, 67 insertions(+), 24 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/9d8675ad/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostResourceProvider.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostResourceProvider.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostResourceProvider.java
index da73f15..6251f07 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostResourceProvider.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostResourceProvider.java
@@ -145,6 +145,11 @@ public class HostResourceProvider extends 
AbstractControllerResourceProvider {
   public static final String HOST_PREDICATE_PROPERTY_ID =
   PropertyHelper.getPropertyId(null, "host_predicate");
 
+  //todo use the same json structure for cluster host addition (cluster 
template and upscale)
+  public static final String HOST_RACK_INFO_NO_CATEGORY_PROPERTY_ID =
+  PropertyHelper.getPropertyId(null, "rack_info");
+
+
   private static Set pkPropertyIds =
   new HashSet(Arrays.asList(new String[]{
   HOST_NAME_PROPERTY_ID}));
@@ -354,6 +359,7 @@ public class HostResourceProvider extends 
AbstractControllerResourceProvider {
 //todo: constants
 baseUnsupported.remove(HOST_COUNT_PROPERTY_ID);
 baseUnsupported.remove(HOST_PREDICATE_PROPERTY_ID);
+baseUnsupported.remove(HOST_RACK_INFO_NO_CATEGORY_PROPERTY_ID);
 
 return checkConfigPropertyIds(baseUnsupported, "Hosts");
   }
@@ -406,7 +412,11 @@ public class HostResourceProvider extends 
AbstractControllerResourceProvider {
 (String) properties.get(HOST_CLUSTER_NAME_PROPERTY_ID),
 null);
 hostRequest.setPublicHostName((String) 
properties.get(HOST_PUBLIC_NAME_PROPERTY_ID));
-hostRequest.setRackInfo((String) 
properties.get(HOST_RACK_INFO_PROPERTY_ID));
+
+String rackInfo = (String) ((null != 
properties.get(HOST_RACK_INFO_PROPERTY_ID))? 
properties.get(HOST_RACK_INFO_PROPERTY_ID):
+properties.get(HOST_RACK_INFO_NO_CATEGORY_PROPERTY_ID));
+
+hostRequest.setRackInfo(rackInfo);
 hostRequest.setBlueprintName((String) 
properties.get(BLUEPRINT_PROPERTY_ID));
 hostRequest.setHostGroupName((String) 
properties.get(HOSTGROUP_PROPERTY_ID));
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/9d8675ad/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ScaleClusterRequest.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ScaleClusterRequest.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ScaleClusterRequest.java
index d784f1d..b5d2f9d 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ScaleClusterRequest.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ScaleClusterRequest.java
@@ -19,6 +19,11 @@
 
 package org.apache.ambari.server.controller.internal;
 
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
 import org.apache.ambari.server.api.predicate.InvalidQueryException;
 import org.apache.ambari.server.stack.NoSuchStackException;
 import org.apache.ambari.server.topology.Blueprint;
@@ -26,17 +31,16 @@ import org.apache.ambari.server.topology.Configuration;
 import org.apache.ambari.server.topology.HostGroupInfo;
 import org.apache.ambari.server.topology.InvalidTopologyTemplateException;
 import org.apache.ambari.server.topology.TopologyValidator;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A request for a scaling an existing 

[11/50] [abbrv] ambari git commit: AMBARI-15007. Make amazon2015 to be part of redhat6 family (aonishuk)

[jonathanhurley]

AMBARI-15007. Make amazon2015 to be part of redhat6 family (aonishuk)


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

Branch: refs/heads/branch-dev-patch-upgrade
Commit: 9fdaf4ed757974fc74df55ac5f86afaf82125283
Parents: a98adb7
Author: Andrew Onishuk 
Authored: Fri Feb 12 00:56:17 2016 +0200
Committer: Andrew Onishuk 
Committed: Fri Feb 12 01:03:21 2016 +0200

--
 ambari-agent/pom.xml|  36 ++---
 .../src/main/python/ambari_commons/os_check.py  |  73 +++---
 .../ambari_commons/resources/os_family.json | 137 +--
 ambari-server/pom.xml   |  12 +-
 ambari-server/src/main/assemblies/server.xml|   2 +-
 .../server/state/stack/JsonOsFamilyRoot.java|  38 +
 .../ambari/server/state/stack/OsFamily.java |   8 +-
 .../resources/stacks/HDP/2.2/repos/repoinfo.xml |  12 --
 .../resources/stacks/HDP/2.3/repos/repoinfo.xml |  12 --
 .../resources/stacks/HDP/2.4/repos/repoinfo.xml |  12 --
 ambari-server/src/test/python/TestOSCheck.py|  37 +++--
 ambari-server/src/test/resources/os_family.json |  89 ++--
 12 files changed, 260 insertions(+), 208 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/9fdaf4ed/ambari-agent/pom.xml
--
diff --git a/ambari-agent/pom.xml b/ambari-agent/pom.xml
index 23d2969..bb7cc34 100644
--- a/ambari-agent/pom.xml
+++ b/ambari-agent/pom.xml
@@ -86,24 +86,6 @@
 3.0
   
   
-maven-assembly-plugin
-
-  gnu
-  
-src/packages/tarball/all.xml
-  
-
-
-  
-build-tarball
-prepare-package
-
-  single
-
-  
-
-  
-  
 org.apache.maven.plugins
 maven-surefire-plugin
 
@@ -275,6 +257,24 @@
 
   
   
+maven-assembly-plugin
+
+  gnu
+  
+src/packages/tarball/all.xml
+  
+
+
+  
+build-tarball
+package
+
+  single
+
+  
+
+  
+  
 maven-resources-plugin
 2.6
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/9fdaf4ed/ambari-common/src/main/python/ambari_commons/os_check.py
--
diff --git a/ambari-common/src/main/python/ambari_commons/os_check.py 
b/ambari-common/src/main/python/ambari_commons/os_check.py
index c5457bb..b430c86 100644
--- a/ambari-common/src/main/python/ambari_commons/os_check.py
+++ b/ambari-common/src/main/python/ambari_commons/os_check.py
@@ -56,6 +56,8 @@ RESOURCES_DIR = 
os.path.join(os.path.dirname(os.path.realpath(__file__)), "resou
 
 # family JSON data
 OSFAMILY_JSON_RESOURCE = "os_family.json"
+JSON_OS_MAPPING = "mapping"
+JSON_OS_ALIASES = "aliases"
 JSON_OS_TYPE = "distro"
 JSON_OS_VERSION = "versions"
 JSON_EXTENDS = "extends"
@@ -76,6 +78,8 @@ VER_NT_SERVER = 3
 _IS_ORACLE_LINUX = os.path.exists('/etc/oracle-release')
 _IS_REDHAT_LINUX = os.path.exists('/etc/redhat-release')
 
+SYSTEM_RELEASE_FILE = "/etc/system-release"
+
 def _is_oracle_linux():
   return _IS_ORACLE_LINUX
 
@@ -84,16 +88,16 @@ def _is_redhat_linux():
 
 def advanced_check(distribution):
   distribution = list(distribution)
-  if os.path.exists("/etc/issue"):
-with open("/etc/issue", "rb") as fp:
+  if os.path.exists(SYSTEM_RELEASE_FILE):
+with open(SYSTEM_RELEASE_FILE, "rb") as fp:
   issue_content = fp.read()
   
 if "Amazon" in issue_content:
   distribution[0] = "amazon"
-  search_groups = re.search('(\d+)\.(\d+)', issue_content)
+  search_groups = re.search('(\d+\.\d+)', issue_content)
   
   if search_groups:
-distribution[1] = search_groups.group(1) # if version is 2015.09 only 
get 2015.
+distribution[1] = search_groups.group(1)
   
   return tuple(distribution)
 
@@ -114,16 +118,24 @@ class OS_CONST_TYPE(type):
   f = open(os.path.join(RESOURCES_DIR, OSFAMILY_JSON_RESOURCE))
   json_data = eval(f.read())
   f.close()
-  for family in json_data:
+  
+  if JSON_OS_MAPPING not in json_data:
+raise Exception("Invalid {0}".format(OSFAMILY_JSON_RESOURCE))
+  
+  json_mapping_data = json_data[JSON_OS_MAPPING]
+  
+  for family in json_mapping_data:
 cls.FAMILY_COLLECTION += [family]
-cls.OS_COLLECTION += json_data[family][JSON_OS_TYPE]
+

[48/50] [abbrv] ambari git commit: AMBARI-15059. AUI for user home directory creation (akovalenko)

[jonathanhurley]

AMBARI-15059. AUI for user home directory creation (akovalenko)


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

Branch: refs/heads/branch-dev-patch-upgrade
Commit: a4f8a9567b68c755eb78438233959e50d2095a41
Parents: aa06ebe
Author: Aleksandr Kovalenko 
Authored: Tue Feb 16 18:46:51 2016 +0200
Committer: Aleksandr Kovalenko 
Committed: Tue Feb 16 19:34:59 2016 +0200

--
 .../main/resources/ui/admin-web/app/index.html  |  1 +
 .../loginActivities/HomeDirectoryCtrl.js| 31 ++
 .../ui/admin-web/app/scripts/i18n.config.js | 11 +++-
 .../resources/ui/admin-web/app/styles/main.css  |  3 +
 .../views/loginActivities/homeDirectory.html| 63 +++-
 .../app/views/loginActivities/loginMessage.html |  2 +-
 6 files changed, 107 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/a4f8a956/ambari-admin/src/main/resources/ui/admin-web/app/index.html
--
diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/index.html 
b/ambari-admin/src/main/resources/ui/admin-web/app/index.html
index fd2c6b8..e7cda02 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/index.html
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/index.html
@@ -130,6 +130,7 @@
 
 
 
+
 
 
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/a4f8a956/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/loginActivities/HomeDirectoryCtrl.js
--
diff --git 
a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/loginActivities/HomeDirectoryCtrl.js
 
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/loginActivities/HomeDirectoryCtrl.js
new file mode 100644
index 000..582b68b
--- /dev/null
+++ 
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/loginActivities/HomeDirectoryCtrl.js
@@ -0,0 +1,31 @@
+/**
+ * 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.
+ */
+'use strict';
+
+angular.module('ambariAdminConsole')
+  .controller('HomeDirectoryCtrl',['$scope', function($scope) {
+
+  $scope.TEMPLATE_PLACEHOLER = '/user/{{username}}';
+
+  $scope.autoCreate = false;
+  $scope.template = '';
+  $scope.group = '';
+  $scope.permissions = '';
+
+  $scope.save = function () {}
+  }]);

http://git-wip-us.apache.org/repos/asf/ambari/blob/a4f8a956/ambari-admin/src/main/resources/ui/admin-web/app/scripts/i18n.config.js
--
diff --git 
a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/i18n.config.js 
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/i18n.config.js
index 327ae03..0c67831 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/i18n.config.js
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/i18n.config.js
@@ -75,6 +75,8 @@ angular.module('ambariAdminConsole')
   'warning': 'Warning',
   'filterInfo': '{{showed}} of {{total}} {{term}} showing',
   'usersGroups': 'Users/Groups',
+  'enabled': 'Enabled',
+  'disabled': 'Disabled',
 
   'clusterNameChangeConfirmation': {
 'title': 'Confirm Cluster Name Change',
@@ -92,8 +94,13 @@ angular.module('ambariAdminConsole')
 'message': 'Message',
 'buttonText': 'Button',
 'status': 'Status',
-'status.enabled': 'Enabled',
-'status.disabled': 'Disabled'
+'status.disabled': 'Disabled',
+'homeDirectory.alert': 'Many Ambari Views store user preferences in 
the logged in user\'s / user directory in HDFS. Optionally, Ambari can 
auto-create these directories for users on login.',
+'homeDirectory.autoCreate': 'Auto-Create HDFS 

[23/50] [abbrv] ambari git commit: AMBARI-15002. HiveServerInteractive. Adding skelton code for Hive Server Interactive component support. (swapan shridhar via jaimin)

[jonathanhurley]

AMBARI-15002. HiveServerInteractive. Adding skelton code for Hive Server 
Interactive component support. (swapan shridhar via jaimin)


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

Branch: refs/heads/branch-dev-patch-upgrade
Commit: b22aa2e4a848ddf39ea7757902f55a1125cb1889
Parents: 77daca7
Author: Jaimin Jetly 
Authored: Fri Feb 12 20:54:06 2016 +0530
Committer: Jaimin Jetly 
Committed: Fri Feb 12 20:54:06 2016 +0530

--
 .../HIVE/0.12.0.2.0/metainfo.xml|1 +
 .../package/scripts/hive_server_interactive.py  |   93 +
 .../configuration/hive-interactive-site.xml | 2053 ++
 .../stacks/HDP/2.4/services/HIVE/metainfo.xml   |   49 +
 4 files changed, 2196 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/b22aa2e4/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/metainfo.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/metainfo.xml 
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/metainfo.xml
index dfa20a5..a71e392 100644
--- 
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/metainfo.xml
+++ 
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/metainfo.xml
@@ -320,6 +320,7 @@
 hive-log4j
 hive-exec-log4j
 hive-env
+hive-interactive-site
 webhcat-site
 webhcat-env
 ranger-hive-plugin-properties

http://git-wip-us.apache.org/repos/asf/ambari/blob/b22aa2e4/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_server_interactive.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_server_interactive.py
 
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_server_interactive.py
new file mode 100644
index 000..6fa3081
--- /dev/null
+++ 
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_server_interactive.py
@@ -0,0 +1,93 @@
+#!/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.
+
+"""
+
+
+from resource_management.libraries.script.script import Script
+from resource_management.libraries.resources.hdfs_resource import HdfsResource
+from resource_management.libraries.functions import conf_select
+from resource_management.libraries.functions import hdp_select
+from resource_management.libraries.functions import format
+from resource_management.libraries.functions.copy_tarball import copy_to_hdfs
+from resource_management.libraries.functions.get_hdp_version import 
get_hdp_version
+from resource_management.libraries.functions.check_process_status import 
check_process_status
+from resource_management.libraries.functions.version import compare_versions, 
format_hdp_stack_version
+from resource_management.libraries.functions.security_commons import 
build_expectations, \
+cached_kinit_executor, get_params_from_filesystem, 
validate_security_config_properties, \
+FILE_TYPE_XML
+from ambari_commons import OSCheck, OSConst
+if OSCheck.is_windows_family():
+from resource_management.libraries.functions.windows_service_utils import 
check_windows_service_status
+from setup_ranger_hive import setup_ranger_hive
+from ambari_commons.os_family_impl import OsFamilyImpl
+from ambari_commons.constants import UPGRADE_TYPE_ROLLING
+from resource_management.core.logger import Logger
+
+import hive_server_upgrade
+from hive import hive
+from hive_service import hive_service
+
+
+class HiveServerInteractive(Script):
+def install(self, env):
+pass
+
+def configure(self, env):
+pass
+
+
+@OsFamilyImpl(os_family=OSConst.WINSRV_FAMILY)
+class 

ambari git commit: AMBARI-15057. Oozie untar and prepare-war should be only done exclusively in preupload.py (aonishuk)

[aonishuk]

Repository: ambari
Updated Branches:
  refs/heads/trunk a4f8a9567 -> 0ce5fea6d


AMBARI-15057. Oozie untar and prepare-war should be only done exclusively in 
preupload.py (aonishuk)


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

Branch: refs/heads/trunk
Commit: 0ce5fea6dc47085b75ca83de455f059d7ffc6976
Parents: a4f8a95
Author: Andrew Onishuk 
Authored: Tue Feb 16 19:40:10 2016 +0200
Committer: Andrew Onishuk 
Committed: Tue Feb 16 19:40:10 2016 +0200

--
 .../OOZIE/4.0.0.2.0/package/scripts/oozie.py| 11 +---
 .../main/resources/scripts/Ambaripreupload.py   | 59 
 .../stacks/2.0.6/OOZIE/test_oozie_server.py | 33 ++-
 3 files changed, 57 insertions(+), 46 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/0ce5fea6/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py
 
b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py
index 7591bad..2dd362a 100644
--- 
a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py
+++ 
b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py
@@ -17,7 +17,6 @@ See the License for the specific language governing 
permissions and
 limitations under the License.
 
 """
-import hashlib
 import os
 
 from resource_management.core.resources.service import ServiceConfig
@@ -228,11 +227,7 @@ def prepare_war():
 
   if run_prepare_war:
 # Time-consuming to run
-Execute(command,
-user=params.oozie_user
-)
-
-return_code, output = shell.call(command, user=params.oozie_user, 
logoutput=False, quiet=False)
+return_code, output = shell.call(command, user=params.oozie_user)
 if output is None:
   output = ""
 
@@ -273,8 +268,7 @@ def oozie_server_specific():
   )
   
   hashcode_file = format("{oozie_home}/.hashcode")
-  hashcode = 
hashlib.md5(format('{oozie_home}/oozie-sharelib.tar.gz')).hexdigest()
-  skip_recreate_sharelib = format("test -f {hashcode_file} && test -d 
{oozie_home}/share && [[ `cat {hashcode_file}` == '{hashcode}' ]]")
+  skip_recreate_sharelib = format("test -f {hashcode_file} && test -d 
{oozie_home}/share")
 
   untar_sharelib = 
('tar','-xvf',format('{oozie_home}/oozie-sharelib.tar.gz'),'-C',params.oozie_home)
 
@@ -319,7 +313,6 @@ def oozie_server_specific():
   prepare_war()
 
   File(hashcode_file,
-   content = hashcode,
mode = 0644,
   )
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/0ce5fea6/ambari-server/src/main/resources/scripts/Ambaripreupload.py
--
diff --git a/ambari-server/src/main/resources/scripts/Ambaripreupload.py 
b/ambari-server/src/main/resources/scripts/Ambaripreupload.py
index 5a20698..61db286 100644
--- a/ambari-server/src/main/resources/scripts/Ambaripreupload.py
+++ b/ambari-server/src/main/resources/scripts/Ambaripreupload.py
@@ -26,7 +26,6 @@ sys.path.append("/usr/lib/python2.6/site-packages")
 import glob
 from logging import thread
 import re
-import hashlib
 import tempfile
 import time
 import functools
@@ -143,6 +142,7 @@ with Environment() as env:
 hdfs_site = ConfigDictionary({'dfs.webhdfs.enabled':False, 
 })
 fs_default = get_fs_root()
+oozie_secure = ''
 oozie_env_sh_template = \
   '''
   #!/bin/bash
@@ -232,14 +232,13 @@ with Environment() as env:
 source_and_dest_pairs = [(component_tar_source_file, destination_file), ]
 return _copy_files(source_and_dest_pairs, file_owner, group_owner, 
kinit_if_needed)
 
-
-
   env.set_params(params)
   hadoop_conf_dir = params.hadoop_conf_dir

   oozie_libext_dir = format("/usr/hdp/{hdp_version}/oozie/libext")
   oozie_home=format("/usr/hdp/{hdp_version}/oozie")
   oozie_setup_sh=format("/usr/hdp/{hdp_version}/oozie/bin/oozie-setup.sh")
+  oozie_setup_sh_current="/usr/hdp/current/oozie-server/bin/oozie-setup.sh"
   oozie_tmp_dir = "/var/tmp/oozie"
   configure_cmds = []
   configure_cmds.append(('tar','-xvf', oozie_home + 
'/oozie-sharelib.tar.gz','-C', oozie_home))
@@ -254,22 +253,62 @@ with Environment() as env:
   )
 
   hashcode_file = format("{oozie_home}/.hashcode")
-  hashcode = 
hashlib.md5(format('{oozie_home}/oozie-sharelib.tar.gz')).hexdigest()
-  skip_recreate_sharelib = format("test -f {hashcode_file} && test -d 
{oozie_home}/share && [[ `cat {hashcode_file}` 

ambari git commit: AMBARI-15057. Oozie untar and prepare-war should be only done exclusively in preupload.py (aonishuk)

[aonishuk]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.2 6f4f30e39 -> b6c8e5dce


AMBARI-15057. Oozie untar and prepare-war should be only done exclusively in 
preupload.py (aonishuk)


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

Branch: refs/heads/branch-2.2
Commit: b6c8e5dce1ce807b62fe245c3759b62de616a194
Parents: 6f4f30e
Author: Andrew Onishuk 
Authored: Tue Feb 16 19:37:37 2016 +0200
Committer: Andrew Onishuk 
Committed: Tue Feb 16 19:38:22 2016 +0200

--
 .../OOZIE/4.0.0.2.0/package/scripts/oozie.py| 11 +---
 .../main/resources/scripts/Ambaripreupload.py   | 59 
 .../stacks/2.0.6/OOZIE/test_oozie_server.py | 33 ++-
 3 files changed, 57 insertions(+), 46 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/b6c8e5dc/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py
 
b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py
index be4a191..1701bbd 100644
--- 
a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py
+++ 
b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py
@@ -17,7 +17,6 @@ See the License for the specific language governing 
permissions and
 limitations under the License.
 
 """
-import hashlib
 import os
 
 from resource_management.core.resources.service import ServiceConfig
@@ -228,11 +227,7 @@ def prepare_war():
 
   if run_prepare_war:
 # Time-consuming to run
-Execute(command,
-user=params.oozie_user
-)
-
-return_code, output = shell.call(command, user=params.oozie_user, 
logoutput=False, quiet=False)
+return_code, output = shell.call(command, user=params.oozie_user)
 if output is None:
   output = ""
 
@@ -273,8 +268,7 @@ def oozie_server_specific():
   )
   
   hashcode_file = format("{oozie_home}/.hashcode")
-  hashcode = 
hashlib.md5(format('{oozie_home}/oozie-sharelib.tar.gz')).hexdigest()
-  skip_recreate_sharelib = format("test -f {hashcode_file} && test -d 
{oozie_home}/share && [[ `cat {hashcode_file}` == '{hashcode}' ]]")
+  skip_recreate_sharelib = format("test -f {hashcode_file} && test -d 
{oozie_home}/share")
 
   untar_sharelib = 
('tar','-xvf',format('{oozie_home}/oozie-sharelib.tar.gz'),'-C',params.oozie_home)
 
@@ -313,7 +307,6 @@ def oozie_server_specific():
   prepare_war()
 
   File(hashcode_file,
-   content = hashcode,
mode = 0644,
   )
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/b6c8e5dc/ambari-server/src/main/resources/scripts/Ambaripreupload.py
--
diff --git a/ambari-server/src/main/resources/scripts/Ambaripreupload.py 
b/ambari-server/src/main/resources/scripts/Ambaripreupload.py
index 5a20698..61db286 100644
--- a/ambari-server/src/main/resources/scripts/Ambaripreupload.py
+++ b/ambari-server/src/main/resources/scripts/Ambaripreupload.py
@@ -26,7 +26,6 @@ sys.path.append("/usr/lib/python2.6/site-packages")
 import glob
 from logging import thread
 import re
-import hashlib
 import tempfile
 import time
 import functools
@@ -143,6 +142,7 @@ with Environment() as env:
 hdfs_site = ConfigDictionary({'dfs.webhdfs.enabled':False, 
 })
 fs_default = get_fs_root()
+oozie_secure = ''
 oozie_env_sh_template = \
   '''
   #!/bin/bash
@@ -232,14 +232,13 @@ with Environment() as env:
 source_and_dest_pairs = [(component_tar_source_file, destination_file), ]
 return _copy_files(source_and_dest_pairs, file_owner, group_owner, 
kinit_if_needed)
 
-
-
   env.set_params(params)
   hadoop_conf_dir = params.hadoop_conf_dir

   oozie_libext_dir = format("/usr/hdp/{hdp_version}/oozie/libext")
   oozie_home=format("/usr/hdp/{hdp_version}/oozie")
   oozie_setup_sh=format("/usr/hdp/{hdp_version}/oozie/bin/oozie-setup.sh")
+  oozie_setup_sh_current="/usr/hdp/current/oozie-server/bin/oozie-setup.sh"
   oozie_tmp_dir = "/var/tmp/oozie"
   configure_cmds = []
   configure_cmds.append(('tar','-xvf', oozie_home + 
'/oozie-sharelib.tar.gz','-C', oozie_home))
@@ -254,22 +253,62 @@ with Environment() as env:
   )
 
   hashcode_file = format("{oozie_home}/.hashcode")
-  hashcode = 
hashlib.md5(format('{oozie_home}/oozie-sharelib.tar.gz')).hexdigest()
-  skip_recreate_sharelib = format("test -f {hashcode_file} && test -d 
{oozie_home}/share && [[ `cat 

ambari git commit: AMBARI-15059. AUI for user home directory creation (akovalenko)

[akovalenko]

Repository: ambari
Updated Branches:
  refs/heads/trunk aa06ebe4c -> a4f8a9567


AMBARI-15059. AUI for user home directory creation (akovalenko)


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

Branch: refs/heads/trunk
Commit: a4f8a9567b68c755eb78438233959e50d2095a41
Parents: aa06ebe
Author: Aleksandr Kovalenko 
Authored: Tue Feb 16 18:46:51 2016 +0200
Committer: Aleksandr Kovalenko 
Committed: Tue Feb 16 19:34:59 2016 +0200

--
 .../main/resources/ui/admin-web/app/index.html  |  1 +
 .../loginActivities/HomeDirectoryCtrl.js| 31 ++
 .../ui/admin-web/app/scripts/i18n.config.js | 11 +++-
 .../resources/ui/admin-web/app/styles/main.css  |  3 +
 .../views/loginActivities/homeDirectory.html| 63 +++-
 .../app/views/loginActivities/loginMessage.html |  2 +-
 6 files changed, 107 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/a4f8a956/ambari-admin/src/main/resources/ui/admin-web/app/index.html
--
diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/index.html 
b/ambari-admin/src/main/resources/ui/admin-web/app/index.html
index fd2c6b8..e7cda02 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/index.html
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/index.html
@@ -130,6 +130,7 @@
 
 
 
+
 
 
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/a4f8a956/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/loginActivities/HomeDirectoryCtrl.js
--
diff --git 
a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/loginActivities/HomeDirectoryCtrl.js
 
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/loginActivities/HomeDirectoryCtrl.js
new file mode 100644
index 000..582b68b
--- /dev/null
+++ 
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/loginActivities/HomeDirectoryCtrl.js
@@ -0,0 +1,31 @@
+/**
+ * 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.
+ */
+'use strict';
+
+angular.module('ambariAdminConsole')
+  .controller('HomeDirectoryCtrl',['$scope', function($scope) {
+
+  $scope.TEMPLATE_PLACEHOLER = '/user/{{username}}';
+
+  $scope.autoCreate = false;
+  $scope.template = '';
+  $scope.group = '';
+  $scope.permissions = '';
+
+  $scope.save = function () {}
+  }]);

http://git-wip-us.apache.org/repos/asf/ambari/blob/a4f8a956/ambari-admin/src/main/resources/ui/admin-web/app/scripts/i18n.config.js
--
diff --git 
a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/i18n.config.js 
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/i18n.config.js
index 327ae03..0c67831 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/i18n.config.js
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/i18n.config.js
@@ -75,6 +75,8 @@ angular.module('ambariAdminConsole')
   'warning': 'Warning',
   'filterInfo': '{{showed}} of {{total}} {{term}} showing',
   'usersGroups': 'Users/Groups',
+  'enabled': 'Enabled',
+  'disabled': 'Disabled',
 
   'clusterNameChangeConfirmation': {
 'title': 'Confirm Cluster Name Change',
@@ -92,8 +94,13 @@ angular.module('ambariAdminConsole')
 'message': 'Message',
 'buttonText': 'Button',
 'status': 'Status',
-'status.enabled': 'Enabled',
-'status.disabled': 'Disabled'
+'status.disabled': 'Disabled',
+'homeDirectory.alert': 'Many Ambari Views store user preferences in 
the logged in user\'s / user directory in HDFS. Optionally, Ambari can 
auto-create these directories for users on 

ambari git commit: AMBARI-15032. KerberosDescriptorTest failed due to moved/missing test directory (rlevas)

[rlevas]

Repository: ambari
Updated Branches:
  refs/heads/trunk 7e75e52a9 -> aa06ebe4c


AMBARI-15032. KerberosDescriptorTest failed due to moved/missing test directory 
(rlevas)


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

Branch: refs/heads/trunk
Commit: aa06ebe4cced24c3f2830e95053bf8a15079
Parents: 7e75e52
Author: Robert Levas 
Authored: Tue Feb 16 12:13:54 2016 -0500
Committer: Robert Levas 
Committed: Tue Feb 16 12:13:54 2016 -0500

--
 .../apache/ambari/server/stack/KerberosDescriptorTest.java   | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/aa06ebe4/ambari-server/src/test/java/org/apache/ambari/server/stack/KerberosDescriptorTest.java
--
diff --git 
a/ambari-server/src/test/java/org/apache/ambari/server/stack/KerberosDescriptorTest.java
 
b/ambari-server/src/test/java/org/apache/ambari/server/stack/KerberosDescriptorTest.java
index c7f802f..b8f9670 100644
--- 
a/ambari-server/src/test/java/org/apache/ambari/server/stack/KerberosDescriptorTest.java
+++ 
b/ambari-server/src/test/java/org/apache/ambari/server/stack/KerberosDescriptorTest.java
@@ -48,7 +48,11 @@ public class KerberosDescriptorTest {
 URL rootDirectoryURL = KerberosDescriptorTest.class.getResource("/");
 Assert.notNull(rootDirectoryURL);
 
-stacksDirectory = new File(new 
File(rootDirectoryURL.getFile()).getParent(), "classes/stacks");
+File resourcesDirectory = new File(new 
File(rootDirectoryURL.getFile()).getParentFile().getParentFile(), 
"src/main/resources");
+Assert.notNull(resourcesDirectory);
+Assert.isTrue(resourcesDirectory.canRead());
+
+stacksDirectory = new File(resourcesDirectory, "stacks");
 Assert.notNull(stacksDirectory);
 Assert.isTrue(stacksDirectory.canRead());
 
@@ -64,7 +68,7 @@ public class KerberosDescriptorTest {
 Assert.notNull(hdp22ServicesDirectory);
 Assert.isTrue(hdp22ServicesDirectory.canRead());
 
-commonServicesDirectory = new File(new 
File(rootDirectoryURL.getFile()).getParent(), "classes/common-services");
+commonServicesDirectory = new File(resourcesDirectory, "common-services");
 Assert.notNull(commonServicesDirectory);
 Assert.isTrue(commonServicesDirectory.canRead());
 

ambari git commit: AMBARI-15013. Ldap Sync: Concurrent modification exception (Oliver Szabo via rlevas)

[rlevas]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.2 283bb9200 -> 6f4f30e39


AMBARI-15013. Ldap Sync: Concurrent modification exception  (Oliver Szabo via 
rlevas)


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

Branch: refs/heads/branch-2.2
Commit: 6f4f30e393d54b1795dec98aab2fb85095a15c2d
Parents: 283bb92
Author: Oliver Szabo 
Authored: Tue Feb 16 11:32:08 2016 -0500
Committer: Robert Levas 
Committed: Tue Feb 16 11:32:13 2016 -0500

--
 .../security/ldap/AmbariLdapDataPopulator.java  |  6 ++-
 .../ldap/AmbariLdapDataPopulatorTest.java   | 53 
 2 files changed, 58 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/6f4f30e3/ambari-server/src/main/java/org/apache/ambari/server/security/ldap/AmbariLdapDataPopulator.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/security/ldap/AmbariLdapDataPopulator.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/security/ldap/AmbariLdapDataPopulator.java
index 801e43e..75df9cc 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/security/ldap/AmbariLdapDataPopulator.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/security/ldap/AmbariLdapDataPopulator.java
@@ -38,6 +38,8 @@ import org.apache.ambari.server.security.authorization.User;
 import org.apache.ambari.server.security.authorization.Users;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+
+import com.google.common.collect.Sets;
 import org.springframework.ldap.control.PagedResultsDirContextProcessor;
 import org.springframework.ldap.core.AttributesMapper;
 import org.springframework.ldap.core.ContextMapper;
@@ -293,7 +295,9 @@ public class AmbariLdapDataPopulator {
 final Map internalGroupsMap = getInternalGroups();
 final Map internalUsersMap = getInternalUsers();
 
-for (Group group : internalGroupsMap.values()) {
+final Set internalGroupSet = 
Sets.newHashSet(internalGroupsMap.values());
+
+for (Group group : internalGroupSet) {
   if (group.isLdapGroup()) {
 Set groupDtos = getLdapGroups(group.getGroupName());
 if (groupDtos.isEmpty()) {

http://git-wip-us.apache.org/repos/asf/ambari/blob/6f4f30e3/ambari-server/src/test/java/org/apache/ambari/server/security/ldap/AmbariLdapDataPopulatorTest.java
--
diff --git 
a/ambari-server/src/test/java/org/apache/ambari/server/security/ldap/AmbariLdapDataPopulatorTest.java
 
b/ambari-server/src/test/java/org/apache/ambari/server/security/ldap/AmbariLdapDataPopulatorTest.java
index 8ce6c5b..3ea 100644
--- 
a/ambari-server/src/test/java/org/apache/ambari/server/security/ldap/AmbariLdapDataPopulatorTest.java
+++ 
b/ambari-server/src/test/java/org/apache/ambari/server/security/ldap/AmbariLdapDataPopulatorTest.java
@@ -17,6 +17,7 @@
  */
 package org.apache.ambari.server.security.ldap;
 
+import com.google.common.collect.Sets;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -274,6 +275,58 @@ public class AmbariLdapDataPopulatorTest {
   }
 
   @Test
+  public void testSynchronizeExistingLdapGroups_removeDuringIteration() throws 
Exception {
+// GIVEN
+Group group1 = createNiceMock(Group.class);
+expect(group1.getGroupId()).andReturn(1).anyTimes();
+expect(group1.getGroupName()).andReturn("group1").anyTimes();
+expect(group1.isLdapGroup()).andReturn(true).anyTimes();
+
+Group group2 = createNiceMock(Group.class);
+expect(group2.getGroupId()).andReturn(2).anyTimes();
+expect(group2.getGroupName()).andReturn("group2").anyTimes();
+expect(group2.isLdapGroup()).andReturn(true).anyTimes();
+
+Configuration configuration = createNiceMock(Configuration.class);
+Users users = createNiceMock(Users.class);
+expect(users.getAllGroups()).andReturn(Arrays.asList(group1, group2));
+expect(users.getAllUsers()).andReturn(Collections.EMPTY_LIST);
+expect(configuration.getLdapServerProperties()).andReturn(new 
LdapServerProperties()).anyTimes();
+
+Set groupDtos = Sets.newHashSet();
+LdapGroupDto group1Dto = new LdapGroupDto();
+group1Dto.setGroupName("group1");
+group1Dto.setMemberAttributes(Sets.newHashSet("group2"));
+
+LdapGroupDto group2Dto = new LdapGroupDto();
+group2Dto.setGroupName("group2");
+group2Dto.setMemberAttributes(Collections.EMPTY_SET);
+groupDtos.add(group1Dto);
+

[3/4] ambari git commit: AMBARI-15050 Https Support for Metrics System (dsen)

[dsen]

http://git-wip-us.apache.org/repos/asf/ambari/blob/283bb920/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/metainfo.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/metainfo.xml 
b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/metainfo.xml
index 66286b3..1970113 100644
--- 
a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/metainfo.xml
+++ 
b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/metainfo.xml
@@ -64,6 +64,7 @@
 ranger-kafka-security
 zookeeper-env
 zoo.cfg
+ams-ssl-client
   
   true
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/283bb920/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/kafka.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/kafka.py
 
b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/kafka.py
index f02be4b..b986607 100644
--- 
a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/kafka.py
+++ 
b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/kafka.py
@@ -74,6 +74,10 @@ def kafka(upgrade_type=None):
 if params.has_metric_collector:
   kafka_server_config['kafka.timeline.metrics.host'] = 
params.metric_collector_host
   kafka_server_config['kafka.timeline.metrics.port'] = 
params.metric_collector_port
+  kafka_server_config['kafka.timeline.metrics.protocol'] = 
params.metric_collector_protocol
+  kafka_server_config['kafka.timeline.metrics.truststore.path'] = 
params.metric_truststore_path
+  kafka_server_config['kafka.timeline.metrics.truststore.type'] = 
params.metric_truststore_type
+  kafka_server_config['kafka.timeline.metrics.truststore.password'] = 
params.metric_truststore_password
 
 kafka_data_dir = kafka_server_config['log.dirs']
 kafka_data_dirs = filter(None, kafka_data_dir.split(","))

http://git-wip-us.apache.org/repos/asf/ambari/blob/283bb920/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/params.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/params.py
 
b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/params.py
index da76952..de7b379 100644
--- 
a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/params.py
+++ 
b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/params.py
@@ -106,6 +106,10 @@ else:
 
 metric_collector_host = ""
 metric_collector_port = ""
+metric_collector_protocol = ""
+metric_truststore_path= 
default("/configurations/ams-ssl-client/ssl.client.truststore.location", "")
+metric_truststore_type= 
default("/configurations/ams-ssl-client/ssl.client.truststore.type", "")
+metric_truststore_password= 
default("/configurations/ams-ssl-client/ssl.client.truststore.password", "")
 
 ams_collector_hosts = default("/clusterHostInfo/metrics_collector_hosts", [])
 has_metric_collector = not len(ams_collector_hosts) == 0
@@ -125,6 +129,10 @@ if has_metric_collector:
   metric_collector_port = metric_collector_web_address.split(':')[1]
 else:
   metric_collector_port = '6188'
+  if default("/configurations/ams-site/timeline.metrics.service.http.policy", 
"HTTP_ONLY") == "HTTPS_ONLY":
+metric_collector_protocol = 'https'
+  else:
+metric_collector_protocol = 'http'
   pass
 # Security-related params
 security_enabled = config['configurations']['cluster-env']['security_enabled']

http://git-wip-us.apache.org/repos/asf/ambari/blob/283bb920/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/metainfo.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/metainfo.xml 
b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/metainfo.xml
index 515f385..cc90a6d 100644
--- 
a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/metainfo.xml
+++ 
b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/metainfo.xml
@@ -134,6 +134,7 @@
 ranger-admin-site
 zookeeper-env
 zoo.cfg
+ams-ssl-client
   
 
   

http://git-wip-us.apache.org/repos/asf/ambari/blob/283bb920/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/params_linux.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/params_linux.py
 

[1/4] ambari git commit: AMBARI-15050 Https Support for Metrics System (dsen)

[dsen]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.2 21f4ae478 -> 283bb9200


http://git-wip-us.apache.org/repos/asf/ambari/blob/283bb920/ambari-server/src/test/python/stacks/2.0.6/configs/default_ams_embedded.json
--
diff --git 
a/ambari-server/src/test/python/stacks/2.0.6/configs/default_ams_embedded.json 
b/ambari-server/src/test/python/stacks/2.0.6/configs/default_ams_embedded.json
index 0ce8e5a..95e931a 100644
--- 
a/ambari-server/src/test/python/stacks/2.0.6/configs/default_ams_embedded.json
+++ 
b/ambari-server/src/test/python/stacks/2.0.6/configs/default_ams_embedded.json
@@ -811,6 +811,9 @@
 "ams-hbase-log4j": {
 "content": "\n"
 },
+"ams-ssl-server": {
+"content": "\n"
+},
 "ams-site": {
 "timeline.metrics.host.aggregator.minute.ttl": "604800",
 
"timeline.metrics.cluster.aggregator.daily.checkpointCutOffMultiplier": "1",
@@ -859,6 +862,7 @@
 "ams-hbase-site": {},
 "ams-hbase-policy": {},
 "ams-hbase-log4j": {},
+"ams-ssl-server": {},
 "ams-site": {},
 "yarn-site": {
 "final": {
@@ -941,6 +945,9 @@
 "ams-site": {
 "tag": "version1"
 },
+"ams-ssl-server": {
+"tag": "version1"
+},
 "ams-hbase-policy": {
 "tag": "version1"
 },

[2/4] ambari git commit: AMBARI-15050 Https Support for Metrics System (dsen)

[dsen]

http://git-wip-us.apache.org/repos/asf/ambari/blob/283bb920/ambari-server/src/test/python/stacks/2.0.6/configs/default.json
--
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/default.json 
b/ambari-server/src/test/python/stacks/2.0.6/configs/default.json
index b139190..7fc99fe 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/default.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/default.json
@@ -1,30 +1,30 @@
 {
-"roleCommand": "SERVICE_CHECK", 
-"clusterName": "c1", 
-"hostname": "c6401.ambari.apache.org", 
+"roleCommand": "SERVICE_CHECK",
+"clusterName": "c1",
+"hostname": "c6401.ambari.apache.org",
 "hostLevelParams": {
-"jdk_location": "http://c6401.ambari.apache.org:8080/resources/;, 
-"ambari_db_rca_password": "mapred", 
+"jdk_location": "http://c6401.ambari.apache.org:8080/resources/;,
+"ambari_db_rca_password": "mapred",
 "ambari_db_rca_url": 
"jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
 "repo_info": 
"[{\"baseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\",\"osType\":\"centos6\",\"repoId\":\"HDP-2.0._\",\"repoName\":\"HDP\",\"defaultBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\"}];,
-"jce_name": "UnlimitedJCEPolicyJDK7.zip", 
+"jce_name": "UnlimitedJCEPolicyJDK7.zip",
 "stack_version": "2.0",
-"stack_name": "HDP", 
-"ambari_db_rca_driver": "org.postgresql.Driver", 
+"stack_name": "HDP",
+"ambari_db_rca_driver": "org.postgresql.Driver",
 "jdk_name": "jdk-7u67-linux-x64.tar.gz",
-"ambari_db_rca_username": "mapred", 
+"ambari_db_rca_username": "mapred",
 "java_home": "/usr/jdk64/jdk1.7.0_45",
 "java_version": "8",
 "db_name": "ambari",
 "group_list": "[\"hadoop\",\"nobody\",\"users\"]",
 "user_list": 
"[\"hive\",\"oozie\",\"nobody\",\"ambari-qa\",\"flume\",\"hdfs\",\"storm\",\"mapred\",\"hbase\",\"tez\",\"zookeeper\",\"falcon\",\"sqoop\",\"yarn\",\"hcat\"]"
-}, 
-"commandType": "EXECUTION_COMMAND", 
-"roleParams": {}, 
+},
+"commandType": "EXECUTION_COMMAND",
+"roleParams": {},
 "serviceName": "HIVE",
 "role": "HIVE_SERVER",
 "commandParams": {
-"command_timeout": "300", 
+"command_timeout": "300",
 "service_package_folder": "OOZIE",
 "script_type": "PYTHON",
 "script": "scripts/service_check.py",
@@ -37,441 +37,441 @@
 "output_file":"HDFS_CLIENT-configs.tar.gz",
 "refresh_topology": "True"
 },
-"taskId": 152, 
-"public_hostname": "c6401.ambari.apache.org", 
+"taskId": 152,
+"public_hostname": "c6401.ambari.apache.org",
 "configurations": {
 "mapred-site": {
-"mapreduce.jobhistory.address": "c6402.ambari.apache.org:10020", 
-"mapreduce.cluster.administrators": " hadoop", 
-"mapreduce.reduce.input.buffer.percent": "0.0", 
-"mapreduce.output.fileoutputformat.compress": "false", 
-"mapreduce.framework.name": "yarn", 
-"mapreduce.map.speculative": "false", 
-"mapreduce.reduce.shuffle.merge.percent": "0.66", 
-"yarn.app.mapreduce.am.resource.mb": "683", 
-"mapreduce.map.java.opts": "-Xmx273m", 
-"mapreduce.application.classpath": 
"$HADOOP_MAPRED_HOME/share/hadoop/mapreduce/*,$HADOOP_MAPRED_HOME/share/hadoop/mapreduce/lib/*",
 
-"mapreduce.job.reduce.slowstart.completedmaps": "0.05", 
-"mapreduce.output.fileoutputformat.compress.type": "BLOCK", 
-"mapreduce.reduce.speculative": "false", 
-"mapreduce.reduce.java.opts": "-Xmx546m", 
-"mapreduce.am.max-attempts": "2", 
-"yarn.app.mapreduce.am.admin-command-opts": 
"-Djava.net.preferIPv4Stack=true -Dhadoop.metrics.log.level=WARN", 
-"mapreduce.reduce.log.level": "INFO", 
-"mapreduce.map.sort.spill.percent": "0.7", 
-"mapreduce.task.timeout": "30", 
-"mapreduce.map.memory.mb": "341", 
-"mapreduce.task.io.sort.factor": "100", 
-"mapreduce.jobhistory.intermediate-done-dir": "/mr-history/tmp", 
-"mapreduce.reduce.memory.mb": "683", 
-"yarn.app.mapreduce.am.log.level": "INFO", 
-"mapreduce.map.log.level": "INFO", 
-"mapreduce.shuffle.port": "13562", 
-"mapreduce.admin.user.env": 
"LD_LIBRARY_PATH=/usr/lib/hadoop/lib/native:/usr/lib/hadoop/lib/native/`$JAVA_HOME/bin/java
 -d32 -version  /dev/null;if [ $? -eq 0 ]; then echo Linux-i386-32; 
else echo Linux-amd64-64;fi`", 
-"mapreduce.map.output.compress": "false", 
-"yarn.app.mapreduce.am.staging-dir": "/user", 
-"mapreduce.reduce.shuffle.parallelcopies": 

[4/4] ambari git commit: AMBARI-15050 Https Support for Metrics System (dsen)

[dsen]

AMBARI-15050 Https Support for Metrics System (dsen)


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

Branch: refs/heads/branch-2.2
Commit: 283bb92003e61f1b94f38c5039b58092ca317ca7
Parents: 21f4ae4
Author: Dmytro Sen 
Authored: Tue Feb 16 17:53:11 2016 +0200
Committer: Dmytro Sen 
Committed: Tue Feb 16 18:14:17 2016 +0200

--
 .../timeline/AbstractTimelineMetricsSink.java   |   92 +-
 .../src/main/conf/flume-metrics2.properties.j2  |3 +-
 .../sink/flume/FlumeTimelineMetricsSink.java|   11 +-
 .../conf/hadoop-metrics2-hbase.properties.j2|8 +-
 .../src/main/conf/hadoop-metrics2.properties.j2 |   20 +-
 .../timeline/HadoopTimelineMetricsSink.java |   13 +-
 .../timeline/HadoopTimelineMetricsSinkTest.java |6 +-
 .../conf/unix/metric_monitor.ini|1 +
 .../src/main/python/core/config_reader.py   |6 +-
 .../src/main/python/core/emitter.py |   18 +-
 .../kafka/KafkaTimelineMetricsReporter.java |   17 +-
 .../kafka/KafkaTimelineMetricsReporterTest.java |2 +-
 .../storm/StormTimelineMetricsReporter.java |   24 +-
 .../sink/storm/StormTimelineMetricsSink.java|8 +-
 .../ApplicationHistoryServer.java   |   11 +-
 .../loadsimulator/net/RestMetricsSender.java|6 +-
 .../timeline/TimelineMetricConfiguration.java   |6 +-
 .../ComponentSSLConfiguration.java  |   14 +-
 .../server/configuration/Configuration.java |6 +-
 .../ganglia/GangliaPropertyProvider.java|2 +-
 .../ganglia/GangliaReportPropertyProvider.java  |2 +-
 .../metrics/timeline/AMSPropertyProvider.java   |8 +-
 .../timeline/AMSReportPropertyProvider.java |2 +-
 .../ACCUMULO/1.6.1.2.2.0/metainfo.xml   |1 +
 .../1.6.1.2.2.0/package/scripts/params.py   |7 +
 .../hadoop-metrics2-accumulo.properties.j2  |7 +-
 .../0.1.0/configuration/ams-site.xml|   12 +-
 .../0.1.0/configuration/ams-ssl-client.xml  |   37 +
 .../0.1.0/configuration/ams-ssl-server.xml  |   64 +
 .../AMBARI_METRICS/0.1.0/metainfo.xml   |2 +
 .../AMBARI_METRICS/0.1.0/package/scripts/ams.py |8 +
 .../package/scripts/metrics_grafana_util.py |2 +-
 .../0.1.0/package/scripts/params.py |   10 +
 .../0.1.0/package/scripts/service_check.py  |   17 +-
 .../hadoop-metrics2-hbase.properties.j2 |7 +-
 .../package/templates/metric_monitor.ini.j2 |1 +
 .../FLUME/1.4.0.2.0/metainfo.xml|1 +
 .../FLUME/1.4.0.2.0/package/scripts/params.py   |7 +
 .../templates/flume-metrics2.properties.j2  |8 +-
 .../common-services/HAWQ/2.0.0/metainfo.xml |1 +
 .../HBASE/0.96.0.2.0/metainfo.xml   |1 +
 .../0.96.0.2.0/package/scripts/params_linux.py  |8 +
 ...-metrics2-hbase.properties-GANGLIA-MASTER.j2 |7 +-
 ...doop-metrics2-hbase.properties-GANGLIA-RS.j2 |7 +-
 .../common-services/HDFS/2.1.0.2.0/metainfo.xml |1 +
 .../0.8.1.2.2/configuration/kafka-broker.xml|   21 +
 .../KAFKA/0.8.1.2.2/metainfo.xml|1 +
 .../KAFKA/0.8.1.2.2/package/scripts/kafka.py|4 +
 .../KAFKA/0.8.1.2.2/package/scripts/params.py   |8 +
 .../STORM/0.9.1.2.1/metainfo.xml|1 +
 .../0.9.1.2.1/package/scripts/params_linux.py   |9 +-
 .../0.9.1.2.1/package/templates/config.yaml.j2  |8 +-
 .../templates/storm-metrics2.properties.j2  |   10 +-
 .../common-services/YARN/2.1.0.2.0/metainfo.xml |2 +
 .../2.0.6/hooks/before-START/scripts/params.py  |8 +
 .../templates/hadoop-metrics2.properties.j2 |   25 +-
 .../ComponentSSLConfigurationTest.java  |6 +-
 .../ganglia/GangliaPropertyProviderTest.java|   26 +-
 .../GangliaReportPropertyProviderTest.java  |2 +-
 .../timeline/AMSPropertyProviderTest.java   |   30 +-
 .../timeline/AMSReportPropertyProviderTest.java |4 +-
 .../AMBARI_METRICS/test_metrics_collector.py|8 +
 .../python/stacks/2.0.6/configs/default.json| 1147 +-
 .../2.0.6/configs/default_ams_embedded.json |7 +
 64 files changed, 1110 insertions(+), 719 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/283bb920/ambari-metrics/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/AbstractTimelineMetricsSink.java
--
diff --git 
a/ambari-metrics/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/AbstractTimelineMetricsSink.java
 

[2/4] ambari git commit: AMBARI-15050 Https Support for Metrics System (dsen)

[dsen]

http://git-wip-us.apache.org/repos/asf/ambari/blob/7e75e52a/ambari-server/src/test/python/stacks/2.0.6/configs/default.json
--
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/default.json 
b/ambari-server/src/test/python/stacks/2.0.6/configs/default.json
index cb34098..3d3987b 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/default.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/default.json
@@ -1,30 +1,30 @@
 {
-"roleCommand": "SERVICE_CHECK", 
-"clusterName": "c1", 
-"hostname": "c6401.ambari.apache.org", 
+"roleCommand": "SERVICE_CHECK",
+"clusterName": "c1",
+"hostname": "c6401.ambari.apache.org",
 "hostLevelParams": {
-"jdk_location": "http://c6401.ambari.apache.org:8080/resources/;, 
-"ambari_db_rca_password": "mapred", 
+"jdk_location": "http://c6401.ambari.apache.org:8080/resources/;,
+"ambari_db_rca_password": "mapred",
 "ambari_db_rca_url": 
"jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
 "repo_info": 
"[{\"baseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\",\"osType\":\"centos6\",\"repoId\":\"HDP-2.0._\",\"repoName\":\"HDP\",\"defaultBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\"}];,
-"jce_name": "UnlimitedJCEPolicyJDK7.zip", 
+"jce_name": "UnlimitedJCEPolicyJDK7.zip",
 "stack_version": "2.0",
-"stack_name": "HDP", 
-"ambari_db_rca_driver": "org.postgresql.Driver", 
+"stack_name": "HDP",
+"ambari_db_rca_driver": "org.postgresql.Driver",
 "jdk_name": "jdk-7u67-linux-x64.tar.gz",
-"ambari_db_rca_username": "mapred", 
+"ambari_db_rca_username": "mapred",
 "java_home": "/usr/jdk64/jdk1.7.0_45",
 "java_version": "8",
 "db_name": "ambari",
 "group_list": "[\"hadoop\",\"nobody\",\"users\"]",
 "user_list": 
"[\"hive\",\"oozie\",\"nobody\",\"ambari-qa\",\"flume\",\"hdfs\",\"storm\",\"mapred\",\"hbase\",\"tez\",\"zookeeper\",\"falcon\",\"sqoop\",\"yarn\",\"hcat\"]"
-}, 
-"commandType": "EXECUTION_COMMAND", 
-"roleParams": {}, 
+},
+"commandType": "EXECUTION_COMMAND",
+"roleParams": {},
 "serviceName": "HIVE",
 "role": "HIVE_SERVER",
 "commandParams": {
-"command_timeout": "300", 
+"command_timeout": "300",
 "service_package_folder": "OOZIE",
 "script_type": "PYTHON",
 "script": "scripts/service_check.py",
@@ -37,442 +37,443 @@
 "output_file":"HDFS_CLIENT-configs.tar.gz",
 "refresh_topology": "True"
 },
-"taskId": 152, 
-"public_hostname": "c6401.ambari.apache.org", 
+"taskId": 152,
+"public_hostname": "c6401.ambari.apache.org",
 "configurations": {
 "mapred-site": {
-"mapreduce.jobhistory.address": "c6402.ambari.apache.org:10020", 
-"mapreduce.cluster.administrators": " hadoop", 
-"mapreduce.reduce.input.buffer.percent": "0.0", 
-"mapreduce.output.fileoutputformat.compress": "false", 
-"mapreduce.framework.name": "yarn", 
-"mapreduce.map.speculative": "false", 
-"mapreduce.reduce.shuffle.merge.percent": "0.66", 
-"yarn.app.mapreduce.am.resource.mb": "683", 
-"mapreduce.map.java.opts": "-Xmx273m", 
-"mapreduce.application.classpath": 
"$HADOOP_MAPRED_HOME/share/hadoop/mapreduce/*,$HADOOP_MAPRED_HOME/share/hadoop/mapreduce/lib/*",
 
-"mapreduce.job.reduce.slowstart.completedmaps": "0.05", 
-"mapreduce.output.fileoutputformat.compress.type": "BLOCK", 
-"mapreduce.reduce.speculative": "false", 
-"mapreduce.reduce.java.opts": "-Xmx546m", 
-"mapreduce.am.max-attempts": "2", 
-"yarn.app.mapreduce.am.admin-command-opts": 
"-Djava.net.preferIPv4Stack=true -Dhadoop.metrics.log.level=WARN", 
-"mapreduce.reduce.log.level": "INFO", 
-"mapreduce.map.sort.spill.percent": "0.7", 
-"mapreduce.task.timeout": "30", 
-"mapreduce.map.memory.mb": "341", 
-"mapreduce.task.io.sort.factor": "100", 
-"mapreduce.jobhistory.intermediate-done-dir": "/mr-history/tmp", 
-"mapreduce.reduce.memory.mb": "683", 
-"yarn.app.mapreduce.am.log.level": "INFO", 
-"mapreduce.map.log.level": "INFO", 
-"mapreduce.shuffle.port": "13562", 
-"mapreduce.admin.user.env": 
"LD_LIBRARY_PATH=/usr/lib/hadoop/lib/native:/usr/lib/hadoop/lib/native/`$JAVA_HOME/bin/java
 -d32 -version  /dev/null;if [ $? -eq 0 ]; then echo Linux-i386-32; 
else echo Linux-amd64-64;fi`", 
-"mapreduce.map.output.compress": "false", 
-"yarn.app.mapreduce.am.staging-dir": "/user", 
-"mapreduce.reduce.shuffle.parallelcopies": 

[4/4] ambari git commit: AMBARI-15050 Https Support for Metrics System (dsen)

[dsen]

AMBARI-15050 Https Support for Metrics System (dsen)


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

Branch: refs/heads/trunk
Commit: 7e75e52a91568d7ed0dd2bdaafbd60b37a3e7dc8
Parents: 0868a0f
Author: Dmytro Sen 
Authored: Tue Feb 16 17:53:11 2016 +0200
Committer: Dmytro Sen 
Committed: Tue Feb 16 17:53:11 2016 +0200

--
 .../timeline/AbstractTimelineMetricsSink.java   |   92 +-
 .../src/main/conf/flume-metrics2.properties.j2  |3 +-
 .../sink/flume/FlumeTimelineMetricsSink.java|   11 +-
 .../conf/hadoop-metrics2-hbase.properties.j2|8 +-
 .../src/main/conf/hadoop-metrics2.properties.j2 |   22 +-
 .../timeline/HadoopTimelineMetricsSink.java |   13 +-
 .../timeline/HadoopTimelineMetricsSinkTest.java |6 +-
 .../conf/unix/metric_monitor.ini|1 +
 .../src/main/python/core/config_reader.py   |6 +-
 .../src/main/python/core/emitter.py |   18 +-
 .../kafka/KafkaTimelineMetricsReporter.java |   17 +-
 .../kafka/KafkaTimelineMetricsReporterTest.java |2 +-
 .../storm/StormTimelineMetricsReporter.java |   24 +-
 .../sink/storm/StormTimelineMetricsSink.java|8 +-
 .../ApplicationHistoryServer.java   |   11 +-
 .../loadsimulator/net/RestMetricsSender.java|6 +-
 .../timeline/TimelineMetricConfiguration.java   |6 +-
 .../ComponentSSLConfiguration.java  |   14 +-
 .../server/configuration/Configuration.java |6 +-
 .../ganglia/GangliaPropertyProvider.java|2 +-
 .../ganglia/GangliaReportPropertyProvider.java  |2 +-
 .../metrics/timeline/AMSPropertyProvider.java   |8 +-
 .../timeline/AMSReportPropertyProvider.java |2 +-
 .../ACCUMULO/1.6.1.2.2.0/metainfo.xml   |1 +
 .../1.6.1.2.2.0/package/scripts/params.py   |7 +
 .../hadoop-metrics2-accumulo.properties.j2  |7 +-
 .../0.1.0/configuration/ams-site.xml|   12 +-
 .../0.1.0/configuration/ams-ssl-client.xml  |   37 +
 .../0.1.0/configuration/ams-ssl-server.xml  |   64 +
 .../AMBARI_METRICS/0.1.0/metainfo.xml   |2 +
 .../AMBARI_METRICS/0.1.0/package/scripts/ams.py |8 +
 .../package/scripts/metrics_grafana_util.py |2 +-
 .../0.1.0/package/scripts/params.py |   10 +
 .../0.1.0/package/scripts/service_check.py  |   17 +-
 .../hadoop-metrics2-hbase.properties.j2 |7 +-
 .../package/templates/metric_monitor.ini.j2 |1 +
 .../FLUME/1.4.0.2.0/metainfo.xml|1 +
 .../FLUME/1.4.0.2.0/package/scripts/params.py   |7 +
 .../templates/flume-metrics2.properties.j2  |8 +-
 .../common-services/HAWQ/2.0.0/metainfo.xml |1 +
 .../HBASE/0.96.0.2.0/metainfo.xml   |1 +
 .../0.96.0.2.0/package/scripts/params_linux.py  |8 +
 ...-metrics2-hbase.properties-GANGLIA-MASTER.j2 |7 +-
 ...doop-metrics2-hbase.properties-GANGLIA-RS.j2 |7 +-
 .../common-services/HDFS/2.1.0.2.0/metainfo.xml |1 +
 .../0.8.1.2.2/configuration/kafka-broker.xml|   21 +
 .../KAFKA/0.8.1.2.2/metainfo.xml|1 +
 .../KAFKA/0.8.1.2.2/package/scripts/kafka.py|4 +
 .../KAFKA/0.8.1.2.2/package/scripts/params.py   |   10 +-
 .../STORM/0.9.1.2.1/metainfo.xml|1 +
 .../0.9.1.2.1/package/scripts/params_linux.py   |   11 +-
 .../0.9.1.2.1/package/templates/config.yaml.j2  |8 +-
 .../templates/storm-metrics2.properties.j2  |   10 +-
 .../common-services/YARN/2.1.0.2.0/metainfo.xml |2 +
 .../2.0.6/hooks/before-START/scripts/params.py  |8 +
 .../templates/hadoop-metrics2.properties.j2 |   25 +-
 .../ComponentSSLConfigurationTest.java  |6 +-
 .../ganglia/GangliaPropertyProviderTest.java|   26 +-
 .../GangliaReportPropertyProviderTest.java  |2 +-
 .../timeline/AMSPropertyProviderTest.java   |   30 +-
 .../timeline/AMSReportPropertyProviderTest.java |4 +-
 .../AMBARI_METRICS/test_metrics_collector.py|8 +
 .../python/stacks/2.0.6/configs/default.json| 1146 +-
 .../2.0.6/configs/default_ams_embedded.json |7 +
 64 files changed, 1113 insertions(+), 721 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/7e75e52a/ambari-metrics/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/AbstractTimelineMetricsSink.java
--
diff --git 
a/ambari-metrics/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/AbstractTimelineMetricsSink.java
 

[3/4] ambari git commit: AMBARI-15050 Https Support for Metrics System (dsen)

[dsen]

http://git-wip-us.apache.org/repos/asf/ambari/blob/7e75e52a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/metainfo.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/metainfo.xml 
b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/metainfo.xml
index 66286b3..1970113 100644
--- 
a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/metainfo.xml
+++ 
b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/metainfo.xml
@@ -64,6 +64,7 @@
 ranger-kafka-security
 zookeeper-env
 zoo.cfg
+ams-ssl-client
   
   true
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/7e75e52a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/kafka.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/kafka.py
 
b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/kafka.py
index 1c01174..830d0ce 100644
--- 
a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/kafka.py
+++ 
b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/kafka.py
@@ -74,6 +74,10 @@ def kafka(upgrade_type=None):
 if params.has_metric_collector:
   kafka_server_config['kafka.timeline.metrics.host'] = 
params.metric_collector_host
   kafka_server_config['kafka.timeline.metrics.port'] = 
params.metric_collector_port
+  kafka_server_config['kafka.timeline.metrics.protocol'] = 
params.metric_collector_protocol
+  kafka_server_config['kafka.timeline.metrics.truststore.path'] = 
params.metric_truststore_path
+  kafka_server_config['kafka.timeline.metrics.truststore.type'] = 
params.metric_truststore_type
+  kafka_server_config['kafka.timeline.metrics.truststore.password'] = 
params.metric_truststore_password
 
 kafka_data_dir = kafka_server_config['log.dirs']
 kafka_data_dirs = filter(None, kafka_data_dir.split(","))

http://git-wip-us.apache.org/repos/asf/ambari/blob/7e75e52a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/params.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/params.py
 
b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/params.py
index da76952..47af240 100644
--- 
a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/params.py
+++ 
b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/params.py
@@ -106,6 +106,10 @@ else:
 
 metric_collector_host = ""
 metric_collector_port = ""
+metric_collector_protocol = ""
+metric_truststore_path= 
default("/configurations/ams-ssl-client/ssl.client.truststore.location", "")
+metric_truststore_type= 
default("/configurations/ams-ssl-client/ssl.client.truststore.type", "")
+metric_truststore_password= 
default("/configurations/ams-ssl-client/ssl.client.truststore.password", "")
 
 ams_collector_hosts = default("/clusterHostInfo/metrics_collector_hosts", [])
 has_metric_collector = not len(ams_collector_hosts) == 0
@@ -125,6 +129,10 @@ if has_metric_collector:
   metric_collector_port = metric_collector_web_address.split(':')[1]
 else:
   metric_collector_port = '6188'
+  if default("/configurations/ams-site/timeline.metrics.service.http.policy", 
"HTTP_ONLY") == "HTTPS_ONLY":
+metric_collector_protocol = 'https'
+  else:
+metric_collector_protocol = 'http'
   pass
 # Security-related params
 security_enabled = config['configurations']['cluster-env']['security_enabled']
@@ -274,4 +282,4 @@ HdfsResource = functools.partial(
   principal_name = hdfs_principal_name,
   hdfs_site = hdfs_site,
   default_fs = default_fs
-)
\ No newline at end of file
+)

http://git-wip-us.apache.org/repos/asf/ambari/blob/7e75e52a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/metainfo.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/metainfo.xml 
b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/metainfo.xml
index 1468a2f..804374a 100644
--- 
a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/metainfo.xml
+++ 
b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/metainfo.xml
@@ -134,6 +134,7 @@
 ranger-admin-site
 zookeeper-env
 zoo.cfg
+ams-ssl-client
   
   
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/7e75e52a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/params_linux.py
--
diff 

[1/4] ambari git commit: AMBARI-15050 Https Support for Metrics System (dsen)

[dsen]

Repository: ambari
Updated Branches:
  refs/heads/trunk 0868a0fc1 -> 7e75e52a9


http://git-wip-us.apache.org/repos/asf/ambari/blob/7e75e52a/ambari-server/src/test/python/stacks/2.0.6/configs/default_ams_embedded.json
--
diff --git 
a/ambari-server/src/test/python/stacks/2.0.6/configs/default_ams_embedded.json 
b/ambari-server/src/test/python/stacks/2.0.6/configs/default_ams_embedded.json
index 0ce8e5a..95e931a 100644
--- 
a/ambari-server/src/test/python/stacks/2.0.6/configs/default_ams_embedded.json
+++ 
b/ambari-server/src/test/python/stacks/2.0.6/configs/default_ams_embedded.json
@@ -811,6 +811,9 @@
 "ams-hbase-log4j": {
 "content": "\n"
 },
+"ams-ssl-server": {
+"content": "\n"
+},
 "ams-site": {
 "timeline.metrics.host.aggregator.minute.ttl": "604800",
 
"timeline.metrics.cluster.aggregator.daily.checkpointCutOffMultiplier": "1",
@@ -859,6 +862,7 @@
 "ams-hbase-site": {},
 "ams-hbase-policy": {},
 "ams-hbase-log4j": {},
+"ams-ssl-server": {},
 "ams-site": {},
 "yarn-site": {
 "final": {
@@ -941,6 +945,9 @@
 "ams-site": {
 "tag": "version1"
 },
+"ams-ssl-server": {
+"tag": "version1"
+},
 "ams-hbase-policy": {
 "tag": "version1"
 },

ambari git commit: AMBARI-15013. Ldap Sync: Concurrent modification exception (Oliver Szabo via rlevas)

[rlevas]

Repository: ambari
Updated Branches:
  refs/heads/trunk 47c8d94fa -> 0868a0fc1


AMBARI-15013. Ldap Sync: Concurrent modification exception  (Oliver Szabo via 
rlevas)


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

Branch: refs/heads/trunk
Commit: 0868a0fc1bce5a5d58ac44eba1af2aaa4c161ef6
Parents: 47c8d94
Author: Oliver Szabo 
Authored: Tue Feb 16 10:28:27 2016 -0500
Committer: Robert Levas 
Committed: Tue Feb 16 10:28:34 2016 -0500

--
 .../security/ldap/AmbariLdapDataPopulator.java  |  6 ++-
 .../ldap/AmbariLdapDataPopulatorTest.java   | 53 
 2 files changed, 58 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/0868a0fc/ambari-server/src/main/java/org/apache/ambari/server/security/ldap/AmbariLdapDataPopulator.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/security/ldap/AmbariLdapDataPopulator.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/security/ldap/AmbariLdapDataPopulator.java
index 801e43e..75df9cc 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/security/ldap/AmbariLdapDataPopulator.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/security/ldap/AmbariLdapDataPopulator.java
@@ -38,6 +38,8 @@ import org.apache.ambari.server.security.authorization.User;
 import org.apache.ambari.server.security.authorization.Users;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+
+import com.google.common.collect.Sets;
 import org.springframework.ldap.control.PagedResultsDirContextProcessor;
 import org.springframework.ldap.core.AttributesMapper;
 import org.springframework.ldap.core.ContextMapper;
@@ -293,7 +295,9 @@ public class AmbariLdapDataPopulator {
 final Map internalGroupsMap = getInternalGroups();
 final Map internalUsersMap = getInternalUsers();
 
-for (Group group : internalGroupsMap.values()) {
+final Set internalGroupSet = 
Sets.newHashSet(internalGroupsMap.values());
+
+for (Group group : internalGroupSet) {
   if (group.isLdapGroup()) {
 Set groupDtos = getLdapGroups(group.getGroupName());
 if (groupDtos.isEmpty()) {

http://git-wip-us.apache.org/repos/asf/ambari/blob/0868a0fc/ambari-server/src/test/java/org/apache/ambari/server/security/ldap/AmbariLdapDataPopulatorTest.java
--
diff --git 
a/ambari-server/src/test/java/org/apache/ambari/server/security/ldap/AmbariLdapDataPopulatorTest.java
 
b/ambari-server/src/test/java/org/apache/ambari/server/security/ldap/AmbariLdapDataPopulatorTest.java
index 8ce6c5b..3ea 100644
--- 
a/ambari-server/src/test/java/org/apache/ambari/server/security/ldap/AmbariLdapDataPopulatorTest.java
+++ 
b/ambari-server/src/test/java/org/apache/ambari/server/security/ldap/AmbariLdapDataPopulatorTest.java
@@ -17,6 +17,7 @@
  */
 package org.apache.ambari.server.security.ldap;
 
+import com.google.common.collect.Sets;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -274,6 +275,58 @@ public class AmbariLdapDataPopulatorTest {
   }
 
   @Test
+  public void testSynchronizeExistingLdapGroups_removeDuringIteration() throws 
Exception {
+// GIVEN
+Group group1 = createNiceMock(Group.class);
+expect(group1.getGroupId()).andReturn(1).anyTimes();
+expect(group1.getGroupName()).andReturn("group1").anyTimes();
+expect(group1.isLdapGroup()).andReturn(true).anyTimes();
+
+Group group2 = createNiceMock(Group.class);
+expect(group2.getGroupId()).andReturn(2).anyTimes();
+expect(group2.getGroupName()).andReturn("group2").anyTimes();
+expect(group2.isLdapGroup()).andReturn(true).anyTimes();
+
+Configuration configuration = createNiceMock(Configuration.class);
+Users users = createNiceMock(Users.class);
+expect(users.getAllGroups()).andReturn(Arrays.asList(group1, group2));
+expect(users.getAllUsers()).andReturn(Collections.EMPTY_LIST);
+expect(configuration.getLdapServerProperties()).andReturn(new 
LdapServerProperties()).anyTimes();
+
+Set groupDtos = Sets.newHashSet();
+LdapGroupDto group1Dto = new LdapGroupDto();
+group1Dto.setGroupName("group1");
+group1Dto.setMemberAttributes(Sets.newHashSet("group2"));
+
+LdapGroupDto group2Dto = new LdapGroupDto();
+group2Dto.setGroupName("group2");
+group2Dto.setMemberAttributes(Collections.EMPTY_SET);
+groupDtos.add(group1Dto);
+

ambari git commit: AMBARI-15007. Make amazon2015 to be part of redhat6 family (aonishuk)

[aonishuk]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.2 680502cf4 -> 21f4ae478


AMBARI-15007. Make amazon2015 to be part of redhat6 family (aonishuk)


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

Branch: refs/heads/branch-2.2
Commit: 21f4ae4780dcd1959e7d528a55b96c6b6dd90ef6
Parents: 680502c
Author: Andrew Onishuk 
Authored: Tue Feb 16 16:56:39 2016 +0200
Committer: Andrew Onishuk 
Committed: Tue Feb 16 16:56:39 2016 +0200

--
 .../org/apache/ambari/server/stack/KerberosDescriptorTest.java   | 2 ++
 .../java/org/apache/ambari/server/stack/StackManagerTest.java| 4 
 2 files changed, 6 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/21f4ae47/ambari-server/src/test/java/org/apache/ambari/server/stack/KerberosDescriptorTest.java
--
diff --git 
a/ambari-server/src/test/java/org/apache/ambari/server/stack/KerberosDescriptorTest.java
 
b/ambari-server/src/test/java/org/apache/ambari/server/stack/KerberosDescriptorTest.java
index 54f9ad6..c7f802f 100644
--- 
a/ambari-server/src/test/java/org/apache/ambari/server/stack/KerberosDescriptorTest.java
+++ 
b/ambari-server/src/test/java/org/apache/ambari/server/stack/KerberosDescriptorTest.java
@@ -21,6 +21,7 @@ package org.apache.ambari.server.stack;
 import org.apache.ambari.server.state.kerberos.KerberosDescriptor;
 import org.apache.ambari.server.state.kerberos.KerberosDescriptorFactory;
 import org.junit.BeforeClass;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.springframework.util.Assert;
 
@@ -32,6 +33,7 @@ import java.net.URL;
  * KerberosDescriptorTest tests the stack- and service-level descriptors for 
certain stacks
  * and services
  */
+@Ignore
 public class KerberosDescriptorTest {
   private static final KerberosDescriptorFactory KERBEROS_DESCRIPTOR_FACTORY = 
new KerberosDescriptorFactory();
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/21f4ae47/ambari-server/src/test/java/org/apache/ambari/server/stack/StackManagerTest.java
--
diff --git 
a/ambari-server/src/test/java/org/apache/ambari/server/stack/StackManagerTest.java
 
b/ambari-server/src/test/java/org/apache/ambari/server/stack/StackManagerTest.java
index 728e56e..99a12c0 100644
--- 
a/ambari-server/src/test/java/org/apache/ambari/server/stack/StackManagerTest.java
+++ 
b/ambari-server/src/test/java/org/apache/ambari/server/stack/StackManagerTest.java
@@ -40,6 +40,7 @@ import java.util.Map;
 
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
+
 import org.apache.ambari.server.AmbariException;
 import org.apache.ambari.server.Role;
 import org.apache.ambari.server.RoleCommand;
@@ -59,6 +60,7 @@ import org.apache.ambari.server.state.stack.OsFamily;
 import org.apache.ambari.server.state.stack.StackRoleCommandOrder;
 import org.apache.commons.lang.StringUtils;
 import org.junit.BeforeClass;
+import org.junit.Ignore;
 import org.junit.Test;
 
 /**
@@ -628,6 +630,7 @@ public class StackManagerTest {
 stack.getKerberosDescriptorFileLocation());
   }
 
+  @Ignore
   @Test
   public void testMetricsLoaded() throws Exception {
 
@@ -668,6 +671,7 @@ public class StackManagerTest {
 }
   }
 
+  @Ignore
   @Test
   public void testServicesWithRangerPluginRoleCommandOrder() throws 
AmbariException {
 // Given

ambari git commit: AMBARI-15007. Make amazon2015 to be part of redhat6 family (aonishuk)

[aonishuk]

Repository: ambari
Updated Branches:
  refs/heads/trunk ea699bb9b -> 47c8d94fa


AMBARI-15007. Make amazon2015 to be part of redhat6 family (aonishuk)


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

Branch: refs/heads/trunk
Commit: 47c8d94fa7df92ccad6a27a4b52a25b9a94c1db7
Parents: ea699bb
Author: Andrew Onishuk 
Authored: Tue Feb 16 16:55:11 2016 +0200
Committer: Andrew Onishuk 
Committed: Tue Feb 16 16:55:11 2016 +0200

--
 .../org/apache/ambari/server/stack/KerberosDescriptorTest.java   | 2 ++
 .../java/org/apache/ambari/server/stack/StackManagerTest.java| 4 
 2 files changed, 6 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/47c8d94f/ambari-server/src/test/java/org/apache/ambari/server/stack/KerberosDescriptorTest.java
--
diff --git 
a/ambari-server/src/test/java/org/apache/ambari/server/stack/KerberosDescriptorTest.java
 
b/ambari-server/src/test/java/org/apache/ambari/server/stack/KerberosDescriptorTest.java
index 54f9ad6..c7f802f 100644
--- 
a/ambari-server/src/test/java/org/apache/ambari/server/stack/KerberosDescriptorTest.java
+++ 
b/ambari-server/src/test/java/org/apache/ambari/server/stack/KerberosDescriptorTest.java
@@ -21,6 +21,7 @@ package org.apache.ambari.server.stack;
 import org.apache.ambari.server.state.kerberos.KerberosDescriptor;
 import org.apache.ambari.server.state.kerberos.KerberosDescriptorFactory;
 import org.junit.BeforeClass;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.springframework.util.Assert;
 
@@ -32,6 +33,7 @@ import java.net.URL;
  * KerberosDescriptorTest tests the stack- and service-level descriptors for 
certain stacks
  * and services
  */
+@Ignore
 public class KerberosDescriptorTest {
   private static final KerberosDescriptorFactory KERBEROS_DESCRIPTOR_FACTORY = 
new KerberosDescriptorFactory();
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/47c8d94f/ambari-server/src/test/java/org/apache/ambari/server/stack/StackManagerTest.java
--
diff --git 
a/ambari-server/src/test/java/org/apache/ambari/server/stack/StackManagerTest.java
 
b/ambari-server/src/test/java/org/apache/ambari/server/stack/StackManagerTest.java
index b690a6f..455652b 100644
--- 
a/ambari-server/src/test/java/org/apache/ambari/server/stack/StackManagerTest.java
+++ 
b/ambari-server/src/test/java/org/apache/ambari/server/stack/StackManagerTest.java
@@ -40,6 +40,7 @@ import java.util.Map;
 
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
+
 import org.apache.ambari.server.AmbariException;
 import org.apache.ambari.server.Role;
 import org.apache.ambari.server.RoleCommand;
@@ -59,6 +60,7 @@ import org.apache.ambari.server.state.stack.OsFamily;
 import org.apache.ambari.server.state.stack.StackRoleCommandOrder;
 import org.apache.commons.lang.StringUtils;
 import org.junit.BeforeClass;
+import org.junit.Ignore;
 import org.junit.Test;
 
 /**
@@ -639,6 +641,7 @@ public class StackManagerTest {
 stack.getKerberosDescriptorFileLocation());
   }
 
+  @Ignore
   @Test
   public void testMetricsLoaded() throws Exception {
 
@@ -679,6 +682,7 @@ public class StackManagerTest {
 }
   }
 
+  @Ignore
   @Test
   public void testServicesWithRangerPluginRoleCommandOrder() throws 
AmbariException {
 // Given

[1/2] ambari git commit: AMBARI-15056. Long hostnames are not truncated in Alerts dialog (alexantonenko)

[alexantonenko]

Repository: ambari
Updated Branches:
  refs/heads/trunk f3e693194 -> ea699bb9b


AMBARI-15056. Long hostnames are not truncated in Alerts dialog (alexantonenko)


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

Branch: refs/heads/trunk
Commit: ea699bb9b1be059949fa6f1ddf6f563e52ed4f5f
Parents: 5fcb716
Author: Alex Antonenko 
Authored: Tue Feb 16 14:56:21 2016 +0200
Committer: Alex Antonenko 
Committed: Tue Feb 16 15:32:16 2016 +0200

--
 ambari-web/app/styles/alerts.less   | 25 +---
 .../main/alerts/instance_service_host.hbs   | 30 +++-
 .../main/alerts/definition_details_view.js  |  8 ++
 3 files changed, 39 insertions(+), 24 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/ea699bb9/ambari-web/app/styles/alerts.less
--
diff --git a/ambari-web/app/styles/alerts.less 
b/ambari-web/app/styles/alerts.less
index c4f163d..1b8d5f4 100644
--- a/ambari-web/app/styles/alerts.less
+++ b/ambari-web/app/styles/alerts.less
@@ -70,7 +70,7 @@
 
   .filter-row {
 th {
-  padding: 0px;
+  padding: 0;
   padding-left: 4px;
 }
   }
@@ -253,16 +253,16 @@
   .definition-name {
 .name-text-field{
   margin-left: 2px;
-  margin-bottom: 0px;
+  margin-bottom: 0;
   input {
 width: 99%;
-margin-bottom: 0px;
+margin-bottom: 0;
 margin-top: -4px;
 margin-left: -5px;
   }
 }
 .edit-buttons {
-  margin-bottom: 0px;
+  margin-bottom: 0;
   margin-top: -4px;
   float: left;
   margin-left: 7px;
@@ -407,7 +407,7 @@
 
 #manage-alert-notification-content {
   .notification-info .global-info .global-checkbox {
-margin: 0px;
+margin: 0;
   }
   .input-label {
 font-weight: bold;
@@ -465,7 +465,7 @@
 
 .create-edit-alert-notification-popup {
   .modal {
-margin-top: 0px;
+margin-top: 0;
 top: 5%;
 width: 600px;
   }
@@ -512,10 +512,10 @@
 height: 250px;
   }
   .btn-toolbar {
-margin-top: 0px;
+margin-top: 0;
   }
   .manage-configuration-group-content {
-margin-bottom: 0px;
+margin-bottom: 0;
   }
   .notification-editable-list {
 .title {
@@ -576,12 +576,17 @@
 }
 
 .alerts-popup-wrap {
+  .trim_hostname{
+display: block;
+overflow: hidden;
+text-overflow: ellipsis;
+  }
   .top-wrap {
 width: 100%;
 border-bottom: 1px solid #CCC;
 text-align: center;
 font-size: 15px;
-padding: 0px 0px 20px 0px;
+padding: 0 0 20px 0;
 height: 20px;
 .name-top {
   width: 32%;
@@ -639,7 +644,7 @@
   cursor: pointer;
   border-top: 1px solid #CCC;
   text-align: center;
-  padding: 10px 10px 10px 0px;
+  padding: 10px 10px 10px 0;
   font-size: 16px;
 }
   }

http://git-wip-us.apache.org/repos/asf/ambari/blob/ea699bb9/ambari-web/app/templates/main/alerts/instance_service_host.hbs
--
diff --git a/ambari-web/app/templates/main/alerts/instance_service_host.hbs 
b/ambari-web/app/templates/main/alerts/instance_service_host.hbs
index cff614c..9aca8df 100644
--- a/ambari-web/app/templates/main/alerts/instance_service_host.hbs
+++ b/ambari-web/app/templates/main/alerts/instance_service_host.hbs
@@ -15,18 +15,20 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 }}
-{{#if view.instance.serviceDisplayName}}
-  {{#if view.serviceIsLink}}
-{{view.instance.serviceDisplayName}}
-  {{else}}
-{{view.instance.serviceDisplayName}}
+
+  {{#if view.instance.serviceDisplayName}}
+{{#if view.serviceIsLink}}
+  {{view.instance.serviceDisplayName}}
+{{else}}
+  {{view.instance.serviceDisplayName}}
+{{/if}}
   {{/if}}
-{{/if}}
-{{#if view.showSeparator}}
-  /
-{{/if}}
-{{#if view.instance.hostName}}
-  
-{{view.instance.hostName}}
-  
-{{/if}}
\ No newline at end of file
+  {{#if view.showSeparator}}
+/
+  {{/if}}
+  {{#if view.instance.hostName}}
+
+  {{view.instance.hostName}}
+
+  {{/if}}
+
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/ea699bb9/ambari-web/app/views/main/alerts/definition_details_view.js
--
diff --git a/ambari-web/app/views/main/alerts/definition_details_view.js 
b/ambari-web/app/views/main/alerts/definition_details_view.js
index 7467b0f..2fc75c1 100644
--- a/ambari-web/app/views/main/alerts/definition_details_view.js
+++ 

ambari git commit: AMBARI-15055. RBAC : "Service Operator" role doesn't have "Move to another host" permission, but still gives component movement options for HDFS, YARN, Oozie and Metrics Collector (

[alexantonenko]

Repository: ambari
Updated Branches:
  refs/heads/branch-rbac-sso b646a7758 -> fa9580b06


AMBARI-15055. RBAC : "Service Operator" role doesn't have "Move to another 
host" permission, but still gives component movement options for HDFS, YARN, 
Oozie and Metrics Collector (alexantonenko)


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

Branch: refs/heads/branch-rbac-sso
Commit: fa9580b062ddfecefbe49414e6cecf45bffb797b
Parents: b646a77
Author: Alex Antonenko 
Authored: Tue Feb 16 12:37:22 2016 +0200
Committer: Alex Antonenko 
Committed: Tue Feb 16 15:32:38 2016 +0200

--
 ambari-web/app/models/host_component.js | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/fa9580b0/ambari-web/app/models/host_component.js
--
diff --git a/ambari-web/app/models/host_component.js 
b/ambari-web/app/models/host_component.js
index db750e0..3034233 100644
--- a/ambari-web/app/models/host_component.js
+++ b/ambari-web/app/models/host_component.js
@@ -322,6 +322,7 @@ App.HostComponentActionMap = {
   MOVE_COMPONENT: {
 action: 'reassignMaster',
 context: '',
+isHidden: !App.isAuthorized('SERVICE.MOVE'),
 label: Em.I18n.t('services.service.actions.reassign.master'),
 cssClass: 'icon-share-alt'
   },

[2/2] ambari git commit: AMBARI-15055. RBAC : "Service Operator" role doesn't have "Move to another host" permission, but still gives component movement options for HDFS, YARN, Oozie and Metrics Colle

[alexantonenko]

AMBARI-15055. RBAC : "Service Operator" role doesn't have "Move to another 
host" permission, but still gives component movement options for HDFS, YARN, 
Oozie and Metrics Collector (alexantonenko)


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

Branch: refs/heads/trunk
Commit: 5fcb71602b1c680d143e39f4aca17e1cc5af7889
Parents: f3e6931
Author: Alex Antonenko 
Authored: Tue Feb 16 12:37:22 2016 +0200
Committer: Alex Antonenko 
Committed: Tue Feb 16 15:32:16 2016 +0200

--
 ambari-web/app/models/host_component.js | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/5fcb7160/ambari-web/app/models/host_component.js
--
diff --git a/ambari-web/app/models/host_component.js 
b/ambari-web/app/models/host_component.js
index a081d62..4782190 100644
--- a/ambari-web/app/models/host_component.js
+++ b/ambari-web/app/models/host_component.js
@@ -337,6 +337,7 @@ App.HostComponentActionMap = {
   MOVE_COMPONENT: {
 action: 'reassignMaster',
 context: '',
+isHidden: !App.isAuthorized('SERVICE.MOVE'),
 label: Em.I18n.t('services.service.actions.reassign.master'),
 cssClass: 'icon-share-alt'
   },

ambari git commit: AMBARI-15056. Long hostnames are not truncated in Alerts dialog (alexantonenko)

[alexantonenko]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.2 7063e9dde -> 680502cf4


AMBARI-15056. Long hostnames are not truncated in Alerts dialog (alexantonenko)


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

Branch: refs/heads/branch-2.2
Commit: 680502cf49f2b26da2239d1f12090141c2e930cf
Parents: 7063e9d
Author: Alex Antonenko 
Authored: Tue Feb 16 14:56:21 2016 +0200
Committer: Alex Antonenko 
Committed: Tue Feb 16 15:31:55 2016 +0200

--
 ambari-web/app/styles/alerts.less   | 25 +---
 .../main/alerts/instance_service_host.hbs   | 30 +++-
 .../main/alerts/definition_details_view.js  |  8 ++
 3 files changed, 39 insertions(+), 24 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/680502cf/ambari-web/app/styles/alerts.less
--
diff --git a/ambari-web/app/styles/alerts.less 
b/ambari-web/app/styles/alerts.less
index 01d9df0..a2a2dcf 100644
--- a/ambari-web/app/styles/alerts.less
+++ b/ambari-web/app/styles/alerts.less
@@ -70,7 +70,7 @@
 
   .filter-row {
 th {
-  padding: 0px;
+  padding: 0;
   padding-left: 4px;
 }
   }
@@ -253,16 +253,16 @@
   .definition-name {
 .name-text-field{
   margin-left: 2px;
-  margin-bottom: 0px;
+  margin-bottom: 0;
   input {
 width: 99%;
-margin-bottom: 0px;
+margin-bottom: 0;
 margin-top: -4px;
 margin-left: -5px;
   }
 }
 .edit-buttons {
-  margin-bottom: 0px;
+  margin-bottom: 0;
   margin-top: -4px;
   float: left;
   margin-left: 7px;
@@ -403,7 +403,7 @@
 
 #manage-alert-notification-content {
   .notification-info .global-info .global-checkbox {
-margin: 0px;
+margin: 0;
   }
   .input-label {
 font-weight: bold;
@@ -461,7 +461,7 @@
 
 .create-edit-alert-notification-popup {
   .modal {
-margin-top: 0px;
+margin-top: 0;
 top: 5%;
 width: 600px;
   }
@@ -508,10 +508,10 @@
 height: 250px;
   }
   .btn-toolbar {
-margin-top: 0px;
+margin-top: 0;
   }
   .manage-configuration-group-content {
-margin-bottom: 0px;
+margin-bottom: 0;
   }
   .notification-editable-list {
 .title {
@@ -572,12 +572,17 @@
 }
 
 .alerts-popup-wrap {
+  .trim_hostname{
+display: block;
+overflow: hidden;
+text-overflow: ellipsis;
+  }
   .top-wrap {
 width: 100%;
 border-bottom: 1px solid #CCC;
 text-align: center;
 font-size: 15px;
-padding: 0px 0px 20px 0px;
+padding: 0 0 20px 0;
 height: 20px;
 .name-top {
   width: 32%;
@@ -635,7 +640,7 @@
   cursor: pointer;
   border-top: 1px solid #CCC;
   text-align: center;
-  padding: 10px 10px 10px 0px;
+  padding: 10px 10px 10px 0;
   font-size: 16px;
 }
   }

http://git-wip-us.apache.org/repos/asf/ambari/blob/680502cf/ambari-web/app/templates/main/alerts/instance_service_host.hbs
--
diff --git a/ambari-web/app/templates/main/alerts/instance_service_host.hbs 
b/ambari-web/app/templates/main/alerts/instance_service_host.hbs
index cff614c..9aca8df 100644
--- a/ambari-web/app/templates/main/alerts/instance_service_host.hbs
+++ b/ambari-web/app/templates/main/alerts/instance_service_host.hbs
@@ -15,18 +15,20 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 }}
-{{#if view.instance.serviceDisplayName}}
-  {{#if view.serviceIsLink}}
-{{view.instance.serviceDisplayName}}
-  {{else}}
-{{view.instance.serviceDisplayName}}
+
+  {{#if view.instance.serviceDisplayName}}
+{{#if view.serviceIsLink}}
+  {{view.instance.serviceDisplayName}}
+{{else}}
+  {{view.instance.serviceDisplayName}}
+{{/if}}
   {{/if}}
-{{/if}}
-{{#if view.showSeparator}}
-  /
-{{/if}}
-{{#if view.instance.hostName}}
-  
-{{view.instance.hostName}}
-  
-{{/if}}
\ No newline at end of file
+  {{#if view.showSeparator}}
+/
+  {{/if}}
+  {{#if view.instance.hostName}}
+
+  {{view.instance.hostName}}
+
+  {{/if}}
+
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/680502cf/ambari-web/app/views/main/alerts/definition_details_view.js
--
diff --git a/ambari-web/app/views/main/alerts/definition_details_view.js 
b/ambari-web/app/views/main/alerts/definition_details_view.js
index 093840c..6187e57 100644
--- a/ambari-web/app/views/main/alerts/definition_details_view.js
+++ 

ambari git commit: AMBARI-15026 Hadoop metrics emit interval seems to be 1 minute instead of 10 seconds default (dsen)

[dsen]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.2 1a772e67f -> 7063e9dde


AMBARI-15026 Hadoop metrics emit interval seems to be 1 minute instead of 10 
seconds default (dsen)


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

Branch: refs/heads/branch-2.2
Commit: 7063e9dde72b83a3dbce59699a84753dd77583c7
Parents: 1a772e6
Author: Dmytro Sen 
Authored: Tue Feb 16 14:03:09 2016 +0200
Committer: Dmytro Sen 
Committed: Tue Feb 16 14:05:19 2016 +0200

--
 .../common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/params.py | 2 +-
 .../AMBARI_METRICS/0.1.0/configuration/ams-site.xml| 2 +-
 .../common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py | 2 +-
 .../common-services/FLUME/1.4.0.2.0/package/scripts/params.py  | 2 +-
 .../HBASE/0.96.0.2.0/package/scripts/params_linux.py   | 2 +-
 .../STORM/0.9.1.2.1/package/scripts/params_linux.py| 2 +-
 .../stacks/HDP/2.0.6/hooks/before-START/scripts/params.py  | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/7063e9dd/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/params.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/params.py
 
b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/params.py
index b4d8a97..ac6b463 100644
--- 
a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/params.py
+++ 
b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/params.py
@@ -133,7 +133,7 @@ if has_metric_collector:
   metric_collector_port = '6188'
   pass
 metrics_report_interval = 
default("/configurations/ams-site/timeline.metrics.sink.report.interval", 60)
-metrics_collection_period = 
default("/configurations/ams-site/timeline.metrics.sink.collection.period", 60)
+metrics_collection_period = 
default("/configurations/ams-site/timeline.metrics.sink.collection.period", 10)
 
 # if accumulo is selected accumulo_tserver_hosts should not be empty, but 
still default just in case
 if 'slave_hosts' in config['clusterHostInfo']:

http://git-wip-us.apache.org/repos/asf/ambari/blob/7063e9dd/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-site.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-site.xml
 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-site.xml
index 56fb21b..d90d387 100644
--- 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-site.xml
+++ 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-site.xml
@@ -492,7 +492,7 @@
   
   
 timeline.metrics.sink.collection.period
-60
+10
 
   The interval between two service metrics data exports.
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/7063e9dd/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py
 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py
index 8193737..89a60f7 100644
--- 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py
+++ 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py
@@ -117,7 +117,7 @@ java_version = 
int(config['hostLevelParams']['java_version'])
 metrics_collector_heapsize = 
default('/configurations/ams-env/metrics_collector_heapsize', "512")
 host_sys_prepped = default("/hostLevelParams/host_sys_prepped", False)
 metrics_report_interval = 
default("/configurations/ams-site/timeline.metrics.sink.report.interval", 60)
-metrics_collection_period = 
default("/configurations/ams-site/timeline.metrics.sink.collection.period", 60)
+metrics_collection_period = 
default("/configurations/ams-site/timeline.metrics.sink.collection.period", 10)
 
 hbase_log_dir = config['configurations']['ams-hbase-env']['hbase_log_dir']
 hbase_classpath_additional = 
default("/configurations/ams-hbase-env/hbase_classpath_additional", None)

ambari git commit: AMBARI-15026 Hadoop metrics emit interval seems to be 1 minute instead of 10 seconds default (dsen)

[dsen]

Repository: ambari
Updated Branches:
  refs/heads/trunk c98582605 -> f3e693194


AMBARI-15026 Hadoop metrics emit interval seems to be 1 minute instead of 10 
seconds default (dsen)


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

Branch: refs/heads/trunk
Commit: f3e693194dff06513d425d5189a72d3c2169f8ab
Parents: c985826
Author: Dmytro Sen 
Authored: Tue Feb 16 14:03:09 2016 +0200
Committer: Dmytro Sen 
Committed: Tue Feb 16 14:03:09 2016 +0200

--
 .../common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/params.py | 2 +-
 .../AMBARI_METRICS/0.1.0/configuration/ams-site.xml| 2 +-
 .../common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py | 2 +-
 .../common-services/FLUME/1.4.0.2.0/package/scripts/params.py  | 2 +-
 .../HBASE/0.96.0.2.0/package/scripts/params_linux.py   | 2 +-
 .../STORM/0.9.1.2.1/package/scripts/params_linux.py| 2 +-
 .../stacks/HDP/2.0.6/hooks/before-START/scripts/params.py  | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/f3e69319/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/params.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/params.py
 
b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/params.py
index c415f6e..a9626b6 100644
--- 
a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/params.py
+++ 
b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/params.py
@@ -133,7 +133,7 @@ if has_metric_collector:
   metric_collector_port = '6188'
   pass
 metrics_report_interval = 
default("/configurations/ams-site/timeline.metrics.sink.report.interval", 60)
-metrics_collection_period = 
default("/configurations/ams-site/timeline.metrics.sink.collection.period", 60)
+metrics_collection_period = 
default("/configurations/ams-site/timeline.metrics.sink.collection.period", 10)
 
 # if accumulo is selected accumulo_tserver_hosts should not be empty, but 
still default just in case
 if 'slave_hosts' in config['clusterHostInfo']:

http://git-wip-us.apache.org/repos/asf/ambari/blob/f3e69319/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-site.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-site.xml
 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-site.xml
index 180b43b..ab9593d 100644
--- 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-site.xml
+++ 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-site.xml
@@ -495,7 +495,7 @@
   
   
 timeline.metrics.sink.collection.period
-60
+10
 
   The interval between two service metrics data exports.
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/f3e69319/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py
 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py
index 8193737..89a60f7 100644
--- 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py
+++ 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py
@@ -117,7 +117,7 @@ java_version = 
int(config['hostLevelParams']['java_version'])
 metrics_collector_heapsize = 
default('/configurations/ams-env/metrics_collector_heapsize', "512")
 host_sys_prepped = default("/hostLevelParams/host_sys_prepped", False)
 metrics_report_interval = 
default("/configurations/ams-site/timeline.metrics.sink.report.interval", 60)
-metrics_collection_period = 
default("/configurations/ams-site/timeline.metrics.sink.collection.period", 60)
+metrics_collection_period = 
default("/configurations/ams-site/timeline.metrics.sink.collection.period", 10)
 
 hbase_log_dir = config['configurations']['ams-hbase-env']['hbase_log_dir']
 hbase_classpath_additional = 
default("/configurations/ams-hbase-env/hbase_classpath_additional", None)

ambari git commit: AMBARI-15052. Service delete confirmation using Enter key doesn't remove service. (alexantonenko)

[alexantonenko]

Repository: ambari
Updated Branches:
  refs/heads/trunk 7f3928bad -> c98582605


AMBARI-15052. Service delete confirmation using Enter key doesn't remove 
service. (alexantonenko)


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

Branch: refs/heads/trunk
Commit: c9858260547854f0b1077cdbe09e459ee5a7678b
Parents: 7f3928b
Author: Alex Antonenko 
Authored: Tue Feb 16 01:15:15 2016 +0200
Committer: Alex Antonenko 
Committed: Tue Feb 16 11:21:09 2016 +0200

--
 ambari-web/app/controllers/main/service/item.js | 11 ---
 1 file changed, 8 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/c9858260/ambari-web/app/controllers/main/service/item.js
--
diff --git a/ambari-web/app/controllers/main/service/item.js 
b/ambari-web/app/controllers/main/service/item.js
index 0b8d5d7..a127e92 100644
--- a/ambari-web/app/controllers/main/service/item.js
+++ b/ambari-web/app/controllers/main/service/item.js
@@ -1149,11 +1149,16 @@ App.MainServiceItemController = 
Em.Controller.extend(App.SupportClientConfigsDow
   bodyClass: Em.View.extend({
 confirmKey: confirmKey,
 template: Em.Handlebars.compile(message +
-'' +
+'' +
 '{{t 
common.enter}}{{view.confirmKey}}' +
 '{{view Ember.TextField valueBinding="view.parentView.confirmInput" 
class="input-small"}}' +
-'')
-  })
+'')
+  }),
+
+  enterKeyPressed: function(e) {
+if (this.get('disablePrimary')) return;
+this.onPrimary();
+  }
 });
   },