ambari git commit: AMBARI-19022: Ambari-server: Remove credential store from KNOX stack definition since it does not support credential store

[smnaha]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 40fde4a65 -> 8036eb247


AMBARI-19022: Ambari-server: Remove credential store from KNOX stack definition 
since it does not support credential store


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

Branch: refs/heads/branch-2.5
Commit: 8036eb247691f7e5278ab13bb36b60eaac4973df
Parents: 40fde4a
Author: Nahappan Somasundaram 
Authored: Tue Nov 29 14:44:39 2016 -0800
Committer: Nahappan Somasundaram 
Committed: Tue Nov 29 20:53:04 2016 -0800

--
 .../src/main/resources/stacks/HDP/2.5/services/KNOX/metainfo.xml | 4 
 1 file changed, 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/8036eb24/ambari-server/src/main/resources/stacks/HDP/2.5/services/KNOX/metainfo.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.5/services/KNOX/metainfo.xml 
b/ambari-server/src/main/resources/stacks/HDP/2.5/services/KNOX/metainfo.xml
index 01af67c..8f303a5 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/KNOX/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/KNOX/metainfo.xml
@@ -21,10 +21,6 @@
 
   KNOX
   0.9.0.2.5
-  
-true
-false
-  
 
   
 

ambari git commit: AMBARI-19022: Ambari-server: Remove credential store from KNOX stack definition since it does not support credential store

[smnaha]

Repository: ambari
Updated Branches:
  refs/heads/trunk ca7e071f0 -> 1fb8d0799


AMBARI-19022: Ambari-server: Remove credential store from KNOX stack definition 
since it does not support credential store


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

Branch: refs/heads/trunk
Commit: 1fb8d0799eb9117868eb2a5df2312569fd07ed43
Parents: ca7e071
Author: Nahappan Somasundaram 
Authored: Tue Nov 29 14:44:39 2016 -0800
Committer: Nahappan Somasundaram 
Committed: Tue Nov 29 16:26:13 2016 -0800

--
 .../src/main/resources/stacks/HDP/2.5/services/KNOX/metainfo.xml | 4 
 1 file changed, 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/1fb8d079/ambari-server/src/main/resources/stacks/HDP/2.5/services/KNOX/metainfo.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.5/services/KNOX/metainfo.xml 
b/ambari-server/src/main/resources/stacks/HDP/2.5/services/KNOX/metainfo.xml
index 01af67c..8f303a5 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/KNOX/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/KNOX/metainfo.xml
@@ -21,10 +21,6 @@
 
   KNOX
   0.9.0.2.5
-  
-true
-false
-  
 
   
 

[2/2] ambari git commit: Revert "AMBARI-18903. Implement Create Alerts: Create a base wizard for all steps.(xiwang)"

[xiwang]

Revert "AMBARI-18903. Implement Create Alerts: Create a base wizard for all 
steps.(xiwang)"

This reverts commit 521995f4a9884ee62bd92f9f226b152f0155afc9.


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

Branch: refs/heads/branch-2.5
Commit: 40fde4a65a4d21477db53d402af422348f1821eb
Parents: be8354a
Author: Xi Wang 
Authored: Tue Nov 29 17:22:39 2016 -0800
Committer: Xi Wang 
Committed: Tue Nov 29 17:23:52 2016 -0800

--
 .../main/alerts/alert_definitions_actions_controller.js  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/40fde4a6/ambari-web/app/controllers/main/alerts/alert_definitions_actions_controller.js
--
diff --git 
a/ambari-web/app/controllers/main/alerts/alert_definitions_actions_controller.js
 
b/ambari-web/app/controllers/main/alerts/alert_definitions_actions_controller.js
index ad239c6..f3f0387 100644
--- 
a/ambari-web/app/controllers/main/alerts/alert_definitions_actions_controller.js
+++ 
b/ambari-web/app/controllers/main/alerts/alert_definitions_actions_controller.js
@@ -27,12 +27,12 @@ App.MainAlertDefinitionActionsController = 
Em.ArrayController.extend({
* @type {{title: string, icon: string, action: string, showDivider: 
boolean}[]}
*/
   content: [
-{
+/*{
   title: Em.I18n.t('alerts.actions.create'),
   icon: 'icon-plus',
   action: 'createNewAlertDefinition',
   showDivider: true
-},
+},*/
 {
   title: Em.I18n.t('alerts.actions.manageGroups'),
   icon: 'icon-th-large',

[1/2] ambari git commit: Revert "AMBARI-18912. Implement Create Alerts: step 1 select alert type.(XIWANG)"

[xiwang]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 207358870 -> 40fde4a65


Revert "AMBARI-18912. Implement Create Alerts: step 1 select alert 
type.(XIWANG)"

This reverts commit 86ecd898e7045c67cee85ca25c6c746298bd5ef8.


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

Branch: refs/heads/branch-2.5
Commit: be8354a5a987e9e92ca79cffb72496fc9a34fb4f
Parents: 2073588
Author: Xi Wang 
Authored: Tue Nov 29 17:07:33 2016 -0800
Committer: Xi Wang 
Committed: Tue Nov 29 17:09:19 2016 -0800

--
 .../add_alert_definition/step1_controller.js| 41 +++-
 .../alerts/definition_configs_controller.js | 40 ++--
 ambari-web/app/messages.js  | 17 ++---
 .../app/models/alerts/alert_definition.js   | 54 
 ambari-web/app/styles/alerts.less   | 66 +---
 .../main/alerts/add_alert_definition/step1.hbs  | 29 +++--
 .../alerts/add_alert_definition/step1_view.js   |  3 -
 .../step1_controller_test.js| 24 ++-
 8 files changed, 80 insertions(+), 194 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/be8354a5/ambari-web/app/controllers/main/alerts/add_alert_definition/step1_controller.js
--
diff --git 
a/ambari-web/app/controllers/main/alerts/add_alert_definition/step1_controller.js
 
b/ambari-web/app/controllers/main/alerts/add_alert_definition/step1_controller.js
index c758fc0..43e25c8 100644
--- 
a/ambari-web/app/controllers/main/alerts/add_alert_definition/step1_controller.js
+++ 
b/ambari-web/app/controllers/main/alerts/add_alert_definition/step1_controller.js
@@ -24,25 +24,34 @@ App.AddAlertDefinitionStep1Controller = 
Em.Controller.extend({
 
   /**
* List of available alert definition types
-   * @type {{name: string, isActive: boolean}[]}
+   * @type {{value: string, isActive: boolean}[]}
*/
-  alertDefinitionsTypes: function () {
-return App.AlertType.find().map(function(option) {
-  return Em.Object.create({
-name: option.get('name'),
-displayName: option.get('displayName'),
-icon: option.get('iconPath'),
-description: option.get('description')
-  });
-});
-  }.property(),
+  alertDefinitionsTypes: [
+Em.Object.create({value: 'PORT', isActive: false, icon: 'icon-signal'}),
+Em.Object.create({value: 'METRIC', isActive: false, icon: 'icon-bolt'}),
+Em.Object.create({value: 'WEB', isActive: false, icon: 'icon-globe'}),
+Em.Object.create({value: 'AGGREGATE', isActive: false, icon: 
'icon-plus-sign-alt'}),
+Em.Object.create({value: 'SCRIPT', isActive: false, icon: 'icon-code'}),
+Em.Object.create({value: 'SERVER', isActive: false, icon: 'icon-desktop'}),
+Em.Object.create({value: 'RECOVERY', isActive: false, icon: 
'icon-desktop'})
+  ],
+
+  /**
+   * "Next"-button is disabled if user doesn't select any alert definition type
+   * @type {boolean}
+   */
+  isSubmitDisabled: Em.computed.everyBy('alertDefinitionsTypes', 'isActive', 
false),
 
   /**
* Set selectedType if it exists in the wizard controller
* @method loadStep
*/
   loadStep: function() {
-this.set('content.selectedType', '');
+this.get('alertDefinitionsTypes').setEach('isActive', false);
+var selectedType = this.get('content.selectedType');
+if(selectedType) {
+  this.selectType({context: {value: selectedType}});
+}
   },
 
   /**
@@ -52,10 +61,10 @@ App.AddAlertDefinitionStep1Controller = 
Em.Controller.extend({
*/
   selectType: function(e) {
 var type = e.context,
-types = this.get('alertDefinitionsTypes');
-this.set('content.selectedType', type.name);
-$("[rel='selectable-tooltip']").trigger('mouseleave');
-App.router.send('next');
+  types = this.get('alertDefinitionsTypes');
+types.setEach('isActive', false);
+types.findProperty('value', type.value).set('isActive', true);
+this.set('content.selectedType', type.value);
   }
 
 });

http://git-wip-us.apache.org/repos/asf/ambari/blob/be8354a5/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 138aaa4..4c82556 100644
--- a/ambari-web/app/controllers/main/alerts/definition_configs_controller.js
+++ b/ambari-web/app/controllers/main/alerts/definition_configs_controller.js
@@ -225,7 +225,7 @@ 

ambari git commit: AMBARI-19005. 'conf.server' dir for HIVE1 and HIVE2 should have 700 permission and files in it should have 600 permission.

[swapan]

Repository: ambari
Updated Branches:
  refs/heads/branch-feature-AMBARI-18901 82e9a1d8e -> 24045aa89


AMBARI-19005. 'conf.server' dir for HIVE1 and HIVE2 should have 700 permission 
and files in it should have 600 permission.


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

Branch: refs/heads/branch-feature-AMBARI-18901
Commit: 24045aa89c5ce9c9dc251be1339ce0eadd7c3c2f
Parents: 82e9a1d
Author: Swapan Shridhar 
Authored: Mon Nov 28 16:30:25 2016 -0800
Committer: Swapan Shridhar 
Committed: Tue Nov 29 16:10:03 2016 -0800

--
 .../HIVE/0.12.0.2.0/package/scripts/hive.py | 38 
 .../package/scripts/hive_interactive.py | 20 ++-
 2 files changed, 36 insertions(+), 22 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/24045aa8/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive.py
 
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive.py
index bcc598a..415261d 100644
--- 
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive.py
+++ 
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive.py
@@ -109,7 +109,7 @@ def hive(name=None):
 
   if name == 'hiveserver2':
 # copy tarball to HDFS feature not supported
-if not (params.stack_version_formatted_major and 
check_stack_feature(StackFeature.COPY_TARBALL_TO_HDFS, 
params.stack_version_formatted_major)):  
+if not (params.stack_version_formatted_major and 
check_stack_feature(StackFeature.COPY_TARBALL_TO_HDFS, 
params.stack_version_formatted_major)):
   params.HdfsResource(params.webhcat_apps_dir,
 type="directory",
 action="create_on_execute",
@@ -226,13 +226,13 @@ def hive(name=None):
 
configuration_attributes=params.config['configuration_attributes']['hive-site'],
 owner=params.hive_user,
 group=params.user_group,
-mode=0644)
+mode=0600)
 
   # Generate atlas-application.properties.xml file
   if has_atlas_in_cluster():
 atlas_hook_filepath = os.path.join(params.hive_config_dir, 
params.atlas_hook_filename)
 setup_atlas_hook(SERVICE.HIVE, params.hive_atlas_application_properties, 
atlas_hook_filepath, params.hive_user, params.user_group)
-  
+
   if name == 'hiveserver2':
 XmlConfig("hiveserver2-site.xml",
   conf_dir=params.hive_server_conf_dir,
@@ -240,7 +240,7 @@ def hive(name=None):
   
configuration_attributes=params.config['configuration_attributes']['hiveserver2-site'],
   owner=params.hive_user,
   group=params.user_group,
-  mode=0644)
+  mode=0600)
 
   if params.hive_metastore_site_supported and name == 'metastore':
 XmlConfig("hivemetastore-site.xml",
@@ -249,11 +249,12 @@ def hive(name=None):
   
configuration_attributes=params.config['configuration_attributes']['hivemetastore-site'],
   owner=params.hive_user,
   group=params.user_group,
-  mode=0644)
-  
+  mode=0600)
+
   File(format("{hive_config_dir}/hive-env.sh"),
owner=params.hive_user,
group=params.user_group,
+   mode=0600,
content=InlineTemplate(params.hive_env_sh_template)
   )
 
@@ -286,6 +287,7 @@ def hive(name=None):
 File(os.path.join(params.hive_server_conf_dir, 
"hadoop-metrics2-hivemetastore.properties"),
  owner=params.hive_user,
  group=params.user_group,
+ mode=0600,
  content=Template("hadoop-metrics2-hivemetastore.properties.j2")
 )
 
@@ -328,6 +330,7 @@ def hive(name=None):
 File(os.path.join(params.hive_server_conf_dir, 
"hadoop-metrics2-hiveserver2.properties"),
  owner=params.hive_user,
  group=params.user_group,
+ mode=0600,
  content=Template("hadoop-metrics2-hiveserver2.properties.j2")
 )
 
@@ -356,11 +359,16 @@ Writes configuration files required by Hive.
 """
 def fill_conf_dir(component_conf_dir):
   import params
+  hive_client_conf_path = 
os.path.realpath(format("{stack_root}/current/{component_directory}/conf"))
+  component_conf_dir = os.path.realpath(component_conf_dir)
+  mode_identified_for_file = 0644 if component_conf_dir == 
hive_client_conf_path else 0600
+  mode_identified_for_dir = 0744 if component_conf_dir == 

ambari git commit: AMBARI-18792. Update some configuration properties for hive interactive for the HDP 2.6 stack - minor fix (Siddharth Seth via smohanty)

[smohanty]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 052da577b -> 207358870


AMBARI-18792. Update some configuration properties for hive interactive for the 
HDP 2.6 stack - minor fix (Siddharth Seth via smohanty)


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

Branch: refs/heads/branch-2.5
Commit: 20735887018d4de6e4e5d67839a2aa30eea0f2ad
Parents: 052da57
Author: Sumit Mohanty 
Authored: Tue Nov 29 15:35:20 2016 -0800
Committer: Sumit Mohanty 
Committed: Tue Nov 29 15:35:20 2016 -0800

--
 .../java/org/apache/ambari/server/upgrade/UpgradeCatalog250.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/20735887/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog250.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog250.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog250.java
index 44ce895..52de784 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog250.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog250.java
@@ -124,7 +124,7 @@ public class UpgradeCatalog250 extends 
AbstractUpgradeCatalog {
*/
   @Override
   protected void executePreDMLUpdates() throws AmbariException, SQLException {
-updateHiveLlapConfigs();
+
   }
 
   /**
@@ -135,6 +135,7 @@ public class UpgradeCatalog250 extends 
AbstractUpgradeCatalog {
 addNewConfigurationsFromXml();
 updateAMSConfigs();
 updateKafkaConfigs();
+updateHiveLlapConfigs();
   }
 
   protected void updateHostVersionTable() throws SQLException {

ambari git commit: AMBARI-18792. Update some configuration properties for hive interactive for the HDP 2.6 stack (Siddharth Seth via smohanty)

[smohanty]

Repository: ambari
Updated Branches:
  refs/heads/trunk 2cc4c9ed7 -> ca7e071f0


AMBARI-18792. Update some configuration properties for hive interactive for the 
HDP 2.6 stack (Siddharth Seth via smohanty)


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

Branch: refs/heads/trunk
Commit: ca7e071f044d70186c7bf9d18bf24c29f3767730
Parents: 2cc4c9e
Author: Sumit Mohanty 
Authored: Tue Nov 29 11:39:53 2016 -0800
Committer: Sumit Mohanty 
Committed: Tue Nov 29 15:28:46 2016 -0800

--
 .../server/upgrade/UpgradeCatalog250.java   | 52 +
 .../configuration/hive-interactive-site.xml | 58 +++
 .../HIVE/configuration/tez-interactive-site.xml | 78 
 3 files changed, 188 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/ca7e071f/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog250.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog250.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog250.java
index e81568c..3b2cdd3 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog250.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog250.java
@@ -23,6 +23,7 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import org.apache.ambari.server.AmbariException;
 import org.apache.ambari.server.actionmanager.CommandExecutionType;
@@ -134,6 +135,7 @@ public class UpgradeCatalog250 extends 
AbstractUpgradeCatalog {
 addNewConfigurationsFromXml();
 updateAMSConfigs();
 updateKafkaConfigs();
+updateHiveLlapConfigs();
   }
 
   protected void updateHostVersionTable() throws SQLException {
@@ -151,6 +153,56 @@ public class UpgradeCatalog250 extends 
AbstractUpgradeCatalog {
 dbAccessor.addUniqueConstraint(GROUPS_TABLE, "UNQ_groups_0", "group_name", 
"group_type");
   }
 
+  protected void updateHiveLlapConfigs() throws AmbariException {
+AmbariManagementController ambariManagementController = 
injector.getInstance(AmbariManagementController.class);
+Clusters clusters = ambariManagementController.getClusters();
+
+if (clusters != null) {
+  Map clusterMap = clusters.getClusters();
+
+  if (clusterMap != null && !clusterMap.isEmpty()) {
+for (final Cluster cluster : clusterMap.values()) {
+  Set installedServices = cluster.getServices().keySet();
+
+  if (installedServices.contains("HIVE")) {
+Config hiveSite = 
cluster.getDesiredConfigByType("hive-interactive-site");
+if (hiveSite != null) {
+  Map hiveSiteProperties = 
hiveSite.getProperties();
+  String schedulerDelay = 
hiveSiteProperties.get("hive.llap.task.scheduler.locality.delay");
+  if (schedulerDelay != null) {
+// Property exists. Change to new default if set to -1.
+if (schedulerDelay.length() != 0) {
+  try {
+int schedulerDelayInt = Integer.parseInt(schedulerDelay);
+if (schedulerDelayInt == -1) {
+  // Old default. Set to new default.
+  updateConfigurationProperties("hive-interactive-site", 
Collections
+
.singletonMap("hive.llap.task.scheduler.locality.delay", "8000"), true,
+false);
+}
+  } catch (NumberFormatException e) {
+// Invalid existing value. Set to new default.
+updateConfigurationProperties("hive-interactive-site", 
Collections
+  
.singletonMap("hive.llap.task.scheduler.locality.delay", "8000"), true,
+  false);
+  }
+}
+  }
+  updateConfigurationProperties("hive-interactive-site",
+
Collections.singletonMap("hive.mapjoin.hybridgrace.hashtable", "true"), true,
+false);
+  updateConfigurationProperties("tez-interactive-site",
+
Collections.singletonMap("tez.session.am.dag.submit.timeout.secs", "1209600"), 
true,
+ 

[01/25] ambari git commit: AMBARI-18995. HBASE service check fails if run with tty=true (aonishuk)

[jonathanhurley]

Repository: ambari
Updated Branches:
  refs/heads/branch-feature-AMBARI-18456 1f804d139 -> 276d1244e


AMBARI-18995. HBASE service check fails if run with tty=true (aonishuk)


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

Branch: refs/heads/branch-feature-AMBARI-18456
Commit: b1eaffc7065d60c03a022a2ae3e4afca9f7ebb62
Parents: ece1de3
Author: Andrew Onishuk 
Authored: Mon Nov 28 17:01:33 2016 +0200
Committer: Andrew Onishuk 
Committed: Mon Nov 28 17:01:33 2016 +0200

--
 .../HBASE/0.96.0.2.0/package/files/hbaseSmokeVerify.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/b1eaffc7/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/files/hbaseSmokeVerify.sh
--
diff --git 
a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/files/hbaseSmokeVerify.sh
 
b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/files/hbaseSmokeVerify.sh
index 5c320c0..8b085e8 100644
--- 
a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/files/hbaseSmokeVerify.sh
+++ 
b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/files/hbaseSmokeVerify.sh
@@ -25,7 +25,7 @@ hbase_cmd=$3
 echo "scan 'ambarismoketest'" | $hbase_cmd --config $conf_dir shell > 
/tmp/hbase_chk_verify
 cat /tmp/hbase_chk_verify
 echo "Looking for $data"
-grep -q $data /tmp/hbase_chk_verify
+tr -d '\n|\t| ' < /tmp/hbase_chk_verify | grep -q $data
 if [ "$?" -ne 0 ]
 then
   exit 1

[23/25] ambari git commit: Updated team page. (yusaku)

[jonathanhurley]

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/1a8a5382
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1a8a5382
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1a8a5382

Branch: refs/heads/branch-feature-AMBARI-18456
Commit: 1a8a53828ad4f6214bbef7a96733361d1b05b598
Parents: 2c7c0a7
Author: Yusaku Sako 
Authored: Tue Nov 29 10:28:53 2016 -0800
Committer: Yusaku Sako 
Committed: Tue Nov 29 10:28:53 2016 -0800

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


http://git-wip-us.apache.org/repos/asf/ambari/blob/1a8a5382/docs/pom.xml
--
diff --git a/docs/pom.xml b/docs/pom.xml
index 625dce3..75e547d 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -611,7 +611,7 @@
 Committer
 
 
-Pivotal
+Uber
 
 
 
@@ -773,7 +773,7 @@
 
 rzang
 Richard Zang
-rz...@hortonworks.com
+rz...@apache.org
 -8
 
 PMC

[21/25] ambari git commit: AMBARI-19010. Log Search external login credential let every user in (oleewere)

[jonathanhurley]

AMBARI-19010. Log Search external login credential let every user in (oleewere)

Change-Id: Iab889180bfb4916fd06240588b6cdd80493889a1


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

Branch: refs/heads/branch-feature-AMBARI-18456
Commit: f31f3f646610a2e480279989d6790437e5362cb8
Parents: a952843
Author: oleewere 
Authored: Tue Nov 29 13:16:51 2016 +0100
Committer: oleewere 
Committed: Tue Nov 29 18:03:42 2016 +0100

--
 .../ambari/logsearch/common/ExternalServerClient.java   | 12 ++--
 1 file changed, 10 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/f31f3f64/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/common/ExternalServerClient.java
--
diff --git 
a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/common/ExternalServerClient.java
 
b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/common/ExternalServerClient.java
index 1207373..230ca8c 100644
--- 
a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/common/ExternalServerClient.java
+++ 
b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/common/ExternalServerClient.java
@@ -23,9 +23,11 @@ import javax.inject.Named;
 import javax.ws.rs.client.Invocation;
 import javax.ws.rs.client.WebTarget;
 import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
 
 import org.apache.ambari.logsearch.conf.AuthPropsConfig;
 import org.apache.ambari.logsearch.util.SSLUtil;
+import org.apache.commons.httpclient.auth.InvalidCredentialsException;
 import org.apache.log4j.Logger;
 import org.glassfish.jersey.client.JerseyClient;
 import org.glassfish.jersey.client.JerseyClientBuilder;
@@ -64,9 +66,15 @@ public class ExternalServerClient {
 WebTarget target = client.target(url);
 LOG.debug("URL: " + url);
 
-Invocation.Builder invocationBuilder =  
target.request(MediaType.APPLICATION_JSON_TYPE);
+Invocation.Builder invocationBuilder =  target.request();
 try {
-  return invocationBuilder.get().readEntity(klass);
+  Response response = invocationBuilder.get();
+  if (response.getStatus() != Response.Status.OK.getStatusCode()
+&& response.getStatus() != Response.Status.FOUND.getStatusCode()) {
+throw new InvalidCredentialsException(String.format("External auth 
failed with status code: %d, response: %s",
+  response.getStatus(), response.readEntity(String.class)));
+  }
+  return response.readEntity(klass);
 } catch (Exception e) {
   throw new Exception(e.getCause());
 } finally {

[12/25] ambari git commit: AMBARI-18946 Ambari Integration for Zeppelin and Spark 2.0 (r-kamath)

[jonathanhurley]

AMBARI-18946 Ambari Integration for Zeppelin and Spark 2.0 (r-kamath)


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

Branch: refs/heads/branch-feature-AMBARI-18456
Commit: 69390ee4897699a94542e946e2f03d31ee4a626b
Parents: b5b73d2
Author: Renjith Kamath 
Authored: Tue Nov 29 11:57:41 2016 +0530
Committer: Renjith Kamath 
Committed: Tue Nov 29 11:59:01 2016 +0530

--
 .../0.6.0.2.5/package/scripts/master.py | 15 +++
 .../0.6.0.2.5/package/scripts/params.py | 28 +++-
 2 files changed, 31 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/69390ee4/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py
 
b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py
index 33a2a14..e82b53c 100644
--- 
a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py
+++ 
b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py
@@ -58,8 +58,12 @@ class Master(Script):
 # update the configs specified by user
 self.configure(env)
 
-Execute('echo spark_version:' + params.spark_version + ' detected for 
spark_home: '
-+ params.spark_home + ' >> ' + params.zeppelin_log_file, 
user=params.zeppelin_user)
+if params.spark_version:
+  Execute('echo spark_version:' + str(params.spark_version) + ' detected 
for spark_home: '
+  + params.spark_home + ' >> ' + params.zeppelin_log_file, 
user=params.zeppelin_user)
+if params.spark2_version:
+  Execute('echo spark2_version:' + str(params.spark2_version) + ' detected 
for spark2_home: '
+  + params.spark2_home + ' >> ' + params.zeppelin_log_file, 
user=params.zeppelin_user)
 
   def create_zeppelin_dir(self, params):
 params.HdfsResource(format("/user/{zeppelin_user}"),
@@ -138,9 +142,10 @@ class Master(Script):
 File(format("{params.conf_dir}/log4j.properties"), 
content=params.log4j_properties_content,
  owner=params.zeppelin_user, group=params.zeppelin_group)
 
-# copy hive-site.xml
-File(format("{params.conf_dir}/hive-site.xml"), 
content=StaticFile("/etc/spark/conf/hive-site.xml"),
- owner=params.zeppelin_user, group=params.zeppelin_group)
+# copy hive-site.xml only if Spark 1.x is installed
+if 'spark-defaults' in params.config['configurations']:
+File(format("{params.conf_dir}/hive-site.xml"), 
content=StaticFile("/etc/spark/conf/hive-site.xml"),
+ owner=params.zeppelin_user, group=params.zeppelin_group)
 
 if len(params.hbase_master_hosts) > 0:
   # copy hbase-site.xml

http://git-wip-us.apache.org/repos/asf/ambari/blob/69390ee4/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/params.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/params.py
 
b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/params.py
index 27ed150..5a3174f 100644
--- 
a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/params.py
+++ 
b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/params.py
@@ -39,6 +39,14 @@ def get_port_from_url(address):
   else:
 return address
 
+def extract_spark_version(spark_home):
+  try:
+with open(spark_home + "/RELEASE") as fline:
+  return re.search('Spark (\d\.\d).+', fline.readline().rstrip()).group(1)
+  except:
+pass
+  return None
+
 
 # server configurations
 config = Script.get_config()
@@ -58,13 +66,17 @@ spark_jar_dir = 
config['configurations']['zeppelin-env']['zeppelin.spark.jar.dir
 spark_jar = format("{spark_jar_dir}/zeppelin-spark-0.5.5-SNAPSHOT.jar")
 setup_view = True
 temp_file = config['configurations']['zeppelin-env']['zeppelin.temp.file']
-spark_home = os.path.join(stack_root, "current", "spark-client")
 
-try:
-  fline = open(spark_home + "/RELEASE").readline().rstrip()
-  spark_version = re.search('Spark (\d\.\d).+', fline).group(1)
-except:
-  pass
+spark_home = None
+spark_version = None
+spark2_home = None
+spark2_version = None
+if 'spark-defaults' in config['configurations']:
+  spark_home = os.path.join(stack_root, "current", 'spark-client')
+  

[17/25] ambari git commit: AMBARI-19001. Support configurable grok filters (output + ambari) (oleewere)

[jonathanhurley]

AMBARI-19001. Support configurable grok filters (output + ambari) (oleewere)

Change-Id: Ibf02fc6ca6759435ac14dc59de9f71782d7ea709


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

Branch: refs/heads/branch-feature-AMBARI-18456
Commit: cfeb39176757aae6b5670bcff07f86992238cf3e
Parents: edd6b49
Author: oleewere 
Authored: Tue Nov 29 13:46:32 2016 +0100
Committer: oleewere 
Committed: Tue Nov 29 15:54:03 2016 +0100

--
 .../configuration/logfeeder-ambari-config.xml   |  37 ++
 .../configuration/logfeeder-output-config.xml   |  37 ++
 .../LOGSEARCH/0.5.0/metainfo.xml|   5 +
 .../LOGSEARCH/0.5.0/package/scripts/params.py   |  17 +-
 .../0.5.0/package/scripts/setup_logfeeder.py|  10 +
 .../templates/input.config-ambari.json.j2   | 602 ---
 .../package/templates/output.config.json.j2 |  61 --
 .../properties/input.config-ambari.json.j2  | 602 +++
 .../0.5.0/properties/output.config.json.j2  |  61 ++
 .../stacks/2.4/LOGSEARCH/test_logfeeder.py  |  14 +-
 .../test/python/stacks/2.4/configs/default.json |   6 +
 11 files changed, 780 insertions(+), 672 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/cfeb3917/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logfeeder-ambari-config.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logfeeder-ambari-config.xml
 
b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logfeeder-ambari-config.xml
new file mode 100644
index 000..64d7946
--- /dev/null
+++ 
b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logfeeder-ambari-config.xml
@@ -0,0 +1,37 @@
+
+
+
+
+  
+content
+Ambari LogFeeder config
+Grok filters and input file locations for ambari related log 
files
+
+VALUE_FROM_PROPERTY_FILE
+
+  content
+  false
+  input.config-ambari.json.j2
+  text
+
+
+  
+
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/cfeb3917/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logfeeder-output-config.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logfeeder-output-config.xml
 
b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logfeeder-output-config.xml
new file mode 100644
index 000..85654c8
--- /dev/null
+++ 
b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logfeeder-output-config.xml
@@ -0,0 +1,37 @@
+
+
+
+
+  
+content
+LogFeeder output config
+Output configuration for LogFeeder (data 
shipping)
+
+VALUE_FROM_PROPERTY_FILE
+
+  content
+  false
+  output.config.json.j2
+  text
+
+
+  
+
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/cfeb3917/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/metainfo.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/metainfo.xml 
b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/metainfo.xml
index f00b1eb..253294e 100644
--- 
a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/metainfo.xml
+++ 
b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/metainfo.xml
@@ -72,6 +72,7 @@
 logsearch-admin-json
 logsearch-service_logs-solrconfig.xml
 logsearch-audit_logs-solrconfig.xml
+logfeeder-custom-logsearch-config
   
 
 
@@ -111,6 +112,10 @@
 logfeeder-env
 logfeeder-grok
 logfeeder-log4j
+logfeeder-system_log-env
+logfeeder-ambari-config
+logfeeder-output-config
+logfeeder-custom-logsearch-config
   
 
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/cfeb3917/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/params.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/params.py
 
b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/params.py
index bdb0c10..d086f9f 100644
--- 

[15/25] ambari git commit: AMBARI-18989. Log level filter labels not getting updated with host name filter (oleewere)

[jonathanhurley]

AMBARI-18989. Log level filter labels not getting updated with host name filter
 (oleewere)

Change-Id: I8f86056048f85f6a5de5763c59d68a9b023e5abb


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

Branch: refs/heads/branch-feature-AMBARI-18456
Commit: c705fa7fa995045ea27a36b5d457df0bae8106f1
Parents: 3c56dcc
Author: oleewere 
Authored: Fri Nov 25 16:30:37 2016 +0100
Committer: oleewere 
Committed: Tue Nov 29 15:06:36 2016 +0100

--
 .../org/apache/ambari/logsearch/LogSearch.java  |  15 +--
 .../logsearch/common/LogSearchConstants.java|   1 +
 .../AbstractOperationHolderConverter.java   |   9 ++
 ...actServiceLogRequestFacetQueryConverter.java |  44 +++
 .../BaseServiceLogRequestQueryConverter.java|   1 +
 ...ServiceLogAnyGraphRequestQueryConverter.java |  13 +++
 ...eLogComponentLevelRequestQueryConverter.java |  15 +--
 ...eLogComponentRequestFacetQueryConverter.java |  15 +--
 ...rviceLogLevelCountRequestQueryConverter.java |  16 +++
 ...eLogLevelDateRangeRequestQueryConverter.java |  16 ++-
 ...erviceLogTreeRequestFacetQueryConverter.java |  17 +--
 .../ambari/logsearch/doc/DocConstants.java  |   1 +
 .../logsearch/graph/GraphDataGenerator.java |  26 +++--
 .../logsearch/manager/ServiceLogsManager.java   |   2 +-
 .../request/ServiceLogParamDefinition.java  |   6 +
 .../request/impl/BaseServiceLogRequest.java |  13 +++
 .../dashboard/BubbleGraphTableLayoutView.js |   4 +-
 .../views/dashboard/ComponentListView.js|   2 +-
 .../scripts/views/dashboard/HostListView.js |  14 +--
 .../main/webapp/scripts/views/tabs/TreeView.js  |  10 +-
 .../webapp/templates/tabs/TreeView_tmpl.html| 115 ++-
 ...ComponentLevelRequestQueryConverterTest.java |   7 +-
 ...ComponentRequestFacetQueryConverterTest.java |   4 +-
 23 files changed, 202 insertions(+), 164 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/c705fa7f/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/LogSearch.java
--
diff --git 
a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/LogSearch.java
 
b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/LogSearch.java
index d4be790..2c3f4f5 100644
--- 
a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/LogSearch.java
+++ 
b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/LogSearch.java
@@ -63,12 +63,12 @@ public class LogSearch {
   private static final String HTTP_PROTOCOL = "http";
   private static final String HTTPS_PORT = "61889";
   private static final String HTTP_PORT = "61888";
-  
+
   private static final String WEB_RESOURCE_FOLDER = "webapps/app";
   private static final String ROOT_CONTEXT = "/";
   private static final Integer SESSION_TIMEOUT = 30;
 
- 
+
   public static void main(String[] argv) {
 LogSearch logSearch = new LogSearch();
 ManageStartEndTime.manage();
@@ -78,7 +78,7 @@ public class LogSearch {
   logger.error("Error running logsearch server", e);
 }
   }
-  
+
   public void run(String[] argv) throws Exception {
 Server server = buildSever(argv);
 HandlerList handlers = new HandlerList();
@@ -98,9 +98,10 @@ public class LogSearch {
 
   public Server buildSever(String argv[]) {
 Server server = new Server();
-ServerConnector connector = new ServerConnector(server);
 boolean portSpecified = argv.length > 0;
 String protcolProperty = 
PropertiesHelper.getProperty(LOGSEARCH_PROTOCOL_PROP,HTTP_PROTOCOL);
+HttpConfiguration httpConfiguration = new HttpConfiguration();
+httpConfiguration.setRequestHeaderSize(65535);
 if (StringUtils.isEmpty(protcolProperty)) {
   protcolProperty = HTTP_PROTOCOL;
 }
@@ -109,18 +110,18 @@ public class LogSearch {
   logger.info("Building https server...");
   port = portSpecified ? argv[0] : HTTPS_PORT;
   checkPort(Integer.parseInt(port));
-  HttpConfiguration https = new HttpConfiguration();
-  https.addCustomizer(new SecureRequestCustomizer());
+  httpConfiguration.addCustomizer(new SecureRequestCustomizer());
   SslContextFactory sslContextFactory = SSLUtil.getSslContextFactory();
   ServerConnector sslConnector = new ServerConnector(server,
   new SslConnectionFactory(sslContextFactory, "http/1.1"),
-  new HttpConnectionFactory(https));
+  new HttpConnectionFactory(httpConfiguration));
   

[22/25] ambari git commit: AMBARI-18980. Add manual confirm task before finalizing host-ordered upgrade (Duc Le via ncole)

[jonathanhurley]

AMBARI-18980. Add manual confirm task before finalizing host-ordered upgrade 
(Duc Le via ncole)


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

Branch: refs/heads/branch-feature-AMBARI-18456
Commit: 2c7c0a704f4230697b6757bdaad954d8c5d71c79
Parents: f31f3f6
Author: Nate Cole 
Authored: Tue Nov 29 12:45:47 2016 -0500
Committer: Nate Cole 
Committed: Tue Nov 29 12:45:59 2016 -0500

--
 .../stacks/HDP/2.5/upgrades/host-ordered-upgrade.xml | 11 +--
 1 file changed, 9 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/2c7c0a70/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/host-ordered-upgrade.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/host-ordered-upgrade.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/host-ordered-upgrade.xml
index 72241eea..64c79a8 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/host-ordered-upgrade.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/host-ordered-upgrade.xml
@@ -117,14 +117,21 @@
 
   true
   false
-  
+
+  
+UPGRADE
+
+  Please confirm you are ready to finalize.
+
+  
+
   
 
   scripts/namenode.py
   finalize_rolling_upgrade
 
   
-  
+
   
 
 

[06/25] ambari git commit: AMBARI-18841 : Grafana fails to start (Commit 2) (avijayan)

[jonathanhurley]

AMBARI-18841 : Grafana fails to start (Commit 2) (avijayan)


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

Branch: refs/heads/branch-feature-AMBARI-18456
Commit: 8de17fadfd00912b9bc7801011905f6c90bc8a97
Parents: cf82cf2
Author: Aravindan Vijayan 
Authored: Mon Nov 28 10:08:33 2016 -0800
Committer: Aravindan Vijayan 
Committed: Mon Nov 28 10:08:33 2016 -0800

--
 .../conf/unix/ambari-metrics-grafana| 34 ++--
 1 file changed, 9 insertions(+), 25 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/8de17fad/ambari-metrics/ambari-metrics-grafana/conf/unix/ambari-metrics-grafana
--
diff --git 
a/ambari-metrics/ambari-metrics-grafana/conf/unix/ambari-metrics-grafana 
b/ambari-metrics/ambari-metrics-grafana/conf/unix/ambari-metrics-grafana
index eeb189b..472942e 100644
--- a/ambari-metrics/ambari-metrics-grafana/conf/unix/ambari-metrics-grafana
+++ b/ambari-metrics/ambari-metrics-grafana/conf/unix/ambari-metrics-grafana
@@ -94,30 +94,14 @@ function isRunning() {
 
 case "$1" in
   start)
-echo -n $"Starting $DESC:  "
+echo $"Starting $DESC:  " >> $LOG_FILE
 
 isRunning
 if [ $? -eq 0 ]; then
-  echo "Already running."
+  echo "Already running." >> $LOG_FILE
   exit 0
 fi
 
-echo "$(date) Checking for previously running Grafana with out of sync 
PID..." >> $LOG_FILE
-if [ -n "`ps ax | grep -w ambari-metrics-grafana/bin/grafana-server`" ]; 
then
-  PID=`ps aux | grep -w ambari-metrics-grafana/bin/grafana-server | head 
-n 1 | awk '{print $2}'`
-  echo "$(date) Grafana Server already running with PID: ${PID}. Killing 
that instance"  >> $LOG_FILE
-  kill "${PID}" >/dev/null 2>&1
-  sleep "${STOP_TIMEOUT}"
-
-  if kill -0 "${PID}" > /dev/null 2>&1; then
-echo "$(date) WARNING: Grafana Server did not stop gracefully. Trying 
to kill with kill -9" >> $LOG_FILE
-kill -9 "${PID}" >/dev/null 2>&1
-  fi
-
-else
-  echo "$(date) No out of sync Grafana server process found" >> $LOG_FILE
-fi
-
 # Prepare environment
 # mkdir -p "$LOG_DIR" "$DATA_DIR" && chown 
"$GRAFANA_USER":"$GRAFANA_GROUP" "$LOG_DIR" "$DATA_DIR"
 # touch "$PID_FILE" && chown "$GRAFANA_USER":"$GRAFANA_GROUP" "$PID_FILE"
@@ -135,7 +119,7 @@ case "$1" in
   sleep 1
   # check if pid file has been written two
   if ! [[ -s $PID_FILE ]]; then
-echo "FAILED"
+echo "Start FAILED" >> $LOG_FILE
 exit 1
   fi
   i=0
@@ -152,11 +136,11 @@ case "$1" in
   done
 fi
 
-echo "OK"
+echo "OK" >> $LOG_FILE
 exit $return
 ;;
   stop)
-echo -n "Stopping $DESC ..."
+echo -n "Stopping $DESC ..." >> $LOG_FILE
 
 if [ -f "$PID_FILE" ]; then
   pid=$(cat "$PID_FILE")
@@ -165,18 +149,18 @@ case "$1" in
   sleep "${STOP_TIMEOUT}"
 
   if kill -0 "${pid}" > /dev/null 2>&1; then
-echo "WARNING: $DESC did not stop gracefully after ${STOP_TIMEOUT} 
seconds: Trying to kill with kill -9"
+echo "WARNING: $DESC did not stop gracefully after ${STOP_TIMEOUT} 
seconds: Trying to kill with kill -9" >> $LOG_FILE
 kill -9 "${pid}" >/dev/null 2>&1
   fi
 
   if ps -p "${pid}" > /dev/null 2>&1; then
-echo "ERROR: Unable to kill ${pid}"
+echo "ERROR: Unable to kill ${pid}" >> $LOG_FILE
   else
-rm -f "${pidfile}" >/dev/null 2>&1
+rm -f "$PID_FILE" >/dev/null 2>&1
   fi
   echo "OK"
 else
-  echo -n "(not running)"
+  echo -n "(not running)" >> $LOG_FILE
 fi
 exit 0
 ;;

[16/25] ambari git commit: AMBARI-18996. Abillity to enable SPNEGO on Log Search Portal UI from Ambari (oleewere)

[jonathanhurley]

AMBARI-18996. Abillity to enable SPNEGO on Log Search Portal UI from Ambari 
(oleewere)

Change-Id: I679f212cc725cb263b9c57931573fe5e94e712df


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

Branch: refs/heads/branch-feature-AMBARI-18456
Commit: edd6b491fe3586b95297752085a72417b801daf8
Parents: c705fa7
Author: oleewere 
Authored: Tue Nov 29 15:39:11 2016 +0100
Committer: oleewere 
Committed: Tue Nov 29 15:39:11 2016 +0100

--
 .../LogsearchKRBAuthenticationFilter.java   |  4 +-
 .../src/main/resources/logsearch.properties |  2 +-
 .../configuration/logsearch-properties.xml  | 40 +++
 .../configs/services/logsearch_properties.js| 51 +++-
 4 files changed, 93 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/edd6b491/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/web/filters/LogsearchKRBAuthenticationFilter.java
--
diff --git 
a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/web/filters/LogsearchKRBAuthenticationFilter.java
 
b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/web/filters/LogsearchKRBAuthenticationFilter.java
index 808320d..fdda542 100644
--- 
a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/web/filters/LogsearchKRBAuthenticationFilter.java
+++ 
b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/web/filters/LogsearchKRBAuthenticationFilter.java
@@ -72,7 +72,7 @@ public class LogsearchKRBAuthenticationFilter extends 
LogsearchKrbFilter {
   private static final String PRINCIPAL = 
"logsearch.spnego.kerberos.principal";
   private static final String KEYTAB = "logsearch.spnego.kerberos.keytab";
   private static final String HOST_NAME = "logsearch.spnego.kerberos.host";
-  private static final String 
KERBEROS_ENABLE="logsearch.spnego.kerberos.enable";
+  private static final String KERBEROS_ENABLED = 
"logsearch.spnego.kerberos.enabled";
 
   private static final String NAME_RULES_PARAM = "kerberos.name.rules";
   private static final String TOKEN_VALID_PARAM = "token.validity";
@@ -230,7 +230,7 @@ public class LogsearchKRBAuthenticationFilter extends 
LogsearchKrbFilter {
   }
 
   private void isSpnegoEnable() {
-spnegoEnable = PropertiesHelper.getBooleanProperty(KERBEROS_ENABLE, false);
+spnegoEnable = PropertiesHelper.getBooleanProperty(KERBEROS_ENABLED, 
false);
 if (spnegoEnable) {
   spnegoEnable = false;
   String keytab = PropertiesHelper.getProperty(KEYTAB);

http://git-wip-us.apache.org/repos/asf/ambari/blob/edd6b491/ambari-logsearch/ambari-logsearch-portal/src/main/resources/logsearch.properties
--
diff --git 
a/ambari-logsearch/ambari-logsearch-portal/src/main/resources/logsearch.properties
 
b/ambari-logsearch/ambari-logsearch-portal/src/main/resources/logsearch.properties
index 7641b0c..b6cc4a5 100755
--- 
a/ambari-logsearch/ambari-logsearch-portal/src/main/resources/logsearch.properties
+++ 
b/ambari-logsearch/ambari-logsearch-portal/src/main/resources/logsearch.properties
@@ -57,7 +57,7 @@ 
logsearch.solr.jaas.file=/usr/lib/ambari-logsearch-portal/logsearch_solr_jaas.co
 
 
 #portal Kerberos 
-logsearch.spnego.kerberos.enable=false
+logsearch.spnego.kerberos.enabled=false
 logsearch.spnego.kerberos.keytab=
 logsearch.spnego.kerberos.principal=
 logsearch.spnego.kerberos.host=
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/edd6b491/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-properties.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-properties.xml
 
b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-properties.xml
index 9dcd5cf..10ca9ae 100644
--- 
a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-properties.xml
+++ 
b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-properties.xml
@@ -236,4 +236,44 @@
 
 
   
+  
+logsearch.spnego.kerberos.enabled
+
+Http Spnego enabled
+Enable SPNEGO based authentication on the Log Search 
UI
+
+  boolean
+
+
+  
+  
+logsearch.spnego.kerberos.principal
+
+Http Spnego principal
+ 

[14/25] ambari git commit: AMBARI-19008 Fix input height in filters with dropdown. (ababiichuk)

[jonathanhurley]

AMBARI-19008 Fix input height in filters with dropdown. (ababiichuk)


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

Branch: refs/heads/branch-feature-AMBARI-18456
Commit: 3c56dcce5b3c10d29b6b500ce749179eddbc4421
Parents: 5f3b323
Author: ababiichuk 
Authored: Tue Nov 29 13:49:02 2016 +0200
Committer: ababiichuk 
Committed: Tue Nov 29 13:53:27 2016 +0200

--
 ambari-web/app/styles/theme/bootstrap-ambari.css | 5 +
 1 file changed, 1 insertion(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/3c56dcce/ambari-web/app/styles/theme/bootstrap-ambari.css
--
diff --git a/ambari-web/app/styles/theme/bootstrap-ambari.css 
b/ambari-web/app/styles/theme/bootstrap-ambari.css
index f427c0a..d10a13b 100644
--- a/ambari-web/app/styles/theme/bootstrap-ambari.css
+++ b/ambari-web/app/styles/theme/bootstrap-ambari.css
@@ -35,6 +35,7 @@
   outline: none;
   font-family: 'Roboto', sans-serif;
   text-transform: uppercase;
+  height: 34px;
   font-size: 14px;
   padding: 10px 20px;
   line-height: 14px;
@@ -212,10 +213,6 @@
   background-color: #429929;
   border: 1px solid #3FAE2A;
 }
-.navbar-btn {
-  margin-top: 7px;
-  margin-bottom: 7px;
-}
 .btn-regular-default-state {
   background-color: #FFF;
   color: #666;

[24/25] ambari git commit: AMBARI-19003. Perf: Fix deploy-gce-perf-cluster.py to deploy separate server onto own cluster with different settings for more cores and MySQL DB (alejandro)

[jonathanhurley]

AMBARI-19003. Perf: Fix deploy-gce-perf-cluster.py to deploy separate server 
onto own cluster with different settings for more cores and MySQL DB (alejandro)


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

Branch: refs/heads/branch-feature-AMBARI-18456
Commit: 85c9104ec14dc7b059d41f61dbbc6e57aec216d0
Parents: 1a8a538
Author: Alejandro Fernandez 
Authored: Tue Nov 22 14:37:07 2016 -0800
Committer: Alejandro Fernandez 
Committed: Tue Nov 29 12:42:58 2016 -0800

--
 contrib/utils/perf/deploy-gce-perf-cluster.py | 243 ++---
 1 file changed, 169 insertions(+), 74 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/85c9104e/contrib/utils/perf/deploy-gce-perf-cluster.py
--
diff --git a/contrib/utils/perf/deploy-gce-perf-cluster.py 
b/contrib/utils/perf/deploy-gce-perf-cluster.py
index 95ed98f..4737c6f 100644
--- a/contrib/utils/perf/deploy-gce-perf-cluster.py
+++ b/contrib/utils/perf/deploy-gce-perf-cluster.py
@@ -148,6 +148,7 @@ class SCP:
 
 return {"exitstatus": scpstat.returncode, "log": log, "errormsg": errorMsg}
 
+
 # main method to parse arguments from user and start work
 def main():
   parser = argparse.ArgumentParser(
@@ -178,6 +179,30 @@ def main():
   args = parser.parse_args()
   do_work(args)
 
+
+def do_work(args):
+  """
+  Check that all required args are passed in. If so, deploy the cluster.
+  :param args: Command line args
+  """
+  if not args.controller:
+raise Exception("GCE controller ip address is not defined!")
+
+  if not args.key:
+raise Exception("Path to gce ssh key is not defined!")
+
+  if not args.cluster_suffix:
+raise Exception("Cluster name suffix is not defined!")
+
+  if not args.agent_prefix:
+raise Exception("Agent name prefix is not defined!")
+
+  if not args.agents_count:
+raise Exception("Agents count for whole cluster is not defined (will put 
50 Agents per VM)!")
+
+  deploy_cluster(args)
+
+
 def deploy_cluster(args):
   """
   Process cluster deployment
@@ -186,49 +211,54 @@ def deploy_cluster(args):
   # When dividing, need to get the ceil.
   number_of_nodes = ((args.agents_count - 1) / NUMBER_OF_AGENTS_ON_HOST) + 1
 
-  # trying to create cluster with needed params
-  print "Creating cluster {0}-{1} with {2} large nodes on 
centos6...".format(cluster_prefix, args.cluster_suffix, str(number_of_nodes))
-  execute_command(args, args.controller, "/usr/sbin/gce up {0}-{1} {2} 
--centos6 --large".format(cluster_prefix, args.cluster_suffix, 
str(number_of_nodes)),
-  "Failed to create cluster, probably not enough resources!", 
"-tt")
-
-  # VMs are not accessible immediately
-  time.sleep(10)
+  # In case of an error after creating VMs, can simply comment out this 
function to run again without creating VMs.
+  create_vms(args, number_of_nodes)
 
   # getting list of vms information like hostname and ip address
   print "Getting list of virtual machines from cluster..."
   # Dictionary from host name to IP
-  vms = get_vms_list(args)
+  (server_dict, agents_dict) = get_vms_list(args)
 
   # check number of nodes in cluster to be the same as user asked
   print "Checking count of created nodes in cluster..."
-  if not vms or len(vms) < number_of_nodes:
-raise Exception("Cannot bring up enough nodes. Requested {0}, but got {1}. 
Probably not enough resources!".format(number_of_nodes, len(vms)))
+  if not agents_dict or len(agents_dict) < number_of_nodes:
+raise Exception("Cannot bring up enough nodes. Requested {0}, but got {1}. 
Probably not enough resources!".format(number_of_nodes, len(agents_dict)))
 
-  print "GCE cluster was successfully created!"
-  pretty_print_vms(vms)
+  print "GCE cluster was successfully created!\n"
 
   # installing/starting ambari-server and ambari-agents on each host
-  server_host_name = sorted(vms.items())[0][0]
-  server_installed = False
+  server_item = server_dict.items()[0]
+  server_host_name = server_item[0]
+  server_ip = server_item[1]
+  print "=="
+  print "Server Hostname: %s" % server_host_name
+  print "Server IP: %s" % server_ip
+  print "==\n"
+
+  # Sort the agents by hostname into a list.
+  sorted_agents = sort_hosts(agents_dict)
+  pretty_print_vms(sorted_agents)
 
-  print "Creating server.sh script (which will be executed on server to 
install/configure/start ambari-server and ambari-agent)..."
-  create_server_script(args, server_host_name)
+  print "Creating server.sh script (which will be executed on server to 

[18/25] ambari git commit: AMBARI-19014. Add Service Wizard: error thrown during transition on deploy step (akovalenko)

[jonathanhurley]

AMBARI-19014. Add Service Wizard: error thrown during transition on deploy step 
(akovalenko)


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

Branch: refs/heads/branch-feature-AMBARI-18456
Commit: 1b6a92d5527c68523be755f4e4ab9eb7a8f142e6
Parents: cfeb391
Author: Aleksandr Kovalenko 
Authored: Tue Nov 29 15:27:22 2016 +0200
Committer: Aleksandr Kovalenko 
Committed: Tue Nov 29 17:10:13 2016 +0200

--
 .../controllers/main/service/add_controller.js  | 11 +---
 .../main/service/add_controller_test.js | 29 
 2 files changed, 30 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/1b6a92d5/ambari-web/app/controllers/main/service/add_controller.js
--
diff --git a/ambari-web/app/controllers/main/service/add_controller.js 
b/ambari-web/app/controllers/main/service/add_controller.js
index 4310f8d..f312a5a 100644
--- a/ambari-web/app/controllers/main/service/add_controller.js
+++ b/ambari-web/app/controllers/main/service/add_controller.js
@@ -467,7 +467,7 @@ App.AddServiceController = 
App.WizardController.extend(App.AddSecurityConfigs, {
   installSelectedServices: function (callback) {
 var name = 'common.services.update';
 var selectedServices = 
this.get('content.services').filterProperty('isInstalled', 
false).filterProperty('isSelected', true).mapProperty('serviceName');
-var dependentServices = this.getDependentServices();
+var dependentServices = this.getServicesBySelectedSlaves();
 var data = 
this.generateDataForInstallServices(selectedServices.concat(dependentServices));
 this.installServicesRequest(name, data, callback.bind(this));
   },
@@ -484,14 +484,17 @@ App.AddServiceController = 
App.WizardController.extend(App.AddSecurityConfigs, {
   },
 
   /**
-   * return list of services by dependent slave components
+   * return list of services by selected and not installed slave components
* @returns {Array}
*/
-  getDependentServices: function () {
+  getServicesBySelectedSlaves: function () {
 var result = [];
 this.get('content.slaveComponentHosts').forEach(function (slaveComponent) {
   if (slaveComponent.hosts.someProperty('isInstalled', false)) {
-
result.push(App.StackServiceComponent.find().findProperty('componentName', 
slaveComponent.componentName).get('serviceName'));
+var stackComponent = 
App.StackServiceComponent.find().findProperty('componentName', 
slaveComponent.componentName);
+if (stackComponent) {
+  result.push(stackComponent.get('serviceName'));
+}
   }
 });
 return result.uniq();

http://git-wip-us.apache.org/repos/asf/ambari/blob/1b6a92d5/ambari-web/test/controllers/main/service/add_controller_test.js
--
diff --git a/ambari-web/test/controllers/main/service/add_controller_test.js 
b/ambari-web/test/controllers/main/service/add_controller_test.js
index 7470f89..715f46a 100644
--- a/ambari-web/test/controllers/main/service/add_controller_test.js
+++ b/ambari-web/test/controllers/main/service/add_controller_test.js
@@ -566,14 +566,14 @@ describe('App.AddServiceController', function() {
 
   });
 
-  describe('#getDependentServices', function () {
+  describe('#getServicesBySelectedSlaves', function () {
 
 beforeEach(function () {
   sinon.stub(App.StackServiceComponent, 'find').returns([
-  Em.Object.create({
-componentName: 'c1',
-serviceName: 's1'
-  }),
+Em.Object.create({
+  componentName: 'c1',
+  serviceName: 's1'
+}),
 Em.Object.create({
   componentName: 'c2',
   serviceName: 's2'
@@ -596,6 +596,23 @@ describe('App.AddServiceController', function() {
 expect: []
   },
   {
+title: 'should return empty array if component is absent in 
StackServiceComponent model',
+sch: [
+  {
+componentName: 'c5',
+hosts: [
+  {
+isInstalled: false
+  },
+  {
+isInstalled: true
+  }
+]
+  },
+],
+expect: []
+  },
+  {
 title: 'should return services for not installed slaves',
 sch: [
   {
@@ -638,7 +655,7 @@ describe('App.AddServiceController', function() {
   describe(test.title, function () {
 it(function () {
   

[10/25] ambari git commit: AMBARI-18987 A general preupgrade check on if services cannot be upgrade are installed (dili)

[jonathanhurley]

AMBARI-18987 A general preupgrade check on if services cannot be upgrade are 
installed (dili)


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

Branch: refs/heads/branch-feature-AMBARI-18456
Commit: bb803fb332d8d247e236b5e1b29fe97acfd7a7ec
Parents: 640d85a
Author: Di Li 
Authored: Mon Nov 28 15:51:11 2016 -0500
Committer: Di Li 
Committed: Mon Nov 28 15:51:11 2016 -0500

--
 .../ambari/server/checks/CheckDescription.java  |  13 ++
 .../server/checks/ServicePresenceCheck.java | 177 +++
 .../server/checks/ServicePresenceCheckTest.java | 217 +++
 3 files changed, 407 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/bb803fb3/ambari-server/src/main/java/org/apache/ambari/server/checks/CheckDescription.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/checks/CheckDescription.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/checks/CheckDescription.java
index fbc4be1..7f24bf4 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/checks/CheckDescription.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/checks/CheckDescription.java
@@ -277,6 +277,19 @@ public class CheckDescription {
   "This service does not support upgrades and must be removed before 
the upgrade can continue. " +
   "After upgrading, Atlas can be reinstalled").build());
 
+  public static CheckDescription SERVICE_PRESENCE_CHECK = new 
CheckDescription("SERVICE_PRESENCE_CHECK",
+  PrereqCheckType.SERVICE,
+  "Service Is Not Supported For Upgrades",
+  new ImmutableMap.Builder()
+.put(AbstractCheckDescriptor.DEFAULT,
+"The %s service is currently installed on the cluster. " +
+"This service does not support upgrades and must be removed before 
the upgrade can continue. " +
+"After upgrading, %s can be reinstalled")
+.put(ServicePresenceCheck.KEY_SERVICE_REMOVED,
+"The %s service is currently installed on the cluster. " +
+"This service is removed from the new release and must be removed 
before the upgrade can continue. " +
+"After upgrading, %s can be installed").build());
+
   public static CheckDescription RANGER_SERVICE_AUDIT_DB_CHECK = new 
CheckDescription("RANGER_SERVICE_AUDIT_DB_CHECK",
 PrereqCheckType.SERVICE,
 "Remove the Ranger Audit to Database Capability",

http://git-wip-us.apache.org/repos/asf/ambari/blob/bb803fb3/ambari-server/src/main/java/org/apache/ambari/server/checks/ServicePresenceCheck.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/checks/ServicePresenceCheck.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/checks/ServicePresenceCheck.java
new file mode 100644
index 000..0f4eeb1
--- /dev/null
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/checks/ServicePresenceCheck.java
@@ -0,0 +1,177 @@
+/**
+ * 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.
+ */
+package org.apache.ambari.server.checks;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.ambari.server.AmbariException;
+import org.apache.ambari.server.controller.PrereqCheckRequest;
+import org.apache.ambari.server.state.Cluster;
+import org.apache.ambari.server.state.stack.PrereqCheckStatus;
+import org.apache.ambari.server.state.stack.PrerequisiteCheck;
+import 
org.apache.ambari.server.state.stack.UpgradePack.PrerequisiteCheckConfig;
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import 

[07/25] ambari git commit: AMBARI-18973 Service Auto Start: discard popup appears even when no changes were made, second patch (atkach)

[jonathanhurley]

AMBARI-18973 Service Auto Start: discard popup appears even when no changes 
were made, second patch (atkach)


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

Branch: refs/heads/branch-feature-AMBARI-18456
Commit: 3c8b1582c2f0aa65289b762fd0162049916e9140
Parents: 8de17fa
Author: Andrii Tkach 
Authored: Mon Nov 28 18:36:50 2016 +0200
Committer: Andrii Tkach 
Committed: Mon Nov 28 20:41:25 2016 +0200

--
 ambari-web/app/controllers/main/admin/service_auto_start.js | 2 +-
 ambari-web/app/templates/main/admin/service_auto_start.hbs  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/3c8b1582/ambari-web/app/controllers/main/admin/service_auto_start.js
--
diff --git a/ambari-web/app/controllers/main/admin/service_auto_start.js 
b/ambari-web/app/controllers/main/admin/service_auto_start.js
index 501e6bb..df07c94 100644
--- a/ambari-web/app/controllers/main/admin/service_auto_start.js
+++ b/ambari-web/app/controllers/main/admin/service_auto_start.js
@@ -208,7 +208,7 @@ App.MainAdminServiceAutoStartController = 
Em.Controller.extend({
 }
   }.property('enabledComponents', 'totalComponents'),
   components: Em.A([componentRecovery]),
-  enabledComponents: componentRecovery.recovery_enabled ? 1 : 0,
+  enabledComponents: componentRecovery.recoveryEnabled ? 1 : 0,
   totalComponents: 1,
   indicator: function () {
 var percentage = this.get('enabledComponents') / 
this.get('totalComponents');

http://git-wip-us.apache.org/repos/asf/ambari/blob/3c8b1582/ambari-web/app/templates/main/admin/service_auto_start.hbs
--
diff --git a/ambari-web/app/templates/main/admin/service_auto_start.hbs 
b/ambari-web/app/templates/main/admin/service_auto_start.hbs
index 29ec3b3..7334995 100644
--- a/ambari-web/app/templates/main/admin/service_auto_start.hbs
+++ b/ambari-web/app/templates/main/admin/service_auto_start.hbs
@@ -72,7 +72,7 @@
   {{#each component in tab.components}}
 
   
-{{component.display_name}}
+{{component.displayName}}
   
   
 {{view App.MainAdminServiceAutoStartComponentView 
componentBinding="component" tabBinding="tab"}}

[04/25] ambari git commit: AMBARI-18836. Remove group readable from hdfs headless keytab (Shi Wang via rlevas)

[jonathanhurley]

AMBARI-18836. Remove group readable from hdfs headless keytab (Shi Wang via 
rlevas)


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

Branch: refs/heads/branch-feature-AMBARI-18456
Commit: cad0130d9d4a64a6bda1992758c5c7c05e06b39e
Parents: 255725d
Author: Shi Wang 
Authored: Mon Nov 28 12:39:05 2016 -0500
Committer: Robert Levas 
Committed: Mon Nov 28 12:39:10 2016 -0500

--
 .../common-services/HDFS/2.1.0.2.0/kerberos.json  |  2 +-
 .../HIVE/0.12.0.2.0/package/scripts/webhcat.py| 10 --
 .../resources/stacks/HDP/2.5/services/HDFS/kerberos.json  |  2 +-
 .../test/python/stacks/2.0.6/HIVE/test_webhcat_server.py  |  4 
 4 files changed, 2 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/cad0130d/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/kerberos.json
--
diff --git 
a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/kerberos.json 
b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/kerberos.json
index e8c96cb..f30c9e4 100644
--- 
a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/kerberos.json
+++ 
b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/kerberos.json
@@ -56,7 +56,7 @@
 },
 "group": {
   "name": "${cluster-env/user_group}",
-  "access": "r"
+  "access": ""
 },
 "configuration": "hadoop-env/hdfs_user_keytab"
   }

http://git-wip-us.apache.org/repos/asf/ambari/blob/cad0130d/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/webhcat.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/webhcat.py
 
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/webhcat.py
index a7feb60..00b057c 100644
--- 
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/webhcat.py
+++ 
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/webhcat.py
@@ -70,16 +70,6 @@ def webhcat():
 group=params.user_group,
 cd_access="a")
 
-  if params.security_enabled:
-kinit_if_needed = format("{kinit_path_local} -kt {hdfs_user_keytab} 
{hdfs_principal_name};")
-  else:
-kinit_if_needed = ""
-
-  if kinit_if_needed:
-Execute(kinit_if_needed,
-user=params.webhcat_user,
-path='/bin'
-)
 
   # Replace _HOST with hostname in relevant principal-related properties
   webhcat_site = params.config['configurations']['webhcat-site'].copy()

http://git-wip-us.apache.org/repos/asf/ambari/blob/cad0130d/ambari-server/src/main/resources/stacks/HDP/2.5/services/HDFS/kerberos.json
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HDFS/kerberos.json 
b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HDFS/kerberos.json
index 974a69c..9000e95 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HDFS/kerberos.json
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HDFS/kerberos.json
@@ -66,7 +66,7 @@
 },
 "group": {
   "name": "${cluster-env/user_group}",
-  "access": "r"
+  "access": ""
 },
 "configuration": "hadoop-env/hdfs_user_keytab"
   }

http://git-wip-us.apache.org/repos/asf/ambari/blob/cad0130d/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_webhcat_server.py
--
diff --git 
a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_webhcat_server.py 
b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_webhcat_server.py
index 2b26dd8..8df6295 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_webhcat_server.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_webhcat_server.py
@@ -252,10 +252,6 @@ class TestWebHCatServer(RMFTestCase):
   create_parents = True,
   cd_access = 'a'
   )
-self.assertResourceCalled('Execute', '/usr/bin/kinit -kt 
/etc/security/keytabs/hdfs.headless.keytab hdfs;',
-  path = ['/bin'],
-  user = 'hcat',
-  

[19/25] ambari git commit: AMBARI-19009. Remove Spark History Server dependency Zeppelin (magyari_sandor)

[jonathanhurley]

AMBARI-19009. Remove Spark History Server dependency Zeppelin (magyari_sandor)


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

Branch: refs/heads/branch-feature-AMBARI-18456
Commit: 4dda1d739c78f8feb130b1f12b1ba5709be9a1a1
Parents: 1b6a92d
Author: Sandor Magyari 
Authored: Tue Nov 29 13:11:06 2016 +0100
Committer: Sandor Magyari 
Committed: Tue Nov 29 16:19:02 2016 +0100

--
 .../common-services/ZEPPELIN/0.6.0.2.5/role_command_order.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/4dda1d73/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/role_command_order.json
--
diff --git 
a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/role_command_order.json
 
b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/role_command_order.json
index 86dbc85..3b7d2d0 100644
--- 
a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/role_command_order.json
+++ 
b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/role_command_order.json
@@ -1,7 +1,7 @@
 {
   "general_deps" : {
 "_comment" : "dependencies for ZEPPELIN",
-"ZEPPELIN_MASTER-START" : ["NAMENODE-START", 
"SPARK_JOBHISTORYSERVER-START"],
+"ZEPPELIN_MASTER-START" : ["NAMENODE-START"],
 "ZEPPELIN_SERVICE_CHECK-SERVICE_CHECK" : ["ZEPPELIN_MASTER-START"]
   }
 }

[25/25] ambari git commit: Merge branch 'trunk' into branch-feature-AMBARI-18456

[jonathanhurley]

Merge branch 'trunk' into branch-feature-AMBARI-18456


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

Branch: refs/heads/branch-feature-AMBARI-18456
Commit: 276d1244e1b1d8200cf644b7cccfaa0a757f8146
Parents: 1f804d1 85c9104
Author: Jonathan Hurley 
Authored: Tue Nov 29 16:51:58 2016 -0500
Committer: Jonathan Hurley 
Committed: Tue Nov 29 17:00:59 2016 -0500

--
 .../views/stackVersions/stackVersionPage.html   |   2 +-
 .../org/apache/ambari/logsearch/LogSearch.java  |  15 +-
 .../logsearch/common/ExternalServerClient.java  |  12 +-
 .../logsearch/common/LogSearchConstants.java|   1 +
 .../AbstractOperationHolderConverter.java   |   9 +
 ...actServiceLogRequestFacetQueryConverter.java |  44 ++
 .../BaseServiceLogRequestQueryConverter.java|   1 +
 ...ServiceLogAnyGraphRequestQueryConverter.java |  13 +
 ...eLogComponentLevelRequestQueryConverter.java |  15 +-
 ...eLogComponentRequestFacetQueryConverter.java |  15 +-
 ...rviceLogLevelCountRequestQueryConverter.java |  16 +
 ...eLogLevelDateRangeRequestQueryConverter.java |  16 +-
 ...erviceLogTreeRequestFacetQueryConverter.java |  17 +-
 .../ambari/logsearch/doc/DocConstants.java  |   1 +
 .../logsearch/graph/GraphDataGenerator.java |  26 +-
 .../logsearch/manager/ServiceLogsManager.java   |   2 +-
 .../request/ServiceLogParamDefinition.java  |   6 +
 .../request/impl/BaseServiceLogRequest.java |  13 +
 .../LogsearchKRBAuthenticationFilter.java   |   4 +-
 .../src/main/resources/logsearch.properties |   2 +-
 .../dashboard/BubbleGraphTableLayoutView.js |   4 +-
 .../views/dashboard/ComponentListView.js|   2 +-
 .../scripts/views/dashboard/HostListView.js |  14 +-
 .../main/webapp/scripts/views/tabs/TreeView.js  |  10 +-
 .../webapp/templates/tabs/TreeView_tmpl.html| 115 ++--
 ...ComponentLevelRequestQueryConverterTest.java |   7 +-
 ...ComponentRequestFacetQueryConverterTest.java |   4 +-
 .../conf/unix/ambari-metrics-grafana|  34 +-
 .../ambari/server/checks/CheckDescription.java  |  13 +
 .../server/checks/ServicePresenceCheck.java | 177 ++
 .../internal/ClusterControllerImpl.java |   2 +-
 .../ServiceConfigVersionResourceProvider.java   |   3 +-
 .../logging/LoggingSearchPropertyProvider.java  |  11 +-
 .../ambari/server/orm/dao/ClusterDAO.java   |  24 +
 .../ambari/server/orm/dao/ServiceConfigDAO.java |  13 +-
 .../orm/entities/ClusterConfigEntity.java   |   7 +-
 .../entities/ClusterConfigMappingEntity.java|   6 +
 .../orm/entities/ServiceConfigEntity.java   |   5 +-
 .../server/orm/helpers/dbms/MySqlHelper.java|  18 +
 .../upgrades/RangerKmsProxyConfig.java  |  94 +++
 .../server/state/cluster/ClusterImpl.java   |  42 +-
 .../server/upgrade/SchemaUpgradeHelper.java |  35 +-
 .../main/resources/Ambari-DDL-MySQL-CREATE.sql  |   1 +
 .../FLUME/1.4.0.2.0/package/scripts/flume.py|   1 +
 .../package/files/hbaseSmokeVerify.sh   |   2 +-
 .../HDFS/2.1.0.2.0/kerberos.json|   2 +-
 .../HIVE/0.12.0.2.0/configuration/hive-env.xml  |  19 +
 .../HIVE/0.12.0.2.0/package/scripts/webhcat.py  |  10 -
 .../configuration/logfeeder-ambari-config.xml   |  37 ++
 .../configuration/logfeeder-output-config.xml   |  37 ++
 .../configuration/logsearch-properties.xml  |  40 ++
 .../LOGSEARCH/0.5.0/metainfo.xml|   5 +
 .../LOGSEARCH/0.5.0/package/scripts/params.py   |  17 +-
 .../0.5.0/package/scripts/setup_logfeeder.py|  10 +
 .../templates/input.config-ambari.json.j2   | 602 ---
 .../package/templates/output.config.json.j2 |  61 --
 .../properties/input.config-ambari.json.j2  | 602 +++
 .../0.5.0/properties/output.config.json.j2  |  61 ++
 .../OOZIE/4.0.0.2.0/configuration/oozie-env.xml |  19 +
 .../0.6.0.2.5/package/scripts/master.py |  15 +-
 .../0.6.0.2.5/package/scripts/params.py |  28 +-
 .../ZEPPELIN/0.6.0.2.5/role_command_order.json  |   2 +-
 .../HDP/2.0.6/configuration/cluster-env.xml |   6 +
 .../HDP/2.2/services/HIVE/themes/theme.json | 107 +++-
 .../services/HIVE/configuration/hive-env.xml|  35 ++
 .../services/OOZIE/configuration/oozie-env.xml  |  33 +
 .../stacks/HDP/2.3/services/OOZIE/metainfo.xml  |   6 +
 .../HDP/2.3/services/OOZIE/themes/theme.json| 116 
 .../HDP/2.3/upgrades/nonrolling-upgrade-2.5.xml |   7 +
 .../HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml |   7 +
 .../stacks/HDP/2.3/upgrades/upgrade-2.5.xml |  11 +
 .../stacks/HDP/2.3/upgrades/upgrade-2.6.xml |  11 +
 .../HDP/2.4/upgrades/nonrolling-upgrade-2.5.xml |   7 +
 .../HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml 

[08/25] ambari git commit: AMBARI-18999 - Unable to Start Multiple Flume Agents Due to Missing Import (jonathanhurley)

[jonathanhurley]

AMBARI-18999 - Unable to Start Multiple Flume Agents Due to Missing Import 
(jonathanhurley)


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

Branch: refs/heads/branch-feature-AMBARI-18456
Commit: 80d09892d685a8179e6ece33a41f59de1b7d580b
Parents: 3c8b158
Author: Jonathan Hurley 
Authored: Mon Nov 28 11:22:46 2016 -0500
Committer: Jonathan Hurley 
Committed: Mon Nov 28 14:11:02 2016 -0500

--
 .../common-services/FLUME/1.4.0.2.0/package/scripts/flume.py| 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/80d09892/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/flume.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/flume.py
 
b/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/flume.py
index 5823271..aeb7074 100644
--- 
a/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/flume.py
+++ 
b/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/flume.py
@@ -24,6 +24,7 @@ from resource_management.libraries.script.script import Script
 from resource_management.core.resources.service import ServiceConfig
 from resource_management.core.resources.system import Directory, Execute, File
 from resource_management.core.exceptions import Fail
+from resource_management.core import shell
 from resource_management.core.shell import as_user, as_sudo
 from resource_management.core.source import Template, InlineTemplate
 from resource_management.libraries.functions.format import format

[02/25] ambari git commit: AMBARI-18976. Config History request execution time depends on config versions count. (mpapirkovskyy)

[jonathanhurley]

AMBARI-18976. Config History request execution time depends on config versions 
count. (mpapirkovskyy)


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

Branch: refs/heads/branch-feature-AMBARI-18456
Commit: abf9882276d2ed73cd5dcf12a088d16492c9490d
Parents: b1eaffc
Author: Myroslav Papirkovskyi 
Authored: Wed Nov 23 19:03:14 2016 +0200
Committer: Myroslav Papirkovskyi 
Committed: Mon Nov 28 18:38:03 2016 +0200

--
 .../internal/ClusterControllerImpl.java |  2 +-
 .../ServiceConfigVersionResourceProvider.java   |  3 +-
 .../logging/LoggingSearchPropertyProvider.java  | 11 -
 .../ambari/server/orm/dao/ClusterDAO.java   | 24 +++
 .../ambari/server/orm/dao/ServiceConfigDAO.java | 13 +++---
 .../orm/entities/ClusterConfigEntity.java   |  7 +++-
 .../entities/ClusterConfigMappingEntity.java|  6 +++
 .../orm/entities/ServiceConfigEntity.java   |  5 ++-
 .../server/state/cluster/ClusterImpl.java   | 42 +---
 9 files changed, 67 insertions(+), 46 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/abf98822/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterControllerImpl.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterControllerImpl.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterControllerImpl.java
index 32bed7b..c752e80 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterControllerImpl.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterControllerImpl.java
@@ -858,7 +858,7 @@ public class ClusterControllerImpl implements 
ClusterController {
   if (compVal == 0) {
 Schema schema = getSchema(resourceType);
 
-for (Type type : Type.values()) {
+for (Type type : schema.getKeyTypes()) {
   String keyPropertyId = schema.getKeyPropertyId(type);
   if (keyPropertyId != null) {
 compVal = compareValues(resource1.getPropertyValue(keyPropertyId),

http://git-wip-us.apache.org/repos/asf/ambari/blob/abf98822/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceConfigVersionResourceProvider.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceConfigVersionResourceProvider.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceConfigVersionResourceProvider.java
index 2edbe9b..e5ca389 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceConfigVersionResourceProvider.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceConfigVersionResourceProvider.java
@@ -91,8 +91,9 @@ public class ServiceConfigVersionResourceProvider extends
 PROPERTY_IDS.add(SERVICE_CONFIG_VERSION_IS_COMPATIBLE_PROPERTY_ID);
 
 // keys
-
KEY_PROPERTY_IDS.put(Resource.Type.ServiceConfigVersion,SERVICE_CONFIG_VERSION_SERVICE_NAME_PROPERTY_ID);
+
KEY_PROPERTY_IDS.put(Resource.Type.Service,SERVICE_CONFIG_VERSION_SERVICE_NAME_PROPERTY_ID);
 
KEY_PROPERTY_IDS.put(Resource.Type.Cluster,SERVICE_CONFIG_VERSION_CLUSTER_NAME_PROPERTY_ID);
+
KEY_PROPERTY_IDS.put(Resource.Type.ServiceConfigVersion,SERVICE_CONFIG_VERSION_PROPERTY_ID);
   }
 
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/abf98822/ambari-server/src/main/java/org/apache/ambari/server/controller/logging/LoggingSearchPropertyProvider.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/logging/LoggingSearchPropertyProvider.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/logging/LoggingSearchPropertyProvider.java
index d9db290..16788ed 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/logging/LoggingSearchPropertyProvider.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/logging/LoggingSearchPropertyProvider.java
@@ -39,8 +39,10 @@ import org.apache.log4j.Logger;
 
 import java.util.Collections;
 import java.util.EnumSet;
+import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -73,7 +75,7 @@ public class 

[11/25] ambari git commit: AMBARI-18834 Add Ranger proxy user under Ranger KMS config during stack upgrade (mugdha)

[jonathanhurley]

AMBARI-18834 Add Ranger proxy user under Ranger KMS config during stack upgrade 
(mugdha)


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

Branch: refs/heads/branch-feature-AMBARI-18456
Commit: b5b73d20274a8bbffcebbd9f099e30949220
Parents: bb803fb
Author: Mugdha Varadkar 
Authored: Tue Nov 29 09:38:40 2016 +0530
Committer: Mugdha Varadkar 
Committed: Tue Nov 29 09:41:23 2016 +0530

--
 .../upgrades/RangerKmsProxyConfig.java  |  95 +
 .../HDP/2.3/upgrades/nonrolling-upgrade-2.5.xml |   7 +
 .../HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml |   7 +
 .../stacks/HDP/2.3/upgrades/upgrade-2.5.xml |  11 ++
 .../stacks/HDP/2.3/upgrades/upgrade-2.6.xml |  11 ++
 .../HDP/2.4/upgrades/nonrolling-upgrade-2.5.xml |   7 +
 .../HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml |   7 +
 .../stacks/HDP/2.4/upgrades/upgrade-2.5.xml |  11 ++
 .../stacks/HDP/2.4/upgrades/upgrade-2.6.xml |  11 ++
 .../upgrades/RangerKmsProxyConfigTest.java  | 141 +++
 10 files changed, 308 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/b5b73d20/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/RangerKmsProxyConfig.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/RangerKmsProxyConfig.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/RangerKmsProxyConfig.java
new file mode 100644
index 000..bb88f55
--- /dev/null
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/RangerKmsProxyConfig.java
@@ -0,0 +1,95 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.ambari.server.serveraction.upgrades;
+
+import java.text.MessageFormat;
+import java.util.Map;
+import java.util.concurrent.ConcurrentMap;
+
+import org.apache.ambari.server.AmbariException;
+import org.apache.ambari.server.actionmanager.HostRoleStatus;
+import org.apache.ambari.server.agent.CommandReport;
+import org.apache.ambari.server.serveraction.AbstractServerAction;
+import org.apache.ambari.server.state.Cluster;
+import org.apache.ambari.server.state.Clusters;
+import org.apache.ambari.server.state.Config;
+import org.apache.ambari.server.state.SecurityType;
+import org.apache.commons.lang.StringUtils;
+
+import com.google.inject.Inject;
+
+/**
+* Computes Ranger KMS Proxy properties in kms-site
+*/
+
+public class RangerKmsProxyConfig extends AbstractServerAction {
+  private static final String RANGER_ENV_CONFIG_TYPE = "ranger-env";
+  private static final String RANGER_KMS_SITE_CONFIG_TYPE = "kms-site";
+
+  @Inject
+  private Clusters m_clusters;
+
+  @Override
+  public CommandReport execute(ConcurrentMap 
requestSharedDataContext)
+throws AmbariException, InterruptedException {
+
+String clusterName = getExecutionCommand().getClusterName();
+Cluster cluster = m_clusters.getCluster(clusterName);
+String outputMsg = "";
+
+Config rangerEnv = cluster.getDesiredConfigByType(RANGER_ENV_CONFIG_TYPE);
+
+if (null == rangerEnv) {
+  return createCommandReport(0, HostRoleStatus.COMPLETED, "{}",
+MessageFormat.format("Config source type {0} not found, skipping 
adding properties to {1}.", RANGER_ENV_CONFIG_TYPE, 
RANGER_KMS_SITE_CONFIG_TYPE), "");
+}
+
+String rangerUserProp = "ranger_user";
+String rangerUser = rangerEnv.getProperties().get(rangerUserProp);
+
+if (null == rangerUser) {
+  return createCommandReport(0, HostRoleStatus.COMPLETED, "{}",
+MessageFormat.format("Required user service user value from {0}/{1} 
not found, skipping adding properties to {2}.", RANGER_ENV_CONFIG_TYPE, 
rangerUserProp, RANGER_KMS_SITE_CONFIG_TYPE), "");
+}
+
+Config kmsSite = 

[20/25] ambari git commit: AMBARI-19011. Fix markup for widgets browser (onechiporenko)

[jonathanhurley]

AMBARI-19011. Fix markup for widgets browser (onechiporenko)


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

Branch: refs/heads/branch-feature-AMBARI-18456
Commit: a95284362adf794636c7437e6416ca4389046e63
Parents: 4dda1d7
Author: Oleg Nechiporenko 
Authored: Tue Nov 29 15:03:12 2016 +0200
Committer: Oleg Nechiporenko 
Committed: Tue Nov 29 17:43:16 2016 +0200

--
 ambari-web/app/messages.js  |   3 +
 ambari-web/app/styles/application.less  |  10 +-
 ambari-web/app/styles/bootstrap_overrides.less  |   9 +
 .../app/styles/enhanced_service_dashboard.less  | 343 +++
 ambari-web/app/styles/hosts.less|   3 -
 .../modal_popups/widget_browser_popup.hbs   | 108 +++---
 .../main/service/widgets/create/expression.hbs  |  36 +-
 .../main/service/widgets/create/step1.hbs   |  18 +-
 .../main/service/widgets/create/step2.hbs   |  22 +-
 .../service/widgets/create/step2_add_metric.hbs |  12 +-
 .../main/service/widgets/create/step2_graph.hbs |   4 +-
 .../service/widgets/create/step2_number.hbs |   4 +-
 .../service/widgets/create/step2_template.hbs   |   4 +-
 .../main/service/widgets/create/step3.hbs   |  42 ++-
 .../create/widget_property_threshold.hbs|  18 +-
 ambari-web/app/views/common/chosen_plugin.js|  21 +-
 ambari-web/app/views/common/controls_view.js|   2 +-
 .../main/service/widgets/create/step2_view.js   |   2 +
 18 files changed, 308 insertions(+), 353 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/a9528436/ambari-web/app/messages.js
--
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index a1d84a3..aa43687 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -3071,6 +3071,9 @@ Em.I18n.translations = {
   'widget.create.wizard.step2.body.text':'Define the expression with any 
metrics and valid operators. Use parentheses when necessary.',
   'widget.create.wizard.step2.body.template':'Define the template with any 
number of expressions and any string. An expression can be referenced from a 
template by enclosing its name with double curly braces.',
   'widget.create.wizard.step2.body.warning':'Note: Valid operators are +, -, 
*, /',
+  'widget.create.wizard.step2.body.invalid.expression':'Expression is not 
complete or is invalid!',
+  'widget.create.wizard.step2.body.invalid.expression2':'Invalid expression!',
+  'widget.create.wizard.step2.body.invalid.msg2':'Only numbers or operators 
are allowed in this field.',
   'widget.create.wizard.step2.body.template.invalid.msg':'Invalid expression 
name existed. Should use name "Expression#" with double curly braces.',
   'widget.create.wizard.step2.addExpression': 'Add Expression',
   'widget.create.wizard.step2.addDataset': 'Add data set',

http://git-wip-us.apache.org/repos/asf/ambari/blob/a9528436/ambari-web/app/styles/application.less
--
diff --git a/ambari-web/app/styles/application.less 
b/ambari-web/app/styles/application.less
index d449ccb..4a50af7 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -28,6 +28,10 @@ html, body {
   height: 100%;
 }
 
+.form-text {
+  line-height: 34px;
+}
+
 wbr {
   display: inline-block;
 }
@@ -1075,9 +1079,7 @@ a:focus {
   color: #666;
   font-size: 13px;
   line-height: 16px;
-  .row {
-margin-bottom: 8px;
-  }
+
   .upgrade-status-warning {
 color: @health-status-red;
   }
@@ -1535,6 +1537,8 @@ ul.filter {
   height: 38px;
   border: 1px solid #D4D4D4;
   border-radius: 4px;
+  margin-top: 1px;
+  margin-bottom: 1px;
 }
   }
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/a9528436/ambari-web/app/styles/bootstrap_overrides.less
--
diff --git a/ambari-web/app/styles/bootstrap_overrides.less 
b/ambari-web/app/styles/bootstrap_overrides.less
index 97c25ab..b8cdf49 100644
--- a/ambari-web/app/styles/bootstrap_overrides.less
+++ b/ambari-web/app/styles/bootstrap_overrides.less
@@ -113,6 +113,11 @@ select.form-control {
   }
 }
 
+.row {
+  padding-top: 5px;
+  padding-bottom: 5px;
+}
+
 .form-control {
   float: none;
 }
@@ -358,4 +363,8 @@ select.form-control {
 margin-left: 0;
 margin-right: 0;
   }
+}
+
+.wizard .wizard-body {
+  padding: 0 !important;
 }
\ No newline at end of file

[03/25] ambari git commit: AMBARI-18951. Force InnoDB usage for MySQL. (mpapirkovskyy)

[jonathanhurley]

AMBARI-18951. Force InnoDB usage for MySQL. (mpapirkovskyy)


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

Branch: refs/heads/branch-feature-AMBARI-18456
Commit: 255725dfc07a4a4fd7fc8b3f6cdbd7cced1c375a
Parents: abf9882
Author: Myroslav Papirkovskyi 
Authored: Mon Nov 28 18:25:07 2016 +0200
Committer: Myroslav Papirkovskyi 
Committed: Mon Nov 28 18:46:01 2016 +0200

--
 .../server/orm/helpers/dbms/MySqlHelper.java| 18 ++
 .../server/upgrade/SchemaUpgradeHelper.java | 35 +++-
 .../main/resources/Ambari-DDL-MySQL-CREATE.sql  |  1 +
 3 files changed, 53 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/255725df/ambari-server/src/main/java/org/apache/ambari/server/orm/helpers/dbms/MySqlHelper.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/orm/helpers/dbms/MySqlHelper.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/orm/helpers/dbms/MySqlHelper.java
index 38fe062..8a83c90 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/orm/helpers/dbms/MySqlHelper.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/orm/helpers/dbms/MySqlHelper.java
@@ -19,8 +19,13 @@
 package org.apache.ambari.server.orm.helpers.dbms;
 
 import org.apache.ambari.server.orm.DBAccessor;
+import org.eclipse.persistence.exceptions.ValidationException;
 import org.eclipse.persistence.platform.database.DatabasePlatform;
 
+import java.io.IOException;
+import java.io.Writer;
+import java.util.List;
+
 public class MySqlHelper extends GenericDbmsHelper {
   public MySqlHelper(DatabasePlatform databasePlatform) {
 super(databasePlatform);
@@ -75,4 +80,17 @@ public class MySqlHelper extends GenericDbmsHelper {
 .append("AND constraints.TABLE_NAME = 
\"").append(tableName).append("\"");
 return statement.toString();
   }
+
+  @Override
+  public Writer writeCreateTableStatement(Writer writer, String tableName,
+  List 
columns,
+  List primaryKeyColumns) {
+Writer defaultWriter = super.writeCreateTableStatement(writer, tableName, 
columns, primaryKeyColumns);
+try {
+  defaultWriter.write(" ENGINE=INNODB");
+} catch (IOException e) {
+  throw ValidationException.fileError(e);
+}
+return defaultWriter;
+  }
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/255725df/ambari-server/src/main/java/org/apache/ambari/server/upgrade/SchemaUpgradeHelper.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/SchemaUpgradeHelper.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/SchemaUpgradeHelper.java
index 5bf7f21..33ec732 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/SchemaUpgradeHelper.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/SchemaUpgradeHelper.java
@@ -45,6 +45,7 @@ import com.google.inject.Inject;
 import com.google.inject.Injector;
 import com.google.inject.multibindings.Multibinder;
 import com.google.inject.persist.PersistService;
+import org.springframework.jdbc.support.JdbcUtils;
 
 public class SchemaUpgradeHelper {
   private static final Logger LOG = LoggerFactory.getLogger
@@ -331,7 +332,7 @@ public class SchemaUpgradeHelper {
   /**
* Checks if source version meets minimal requirements for upgrade
*
-   * @param minUpgradeVersion min allowed version for the upgrade, could be 
obtained via {@link SchemaUpgradeHelper.getMinimalUpgradeCatalogVersion}
+   * @param minUpgradeVersion min allowed version for the upgrade, could be 
obtained via {@link #getMinimalUpgradeCatalogVersion()}
* @param sourceVersion current version of the Database, which need to be 
upgraded
*
* @return  true if upgrade is allowed or false if not
@@ -344,6 +345,29 @@ public class SchemaUpgradeHelper {
 return VersionUtils.compareVersions(sourceVersion, minUpgradeVersion) >= 0;
   }
 
+  private List getMyISAMTables() throws SQLException {
+if 
(!configuration.getDatabaseType().equals(Configuration.DatabaseType.MYSQL)) {
+  return Collections.emptyList();
+}
+List myISAMTables = new ArrayList<>();
+String query = String.format("SELECT table_name FROM 
information_schema.tables WHERE table_schema = '%s' " +
+  "AND engine = 'MyISAM' AND table_type = 'BASE TABLE'", 

[09/25] ambari git commit: AMBARI-18992: Stack version input text field on Register Version page should align properly even when resizing the page (dili)

[jonathanhurley]

AMBARI-18992: Stack version input text field on Register Version page should 
align properly even when resizing the page (dili)


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

Branch: refs/heads/branch-feature-AMBARI-18456
Commit: 640d85a501e5dbc2b7422bf49f2f94a31aa391b6
Parents: 80d0989
Author: Di Li 
Authored: Mon Nov 28 15:09:54 2016 -0500
Committer: Di Li 
Committed: Mon Nov 28 15:09:54 2016 -0500

--
 .../ui/admin-web/app/views/stackVersions/stackVersionPage.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/640d85a5/ambari-admin/src/main/resources/ui/admin-web/app/views/stackVersions/stackVersionPage.html
--
diff --git 
a/ambari-admin/src/main/resources/ui/admin-web/app/views/stackVersions/stackVersionPage.html
 
b/ambari-admin/src/main/resources/ui/admin-web/app/views/stackVersions/stackVersionPage.html
index a614a0d..b31e2c5 100644
--- 
a/ambari-admin/src/main/resources/ui/admin-web/app/views/stackVersions/stackVersionPage.html
+++ 
b/ambari-admin/src/main/resources/ui/admin-web/app/views/stackVersions/stackVersionPage.html
@@ -83,7 +83,7 @@
 
   
 
-
+
   Name:
   
 

[05/25] ambari git commit: AMBARI-18998. Create smart config tab for Hive and Oozie Database settings (alexantonenko)

[jonathanhurley]

AMBARI-18998. Create smart config tab for Hive and Oozie Database settings 
(alexantonenko)


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

Branch: refs/heads/branch-feature-AMBARI-18456
Commit: cf82cf248a2e5178ea3fa35a76df338e7d258eb9
Parents: cad0130
Author: Alex Antonenko 
Authored: Mon Nov 28 19:48:47 2016 +0200
Committer: Alex Antonenko 
Committed: Mon Nov 28 19:48:58 2016 +0200

--
 .../HIVE/0.12.0.2.0/configuration/hive-env.xml  |  19 +++
 .../OOZIE/4.0.0.2.0/configuration/oozie-env.xml |  19 +++
 .../HDP/2.2/services/HIVE/themes/theme.json | 107 -
 .../services/HIVE/configuration/hive-env.xml|  35 ++
 .../services/OOZIE/configuration/oozie-env.xml  |  33 ++
 .../stacks/HDP/2.3/services/OOZIE/metainfo.xml  |   6 +
 .../HDP/2.3/services/OOZIE/themes/theme.json| 116 +++
 .../stacks/HDP/2.5/services/OOZIE/metainfo.xml  |   6 +
 .../HDP/2.5/services/OOZIE/themes/theme.json| 116 +++
 ambari-web/app/app.js   |   4 -
 .../data/configs/services/hive_properties.js|   4 -
 .../data/configs/services/oozie_properties.js   |   4 -
 12 files changed, 456 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/cf82cf24/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-env.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-env.xml
 
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-env.xml
index de088dc..a3ad66a 100644
--- 
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-env.xml
+++ 
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-env.xml
@@ -74,6 +74,25 @@
 
 
   false
+  value-list
+  
+
+  New MySQL Database
+  New MySQL
+
+
+  Existing MySQL / MariaDB Database
+  Existing MySQL / MariaDB
+
+
+  Existing PostgreSQL Database
+  Existing PostgreSQL
+
+
+  Existing Oracle Database
+  Existing Oracle
+
+  
 
 
   

http://git-wip-us.apache.org/repos/asf/ambari/blob/cf82cf24/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-env.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-env.xml
 
b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-env.xml
index 804c662..c966fb7 100644
--- 
a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-env.xml
+++ 
b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-env.xml
@@ -45,6 +45,25 @@
 Oozie Server Database.
 
   false
+  value-list
+  
+
+  New Derby Database
+  New Derby
+
+
+  Existing MySQL / MariaDB Database
+  Existing MySQL / MariaDB
+
+
+  Existing PostgreSQL Database
+  Existing PostgreSQL
+
+
+  Existing Oracle Database
+  Existing Oracle
+
+  
 
 
   

http://git-wip-us.apache.org/repos/asf/ambari/blob/cf82cf24/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/themes/theme.json
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/themes/theme.json
 
b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/themes/theme.json
index 42bc889..f496826 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/themes/theme.json
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/themes/theme.json
@@ -132,6 +132,42 @@
 }
   ]
 }
+  },
+  {
+"name": "hive-database",
+"display-name": "Database",
+"layout": {
+  "tab-rows": 1,
+  "tab-columns": 1,
+  "sections": [
+ {
+  "name": "hive-database-configurations",
+  "display-name": "Database Configurations",
+  "row-index": "0",
+  "column-index": "0",
+  "row-span": "0",
+  "column-span": "0",
+ 

[13/25] ambari git commit: AMBARI-19002 Ambari widgets and service checks to honor LLAP clusters with 100% allocation to LLAP daemons. (atkach)

[jonathanhurley]

AMBARI-19002 Ambari widgets and service checks to honor LLAP clusters with 100% 
allocation to LLAP daemons. (atkach)


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

Branch: refs/heads/branch-feature-AMBARI-18456
Commit: 5f3b32347451dbaf3c7f980e8ef8dc0ec2aa254b
Parents: 69390ee
Author: Andrii Tkach 
Authored: Tue Nov 29 12:19:48 2016 +0200
Committer: Andrii Tkach 
Committed: Tue Nov 29 12:19:48 2016 +0200

--
 .../stacks/HDP/2.0.6/configuration/cluster-env.xml |  6 ++
 ambari-web/app/views/main/dashboard/widgets.js | 17 +++--
 .../test/views/main/dashboard/widgets_test.js  | 11 ++-
 3 files changed, 31 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/5f3b3234/ambari-server/src/main/resources/stacks/HDP/2.0.6/configuration/cluster-env.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/configuration/cluster-env.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/configuration/cluster-env.xml
index 0d313cc..cc6c8a3 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/configuration/cluster-env.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/configuration/cluster-env.xml
@@ -274,4 +274,10 @@ gpgcheck=0
 For properties handled by handle_mounted_dirs this will make 
Ambari 
 
   
+  
+hide_yarn_memory_widget
+false
+YARN Memory widget should be hidden by default on the 
dashboard.
+
+  
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/5f3b3234/ambari-web/app/views/main/dashboard/widgets.js
--
diff --git a/ambari-web/app/views/main/dashboard/widgets.js 
b/ambari-web/app/views/main/dashboard/widgets.js
index f4603a2..999fc08 100644
--- a/ambari-web/app/views/main/dashboard/widgets.js
+++ b/ambari-web/app/views/main/dashboard/widgets.js
@@ -116,6 +116,16 @@ App.MainDashboardWidgetsView = 
Em.View.extend(App.UserPref, App.LocalStorage, Ap
 }, this);
   },
 
+  resolveConfigDependencies: function(visibleFull, hiddenFull) {
+var clusterEnv = App.router.get('clusterController.clusterEnv').properties;
+
+if (clusterEnv['hide_yarn_memory_widget'] === 'true') {
+  hiddenFull.push(['20', 'YARN Memory']);
+} else {
+  visibleFull.splice(visibleFull.indexOf('19'), 0, '20');
+}
+  },
+
   /**
* Load widget statuses to initPrefObject
*/
@@ -126,7 +136,7 @@ App.MainDashboardWidgetsView = Em.View.extend(App.UserPref, 
App.LocalStorage, Ap
   '6', '7', '8', '9', //host metrics
   '1', '5', '3', '10', //hdfs
   '13', '12', '14', '16', //hbase
-  '17', '18', '19', '20', '23', // all yarn
+  '17', '18', '19', '23', // all yarn
   '21', // storm
   '22', // flume
   '24', // hawq
@@ -135,6 +145,7 @@ App.MainDashboardWidgetsView = Em.View.extend(App.UserPref, 
App.LocalStorage, Ap
 var hiddenFull = [
   ['15', 'Region In Transition']
 ];
+this.resolveConfigDependencies(visibleFull, hiddenFull);
 
 // Display widgets for host metrics if the stack definition has a host 
metrics service to display it.
 if (this.get('host_metrics_model') == null) {
@@ -155,7 +166,9 @@ App.MainDashboardWidgetsView = Em.View.extend(App.UserPref, 
App.LocalStorage, Ap
   hbase.forEach(function (item) {
 visibleFull = visibleFull.without(item);
   }, this);
-  hiddenFull = [];
+  hiddenFull = hiddenFull.filter(function(item) {
+return item[0] !== '15';
+  });
 }
 if (this.get('yarn_model') == null) {
   var yarn = ['17', '18', '19', '20', '23'];

http://git-wip-us.apache.org/repos/asf/ambari/blob/5f3b3234/ambari-web/test/views/main/dashboard/widgets_test.js
--
diff --git a/ambari-web/test/views/main/dashboard/widgets_test.js 
b/ambari-web/test/views/main/dashboard/widgets_test.js
index 49a06a4..0781c79 100644
--- a/ambari-web/test/views/main/dashboard/widgets_test.js
+++ b/ambari-web/test/views/main/dashboard/widgets_test.js
@@ -107,12 +107,21 @@ describe('App.MainDashboardWidgetsView', function () {
   yarn_model: {}
 },
 e: {
-  visibleL: totalWidgetsCount,
+  visibleL: totalWidgetsCount - 1,
   hiddenL: 1
 },
 m: 'All models are not null'
   }
 ]);
+
+beforeEach(function() {
+  sinon.stub(view, 'resolveConfigDependencies');
+});
+
+afterEach(function() {
+  view.resolveConfigDependencies.restore();
+ 

ambari git commit: AMBARI-18871 HTTP responses needs to have the character encoding specified in the content type header (Anita Jebaraj via sangeetar)

[sangeetar]

Repository: ambari
Updated Branches:
  refs/heads/trunk 85c9104ec -> 2cc4c9ed7


AMBARI-18871 HTTP responses needs to have the character encoding specified in 
the content type header (Anita Jebaraj via sangeetar)


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

Branch: refs/heads/trunk
Commit: 2cc4c9ed7009be2e894fec7d24c3cb4f0dd9f24c
Parents: 85c9104
Author: Sangeeta Ravindran 
Authored: Tue Nov 29 13:57:50 2016 -0800
Committer: Sangeeta Ravindran 
Committed: Tue Nov 29 13:57:50 2016 -0800

--
 ambari-server/conf/unix/ambari.properties   |  4 +-
 ambari-server/conf/windows/ambari.properties|  2 +
 .../server/configuration/Configuration.java | 46 
 .../security/AbstractSecurityHeaderFilter.java  | 14 ++
 .../AmbariServerSecurityHeaderFilter.java   |  1 +
 .../AmbariViewsSecurityHeaderFilter.java|  1 +
 .../AbstractSecurityHeaderFilterTest.java   | 29 
 7 files changed, 87 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/2cc4c9ed/ambari-server/conf/unix/ambari.properties
--
diff --git a/ambari-server/conf/unix/ambari.properties 
b/ambari-server/conf/unix/ambari.properties
index 371653f..30a22d1 100644
--- a/ambari-server/conf/unix/ambari.properties
+++ b/ambari-server/conf/unix/ambari.properties
@@ -116,6 +116,7 @@ http.x-frame-options=DENY
 http.x-content-type-options=nosniff
 http.cache-control=no-store
 http.pragma=no-cache
+http.charset=utf-8
 
 # HTTP Header settings for Ambari Views
 views.http.strict-transport-security=max-age=31536000
@@ -124,6 +125,7 @@ views.http.x-frame-options=SAMEORIGIN
 views.http.x-content-type-options=nosniff
 views.http.cache-control=no-store
 views.http.pragma=no-cache
+views.http.charset=utf-8
 
 mpacks.staging.path=$ROOT/var/lib/ambari-server/resources/mpacks
 
@@ -132,4 +134,4 @@ 
security.server.disabled.ciphers=TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384|TLS_ECD
 
 server.python.log.name=ambari-server-command.log
 # server.pyton.log.level=(INFO/DEBUG)
-server.python.log.level=INFO
\ No newline at end of file
+server.python.log.level=INFO

http://git-wip-us.apache.org/repos/asf/ambari/blob/2cc4c9ed/ambari-server/conf/windows/ambari.properties
--
diff --git a/ambari-server/conf/windows/ambari.properties 
b/ambari-server/conf/windows/ambari.properties
index e47319e..d84cf4b 100644
--- a/ambari-server/conf/windows/ambari.properties
+++ b/ambari-server/conf/windows/ambari.properties
@@ -97,6 +97,7 @@ http.x-frame-options=DENY
 http.x-content-type-options=nosniff
 http.cache-control=no-store
 http.pragma=no-cache
+http.charset=utf-8
 
 # HTTP Header settings for Ambari Views
 views.http.strict-transport-security=max-age=31536000
@@ -105,5 +106,6 @@ views.http.x-frame-options=SAMEORIGIN
 views.http.x-content-type-options=nosniff
 views.http.cache-control=no-store
 views.http.pragma=no-cache
+views.http.charset=utf-8
 
 mpacks.staging.path=resources\\mpacks

http://git-wip-us.apache.org/repos/asf/ambari/blob/2cc4c9ed/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
index 5676091..9be8751 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
@@ -2290,6 +2290,14 @@ public class Configuration {
   public static final ConfigurationProperty HTTP_PRAGMA_HEADER_VALUE = 
new ConfigurationProperty<>(
   "http.pragma", "no-cache");
 
+   /**
+   * The value that will be used to set the {@code Charset} HTTP response 
header.
+   */
+  @Markdown(description = "The value that will be used to set the Character 
encoding to HTTP response header.")
+  public static final ConfigurationProperty HTTP_CHARSET = new 
ConfigurationProperty<>(
+  "http.charset", "utf-8");
+
+
   /**
* The value that will be used to set the {@code Strict-Transport-Security}
* HTTP response header for Ambari View requests.
@@ -2339,6 +2347,14 @@ public class Configuration {
   public static final ConfigurationProperty 
VIEWS_HTTP_PRAGMA_HEADER_VALUE = new ConfigurationProperty<>(
   "views.http.pragma", "no-cache");
 
+   /**
+   * The value that 

ambari git commit: AMBARI-18871 HTTP responses needs to have the character encoding specified in the content type header (Anita Jebaraj via sangeetar)

[sangeetar]

Repository: ambari
Updated Branches:
  refs/heads/AMBARI-18871 [created] 51aab93f3
  refs/remotes/origin/trunk [created] 85c9104ec


AMBARI-18871 HTTP responses needs to have the character encoding specified in 
the content type header (Anita Jebaraj via sangeetar)


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

Branch: refs/heads/AMBARI-18871
Commit: 51aab93f31376fcdd155983bacc69491ff278671
Parents: 1a8a538
Author: Sangeeta Ravindran 
Authored: Tue Nov 29 12:44:26 2016 -0800
Committer: Sangeeta Ravindran 
Committed: Tue Nov 29 12:44:26 2016 -0800

--
 ambari-server/conf/unix/ambari.properties   |  4 +-
 ambari-server/conf/windows/ambari.properties|  2 +
 .../server/configuration/Configuration.java | 46 
 .../security/AbstractSecurityHeaderFilter.java  | 14 ++
 .../AmbariServerSecurityHeaderFilter.java   |  1 +
 .../AmbariViewsSecurityHeaderFilter.java|  1 +
 .../AbstractSecurityHeaderFilterTest.java   | 29 
 7 files changed, 87 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/51aab93f/ambari-server/conf/unix/ambari.properties
--
diff --git a/ambari-server/conf/unix/ambari.properties 
b/ambari-server/conf/unix/ambari.properties
index 371653f..30a22d1 100644
--- a/ambari-server/conf/unix/ambari.properties
+++ b/ambari-server/conf/unix/ambari.properties
@@ -116,6 +116,7 @@ http.x-frame-options=DENY
 http.x-content-type-options=nosniff
 http.cache-control=no-store
 http.pragma=no-cache
+http.charset=utf-8
 
 # HTTP Header settings for Ambari Views
 views.http.strict-transport-security=max-age=31536000
@@ -124,6 +125,7 @@ views.http.x-frame-options=SAMEORIGIN
 views.http.x-content-type-options=nosniff
 views.http.cache-control=no-store
 views.http.pragma=no-cache
+views.http.charset=utf-8
 
 mpacks.staging.path=$ROOT/var/lib/ambari-server/resources/mpacks
 
@@ -132,4 +134,4 @@ 
security.server.disabled.ciphers=TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384|TLS_ECD
 
 server.python.log.name=ambari-server-command.log
 # server.pyton.log.level=(INFO/DEBUG)
-server.python.log.level=INFO
\ No newline at end of file
+server.python.log.level=INFO

http://git-wip-us.apache.org/repos/asf/ambari/blob/51aab93f/ambari-server/conf/windows/ambari.properties
--
diff --git a/ambari-server/conf/windows/ambari.properties 
b/ambari-server/conf/windows/ambari.properties
index e47319e..d84cf4b 100644
--- a/ambari-server/conf/windows/ambari.properties
+++ b/ambari-server/conf/windows/ambari.properties
@@ -97,6 +97,7 @@ http.x-frame-options=DENY
 http.x-content-type-options=nosniff
 http.cache-control=no-store
 http.pragma=no-cache
+http.charset=utf-8
 
 # HTTP Header settings for Ambari Views
 views.http.strict-transport-security=max-age=31536000
@@ -105,5 +106,6 @@ views.http.x-frame-options=SAMEORIGIN
 views.http.x-content-type-options=nosniff
 views.http.cache-control=no-store
 views.http.pragma=no-cache
+views.http.charset=utf-8
 
 mpacks.staging.path=resources\\mpacks

http://git-wip-us.apache.org/repos/asf/ambari/blob/51aab93f/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
index 5676091..9be8751 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
@@ -2290,6 +2290,14 @@ public class Configuration {
   public static final ConfigurationProperty HTTP_PRAGMA_HEADER_VALUE = 
new ConfigurationProperty<>(
   "http.pragma", "no-cache");
 
+   /**
+   * The value that will be used to set the {@code Charset} HTTP response 
header.
+   */
+  @Markdown(description = "The value that will be used to set the Character 
encoding to HTTP response header.")
+  public static final ConfigurationProperty HTTP_CHARSET = new 
ConfigurationProperty<>(
+  "http.charset", "utf-8");
+
+
   /**
* The value that will be used to set the {@code Strict-Transport-Security}
* HTTP response header for Ambari View requests.
@@ -2339,6 +2347,14 @@ public class Configuration {
   public static final ConfigurationProperty 
VIEWS_HTTP_PRAGMA_HEADER_VALUE = new ConfigurationProperty<>(
   

ambari git commit: AMBARI-19003. Perf: Fix deploy-gce-perf-cluster.py to deploy separate server onto own cluster with different settings for more cores and MySQL DB (alejandro)

[alejandro]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 f8bfa0565 -> 052da577b


AMBARI-19003. Perf: Fix deploy-gce-perf-cluster.py to deploy separate server 
onto own cluster with different settings for more cores and MySQL DB (alejandro)


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

Branch: refs/heads/branch-2.5
Commit: 052da577bcf5c3130337b7e783bda2b9c0207127
Parents: f8bfa05
Author: Alejandro Fernandez 
Authored: Tue Nov 29 12:43:58 2016 -0800
Committer: Alejandro Fernandez 
Committed: Tue Nov 29 12:43:58 2016 -0800

--
 contrib/utils/perf/deploy-gce-perf-cluster.py | 243 ++---
 1 file changed, 169 insertions(+), 74 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/052da577/contrib/utils/perf/deploy-gce-perf-cluster.py
--
diff --git a/contrib/utils/perf/deploy-gce-perf-cluster.py 
b/contrib/utils/perf/deploy-gce-perf-cluster.py
index 95ed98f..4737c6f 100644
--- a/contrib/utils/perf/deploy-gce-perf-cluster.py
+++ b/contrib/utils/perf/deploy-gce-perf-cluster.py
@@ -148,6 +148,7 @@ class SCP:
 
 return {"exitstatus": scpstat.returncode, "log": log, "errormsg": errorMsg}
 
+
 # main method to parse arguments from user and start work
 def main():
   parser = argparse.ArgumentParser(
@@ -178,6 +179,30 @@ def main():
   args = parser.parse_args()
   do_work(args)
 
+
+def do_work(args):
+  """
+  Check that all required args are passed in. If so, deploy the cluster.
+  :param args: Command line args
+  """
+  if not args.controller:
+raise Exception("GCE controller ip address is not defined!")
+
+  if not args.key:
+raise Exception("Path to gce ssh key is not defined!")
+
+  if not args.cluster_suffix:
+raise Exception("Cluster name suffix is not defined!")
+
+  if not args.agent_prefix:
+raise Exception("Agent name prefix is not defined!")
+
+  if not args.agents_count:
+raise Exception("Agents count for whole cluster is not defined (will put 
50 Agents per VM)!")
+
+  deploy_cluster(args)
+
+
 def deploy_cluster(args):
   """
   Process cluster deployment
@@ -186,49 +211,54 @@ def deploy_cluster(args):
   # When dividing, need to get the ceil.
   number_of_nodes = ((args.agents_count - 1) / NUMBER_OF_AGENTS_ON_HOST) + 1
 
-  # trying to create cluster with needed params
-  print "Creating cluster {0}-{1} with {2} large nodes on 
centos6...".format(cluster_prefix, args.cluster_suffix, str(number_of_nodes))
-  execute_command(args, args.controller, "/usr/sbin/gce up {0}-{1} {2} 
--centos6 --large".format(cluster_prefix, args.cluster_suffix, 
str(number_of_nodes)),
-  "Failed to create cluster, probably not enough resources!", 
"-tt")
-
-  # VMs are not accessible immediately
-  time.sleep(10)
+  # In case of an error after creating VMs, can simply comment out this 
function to run again without creating VMs.
+  create_vms(args, number_of_nodes)
 
   # getting list of vms information like hostname and ip address
   print "Getting list of virtual machines from cluster..."
   # Dictionary from host name to IP
-  vms = get_vms_list(args)
+  (server_dict, agents_dict) = get_vms_list(args)
 
   # check number of nodes in cluster to be the same as user asked
   print "Checking count of created nodes in cluster..."
-  if not vms or len(vms) < number_of_nodes:
-raise Exception("Cannot bring up enough nodes. Requested {0}, but got {1}. 
Probably not enough resources!".format(number_of_nodes, len(vms)))
+  if not agents_dict or len(agents_dict) < number_of_nodes:
+raise Exception("Cannot bring up enough nodes. Requested {0}, but got {1}. 
Probably not enough resources!".format(number_of_nodes, len(agents_dict)))
 
-  print "GCE cluster was successfully created!"
-  pretty_print_vms(vms)
+  print "GCE cluster was successfully created!\n"
 
   # installing/starting ambari-server and ambari-agents on each host
-  server_host_name = sorted(vms.items())[0][0]
-  server_installed = False
+  server_item = server_dict.items()[0]
+  server_host_name = server_item[0]
+  server_ip = server_item[1]
+  print "=="
+  print "Server Hostname: %s" % server_host_name
+  print "Server IP: %s" % server_ip
+  print "==\n"
+
+  # Sort the agents by hostname into a list.
+  sorted_agents = sort_hosts(agents_dict)
+  pretty_print_vms(sorted_agents)
 
-  print "Creating server.sh script (which will be executed on server to 
install/configure/start ambari-server and ambari-agent)..."
-  create_server_script(args, server_host_name)
+  print 

ambari git commit: AMBARI-19003. Perf: Fix deploy-gce-perf-cluster.py to deploy separate server onto own cluster with different settings for more cores and MySQL DB (alejandro)

[alejandro]

Repository: ambari
Updated Branches:
  refs/heads/trunk 1a8a53828 -> 85c9104ec


AMBARI-19003. Perf: Fix deploy-gce-perf-cluster.py to deploy separate server 
onto own cluster with different settings for more cores and MySQL DB (alejandro)


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

Branch: refs/heads/trunk
Commit: 85c9104ec14dc7b059d41f61dbbc6e57aec216d0
Parents: 1a8a538
Author: Alejandro Fernandez 
Authored: Tue Nov 22 14:37:07 2016 -0800
Committer: Alejandro Fernandez 
Committed: Tue Nov 29 12:42:58 2016 -0800

--
 contrib/utils/perf/deploy-gce-perf-cluster.py | 243 ++---
 1 file changed, 169 insertions(+), 74 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/85c9104e/contrib/utils/perf/deploy-gce-perf-cluster.py
--
diff --git a/contrib/utils/perf/deploy-gce-perf-cluster.py 
b/contrib/utils/perf/deploy-gce-perf-cluster.py
index 95ed98f..4737c6f 100644
--- a/contrib/utils/perf/deploy-gce-perf-cluster.py
+++ b/contrib/utils/perf/deploy-gce-perf-cluster.py
@@ -148,6 +148,7 @@ class SCP:
 
 return {"exitstatus": scpstat.returncode, "log": log, "errormsg": errorMsg}
 
+
 # main method to parse arguments from user and start work
 def main():
   parser = argparse.ArgumentParser(
@@ -178,6 +179,30 @@ def main():
   args = parser.parse_args()
   do_work(args)
 
+
+def do_work(args):
+  """
+  Check that all required args are passed in. If so, deploy the cluster.
+  :param args: Command line args
+  """
+  if not args.controller:
+raise Exception("GCE controller ip address is not defined!")
+
+  if not args.key:
+raise Exception("Path to gce ssh key is not defined!")
+
+  if not args.cluster_suffix:
+raise Exception("Cluster name suffix is not defined!")
+
+  if not args.agent_prefix:
+raise Exception("Agent name prefix is not defined!")
+
+  if not args.agents_count:
+raise Exception("Agents count for whole cluster is not defined (will put 
50 Agents per VM)!")
+
+  deploy_cluster(args)
+
+
 def deploy_cluster(args):
   """
   Process cluster deployment
@@ -186,49 +211,54 @@ def deploy_cluster(args):
   # When dividing, need to get the ceil.
   number_of_nodes = ((args.agents_count - 1) / NUMBER_OF_AGENTS_ON_HOST) + 1
 
-  # trying to create cluster with needed params
-  print "Creating cluster {0}-{1} with {2} large nodes on 
centos6...".format(cluster_prefix, args.cluster_suffix, str(number_of_nodes))
-  execute_command(args, args.controller, "/usr/sbin/gce up {0}-{1} {2} 
--centos6 --large".format(cluster_prefix, args.cluster_suffix, 
str(number_of_nodes)),
-  "Failed to create cluster, probably not enough resources!", 
"-tt")
-
-  # VMs are not accessible immediately
-  time.sleep(10)
+  # In case of an error after creating VMs, can simply comment out this 
function to run again without creating VMs.
+  create_vms(args, number_of_nodes)
 
   # getting list of vms information like hostname and ip address
   print "Getting list of virtual machines from cluster..."
   # Dictionary from host name to IP
-  vms = get_vms_list(args)
+  (server_dict, agents_dict) = get_vms_list(args)
 
   # check number of nodes in cluster to be the same as user asked
   print "Checking count of created nodes in cluster..."
-  if not vms or len(vms) < number_of_nodes:
-raise Exception("Cannot bring up enough nodes. Requested {0}, but got {1}. 
Probably not enough resources!".format(number_of_nodes, len(vms)))
+  if not agents_dict or len(agents_dict) < number_of_nodes:
+raise Exception("Cannot bring up enough nodes. Requested {0}, but got {1}. 
Probably not enough resources!".format(number_of_nodes, len(agents_dict)))
 
-  print "GCE cluster was successfully created!"
-  pretty_print_vms(vms)
+  print "GCE cluster was successfully created!\n"
 
   # installing/starting ambari-server and ambari-agents on each host
-  server_host_name = sorted(vms.items())[0][0]
-  server_installed = False
+  server_item = server_dict.items()[0]
+  server_host_name = server_item[0]
+  server_ip = server_item[1]
+  print "=="
+  print "Server Hostname: %s" % server_host_name
+  print "Server IP: %s" % server_ip
+  print "==\n"
+
+  # Sort the agents by hostname into a list.
+  sorted_agents = sort_hosts(agents_dict)
+  pretty_print_vms(sorted_agents)
 
-  print "Creating server.sh script (which will be executed on server to 
install/configure/start ambari-server and ambari-agent)..."
-  create_server_script(args, server_host_name)
+  print "Creating 

ambari git commit: AMBARI-18792. Update some configuration properties for hive interactive for the HDP 2.6 stack (Siddharth Seth via smohanty)

[smohanty]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 aba964062 -> f8bfa0565


AMBARI-18792. Update some configuration properties for hive interactive for the 
HDP 2.6 stack (Siddharth Seth via smohanty)


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

Branch: refs/heads/branch-2.5
Commit: f8bfa056574d1f8dc695615eea70fae74b156fc2
Parents: aba9640
Author: Sumit Mohanty 
Authored: Tue Nov 29 11:39:53 2016 -0800
Committer: Sumit Mohanty 
Committed: Tue Nov 29 11:39:53 2016 -0800

--
 .../server/upgrade/UpgradeCatalog250.java   | 53 -
 .../configuration/hive-interactive-site.xml | 58 +++
 .../HIVE/configuration/tez-interactive-site.xml | 78 
 3 files changed, 188 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/f8bfa056/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog250.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog250.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog250.java
index bc3c120..44ce895 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog250.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog250.java
@@ -23,6 +23,7 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import org.apache.ambari.server.AmbariException;
 import org.apache.ambari.server.actionmanager.CommandExecutionType;
@@ -123,7 +124,7 @@ public class UpgradeCatalog250 extends 
AbstractUpgradeCatalog {
*/
   @Override
   protected void executePreDMLUpdates() throws AmbariException, SQLException {
-
+updateHiveLlapConfigs();
   }
 
   /**
@@ -201,6 +202,56 @@ public class UpgradeCatalog250 extends 
AbstractUpgradeCatalog {
 return content;
   }
 
+  protected void updateHiveLlapConfigs() throws AmbariException {
+AmbariManagementController ambariManagementController = 
injector.getInstance(AmbariManagementController.class);
+Clusters clusters = ambariManagementController.getClusters();
+
+if (clusters != null) {
+  Map clusterMap = clusters.getClusters();
+
+  if (clusterMap != null && !clusterMap.isEmpty()) {
+for (final Cluster cluster : clusterMap.values()) {
+  Set installedServices = cluster.getServices().keySet();
+
+  if (installedServices.contains("HIVE")) {
+Config hiveSite = 
cluster.getDesiredConfigByType("hive-interactive-site");
+if (hiveSite != null) {
+  Map hiveSiteProperties = 
hiveSite.getProperties();
+  String schedulerDelay = 
hiveSiteProperties.get("hive.llap.task.scheduler.locality.delay");
+  if (schedulerDelay != null) {
+// Property exists. Change to new default if set to -1.
+if (schedulerDelay.length() != 0) {
+  try {
+int schedulerDelayInt = Integer.parseInt(schedulerDelay);
+if (schedulerDelayInt == -1) {
+  // Old default. Set to new default.
+  updateConfigurationProperties("hive-interactive-site", 
Collections
+  
.singletonMap("hive.llap.task.scheduler.locality.delay", "8000"), true,
+  false);
+}
+  } catch (NumberFormatException e) {
+// Invalid existing value. Set to new default.
+updateConfigurationProperties("hive-interactive-site", 
Collections
+
.singletonMap("hive.llap.task.scheduler.locality.delay", "8000"), true,
+false);
+  }
+}
+  }
+  updateConfigurationProperties("hive-interactive-site",
+  
Collections.singletonMap("hive.mapjoin.hybridgrace.hashtable", "true"), true,
+  false);
+  updateConfigurationProperties("tez-interactive-site",
+  
Collections.singletonMap("tez.session.am.dag.submit.timeout.secs", "1209600"), 
true,
+  false);
+  // Explicitly skipping hive.llap.allow.permanent.fns during 
upgrades, since it's related to security,
+  // and we don't know if the value is set by the user or as a 
result of the previous default.
+}
+  }
+   

svn commit: r1771938 - 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 whats-ne

[yusaku]

Author: yusaku
Date: Tue Nov 29 18:30:15 2016
New Revision: 1771938

URL: http://svn.apache.org/viewvc?rev=1771938=rev
Log:
Updated team page. (yusaku)

Modified:
ambari/site/index.html
ambari/site/install-0.9.html
ambari/site/install.html
ambari/site/irc.html
ambari/site/issue-tracking.html
ambari/site/license.html
ambari/site/mail-lists.html
ambari/site/privacy-policy.html
ambari/site/project-info.html
ambari/site/team-list.html
ambari/site/whats-new.html

Modified: ambari/site/index.html
URL: 
http://svn.apache.org/viewvc/ambari/site/index.html?rev=1771938=1771937=1771938=diff
==
--- ambari/site/index.html (original)
+++ ambari/site/index.html Tue Nov 29 18:30:15 2016
@@ -1,13 +1,13 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
   
 
 
-
+
 
 Ambari - 
 
@@ -335,7 +335,7 @@
 
 
 
-  Last Published: 
2016-11-23 |
+  Last Published: 
2016-11-29 |
   Version: 2.4.2
 
 

Modified: ambari/site/install-0.9.html
URL: 
http://svn.apache.org/viewvc/ambari/site/install-0.9.html?rev=1771938=1771937=1771938=diff
==
--- ambari/site/install-0.9.html (original)
+++ ambari/site/install-0.9.html Tue Nov 29 18:30:15 2016
@@ -1,13 +1,13 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
   
 
 
-
+
 
 Ambari - 
 
@@ -335,7 +335,7 @@
 
 
 
-  Last Published: 
2016-11-23 |
+  Last Published: 
2016-11-29 |
   Version: 2.4.2
 
 

Modified: ambari/site/install.html
URL: 
http://svn.apache.org/viewvc/ambari/site/install.html?rev=1771938=1771937=1771938=diff
==
--- ambari/site/install.html (original)
+++ ambari/site/install.html Tue Nov 29 18:30:15 2016
@@ -1,13 +1,13 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
   
 
 
-
+
 
 Ambari - 
 
@@ -335,7 +335,7 @@
 
 
 
-  Last Published: 
2016-11-23 |
+  Last Published: 
2016-11-29 |
   Version: 2.4.2
 
 

Modified: ambari/site/irc.html
URL: 
http://svn.apache.org/viewvc/ambari/site/irc.html?rev=1771938=1771937=1771938=diff
==
--- ambari/site/irc.html (original)
+++ ambari/site/irc.html Tue Nov 29 18:30:15 2016
@@ -1,13 +1,13 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
   
 
 
-
+
 
 Ambari - 
 
@@ -335,7 +335,7 @@
 
 
 
-  Last Published: 
2016-11-23 |
+  Last Published: 
2016-11-29 |
   Version: 2.4.2
 
 

Modified: ambari/site/issue-tracking.html
URL: 
http://svn.apache.org/viewvc/ambari/site/issue-tracking.html?rev=1771938=1771937=1771938=diff
==
--- ambari/site/issue-tracking.html (original)
+++ ambari/site/issue-tracking.html Tue Nov 29 18:30:15 2016
@@ -1,13 +1,13 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
   
 
 
-
+
 
 Ambari - Issue Tracking
 
@@ -335,7 +335,7 @@
 
 
 
-  Last Published: 
2016-11-23 |
+  Last Published: 
2016-11-29 |
   Version: 2.4.2
 
 

Modified: ambari/site/license.html
URL: 
http://svn.apache.org/viewvc/ambari/site/license.html?rev=1771938=1771937=1771938=diff
==
--- ambari/site/license.html (original)
+++ ambari/site/license.html Tue Nov 29 18:30:15 2016
@@ -1,13 +1,13 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
   
 
 
-
+
 
 Ambari - Project License
 
@@ -335,7 +335,7 @@
 
 
 
-  Last Published: 
2016-11-23 |
+  Last Published: 
2016-11-29 |
   Version: 2.4.2
 
 

Modified: ambari/site/mail-lists.html
URL: 
http://svn.apache.org/viewvc/ambari/site/mail-lists.html?rev=1771938=1771937=1771938=diff
==
--- ambari/site/mail-lists.html (original)
+++ ambari/site/mail-lists.html Tue Nov 29 18:30:15 2016
@@ -1,13 +1,13 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" 

ambari git commit: Updated team page. (yusaku)

[yusaku]

Repository: ambari
Updated Branches:
  refs/heads/trunk 2c7c0a704 -> 1a8a53828


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/1a8a5382
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1a8a5382
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1a8a5382

Branch: refs/heads/trunk
Commit: 1a8a53828ad4f6214bbef7a96733361d1b05b598
Parents: 2c7c0a7
Author: Yusaku Sako 
Authored: Tue Nov 29 10:28:53 2016 -0800
Committer: Yusaku Sako 
Committed: Tue Nov 29 10:28:53 2016 -0800

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


http://git-wip-us.apache.org/repos/asf/ambari/blob/1a8a5382/docs/pom.xml
--
diff --git a/docs/pom.xml b/docs/pom.xml
index 625dce3..75e547d 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -611,7 +611,7 @@
 Committer
 
 
-Pivotal
+Uber
 
 
 
@@ -773,7 +773,7 @@
 
 rzang
 Richard Zang
-rz...@hortonworks.com
+rz...@apache.org
 -8
 
 PMC

[21/55] [abbrv] ambari git commit: AMBARI-18969. Add support to provide additional slider specific parameters to llap (smohanty)

[ncole]

AMBARI-18969. Add support to provide additional slider specific parameters to 
llap (smohanty)


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

Branch: refs/heads/branch-feature-AMBARI-18634
Commit: 99cb9029a2845909e3351f5e6665a457d2c19e93
Parents: b59dc1d
Author: Sumit Mohanty 
Authored: Wed Nov 23 11:42:05 2016 -0800
Committer: Sumit Mohanty 
Committed: Wed Nov 23 11:42:14 2016 -0800

--
 .../0.12.0.2.0/package/scripts/hive_server_interactive.py |  4 ++--
 .../HIVE/0.12.0.2.0/package/scripts/params_linux.py   |  1 +
 .../services/HIVE/configuration/hive-interactive-env.xml  | 10 ++
 3 files changed, 13 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/99cb9029/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
index d3773a7..b5edac8 100644
--- 
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
@@ -274,9 +274,9 @@ class HiveServerInteractiveDefault(HiveServerInteractive):
   unique_name = "llap-slider%s" % 
datetime.utcnow().strftime('%Y-%m-%d_%H-%M-%S')
 
   cmd = format("{stack_root}/current/hive-server2-hive2/bin/hive --service 
llap --instances {params.num_llap_nodes}"
-   " --slider-am-container-mb {params.slider_am_container_mb} 
--size {params.llap_daemon_container_size}m "
+   " --slider-am-container-mb {params.slider_am_container_mb} 
--size {params.llap_daemon_container_size}m"
" --cache {params.hive_llap_io_mem_size}m --xmx 
{params.llap_heap_size}m --loglevel {params.llap_log_level}"
-   " --output {LLAP_PACKAGE_CREATION_PATH}/{unique_name}")
+   " {params.llap_extra_slider_opts} --output 
{LLAP_PACKAGE_CREATION_PATH}/{unique_name}")
   if params.security_enabled:
 llap_keytab_splits = params.hive_llap_keytab_file.split("/")
 Logger.debug("llap_keytab_splits : {0}".format(llap_keytab_splits))

http://git-wip-us.apache.org/repos/asf/ambari/blob/99cb9029/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py
 
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py
index 30fc82a..a461bfe 100644
--- 
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py
+++ 
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py
@@ -607,6 +607,7 @@ if has_hive_interactive:
   hive_llap_io_mem_size = 
config['configurations']['hive-interactive-site']['hive.llap.io.memory.size']
   llap_heap_size = 
config['configurations']['hive-interactive-env']['llap_heap_size']
   llap_app_name = 
config['configurations']['hive-interactive-env']['llap_app_name']
+  llap_extra_slider_opts = 
default('/configurations/hive-interactive-env/llap_extra_slider_opts', "")
   hive_llap_principal = None
   if security_enabled:
 hive_llap_keytab_file = 
config['configurations']['hive-interactive-site']['hive.llap.zk.sm.keytab.file']

http://git-wip-us.apache.org/repos/asf/ambari/blob/99cb9029/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-env.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-env.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-env.xml
index 1fd72eb..279c7c4 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-env.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-env.xml
@@ -113,6 +113,16 @@
 
   
   
+llap_extra_slider_opts
+
+Additional slider specific opts for llap such as port 
range
+Additional slider specific opts for llap
+
+   

[33/55] [abbrv] ambari git commit: AMBARI-18982. Failures due to timeout don't report any reason (aonishuk)

[ncole]

AMBARI-18982. Failures due to timeout don't report any reason (aonishuk)


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

Branch: refs/heads/branch-feature-AMBARI-18634
Commit: ece1de33af2edb765d81dcdc66445619c9d4a6d9
Parents: 9579275
Author: Andrew Onishuk 
Authored: Mon Nov 28 12:37:39 2016 +0200
Committer: Andrew Onishuk 
Committed: Mon Nov 28 12:37:39 2016 +0200

--
 .../main/python/ambari_agent/CustomServiceOrchestrator.py   | 9 +
 .../python/ambari_agent/TestCustomServiceOrchestrator.py| 4 ++--
 .../apache/ambari/server/actionmanager/ActionScheduler.java | 2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/ece1de33/ambari-agent/src/main/python/ambari_agent/CustomServiceOrchestrator.py
--
diff --git 
a/ambari-agent/src/main/python/ambari_agent/CustomServiceOrchestrator.py 
b/ambari-agent/src/main/python/ambari_agent/CustomServiceOrchestrator.py
index 770484d..ebd3506 100644
--- a/ambari-agent/src/main/python/ambari_agent/CustomServiceOrchestrator.py
+++ b/ambari-agent/src/main/python/ambari_agent/CustomServiceOrchestrator.py
@@ -223,7 +223,7 @@ class CustomServiceOrchestrator():
   # if canceled and not background command
   if handle is None:
 cancel_reason = self.command_canceled_reason(task_id)
-if cancel_reason:
+if cancel_reason is not None:
   ret['stdout'] += cancel_reason
   ret['stderr'] += cancel_reason
 
@@ -251,10 +251,11 @@ class CustomServiceOrchestrator():
 logger.debug('Pop with taskId %s' % task_id)
 pid = self.commands_in_progress.pop(task_id)
 if not isinstance(pid, int):
-  if pid:
-return '\nCommand aborted. ' + pid
+  reason = pid
+  if reason:
+return "\nCommand aborted. Reason: '{0}'".format(reason)
   else:
-return ''
+return "\nCommand aborted."
 return None
 
   def requestComponentStatus(self, command):

http://git-wip-us.apache.org/repos/asf/ambari/blob/ece1de33/ambari-agent/src/test/python/ambari_agent/TestCustomServiceOrchestrator.py
--
diff --git 
a/ambari-agent/src/test/python/ambari_agent/TestCustomServiceOrchestrator.py 
b/ambari-agent/src/test/python/ambari_agent/TestCustomServiceOrchestrator.py
index 2be6e1a..0304adc 100644
--- a/ambari-agent/src/test/python/ambari_agent/TestCustomServiceOrchestrator.py
+++ b/ambari-agent/src/test/python/ambari_agent/TestCustomServiceOrchestrator.py
@@ -400,8 +400,8 @@ class TestCustomServiceOrchestrator(TestCase):
 ret = async_result.get()
 
 self.assertEqual(ret['exitcode'], 1)
-self.assertEquals(ret['stdout'], 'killed\nCommand aborted. reason')
-self.assertEquals(ret['stderr'], 'killed\nCommand aborted. reason')
+self.assertEquals(ret['stdout'], 'killed\nCommand aborted. Reason: 
\'reason\'')
+self.assertEquals(ret['stderr'], 'killed\nCommand aborted. Reason: 
\'reason\'')
 
 self.assertTrue(kill_process_with_children_mock.called)
 self.assertFalse(command['taskId'] in 
orchestrator.commands_in_progress.keys())

http://git-wip-us.apache.org/repos/asf/ambari/blob/ece1de33/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionScheduler.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionScheduler.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionScheduler.java
index 7a84536..e80b020 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionScheduler.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionScheduler.java
@@ -1246,7 +1246,7 @@ class ActionScheduler implements Runnable {
   hostRoleCommand.getStatus() == HostRoleStatus.IN_PROGRESS) {
   CancelCommand cancelCommand = new CancelCommand();
   cancelCommand.setTargetTaskId(hostRoleCommand.getTaskId());
-  cancelCommand.setReason("");
+  cancelCommand.setReason("Stage timeout");
   actionQueue.enqueue(hostRoleCommand.getHostName(), cancelCommand);
 }
   }

[45/55] [abbrv] ambari git commit: AMBARI-18946 Ambari Integration for Zeppelin and Spark 2.0 (r-kamath)

[ncole]

AMBARI-18946 Ambari Integration for Zeppelin and Spark 2.0 (r-kamath)


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

Branch: refs/heads/branch-feature-AMBARI-18634
Commit: 69390ee4897699a94542e946e2f03d31ee4a626b
Parents: b5b73d2
Author: Renjith Kamath 
Authored: Tue Nov 29 11:57:41 2016 +0530
Committer: Renjith Kamath 
Committed: Tue Nov 29 11:59:01 2016 +0530

--
 .../0.6.0.2.5/package/scripts/master.py | 15 +++
 .../0.6.0.2.5/package/scripts/params.py | 28 +++-
 2 files changed, 31 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/69390ee4/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py
 
b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py
index 33a2a14..e82b53c 100644
--- 
a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py
+++ 
b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py
@@ -58,8 +58,12 @@ class Master(Script):
 # update the configs specified by user
 self.configure(env)
 
-Execute('echo spark_version:' + params.spark_version + ' detected for 
spark_home: '
-+ params.spark_home + ' >> ' + params.zeppelin_log_file, 
user=params.zeppelin_user)
+if params.spark_version:
+  Execute('echo spark_version:' + str(params.spark_version) + ' detected 
for spark_home: '
+  + params.spark_home + ' >> ' + params.zeppelin_log_file, 
user=params.zeppelin_user)
+if params.spark2_version:
+  Execute('echo spark2_version:' + str(params.spark2_version) + ' detected 
for spark2_home: '
+  + params.spark2_home + ' >> ' + params.zeppelin_log_file, 
user=params.zeppelin_user)
 
   def create_zeppelin_dir(self, params):
 params.HdfsResource(format("/user/{zeppelin_user}"),
@@ -138,9 +142,10 @@ class Master(Script):
 File(format("{params.conf_dir}/log4j.properties"), 
content=params.log4j_properties_content,
  owner=params.zeppelin_user, group=params.zeppelin_group)
 
-# copy hive-site.xml
-File(format("{params.conf_dir}/hive-site.xml"), 
content=StaticFile("/etc/spark/conf/hive-site.xml"),
- owner=params.zeppelin_user, group=params.zeppelin_group)
+# copy hive-site.xml only if Spark 1.x is installed
+if 'spark-defaults' in params.config['configurations']:
+File(format("{params.conf_dir}/hive-site.xml"), 
content=StaticFile("/etc/spark/conf/hive-site.xml"),
+ owner=params.zeppelin_user, group=params.zeppelin_group)
 
 if len(params.hbase_master_hosts) > 0:
   # copy hbase-site.xml

http://git-wip-us.apache.org/repos/asf/ambari/blob/69390ee4/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/params.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/params.py
 
b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/params.py
index 27ed150..5a3174f 100644
--- 
a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/params.py
+++ 
b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/params.py
@@ -39,6 +39,14 @@ def get_port_from_url(address):
   else:
 return address
 
+def extract_spark_version(spark_home):
+  try:
+with open(spark_home + "/RELEASE") as fline:
+  return re.search('Spark (\d\.\d).+', fline.readline().rstrip()).group(1)
+  except:
+pass
+  return None
+
 
 # server configurations
 config = Script.get_config()
@@ -58,13 +66,17 @@ spark_jar_dir = 
config['configurations']['zeppelin-env']['zeppelin.spark.jar.dir
 spark_jar = format("{spark_jar_dir}/zeppelin-spark-0.5.5-SNAPSHOT.jar")
 setup_view = True
 temp_file = config['configurations']['zeppelin-env']['zeppelin.temp.file']
-spark_home = os.path.join(stack_root, "current", "spark-client")
 
-try:
-  fline = open(spark_home + "/RELEASE").readline().rstrip()
-  spark_version = re.search('Spark (\d\.\d).+', fline).group(1)
-except:
-  pass
+spark_home = None
+spark_version = None
+spark2_home = None
+spark2_version = None
+if 'spark-defaults' in config['configurations']:
+  spark_home = os.path.join(stack_root, "current", 'spark-client')
+  

[27/55] [abbrv] ambari git commit: AMBARI-18985. typeahead was lost while bootstrap 2 to bootstrap3 mirgation (onechiporenko)

[ncole]

AMBARI-18985. typeahead was lost while bootstrap 2 to bootstrap3 mirgation 
(onechiporenko)


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

Branch: refs/heads/branch-feature-AMBARI-18634
Commit: b7d55f0c9375686b8949ada3a4688eb936cf8404
Parents: 14d63dd
Author: Oleg Nechiporenko 
Authored: Thu Nov 24 15:49:00 2016 +0200
Committer: Oleg Nechiporenko 
Committed: Thu Nov 24 15:49:00 2016 +0200

--
 .../common/assign_master_components_view.js |   2 +
 ambari-web/brunch-config.js |   1 +
 ambari-web/vendor/scripts/jquery.typeahead.js   | 300 +++
 3 files changed, 303 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/b7d55f0c/ambari-web/app/views/common/assign_master_components_view.js
--
diff --git a/ambari-web/app/views/common/assign_master_components_view.js 
b/ambari-web/app/views/common/assign_master_components_view.js
index 53859f6..4646cf0 100644
--- a/ambari-web/app/views/common/assign_master_components_view.js
+++ b/ambari-web/app/views/common/assign_master_components_view.js
@@ -63,6 +63,8 @@ App.InputHostView = Em.TextField.extend(App.SelectHost, {
*/
   typeahead: null,
 
+  classNames: ['form-control'],
+
   /**
* When value (host_info) is changed this method is triggered
* If new hostname is valid, this host is assigned to master component

http://git-wip-us.apache.org/repos/asf/ambari/blob/b7d55f0c/ambari-web/brunch-config.js
--
diff --git a/ambari-web/brunch-config.js b/ambari-web/brunch-config.js
index 27a6057..d646fdc 100644
--- a/ambari-web/brunch-config.js
+++ b/ambari-web/brunch-config.js
@@ -67,6 +67,7 @@ module.exports.config = {
   'vendor/scripts/jquery.timeago.js',
   'vendor/scripts/jquery.ajax-retry.js',
   'vendor/scripts/jquery.sticky-kit.js',
+  'vendor/scripts/jquery.typeahead.js',
   'vendor/scripts/underscore.js',
   'vendor/scripts/backbone.js',
   'vendor/scripts/difflib.js',

http://git-wip-us.apache.org/repos/asf/ambari/blob/b7d55f0c/ambari-web/vendor/scripts/jquery.typeahead.js
--
diff --git a/ambari-web/vendor/scripts/jquery.typeahead.js 
b/ambari-web/vendor/scripts/jquery.typeahead.js
new file mode 100644
index 000..c020a8e
--- /dev/null
+++ b/ambari-web/vendor/scripts/jquery.typeahead.js
@@ -0,0 +1,300 @@
+/* =
+ * bootstrap-typeahead.js v2.1.1
+ * http://twitter.github.com/bootstrap/javascript.html#typeahead
+ * =
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed 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.
+ *  */
+
+
+!function($){
+
+  "use strict"; // jshint ;_;
+
+
+  /* TYPEAHEAD PUBLIC CLASS DEFINITION
+   * = */
+
+  var Typeahead = function (element, options) {
+this.$element = $(element)
+this.options = $.extend({}, $.fn.typeahead.defaults, options)
+this.matcher = this.options.matcher || this.matcher
+this.sorter = this.options.sorter || this.sorter
+this.highlighter = this.options.highlighter || this.highlighter
+this.updater = this.options.updater || this.updater
+this.$menu = $(this.options.menu).appendTo('body')
+this.source = this.options.source
+this.shown = false
+this.listen()
+  }
+
+  Typeahead.prototype = {
+
+constructor: Typeahead
+
+, select: function () {
+  var val = this.$menu.find('.active').attr('data-value')
+  this.$element
+.val(this.updater(val))
+.change()
+  return this.hide()
+}
+
+, updater: function (item) {
+  return item
+}
+
+, show: function () {
+  var pos = $.extend({}, this.$element.offset(), {
+height: this.$element[0].offsetHeight
+  })
+
+  this.$menu.css({
+top: pos.top 

[35/55] [abbrv] ambari git commit: AMBARI-18976. Config History request execution time depends on config versions count. (mpapirkovskyy)

[ncole]

AMBARI-18976. Config History request execution time depends on config versions 
count. (mpapirkovskyy)


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

Branch: refs/heads/branch-feature-AMBARI-18634
Commit: abf9882276d2ed73cd5dcf12a088d16492c9490d
Parents: b1eaffc
Author: Myroslav Papirkovskyi 
Authored: Wed Nov 23 19:03:14 2016 +0200
Committer: Myroslav Papirkovskyi 
Committed: Mon Nov 28 18:38:03 2016 +0200

--
 .../internal/ClusterControllerImpl.java |  2 +-
 .../ServiceConfigVersionResourceProvider.java   |  3 +-
 .../logging/LoggingSearchPropertyProvider.java  | 11 -
 .../ambari/server/orm/dao/ClusterDAO.java   | 24 +++
 .../ambari/server/orm/dao/ServiceConfigDAO.java | 13 +++---
 .../orm/entities/ClusterConfigEntity.java   |  7 +++-
 .../entities/ClusterConfigMappingEntity.java|  6 +++
 .../orm/entities/ServiceConfigEntity.java   |  5 ++-
 .../server/state/cluster/ClusterImpl.java   | 42 +---
 9 files changed, 67 insertions(+), 46 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/abf98822/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterControllerImpl.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterControllerImpl.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterControllerImpl.java
index 32bed7b..c752e80 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterControllerImpl.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterControllerImpl.java
@@ -858,7 +858,7 @@ public class ClusterControllerImpl implements 
ClusterController {
   if (compVal == 0) {
 Schema schema = getSchema(resourceType);
 
-for (Type type : Type.values()) {
+for (Type type : schema.getKeyTypes()) {
   String keyPropertyId = schema.getKeyPropertyId(type);
   if (keyPropertyId != null) {
 compVal = compareValues(resource1.getPropertyValue(keyPropertyId),

http://git-wip-us.apache.org/repos/asf/ambari/blob/abf98822/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceConfigVersionResourceProvider.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceConfigVersionResourceProvider.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceConfigVersionResourceProvider.java
index 2edbe9b..e5ca389 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceConfigVersionResourceProvider.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceConfigVersionResourceProvider.java
@@ -91,8 +91,9 @@ public class ServiceConfigVersionResourceProvider extends
 PROPERTY_IDS.add(SERVICE_CONFIG_VERSION_IS_COMPATIBLE_PROPERTY_ID);
 
 // keys
-
KEY_PROPERTY_IDS.put(Resource.Type.ServiceConfigVersion,SERVICE_CONFIG_VERSION_SERVICE_NAME_PROPERTY_ID);
+
KEY_PROPERTY_IDS.put(Resource.Type.Service,SERVICE_CONFIG_VERSION_SERVICE_NAME_PROPERTY_ID);
 
KEY_PROPERTY_IDS.put(Resource.Type.Cluster,SERVICE_CONFIG_VERSION_CLUSTER_NAME_PROPERTY_ID);
+
KEY_PROPERTY_IDS.put(Resource.Type.ServiceConfigVersion,SERVICE_CONFIG_VERSION_PROPERTY_ID);
   }
 
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/abf98822/ambari-server/src/main/java/org/apache/ambari/server/controller/logging/LoggingSearchPropertyProvider.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/logging/LoggingSearchPropertyProvider.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/logging/LoggingSearchPropertyProvider.java
index d9db290..16788ed 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/logging/LoggingSearchPropertyProvider.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/logging/LoggingSearchPropertyProvider.java
@@ -39,8 +39,10 @@ import org.apache.log4j.Logger;
 
 import java.util.Collections;
 import java.util.EnumSet;
+import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -73,7 +75,7 @@ public class 

[25/55] [abbrv] ambari git commit: AMBARI-18983. Service Summary fix add widget button size (akovalenko)

[ncole]

AMBARI-18983. Service Summary fix add widget button size (akovalenko)


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

Branch: refs/heads/branch-feature-AMBARI-18634
Commit: 3081aec39c0f6dfc13545667ec1a1b2ef87d3b06
Parents: c9f6944
Author: Aleksandr Kovalenko 
Authored: Thu Nov 24 10:59:37 2016 +0200
Committer: Aleksandr Kovalenko 
Committed: Thu Nov 24 13:07:34 2016 +0200

--
 ambari-web/app/styles/enhanced_service_dashboard.less  | 2 ++
 ambari-web/app/templates/main/service/info/summary.hbs | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/3081aec3/ambari-web/app/styles/enhanced_service_dashboard.less
--
diff --git a/ambari-web/app/styles/enhanced_service_dashboard.less 
b/ambari-web/app/styles/enhanced_service_dashboard.less
index e783c52..870e9a8 100644
--- a/ambari-web/app/styles/enhanced_service_dashboard.less
+++ b/ambari-web/app/styles/enhanced_service_dashboard.less
@@ -20,10 +20,12 @@
 
 @border-color: #ddd;
 @invalid-color: red;
+@add-widget-btn-color: #f5f5f5;
 
 .service-metrics-block {
 
   #add-widget-action-box {
+background-color: @add-widget-btn-color;
 width: 98%;
 padding: 43px;
 border: 1px solid @border-color;

http://git-wip-us.apache.org/repos/asf/ambari/blob/3081aec3/ambari-web/app/templates/main/service/info/summary.hbs
--
diff --git a/ambari-web/app/templates/main/service/info/summary.hbs 
b/ambari-web/app/templates/main/service/info/summary.hbs
index 385465d..c142464 100644
--- a/ambari-web/app/templates/main/service/info/summary.hbs
+++ b/ambari-web/app/templates/main/service/info/summary.hbs
@@ -136,7 +136,7 @@
   {{#if isAmbariMetricsInstalled}}
 
   
 
 

[08/55] [abbrv] ambari git commit: AMBARI-18960 - Dashboards directory only needs to be sync'd for METRICS_GRAFANA

[ncole]

AMBARI-18960 - Dashboards directory only needs to be sync'd for METRICS_GRAFANA


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

Branch: refs/heads/branch-feature-AMBARI-18634
Commit: 48715331207b73978803aa666209b84c26224fde
Parents: 4a7cbcb
Author: Tim Thorpe 
Authored: Tue Nov 22 08:56:34 2016 -0800
Committer: Tim Thorpe 
Committed: Tue Nov 22 08:56:34 2016 -0800

--
 .../ambari_agent/CustomServiceOrchestrator.py   |  4 +++-
 .../TestCustomServiceOrchestrator.py| 21 
 2 files changed, 24 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/48715331/ambari-agent/src/main/python/ambari_agent/CustomServiceOrchestrator.py
--
diff --git 
a/ambari-agent/src/main/python/ambari_agent/CustomServiceOrchestrator.py 
b/ambari-agent/src/main/python/ambari_agent/CustomServiceOrchestrator.py
index fbc1509..b814334 100644
--- a/ambari-agent/src/main/python/ambari_agent/CustomServiceOrchestrator.py
+++ b/ambari-agent/src/main/python/ambari_agent/CustomServiceOrchestrator.py
@@ -58,6 +58,7 @@ class CustomServiceOrchestrator():
   AMBARI_SERVER_HOST = "ambari_server_host"
   AMBARI_SERVER_PORT = "ambari_server_port"
   AMBARI_SERVER_USE_SSL = "ambari_server_use_ssl"
+  METRICS_GRAFANA = "METRICS_GRAFANA"
 
   FREQUENT_COMMANDS = [COMMAND_NAME_SECURITY_STATUS, COMMAND_NAME_STATUS]
   DONT_DEBUG_FAILURES_FOR_COMMANDS = FREQUENT_COMMANDS
@@ -153,7 +154,8 @@ class CustomServiceOrchestrator():
 self.file_cache.get_host_scripts_base_dir(server_url_prefix)  
 hook_dir = self.file_cache.get_hook_base_dir(command, 
server_url_prefix)
 base_dir = self.file_cache.get_service_base_dir(command, 
server_url_prefix)
-self.file_cache.get_dashboard_base_dir(server_url_prefix)
+if command['role'] == self.METRICS_GRAFANA:
+  self.file_cache.get_dashboard_base_dir(server_url_prefix)
 
 script_path = self.resolve_script_path(base_dir, script)
 script_tuple = (script_path, base_dir)

http://git-wip-us.apache.org/repos/asf/ambari/blob/48715331/ambari-agent/src/test/python/ambari_agent/TestCustomServiceOrchestrator.py
--
diff --git 
a/ambari-agent/src/test/python/ambari_agent/TestCustomServiceOrchestrator.py 
b/ambari-agent/src/test/python/ambari_agent/TestCustomServiceOrchestrator.py
index 9f1241e..d0d6ac4 100644
--- a/ambari-agent/src/test/python/ambari_agent/TestCustomServiceOrchestrator.py
+++ b/ambari-agent/src/test/python/ambari_agent/TestCustomServiceOrchestrator.py
@@ -277,6 +277,8 @@ class TestCustomServiceOrchestrator(TestCase):
 self.assertEqual(ret['exitcode'], 0)
 self.assertTrue(run_file_mock.called)
 self.assertEqual(run_file_mock.call_count, 3)
+# Should only be called for METRICS_GRAFANA
+self.assertFalse(get_dashboard_base_dir_mock.called)
 
 run_file_mock.reset_mock()
 
@@ -299,6 +301,25 @@ class TestCustomServiceOrchestrator(TestCase):
 
 run_file_mock.reset_mock()
 
+# For role=METRICS_GRAFANA, dashboards should be sync'd
+command['role'] = 'METRICS_GRAFANA'
+get_dashboard_base_dir_mock.reset_mock()
+get_dashboard_base_dir_mock.return_value = "/dashboards/"
+
+run_file_mock.return_value = {
+'stdout' : 'sss',
+'stderr' : 'eee',
+'exitcode': 0,
+  }
+ret = orchestrator.runCommand(command, "out.txt", "err.txt")
+self.assertEqual(ret['exitcode'], 0)
+self.assertTrue(run_file_mock.called)
+self.assertEqual(run_file_mock.call_count, 3)
+self.assertTrue(get_dashboard_base_dir_mock.called)
+
+command['role'] = 'REGION_SERVER'
+run_file_mock.reset_mock()
+
 # unknown script type case
 command['commandParams']['script_type'] = "SOME_TYPE"
 ret = orchestrator.runCommand(command, "out.txt", "err.txt")

[50/55] [abbrv] ambari git commit: AMBARI-19001. Support configurable grok filters (output + ambari) (oleewere)

[ncole]

AMBARI-19001. Support configurable grok filters (output + ambari) (oleewere)

Change-Id: Ibf02fc6ca6759435ac14dc59de9f71782d7ea709


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

Branch: refs/heads/branch-feature-AMBARI-18634
Commit: cfeb39176757aae6b5670bcff07f86992238cf3e
Parents: edd6b49
Author: oleewere 
Authored: Tue Nov 29 13:46:32 2016 +0100
Committer: oleewere 
Committed: Tue Nov 29 15:54:03 2016 +0100

--
 .../configuration/logfeeder-ambari-config.xml   |  37 ++
 .../configuration/logfeeder-output-config.xml   |  37 ++
 .../LOGSEARCH/0.5.0/metainfo.xml|   5 +
 .../LOGSEARCH/0.5.0/package/scripts/params.py   |  17 +-
 .../0.5.0/package/scripts/setup_logfeeder.py|  10 +
 .../templates/input.config-ambari.json.j2   | 602 ---
 .../package/templates/output.config.json.j2 |  61 --
 .../properties/input.config-ambari.json.j2  | 602 +++
 .../0.5.0/properties/output.config.json.j2  |  61 ++
 .../stacks/2.4/LOGSEARCH/test_logfeeder.py  |  14 +-
 .../test/python/stacks/2.4/configs/default.json |   6 +
 11 files changed, 780 insertions(+), 672 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/cfeb3917/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logfeeder-ambari-config.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logfeeder-ambari-config.xml
 
b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logfeeder-ambari-config.xml
new file mode 100644
index 000..64d7946
--- /dev/null
+++ 
b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logfeeder-ambari-config.xml
@@ -0,0 +1,37 @@
+
+
+
+
+  
+content
+Ambari LogFeeder config
+Grok filters and input file locations for ambari related log 
files
+
+VALUE_FROM_PROPERTY_FILE
+
+  content
+  false
+  input.config-ambari.json.j2
+  text
+
+
+  
+
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/cfeb3917/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logfeeder-output-config.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logfeeder-output-config.xml
 
b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logfeeder-output-config.xml
new file mode 100644
index 000..85654c8
--- /dev/null
+++ 
b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logfeeder-output-config.xml
@@ -0,0 +1,37 @@
+
+
+
+
+  
+content
+LogFeeder output config
+Output configuration for LogFeeder (data 
shipping)
+
+VALUE_FROM_PROPERTY_FILE
+
+  content
+  false
+  output.config.json.j2
+  text
+
+
+  
+
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/cfeb3917/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/metainfo.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/metainfo.xml 
b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/metainfo.xml
index f00b1eb..253294e 100644
--- 
a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/metainfo.xml
+++ 
b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/metainfo.xml
@@ -72,6 +72,7 @@
 logsearch-admin-json
 logsearch-service_logs-solrconfig.xml
 logsearch-audit_logs-solrconfig.xml
+logfeeder-custom-logsearch-config
   
 
 
@@ -111,6 +112,10 @@
 logfeeder-env
 logfeeder-grok
 logfeeder-log4j
+logfeeder-system_log-env
+logfeeder-ambari-config
+logfeeder-output-config
+logfeeder-custom-logsearch-config
   
 
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/cfeb3917/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/params.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/params.py
 
b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/params.py
index bdb0c10..d086f9f 100644
--- 

[37/55] [abbrv] ambari git commit: AMBARI-18836. Remove group readable from hdfs headless keytab (Shi Wang via rlevas)

[ncole]

AMBARI-18836. Remove group readable from hdfs headless keytab (Shi Wang via 
rlevas)


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

Branch: refs/heads/branch-feature-AMBARI-18634
Commit: cad0130d9d4a64a6bda1992758c5c7c05e06b39e
Parents: 255725d
Author: Shi Wang 
Authored: Mon Nov 28 12:39:05 2016 -0500
Committer: Robert Levas 
Committed: Mon Nov 28 12:39:10 2016 -0500

--
 .../common-services/HDFS/2.1.0.2.0/kerberos.json  |  2 +-
 .../HIVE/0.12.0.2.0/package/scripts/webhcat.py| 10 --
 .../resources/stacks/HDP/2.5/services/HDFS/kerberos.json  |  2 +-
 .../test/python/stacks/2.0.6/HIVE/test_webhcat_server.py  |  4 
 4 files changed, 2 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/cad0130d/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/kerberos.json
--
diff --git 
a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/kerberos.json 
b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/kerberos.json
index e8c96cb..f30c9e4 100644
--- 
a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/kerberos.json
+++ 
b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/kerberos.json
@@ -56,7 +56,7 @@
 },
 "group": {
   "name": "${cluster-env/user_group}",
-  "access": "r"
+  "access": ""
 },
 "configuration": "hadoop-env/hdfs_user_keytab"
   }

http://git-wip-us.apache.org/repos/asf/ambari/blob/cad0130d/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/webhcat.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/webhcat.py
 
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/webhcat.py
index a7feb60..00b057c 100644
--- 
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/webhcat.py
+++ 
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/webhcat.py
@@ -70,16 +70,6 @@ def webhcat():
 group=params.user_group,
 cd_access="a")
 
-  if params.security_enabled:
-kinit_if_needed = format("{kinit_path_local} -kt {hdfs_user_keytab} 
{hdfs_principal_name};")
-  else:
-kinit_if_needed = ""
-
-  if kinit_if_needed:
-Execute(kinit_if_needed,
-user=params.webhcat_user,
-path='/bin'
-)
 
   # Replace _HOST with hostname in relevant principal-related properties
   webhcat_site = params.config['configurations']['webhcat-site'].copy()

http://git-wip-us.apache.org/repos/asf/ambari/blob/cad0130d/ambari-server/src/main/resources/stacks/HDP/2.5/services/HDFS/kerberos.json
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HDFS/kerberos.json 
b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HDFS/kerberos.json
index 974a69c..9000e95 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HDFS/kerberos.json
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HDFS/kerberos.json
@@ -66,7 +66,7 @@
 },
 "group": {
   "name": "${cluster-env/user_group}",
-  "access": "r"
+  "access": ""
 },
 "configuration": "hadoop-env/hdfs_user_keytab"
   }

http://git-wip-us.apache.org/repos/asf/ambari/blob/cad0130d/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_webhcat_server.py
--
diff --git 
a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_webhcat_server.py 
b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_webhcat_server.py
index 2b26dd8..8df6295 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_webhcat_server.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_webhcat_server.py
@@ -252,10 +252,6 @@ class TestWebHCatServer(RMFTestCase):
   create_parents = True,
   cd_access = 'a'
   )
-self.assertResourceCalled('Execute', '/usr/bin/kinit -kt 
/etc/security/keytabs/hdfs.headless.keytab hdfs;',
-  path = ['/bin'],
-  user = 'hcat',
-  

[49/55] [abbrv] ambari git commit: AMBARI-18996. Abillity to enable SPNEGO on Log Search Portal UI from Ambari (oleewere)

[ncole]

AMBARI-18996. Abillity to enable SPNEGO on Log Search Portal UI from Ambari 
(oleewere)

Change-Id: I679f212cc725cb263b9c57931573fe5e94e712df


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

Branch: refs/heads/branch-feature-AMBARI-18634
Commit: edd6b491fe3586b95297752085a72417b801daf8
Parents: c705fa7
Author: oleewere 
Authored: Tue Nov 29 15:39:11 2016 +0100
Committer: oleewere 
Committed: Tue Nov 29 15:39:11 2016 +0100

--
 .../LogsearchKRBAuthenticationFilter.java   |  4 +-
 .../src/main/resources/logsearch.properties |  2 +-
 .../configuration/logsearch-properties.xml  | 40 +++
 .../configs/services/logsearch_properties.js| 51 +++-
 4 files changed, 93 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/edd6b491/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/web/filters/LogsearchKRBAuthenticationFilter.java
--
diff --git 
a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/web/filters/LogsearchKRBAuthenticationFilter.java
 
b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/web/filters/LogsearchKRBAuthenticationFilter.java
index 808320d..fdda542 100644
--- 
a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/web/filters/LogsearchKRBAuthenticationFilter.java
+++ 
b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/web/filters/LogsearchKRBAuthenticationFilter.java
@@ -72,7 +72,7 @@ public class LogsearchKRBAuthenticationFilter extends 
LogsearchKrbFilter {
   private static final String PRINCIPAL = 
"logsearch.spnego.kerberos.principal";
   private static final String KEYTAB = "logsearch.spnego.kerberos.keytab";
   private static final String HOST_NAME = "logsearch.spnego.kerberos.host";
-  private static final String 
KERBEROS_ENABLE="logsearch.spnego.kerberos.enable";
+  private static final String KERBEROS_ENABLED = 
"logsearch.spnego.kerberos.enabled";
 
   private static final String NAME_RULES_PARAM = "kerberos.name.rules";
   private static final String TOKEN_VALID_PARAM = "token.validity";
@@ -230,7 +230,7 @@ public class LogsearchKRBAuthenticationFilter extends 
LogsearchKrbFilter {
   }
 
   private void isSpnegoEnable() {
-spnegoEnable = PropertiesHelper.getBooleanProperty(KERBEROS_ENABLE, false);
+spnegoEnable = PropertiesHelper.getBooleanProperty(KERBEROS_ENABLED, 
false);
 if (spnegoEnable) {
   spnegoEnable = false;
   String keytab = PropertiesHelper.getProperty(KEYTAB);

http://git-wip-us.apache.org/repos/asf/ambari/blob/edd6b491/ambari-logsearch/ambari-logsearch-portal/src/main/resources/logsearch.properties
--
diff --git 
a/ambari-logsearch/ambari-logsearch-portal/src/main/resources/logsearch.properties
 
b/ambari-logsearch/ambari-logsearch-portal/src/main/resources/logsearch.properties
index 7641b0c..b6cc4a5 100755
--- 
a/ambari-logsearch/ambari-logsearch-portal/src/main/resources/logsearch.properties
+++ 
b/ambari-logsearch/ambari-logsearch-portal/src/main/resources/logsearch.properties
@@ -57,7 +57,7 @@ 
logsearch.solr.jaas.file=/usr/lib/ambari-logsearch-portal/logsearch_solr_jaas.co
 
 
 #portal Kerberos 
-logsearch.spnego.kerberos.enable=false
+logsearch.spnego.kerberos.enabled=false
 logsearch.spnego.kerberos.keytab=
 logsearch.spnego.kerberos.principal=
 logsearch.spnego.kerberos.host=
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/edd6b491/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-properties.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-properties.xml
 
b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-properties.xml
index 9dcd5cf..10ca9ae 100644
--- 
a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-properties.xml
+++ 
b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-properties.xml
@@ -236,4 +236,44 @@
 
 
   
+  
+logsearch.spnego.kerberos.enabled
+
+Http Spnego enabled
+Enable SPNEGO based authentication on the Log Search 
UI
+
+  boolean
+
+
+  
+  
+logsearch.spnego.kerberos.principal
+
+Http Spnego principal
+ 

[28/55] [abbrv] ambari git commit: AMBARI-18986. Deployment failure when command does not have role (smohanty)

[ncole]

AMBARI-18986. Deployment failure when command does not have role (smohanty)


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

Branch: refs/heads/branch-feature-AMBARI-18634
Commit: fc46088d9a9943c8e6bd7ea9b29512064faf72c4
Parents: b7d55f0
Author: Sumit Mohanty 
Authored: Thu Nov 24 10:15:30 2016 -0800
Committer: Sumit Mohanty 
Committed: Thu Nov 24 10:16:11 2016 -0800

--
 .../main/python/ambari_agent/CustomServiceOrchestrator.py| 8 ++--
 .../python/ambari_agent/TestCustomServiceOrchestrator.py | 4 ++--
 2 files changed, 8 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/fc46088d/ambari-agent/src/main/python/ambari_agent/CustomServiceOrchestrator.py
--
diff --git 
a/ambari-agent/src/main/python/ambari_agent/CustomServiceOrchestrator.py 
b/ambari-agent/src/main/python/ambari_agent/CustomServiceOrchestrator.py
index b814334..770484d 100644
--- a/ambari-agent/src/main/python/ambari_agent/CustomServiceOrchestrator.py
+++ b/ambari-agent/src/main/python/ambari_agent/CustomServiceOrchestrator.py
@@ -42,6 +42,7 @@ class CustomServiceOrchestrator():
   """
 
   SCRIPT_TYPE_PYTHON = "PYTHON"
+  COMMAND_TYPE = "commandType"
   COMMAND_NAME_STATUS = "STATUS"
   COMMAND_NAME_SECURITY_STATUS = "SECURITY_STATUS"
   CUSTOM_ACTION_COMMAND = 'ACTIONEXECUTE'
@@ -58,7 +59,6 @@ class CustomServiceOrchestrator():
   AMBARI_SERVER_HOST = "ambari_server_host"
   AMBARI_SERVER_PORT = "ambari_server_port"
   AMBARI_SERVER_USE_SSL = "ambari_server_use_ssl"
-  METRICS_GRAFANA = "METRICS_GRAFANA"
 
   FREQUENT_COMMANDS = [COMMAND_NAME_SECURITY_STATUS, COMMAND_NAME_STATUS]
   DONT_DEBUG_FAILURES_FOR_COMMANDS = FREQUENT_COMMANDS
@@ -154,7 +154,11 @@ class CustomServiceOrchestrator():
 self.file_cache.get_host_scripts_base_dir(server_url_prefix)  
 hook_dir = self.file_cache.get_hook_base_dir(command, 
server_url_prefix)
 base_dir = self.file_cache.get_service_base_dir(command, 
server_url_prefix)
-if command['role'] == self.METRICS_GRAFANA:
+from ActionQueue import ActionQueue  # To avoid cyclic dependency
+if self.COMMAND_TYPE in command and command[self.COMMAND_TYPE] == 
ActionQueue.EXECUTION_COMMAND:
+  logger.info("Found it - " + str(command[self.COMMAND_TYPE]) + " 
yeah")
+  # limiting to only EXECUTION_COMMANDs for now
+  # TODO need a design for limiting to specific role/component such as 
METRICS_GRAFANA
   self.file_cache.get_dashboard_base_dir(server_url_prefix)
 
 script_path = self.resolve_script_path(base_dir, script)

http://git-wip-us.apache.org/repos/asf/ambari/blob/fc46088d/ambari-agent/src/test/python/ambari_agent/TestCustomServiceOrchestrator.py
--
diff --git 
a/ambari-agent/src/test/python/ambari_agent/TestCustomServiceOrchestrator.py 
b/ambari-agent/src/test/python/ambari_agent/TestCustomServiceOrchestrator.py
index d0d6ac4..2be6e1a 100644
--- a/ambari-agent/src/test/python/ambari_agent/TestCustomServiceOrchestrator.py
+++ b/ambari-agent/src/test/python/ambari_agent/TestCustomServiceOrchestrator.py
@@ -239,6 +239,7 @@ class TestCustomServiceOrchestrator(TestCase):
 
 FileCache_mock.return_value = None
 command = {
+  'commandType' : 'EXECUTION_COMMAND',
   'role' : 'REGION_SERVER',
   'hostLevelParams' : {
 'stack_name' : 'HDP',
@@ -277,8 +278,7 @@ class TestCustomServiceOrchestrator(TestCase):
 self.assertEqual(ret['exitcode'], 0)
 self.assertTrue(run_file_mock.called)
 self.assertEqual(run_file_mock.call_count, 3)
-# Should only be called for METRICS_GRAFANA
-self.assertFalse(get_dashboard_base_dir_mock.called)
+self.assertTrue(get_dashboard_base_dir_mock.called)
 
 run_file_mock.reset_mock()
 

[09/55] [abbrv] ambari git commit: AMBARI-18938. NPE when authenticating via a Centrify LDAP proxy (rlevas)

[ncole]

AMBARI-18938.  NPE when authenticating via a Centrify LDAP proxy (rlevas)


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

Branch: refs/heads/branch-feature-AMBARI-18634
Commit: e73e783a8b5377b809a829c362900d3cad15d69f
Parents: 4871533
Author: Robert Levas 
Authored: Tue Nov 22 15:28:12 2016 -0500
Committer: Robert Levas 
Committed: Tue Nov 22 15:28:12 2016 -0500

--
 .../AmbariLdapAuthenticationProvider.java   |  23 +-
 .../AmbariLdapBindAuthenticator.java| 233 ---
 .../AmbariLdapBindAuthenticatorTest.java| 226 +++---
 3 files changed, 354 insertions(+), 128 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/e73e783a/ambari-server/src/main/java/org/apache/ambari/server/security/authorization/AmbariLdapAuthenticationProvider.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/security/authorization/AmbariLdapAuthenticationProvider.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/security/authorization/AmbariLdapAuthenticationProvider.java
index 6905757..b5776a3 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/security/authorization/AmbariLdapAuthenticationProvider.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/security/authorization/AmbariLdapAuthenticationProvider.java
@@ -1,4 +1,4 @@
-/**
+/*
  * 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
@@ -24,7 +24,6 @@ import org.apache.ambari.server.configuration.Configuration;
 import org.apache.ambari.server.orm.dao.UserDAO;
 import org.apache.ambari.server.orm.entities.UserEntity;
 import org.apache.ambari.server.security.ClientSecurityType;
-import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.dao.IncorrectResultSizeDataAccessException;
@@ -72,17 +71,21 @@ public class AmbariLdapAuthenticationProvider implements 
AuthenticationProvider
 
 return new AmbariAuthentication(auth, userId);
   } catch (AuthenticationException e) {
-LOG.debug("Got exception during LDAP authentification attempt", e);
+LOG.debug("Got exception during LDAP authentication attempt", e);
 // Try to help in troubleshooting
 Throwable cause = e.getCause();
-if (cause != null) {
-  // Below we check the cause of an AuthenticationException . If it is
-  // caused by another AuthenticationException, than probably
-  // the problem is with LDAP ManagerDN/password
-  if ((cause != e) && (cause instanceof
-  org.springframework.ldap.AuthenticationException)) {
+if ((cause != null) && (cause != e)) {
+  // Below we check the cause of an AuthenticationException to see 
what the actual cause is
+  // and then send an appropriate message to the caller.
+  if (cause instanceof 
org.springframework.ldap.CommunicationException) {
+if (LOG.isDebugEnabled()) {
+  LOG.warn("Failed to communicate with the LDAP server: " + 
cause.getMessage(), e);
+} else {
+  LOG.warn("Failed to communicate with the LDAP server: " + 
cause.getMessage());
+}
+  } else if (cause instanceof 
org.springframework.ldap.AuthenticationException) {
 LOG.warn("Looks like LDAP manager credentials (that are used for " 
+
-"connecting to LDAP server) are invalid.", e);
+"connecting to LDAP server) are invalid.", e);
   }
 }
 throw new InvalidUsernamePasswordCombinationException(e);

http://git-wip-us.apache.org/repos/asf/ambari/blob/e73e783a/ambari-server/src/main/java/org/apache/ambari/server/security/authorization/AmbariLdapBindAuthenticator.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/security/authorization/AmbariLdapBindAuthenticator.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/security/authorization/AmbariLdapBindAuthenticator.java
index b34ef6a..b4ef889 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/security/authorization/AmbariLdapBindAuthenticator.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/security/authorization/AmbariLdapBindAuthenticator.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache 

[20/55] [abbrv] ambari git commit: AMBARI-18968. Ambari Server Unit Test failure: org.apache.ambari.server.state.ServicePropertiesTest.validatePropertySchemaOfServiceXMLs (alejandro)

[ncole]

AMBARI-18968. Ambari Server Unit Test failure: 
org.apache.ambari.server.state.ServicePropertiesTest.validatePropertySchemaOfServiceXMLs
 (alejandro)


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

Branch: refs/heads/branch-feature-AMBARI-18634
Commit: b59dc1dd0daff5da65622c8237cd9ecfba605734
Parents: bd2cd4a
Author: Alejandro Fernandez 
Authored: Tue Nov 22 15:57:58 2016 -0800
Committer: Alejandro Fernandez 
Committed: Wed Nov 23 10:42:28 2016 -0800

--
 .../PERF/1.0/configuration/cluster-env.xml  |   6 +-
 .../GRUMPY/configuration/grumpy-site.xml|   2 +-
 .../services/HAPPY/configuration/happy-site.xml |   2 +-
 .../services/HBASE/configuration/hbase-env.xml  |  30 ++--
 .../HBASE/configuration/hbase-log4j.xml |   2 +-
 .../configuration/hbase-logsearch-conf.xml  |   6 +-
 .../HBASE/configuration/hbase-policy.xml|   6 +-
 .../services/HBASE/configuration/hbase-site.xml |  74 -
 .../services/HDFS/configuration/core-site.xml   |  32 ++--
 .../services/HDFS/configuration/hadoop-env.xml  |  44 +++---
 .../hadoop-metrics2.properties.xml  |   2 +-
 .../HDFS/configuration/hadoop-policy.xml|  22 +--
 .../services/HDFS/configuration/hdfs-log4j.xml  |   2 +-
 .../HDFS/configuration/hdfs-logsearch-conf.xml  |   6 +-
 .../services/HDFS/configuration/hdfs-site.xml   | 108 ++---
 .../services/HDFS/configuration/ssl-client.xml  |  14 +-
 .../services/HDFS/configuration/ssl-server.xml  |  16 +-
 .../SLEEPY/configuration/sleepy-site.xml|   2 +-
 .../services/SNOW/configuration/snow-site.xml   |   2 +-
 .../YARN/configuration-mapred/mapred-env.xml|   2 +-
 .../YARN/configuration-mapred/mapred-site.xml   |  28 ++--
 .../services/YARN/configuration/yarn-env.xml|   8 +-
 .../services/YARN/configuration/yarn-log4j.xml  |   2 +-
 .../services/YARN/configuration/yarn-site.xml   | 150 +--
 24 files changed, 284 insertions(+), 284 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/b59dc1dd/ambari-server/src/main/resources/stacks/PERF/1.0/configuration/cluster-env.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/PERF/1.0/configuration/cluster-env.xml
 
b/ambari-server/src/main/resources/stacks/PERF/1.0/configuration/cluster-env.xml
index a87d37e..7d6dac4 100644
--- 
a/ambari-server/src/main/resources/stacks/PERF/1.0/configuration/cluster-env.xml
+++ 
b/ambari-server/src/main/resources/stacks/PERF/1.0/configuration/cluster-env.xml
@@ -34,7 +34,7 @@
   false
   false
 
-
+
   
 
   
@@ -50,7 +50,7 @@
   false
   false
 
-
+
   
 
   
@@ -69,7 +69,7 @@
 security_enabled
 false
 Security
-
+
   
 
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/b59dc1dd/ambari-server/src/main/resources/stacks/PERF/1.0/services/GRUMPY/configuration/grumpy-site.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/PERF/1.0/services/GRUMPY/configuration/grumpy-site.xml
 
b/ambari-server/src/main/resources/stacks/PERF/1.0/services/GRUMPY/configuration/grumpy-site.xml
index 2d4c442..7952789 100644
--- 
a/ambari-server/src/main/resources/stacks/PERF/1.0/services/GRUMPY/configuration/grumpy-site.xml
+++ 
b/ambari-server/src/main/resources/stacks/PERF/1.0/services/GRUMPY/configuration/grumpy-site.xml
@@ -31,6 +31,6 @@
   100
   10
 
-
+
   
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/b59dc1dd/ambari-server/src/main/resources/stacks/PERF/1.0/services/HAPPY/configuration/happy-site.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/PERF/1.0/services/HAPPY/configuration/happy-site.xml
 
b/ambari-server/src/main/resources/stacks/PERF/1.0/services/HAPPY/configuration/happy-site.xml
index 7d521b8..67762a5 100644
--- 
a/ambari-server/src/main/resources/stacks/PERF/1.0/services/HAPPY/configuration/happy-site.xml
+++ 
b/ambari-server/src/main/resources/stacks/PERF/1.0/services/HAPPY/configuration/happy-site.xml
@@ -31,6 +31,6 @@
   100
   10
 
-
+
   
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/b59dc1dd/ambari-server/src/main/resources/stacks/PERF/1.0/services/HBASE/configuration/hbase-env.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/PERF/1.0/services/HBASE/configuration/hbase-env.xml
 

[18/55] [abbrv] ambari git commit: AMBARI-18842: Provide support for removing an mpack on the command line (jluniya)

[ncole]

AMBARI-18842: Provide support for removing an mpack on the command line 
(jluniya)


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

Branch: refs/heads/branch-feature-AMBARI-18634
Commit: bd2cd4ab61798a44a670797a9348b6e818b7701b
Parents: a8d6f03
Author: Jayush Luniya 
Authored: Wed Nov 23 10:30:00 2016 -0800
Committer: Jayush Luniya 
Committed: Wed Nov 23 10:30:00 2016 -0800

--
 ambari-server/sbin/ambari-server|   6 +-
 ambari-server/src/main/python/ambari-server.py  | 137 ---
 .../main/python/ambari_server/setupActions.py   |   1 +
 .../main/python/ambari_server/setupMpacks.py|  62 +++--
 ambari-server/src/test/python/TestMpacks.py |  10 +-
 5 files changed, 177 insertions(+), 39 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/bd2cd4ab/ambari-server/sbin/ambari-server
--
diff --git a/ambari-server/sbin/ambari-server b/ambari-server/sbin/ambari-server
index f08db13..8afabb1 100755
--- a/ambari-server/sbin/ambari-server
+++ b/ambari-server/sbin/ambari-server
@@ -188,13 +188,17 @@ case "${1:-}" in
 echo -e "Installing management pack"
 $PYTHON "$AMBARI_PYTHON_EXECUTABLE" $@
 ;;
+  uninstall-mpack)
+echo -e "Uninstalling management pack"
+$PYTHON "$AMBARI_PYTHON_EXECUTABLE" $@
+;;
   upgrade-mpack)
 echo -e "Upgrading management pack"
 $PYTHON "$AMBARI_PYTHON_EXECUTABLE" $@
 ;;
   *)
 echo "Usage: $AMBARI_EXECUTABLE
-
{start|stop|reset|restart|upgrade|status|upgradestack|setup|setup-jce|setup-ldap|sync-ldap|set-current|setup-security|refresh-stack-hash|backup|restore|update-host-names|check-database|enable-stack|setup-sso|db-cleanup|install-mpack|upgrade-mpack}
 [options]
+
{start|stop|reset|restart|upgrade|status|upgradestack|setup|setup-jce|setup-ldap|sync-ldap|set-current|setup-security|refresh-stack-hash|backup|restore|update-host-names|check-database|enable-stack|setup-sso|db-cleanup|install-mpack|uninstall-mpack|upgrade-mpack}
 [options]
 Use $AMBARI_PYTHON_EXECUTABLE  --help to get details on 
options available.
 Or, simply invoke ambari-server.py --help to print the options."
 exit 1

http://git-wip-us.apache.org/repos/asf/ambari/blob/bd2cd4ab/ambari-server/src/main/python/ambari-server.py
--
diff --git a/ambari-server/src/main/python/ambari-server.py 
b/ambari-server/src/main/python/ambari-server.py
index d43e0f2..41b2234 100755
--- a/ambari-server/src/main/python/ambari-server.py
+++ b/ambari-server/src/main/python/ambari-server.py
@@ -39,7 +39,7 @@ from ambari_server.serverUtils import is_server_runing, 
refresh_stack_hash
 from ambari_server.serverSetup import reset, setup, setup_jce_policy
 from ambari_server.serverUpgrade import upgrade, upgrade_stack, set_current
 from ambari_server.setupHttps import setup_https, setup_truststore
-from ambari_server.setupMpacks import install_mpack, upgrade_mpack, 
STACK_DEFINITIONS_RESOURCE_NAME, \
+from ambari_server.setupMpacks import install_mpack, uninstall_mpack, 
upgrade_mpack, STACK_DEFINITIONS_RESOURCE_NAME, \
   SERVICE_DEFINITIONS_RESOURCE_NAME, MPACKS_RESOURCE_NAME
 from ambari_server.setupSso import setup_sso
 from ambari_server.dbCleanup import db_cleanup
@@ -52,7 +52,7 @@ from ambari_server.setupActions import BACKUP_ACTION, 
LDAP_SETUP_ACTION, LDAP_SY
   SETUP_ACTION, SETUP_SECURITY_ACTION,START_ACTION, STATUS_ACTION, 
STOP_ACTION, RESTART_ACTION, UPGRADE_ACTION, \
   UPGRADE_STACK_ACTION, SETUP_JCE_ACTION, SET_CURRENT_ACTION, START_ACTION, 
STATUS_ACTION, STOP_ACTION, UPGRADE_ACTION, \
   UPGRADE_STACK_ACTION, SETUP_JCE_ACTION, SET_CURRENT_ACTION, 
ENABLE_STACK_ACTION, SETUP_SSO_ACTION, \
-  DB_CLEANUP_ACTION, INSTALL_MPACK_ACTION, UPGRADE_MPACK_ACTION, 
PAM_SETUP_ACTION
+  DB_CLEANUP_ACTION, INSTALL_MPACK_ACTION, UNINSTALL_MPACK_ACTION, 
UPGRADE_MPACK_ACTION, PAM_SETUP_ACTION
 from ambari_server.setupSecurity import setup_ldap, sync_ldap, 
setup_master_key, setup_ambari_krb5_jaas, setup_pam
 from ambari_server.userInput import get_validated_string_input
 
@@ -316,6 +316,35 @@ def restore(args):
 
   BackupRestore_main(restore_command)
 
+_action_option_dependence_map = {
+}
+
+def add_parser_options(*args, **kwargs):
+  required_for_actions = kwargs.pop("required_for_actions", [])
+  optional_for_actions = kwargs.pop("optional_for_actions", [])
+  parser = kwargs.pop("parser")
+  for action in required_for_actions:
+if not action 

[43/55] [abbrv] ambari git commit: AMBARI-18987 A general preupgrade check on if services cannot be upgrade are installed (dili)

[ncole]

AMBARI-18987 A general preupgrade check on if services cannot be upgrade are 
installed (dili)


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

Branch: refs/heads/branch-feature-AMBARI-18634
Commit: bb803fb332d8d247e236b5e1b29fe97acfd7a7ec
Parents: 640d85a
Author: Di Li 
Authored: Mon Nov 28 15:51:11 2016 -0500
Committer: Di Li 
Committed: Mon Nov 28 15:51:11 2016 -0500

--
 .../ambari/server/checks/CheckDescription.java  |  13 ++
 .../server/checks/ServicePresenceCheck.java | 177 +++
 .../server/checks/ServicePresenceCheckTest.java | 217 +++
 3 files changed, 407 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/bb803fb3/ambari-server/src/main/java/org/apache/ambari/server/checks/CheckDescription.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/checks/CheckDescription.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/checks/CheckDescription.java
index fbc4be1..7f24bf4 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/checks/CheckDescription.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/checks/CheckDescription.java
@@ -277,6 +277,19 @@ public class CheckDescription {
   "This service does not support upgrades and must be removed before 
the upgrade can continue. " +
   "After upgrading, Atlas can be reinstalled").build());
 
+  public static CheckDescription SERVICE_PRESENCE_CHECK = new 
CheckDescription("SERVICE_PRESENCE_CHECK",
+  PrereqCheckType.SERVICE,
+  "Service Is Not Supported For Upgrades",
+  new ImmutableMap.Builder()
+.put(AbstractCheckDescriptor.DEFAULT,
+"The %s service is currently installed on the cluster. " +
+"This service does not support upgrades and must be removed before 
the upgrade can continue. " +
+"After upgrading, %s can be reinstalled")
+.put(ServicePresenceCheck.KEY_SERVICE_REMOVED,
+"The %s service is currently installed on the cluster. " +
+"This service is removed from the new release and must be removed 
before the upgrade can continue. " +
+"After upgrading, %s can be installed").build());
+
   public static CheckDescription RANGER_SERVICE_AUDIT_DB_CHECK = new 
CheckDescription("RANGER_SERVICE_AUDIT_DB_CHECK",
 PrereqCheckType.SERVICE,
 "Remove the Ranger Audit to Database Capability",

http://git-wip-us.apache.org/repos/asf/ambari/blob/bb803fb3/ambari-server/src/main/java/org/apache/ambari/server/checks/ServicePresenceCheck.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/checks/ServicePresenceCheck.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/checks/ServicePresenceCheck.java
new file mode 100644
index 000..0f4eeb1
--- /dev/null
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/checks/ServicePresenceCheck.java
@@ -0,0 +1,177 @@
+/**
+ * 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.
+ */
+package org.apache.ambari.server.checks;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.ambari.server.AmbariException;
+import org.apache.ambari.server.controller.PrereqCheckRequest;
+import org.apache.ambari.server.state.Cluster;
+import org.apache.ambari.server.state.stack.PrereqCheckStatus;
+import org.apache.ambari.server.state.stack.PrerequisiteCheck;
+import 
org.apache.ambari.server.state.stack.UpgradePack.PrerequisiteCheckConfig;
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import 

[40/55] [abbrv] ambari git commit: AMBARI-18973 Service Auto Start: discard popup appears even when no changes were made, second patch (atkach)

[ncole]

AMBARI-18973 Service Auto Start: discard popup appears even when no changes 
were made, second patch (atkach)


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

Branch: refs/heads/branch-feature-AMBARI-18634
Commit: 3c8b1582c2f0aa65289b762fd0162049916e9140
Parents: 8de17fa
Author: Andrii Tkach 
Authored: Mon Nov 28 18:36:50 2016 +0200
Committer: Andrii Tkach 
Committed: Mon Nov 28 20:41:25 2016 +0200

--
 ambari-web/app/controllers/main/admin/service_auto_start.js | 2 +-
 ambari-web/app/templates/main/admin/service_auto_start.hbs  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/3c8b1582/ambari-web/app/controllers/main/admin/service_auto_start.js
--
diff --git a/ambari-web/app/controllers/main/admin/service_auto_start.js 
b/ambari-web/app/controllers/main/admin/service_auto_start.js
index 501e6bb..df07c94 100644
--- a/ambari-web/app/controllers/main/admin/service_auto_start.js
+++ b/ambari-web/app/controllers/main/admin/service_auto_start.js
@@ -208,7 +208,7 @@ App.MainAdminServiceAutoStartController = 
Em.Controller.extend({
 }
   }.property('enabledComponents', 'totalComponents'),
   components: Em.A([componentRecovery]),
-  enabledComponents: componentRecovery.recovery_enabled ? 1 : 0,
+  enabledComponents: componentRecovery.recoveryEnabled ? 1 : 0,
   totalComponents: 1,
   indicator: function () {
 var percentage = this.get('enabledComponents') / 
this.get('totalComponents');

http://git-wip-us.apache.org/repos/asf/ambari/blob/3c8b1582/ambari-web/app/templates/main/admin/service_auto_start.hbs
--
diff --git a/ambari-web/app/templates/main/admin/service_auto_start.hbs 
b/ambari-web/app/templates/main/admin/service_auto_start.hbs
index 29ec3b3..7334995 100644
--- a/ambari-web/app/templates/main/admin/service_auto_start.hbs
+++ b/ambari-web/app/templates/main/admin/service_auto_start.hbs
@@ -72,7 +72,7 @@
   {{#each component in tab.components}}
 
   
-{{component.display_name}}
+{{component.displayName}}
   
   
 {{view App.MainAdminServiceAutoStartComponentView 
componentBinding="component" tabBinding="tab"}}

[34/55] [abbrv] ambari git commit: AMBARI-18995. HBASE service check fails if run with tty=true (aonishuk)

[ncole]

AMBARI-18995. HBASE service check fails if run with tty=true (aonishuk)


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

Branch: refs/heads/branch-feature-AMBARI-18634
Commit: b1eaffc7065d60c03a022a2ae3e4afca9f7ebb62
Parents: ece1de3
Author: Andrew Onishuk 
Authored: Mon Nov 28 17:01:33 2016 +0200
Committer: Andrew Onishuk 
Committed: Mon Nov 28 17:01:33 2016 +0200

--
 .../HBASE/0.96.0.2.0/package/files/hbaseSmokeVerify.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/b1eaffc7/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/files/hbaseSmokeVerify.sh
--
diff --git 
a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/files/hbaseSmokeVerify.sh
 
b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/files/hbaseSmokeVerify.sh
index 5c320c0..8b085e8 100644
--- 
a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/files/hbaseSmokeVerify.sh
+++ 
b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/files/hbaseSmokeVerify.sh
@@ -25,7 +25,7 @@ hbase_cmd=$3
 echo "scan 'ambarismoketest'" | $hbase_cmd --config $conf_dir shell > 
/tmp/hbase_chk_verify
 cat /tmp/hbase_chk_verify
 echo "Looking for $data"
-grep -q $data /tmp/hbase_chk_verify
+tr -d '\n|\t| ' < /tmp/hbase_chk_verify | grep -q $data
 if [ "$?" -ne 0 ]
 then
   exit 1

[26/55] [abbrv] ambari git commit: AMBARI-18984 Test and fix new tables styles on Ambari (part 5). (ababiichuk)

[ncole]

AMBARI-18984 Test and fix new tables styles on Ambari (part 5). (ababiichuk)


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

Branch: refs/heads/branch-feature-AMBARI-18634
Commit: 14d63dd9b4241ef5cf6624c3ca3d5a1f303bc68c
Parents: 3081aec
Author: ababiichuk 
Authored: Thu Nov 24 13:20:26 2016 +0200
Committer: ababiichuk 
Committed: Thu Nov 24 13:20:26 2016 +0200

--
 ambari-web/app/messages.js  |   2 +-
 ambari-web/app/styles/alerts.less   |  75 +
 ambari-web/app/styles/application.less  | 123 ++--
 ambari-web/app/styles/modal_popups.less |  67 +---
 ambari-web/app/styles/stack_versions.less   |   6 +-
 ambari-web/app/styles/wizard.less   |   4 -
 .../templates/common/configs/overrideWindow.hbs |   2 +-
 .../templates/common/host_progress_popup.hbs| 316 +++
 .../common/modal_popups/alerts_popup.hbs|  80 +++--
 .../modal_popups/dependent_configs_list.hbs |   2 +-
 ambari-web/app/templates/experimental.hbs   |   2 +-
 .../templates/main/admin/service_auto_start.hbs |  70 ++--
 .../admin/stack_upgrade/edit_repositories.hbs   |  52 +--
 .../stack_upgrade/stack_upgrade_wizard.hbs  |   4 +-
 .../stack_upgrade/upgrade_history_details.hbs   |   4 +-
 .../main/admin/stack_upgrade/upgrade_task.hbs   |   4 +-
 .../alerts/add_definition_to_group_popup.hbs|   2 +-
 .../main/host/bulk_operation_confirm_popup.hbs  |   2 +-
 ambari-web/app/templates/wizard/step1.hbs   |   2 +-
 .../wizard/step9/step9HostTasksLogPopup.hbs |  88 +++---
 ambari-web/app/utils/host_progress_popup.js |   5 +-
 ambari-web/app/views/main/host.js   |   5 +-
 ambari-web/app/views/wizard/step3_view.js   |   2 +-
 .../views/wizard/step9/hostLogPopupBody_view.js |   2 +
 24 files changed, 414 insertions(+), 507 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/14d63dd9/ambari-web/app/messages.js
--
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index aa4e2aa..a1d84a3 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -1700,7 +1700,7 @@ Em.I18n.translations = {
   'admin.stackVersions.upgrade.installPackage.fail.title':'Packages could not 
be installed',
   'admin.stackVersions.upgrade.installPackage.fail.timeout':'Request timed 
out.',
 
-  'admin.stackVersions.editRepositories.info': 'Provide Base URLs for the 
Operating Systems you are configuring. Uncheck all other Operating Systems.',
+  'admin.stackVersions.editRepositories.info': 'Provide Base URLs for the 
Operating Systems you are configuring.',
   'admin.stackVersions.editRepositories.validation.warning': 'Some of the 
repositories failed validation. Make changes to the base url or skip validation 
if you are sure that urls are correct',
   'admin.stackVersions.version.install.confirm': 'You are about to install 
packages for version {0} on all hosts.',
   'admin.stackVersions.version.linkTooltip': 'Click to Edit Repositories',

http://git-wip-us.apache.org/repos/asf/ambari/blob/14d63dd9/ambari-web/app/styles/alerts.less
--
diff --git a/ambari-web/app/styles/alerts.less 
b/ambari-web/app/styles/alerts.less
index bf3eaf3..77cc13c 100644
--- a/ambari-web/app/styles/alerts.less
+++ b/ambari-web/app/styles/alerts.less
@@ -416,11 +416,6 @@
   .modal-body, .modal-footer, .modal-header {
 min-width: 600px;
   }
-  #alert-info {
-.alert-list-wrap:hover {
-  background-color: #e6e6e6;
-}
-  }
 }
 
 .service-alerts {
@@ -444,76 +439,16 @@
 }
 
 .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: 0 0 20px 0;
-height: 20px;
-.name-top {
-  width: 32%;
-  padding-left: 10px;
-}
-.service-top {
-  width: 31%;
-  padding-left: 10px;
-}
-.status-top,.name-top,.service-top,.last-triggered-top {
-  float: left;
-  text-align: left;
-}
-  }
-  #alert-info{
+  #alert-info {
 overflow: auto;
 max-height: 340px;
-width: 100%;
 .alert-list-wrap {
   padding: 10px 5px;
-  border-top: 1px solid #CCC;
-  border-bottom: 1px solid #CCC;
-}
-.alert-list-line-cursor{
-  width: 100%;
-  min-height: 20px;
-  .status-icon {
-padding-right: 5px;
-min-width: 20px;

[07/55] [abbrv] ambari git commit: AMBARI-18934 - Management packs should be able to link grafana dashboards and service metrics for custom services

[ncole]

AMBARI-18934 - Management packs should be able to link grafana dashboards and 
service metrics for custom services


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

Branch: refs/heads/branch-feature-AMBARI-18634
Commit: 4a7cbcb1b49d070f57c9d5ba9771ad72765693a4
Parents: 2ce9e3b
Author: Tim Thorpe 
Authored: Tue Nov 22 07:52:49 2016 -0800
Committer: Tim Thorpe 
Committed: Tue Nov 22 07:52:49 2016 -0800

--
 ambari-server/pom.xml   |   2 +
 .../python/ambari_server/serverConfiguration.py |   9 +-
 .../main/python/ambari_server/setupMpacks.py| 105 ++--
 ambari-server/src/test/python/TestMpacks.py | 217 +++
 .../grafana-dashboards/grafana-hdfs-users.json  | 270 +++
 .../dashboards/service-metrics/STORM.txt|   7 +
 .../python/uninstall/common-services/SERVICEA   |   1 +
 .../python/uninstall/common-services/SERVICEB   |   1 +
 .../test/python/uninstall/dashboards/SERVICEA   |   1 +
 .../test/python/uninstall/dashboards/SERVICEB   |   1 +
 .../uninstall/dashboards/files/README.txt   |  17 ++
 .../python/uninstall/dashboards/files/STORM.txt |   1 +
 .../uninstall/dashboards/files/metainfo.xml |   1 +
 .../test/python/uninstall/extensions/SERVICEA   |   1 +
 .../test/python/uninstall/extensions/SERVICEB   |   1 +
 .../test/python/uninstall/stacks/2.0/SERVICEA   |   1 +
 .../test/python/uninstall/stacks/2.0/SERVICEB   |   1 +
 .../uninstall/stacks/2.0/files/README.txt   |  17 ++
 .../uninstall/stacks/2.0/files/metainfo1.xml|   1 +
 .../uninstall/stacks/2.0/files/metainfo2.xml|   1 +
 20 files changed, 586 insertions(+), 70 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/4a7cbcb1/ambari-server/pom.xml
--
diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml
index 36c57de..69ab9d0 100644
--- a/ambari-server/pom.xml
+++ b/ambari-server/pom.xml
@@ -274,6 +274,8 @@
 src/test/resources/users.ldif
 src/test/resources/mpacks_replay.log
 src/test/python/stacks/2.5/HIVE/*.txt
+
src/test/python/mpacks/mystack-ambari-mpack-1.0.0.1/stacks/MYSTACK/3.0/services/SERVICEC/dashboards/service-metrics/STORM.txt
+
src/test/python/uninstall/dashboards/files/STORM.txt
 src/main/resources/hive-schema-0.10.0.oracle.sql
 src/main/resources/hive-schema-0.12.0.oracle.sql
 src/main/resources/db/serial

http://git-wip-us.apache.org/repos/asf/ambari/blob/4a7cbcb1/ambari-server/src/main/python/ambari_server/serverConfiguration.py
--
diff --git a/ambari-server/src/main/python/ambari_server/serverConfiguration.py 
b/ambari-server/src/main/python/ambari_server/serverConfiguration.py
index 3086003..9596e0d 100644
--- a/ambari-server/src/main/python/ambari_server/serverConfiguration.py
+++ b/ambari-server/src/main/python/ambari_server/serverConfiguration.py
@@ -186,6 +186,7 @@ SETUP_OR_UPGRADE_MSG = "- If this is a new setup, then run 
the \"ambari-server s
 DEFAULT_DB_NAME = "ambari"
 
 SECURITY_KEYS_DIR = "security.server.keys_dir"
+DASHBOARD_PATH_PROPERTY = 'dashboards.path'
 EXTENSION_PATH_PROPERTY = 'extensions.path'
 COMMON_SERVICES_PATH_PROPERTY = 'common.services.path'
 MPACKS_STAGING_PATH_PROPERTY = 'mpacks.staging.path'
@@ -1447,7 +1448,13 @@ def get_mpacks_staging_location(properties):
 # Dashboard location
 #
 def get_dashboard_location(properties):
-  dashboard_location = configDefaults.DASHBOARD_LOCATION_DEFAULT
+  try:
+dashboard_location = properties[DASHBOARD_PATH_PROPERTY]
+  except KeyError:
+dashboard_location = configDefaults.DASHBOARD_LOCATION_DEFAULT
+
+  if not dashboard_location:
+dashboard_location = configDefaults.DASHBOARD_LOCATION_DEFAULT
   return dashboard_location
 
 #

http://git-wip-us.apache.org/repos/asf/ambari/blob/4a7cbcb1/ambari-server/src/main/python/ambari_server/setupMpacks.py
--
diff --git a/ambari-server/src/main/python/ambari_server/setupMpacks.py 
b/ambari-server/src/main/python/ambari_server/setupMpacks.py
index 773d946..131e14d 100755
--- a/ambari-server/src/main/python/ambari_server/setupMpacks.py
+++ b/ambari-server/src/main/python/ambari_server/setupMpacks.py
@@ -32,7 +32,7 @@ from ambari_commons.logging_utils import print_info_msg, 
print_error_msg, print_
 from ambari_commons.os_utils import copy_file, run_os_command
 from ambari_server.serverConfiguration import get_ambari_properties, 

[48/55] [abbrv] ambari git commit: AMBARI-18989. Log level filter labels not getting updated with host name filter (oleewere)

[ncole]

AMBARI-18989. Log level filter labels not getting updated with host name filter
 (oleewere)

Change-Id: I8f86056048f85f6a5de5763c59d68a9b023e5abb


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

Branch: refs/heads/branch-feature-AMBARI-18634
Commit: c705fa7fa995045ea27a36b5d457df0bae8106f1
Parents: 3c56dcc
Author: oleewere 
Authored: Fri Nov 25 16:30:37 2016 +0100
Committer: oleewere 
Committed: Tue Nov 29 15:06:36 2016 +0100

--
 .../org/apache/ambari/logsearch/LogSearch.java  |  15 +--
 .../logsearch/common/LogSearchConstants.java|   1 +
 .../AbstractOperationHolderConverter.java   |   9 ++
 ...actServiceLogRequestFacetQueryConverter.java |  44 +++
 .../BaseServiceLogRequestQueryConverter.java|   1 +
 ...ServiceLogAnyGraphRequestQueryConverter.java |  13 +++
 ...eLogComponentLevelRequestQueryConverter.java |  15 +--
 ...eLogComponentRequestFacetQueryConverter.java |  15 +--
 ...rviceLogLevelCountRequestQueryConverter.java |  16 +++
 ...eLogLevelDateRangeRequestQueryConverter.java |  16 ++-
 ...erviceLogTreeRequestFacetQueryConverter.java |  17 +--
 .../ambari/logsearch/doc/DocConstants.java  |   1 +
 .../logsearch/graph/GraphDataGenerator.java |  26 +++--
 .../logsearch/manager/ServiceLogsManager.java   |   2 +-
 .../request/ServiceLogParamDefinition.java  |   6 +
 .../request/impl/BaseServiceLogRequest.java |  13 +++
 .../dashboard/BubbleGraphTableLayoutView.js |   4 +-
 .../views/dashboard/ComponentListView.js|   2 +-
 .../scripts/views/dashboard/HostListView.js |  14 +--
 .../main/webapp/scripts/views/tabs/TreeView.js  |  10 +-
 .../webapp/templates/tabs/TreeView_tmpl.html| 115 ++-
 ...ComponentLevelRequestQueryConverterTest.java |   7 +-
 ...ComponentRequestFacetQueryConverterTest.java |   4 +-
 23 files changed, 202 insertions(+), 164 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/c705fa7f/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/LogSearch.java
--
diff --git 
a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/LogSearch.java
 
b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/LogSearch.java
index d4be790..2c3f4f5 100644
--- 
a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/LogSearch.java
+++ 
b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/LogSearch.java
@@ -63,12 +63,12 @@ public class LogSearch {
   private static final String HTTP_PROTOCOL = "http";
   private static final String HTTPS_PORT = "61889";
   private static final String HTTP_PORT = "61888";
-  
+
   private static final String WEB_RESOURCE_FOLDER = "webapps/app";
   private static final String ROOT_CONTEXT = "/";
   private static final Integer SESSION_TIMEOUT = 30;
 
- 
+
   public static void main(String[] argv) {
 LogSearch logSearch = new LogSearch();
 ManageStartEndTime.manage();
@@ -78,7 +78,7 @@ public class LogSearch {
   logger.error("Error running logsearch server", e);
 }
   }
-  
+
   public void run(String[] argv) throws Exception {
 Server server = buildSever(argv);
 HandlerList handlers = new HandlerList();
@@ -98,9 +98,10 @@ public class LogSearch {
 
   public Server buildSever(String argv[]) {
 Server server = new Server();
-ServerConnector connector = new ServerConnector(server);
 boolean portSpecified = argv.length > 0;
 String protcolProperty = 
PropertiesHelper.getProperty(LOGSEARCH_PROTOCOL_PROP,HTTP_PROTOCOL);
+HttpConfiguration httpConfiguration = new HttpConfiguration();
+httpConfiguration.setRequestHeaderSize(65535);
 if (StringUtils.isEmpty(protcolProperty)) {
   protcolProperty = HTTP_PROTOCOL;
 }
@@ -109,18 +110,18 @@ public class LogSearch {
   logger.info("Building https server...");
   port = portSpecified ? argv[0] : HTTPS_PORT;
   checkPort(Integer.parseInt(port));
-  HttpConfiguration https = new HttpConfiguration();
-  https.addCustomizer(new SecureRequestCustomizer());
+  httpConfiguration.addCustomizer(new SecureRequestCustomizer());
   SslContextFactory sslContextFactory = SSLUtil.getSslContextFactory();
   ServerConnector sslConnector = new ServerConnector(server,
   new SslConnectionFactory(sslContextFactory, "http/1.1"),
-  new HttpConnectionFactory(https));
+  new HttpConnectionFactory(httpConfiguration));
   

[52/55] [abbrv] ambari git commit: AMBARI-19009. Remove Spark History Server dependency Zeppelin (magyari_sandor)

[ncole]

AMBARI-19009. Remove Spark History Server dependency Zeppelin (magyari_sandor)


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

Branch: refs/heads/branch-feature-AMBARI-18634
Commit: 4dda1d739c78f8feb130b1f12b1ba5709be9a1a1
Parents: 1b6a92d
Author: Sandor Magyari 
Authored: Tue Nov 29 13:11:06 2016 +0100
Committer: Sandor Magyari 
Committed: Tue Nov 29 16:19:02 2016 +0100

--
 .../common-services/ZEPPELIN/0.6.0.2.5/role_command_order.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/4dda1d73/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/role_command_order.json
--
diff --git 
a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/role_command_order.json
 
b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/role_command_order.json
index 86dbc85..3b7d2d0 100644
--- 
a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/role_command_order.json
+++ 
b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/role_command_order.json
@@ -1,7 +1,7 @@
 {
   "general_deps" : {
 "_comment" : "dependencies for ZEPPELIN",
-"ZEPPELIN_MASTER-START" : ["NAMENODE-START", 
"SPARK_JOBHISTORYSERVER-START"],
+"ZEPPELIN_MASTER-START" : ["NAMENODE-START"],
 "ZEPPELIN_SERVICE_CHECK-SERVICE_CHECK" : ["ZEPPELIN_MASTER-START"]
   }
 }

[04/55] [abbrv] ambari git commit: AMBARI-18826. Stack property definitions made in ambari-web should be made stack agnostic (akovalenko)

[ncole]

http://git-wip-us.apache.org/repos/asf/ambari/blob/2ce9e3b6/ambari-web/app/data/HDP2/site_properties.js
--
diff --git a/ambari-web/app/data/HDP2/site_properties.js 
b/ambari-web/app/data/HDP2/site_properties.js
deleted file mode 100644
index d61d4aa..000
--- a/ambari-web/app/data/HDP2/site_properties.js
+++ /dev/null
@@ -1,2579 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-var App = require('app');
-
-var hdp2properties = [
-  //* HDP stack 
**
-  
/**HDFS***/
-  {
-"name": "dfs.namenode.checkpoint.dir",
-"serviceName": "HDFS",
-"filename": "hdfs-site.xml",
-"category": "SECONDARY_NAMENODE",
-"index": 1
-  },
-  {
-"name": "dfs.namenode.checkpoint.period",
-"category": "General",
-"serviceName": "HDFS",
-"filename": "hdfs-site.xml",
-"index": 3
-  },
-  {
-"name": "dfs.namenode.name.dir",
-"serviceName": "HDFS",
-"filename": "hdfs-site.xml",
-"category": "NAMENODE",
-"index": 1
-  },
-  {
-"name": "dfs.webhdfs.enabled",
-"category": "General",
-"serviceName": "HDFS",
-"filename": "hdfs-site.xml",
-"index": 0
-  },
-  {
-"name": "dfs.datanode.failed.volumes.tolerated",
-"category": "DATANODE",
-"serviceName": "HDFS",
-"filename": "hdfs-site.xml",
-"index": 3
-  },
-  {
-"name": "dfs.datanode.data.dir",
-"category": "DATANODE",
-"serviceName": "HDFS",
-"filename": "hdfs-site.xml",
-"index": 1
-  },
-  {
-"name": "dfs.datanode.data.dir.perm",
-"category": "DATANODE",
-"serviceName": "HDFS",
-"filename": "hdfs-site.xml"
-  },
-  {
-"name": "nfs.file.dump.dir",
-"category": "NFS_GATEWAY",
-"serviceName": "HDFS",
-"filename": "hdfs-site.xml",
-"index": 1
-  },
-  {
-"name": "dfs.namenode.accesstime.precision",
-"category": "General",
-"serviceName": "HDFS",
-"filename": "hdfs-site.xml",
-"index": 2
-  },
-  {
-"name": "nfs.exports.allowed.hosts",
-"category": "NFS_GATEWAY",
-"serviceName": "HDFS",
-"filename": "hdfs-site.xml",
-"index": 3
-  },
-  {
-"name": "dfs.replication",
-"category": "General",
-"serviceName": "HDFS",
-"filename": "hdfs-site.xml"
-  },
-  {
-"name": "dfs.datanode.du.reserved",
-"category": "General",
-"serviceName": "HDFS",
-"filename": "hdfs-site.xml",
-"index": 2
-  },
-  {
-"name": "namenode_heapsize",
-"serviceName": "HDFS",
-"filename": "hadoop-env.xml",
-"category": "NAMENODE",
-"index": 2
-  },
-  {
-"name": "namenode_opt_newsize",
-"serviceName": "HDFS",
-"filename": "hadoop-env.xml",
-"category": "NAMENODE",
-"index": 3
-  },
-  {
-"name": "namenode_opt_permsize",
-"serviceName": "HDFS",
-"filename": "hadoop-env.xml",
-"category": "NAMENODE",
-"index": 5
-  },
-  {
-"name": "namenode_opt_maxpermsize",
-"serviceName": "HDFS",
-"filename": "hadoop-env.xml",
-"category": "NAMENODE",
-"index": 6
-  },
-  {
-"name": "namenode_opt_maxnewsize",
-"serviceName": "HDFS",
-"filename": "hadoop-env.xml",
-"category": "NAMENODE",
-"index": 4
-  },
-  {
-"name": "dtnode_heapsize",
-"serviceName": "HDFS",
-"filename": "hadoop-env.xml",
-"category": "DATANODE",
-"index": 2
-  },
-  {
-"name": "nfsgateway_heapsize",
-"serviceName": "HDFS",
-"filename": "hadoop-env.xml",
-"category": "NFS_GATEWAY",
-"index": 1
-  },
-  {
-"name": "hadoop_heapsize",
-"serviceName": "HDFS",
-"filename": "hadoop-env.xml",
-"category": "General",
-"index": 1
-  },
-
-/**YARN***/
-  {
-"name": "yarn.acl.enable",
-"serviceName": "YARN",
-"filename": "yarn-site.xml",
-"category": "RESOURCEMANAGER"
-  },
-  {
-"name": "yarn.admin.acl",
-"serviceName": "YARN",
-"filename": "yarn-site.xml",
-"category": "RESOURCEMANAGER"
-  },
-  {
- 

[16/55] [abbrv] ambari git commit: Revert "AMBARI-18713 use exclude list of mount device types on docker containers (dsen)"

[ncole]

Revert "AMBARI-18713 use exclude list of mount device types on docker 
containers (dsen)"


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

Branch: refs/heads/branch-feature-AMBARI-18634
Commit: 90967bcd0df7a5ab089611ee5502bb90d0084a0a
Parents: fbf636d
Author: Dmytro Sen 
Authored: Wed Nov 23 18:47:20 2016 +0200
Committer: Dmytro Sen 
Committed: Wed Nov 23 18:47:20 2016 +0200

--
 .../src/main/resources/scripts/stack_advisor.py |  11 +-
 .../HDP/2.0.6/configuration/cluster-env.xml |  10 -
 .../stacks/HDP/2.0.6/services/stack_advisor.py  |  50 +-
 .../stacks/HDP/2.1/services/stack_advisor.py|  20 +-
 .../stacks/HDP/2.2/services/stack_advisor.py|   7 -
 .../src/main/resources/stacks/stack_advisor.py  | 200 +---
 .../stacks/2.0.6/common/test_stack_advisor.py   |  34 +-
 .../stacks/2.1/common/test_stack_advisor.py |   5 -
 .../stacks/2.2/common/test_stack_advisor.py |  20 +-
 .../test/python/stacks/test_stack_adviser.py| 239 --
 ambari-web/app/mixins.js|   1 +
 .../app/utils/configs/config_initializer.js |  28 +-
 .../mount_points_based_initializer_mixin.js | 340 ++
 ambari-web/test/utils/ajax/ajax_test.js |   9 +-
 .../utils/configs/config_initializer_test.js| 458 +++
 15 files changed, 855 insertions(+), 577 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/90967bcd/ambari-server/src/main/resources/scripts/stack_advisor.py
--
diff --git a/ambari-server/src/main/resources/scripts/stack_advisor.py 
b/ambari-server/src/main/resources/scripts/stack_advisor.py
index abfab87..5926c39 100755
--- a/ambari-server/src/main/resources/scripts/stack_advisor.py
+++ b/ambari-server/src/main/resources/scripts/stack_advisor.py
@@ -70,11 +70,13 @@ def main(argv=None):
   if len(args) < 3:
 sys.stderr.write(USAGE)
 sys.exit(2)
+pass
 
   action = args[0]
   if action not in ALL_ACTIONS:
 sys.stderr.write(USAGE)
 sys.exit(2)
+pass
 
   hostsFile = args[1]
   servicesFile = args[2]
@@ -87,7 +89,6 @@ def main(argv=None):
   stackName = services["Versions"]["stack_name"]
   stackVersion = services["Versions"]["stack_version"]
   parentVersions = []
-
   if "stack_hierarchy" in services["Versions"]:
 parentVersions = services["Versions"]["stack_hierarchy"]["stack_versions"]
 
@@ -95,9 +96,8 @@ def main(argv=None):
 
   # Perform action
   actionDir = os.path.realpath(os.path.dirname(args[1]))
-
-  # filter
-  hosts = stackAdvisor.filterHostMounts(hosts, services)
+  result = {}
+  result_file = "non_valid_result_file.json"
 
   if action == RECOMMEND_COMPONENT_LAYOUT_ACTION:
 result = stackAdvisor.recommendComponentLayout(services, hosts)
@@ -111,11 +111,12 @@ def main(argv=None):
   elif action == RECOMMEND_CONFIGURATION_DEPENDENCIES:
 result = stackAdvisor.recommendConfigurationDependencies(services, hosts)
 result_file = os.path.join(actionDir, "configurations.json")
-  else:  # action == VALIDATE_CONFIGURATIONS
+  else: # action == VALIDATE_CONFIGURATIONS
 result = stackAdvisor.validateConfigurations(services, hosts)
 result_file = os.path.join(actionDir, "configurations-validation.json")
 
   dumpJson(result, result_file)
+  pass
 
 
 def instantiateStackAdvisor(stackName, stackVersion, parentVersions):

http://git-wip-us.apache.org/repos/asf/ambari/blob/90967bcd/ambari-server/src/main/resources/stacks/HDP/2.0.6/configuration/cluster-env.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/configuration/cluster-env.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/configuration/cluster-env.xml
index bf257a3..0d313cc 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/configuration/cluster-env.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/configuration/cluster-env.xml
@@ -274,14 +274,4 @@ gpgcheck=0
 For properties handled by handle_mounted_dirs this will make 
Ambari 
 
   
-  
-agent_mounts_ignore_list
-
-Comma separated list of the mounts which would be ignored by 
Ambari during property values suggestion by Stack Adviser
-
-
-  true
-  true
-
-  
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/90967bcd/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 

[54/55] [abbrv] ambari git commit: AMBARI-19010. Log Search external login credential let every user in (oleewere)

[ncole]

AMBARI-19010. Log Search external login credential let every user in (oleewere)

Change-Id: Iab889180bfb4916fd06240588b6cdd80493889a1


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

Branch: refs/heads/branch-feature-AMBARI-18634
Commit: f31f3f646610a2e480279989d6790437e5362cb8
Parents: a952843
Author: oleewere 
Authored: Tue Nov 29 13:16:51 2016 +0100
Committer: oleewere 
Committed: Tue Nov 29 18:03:42 2016 +0100

--
 .../ambari/logsearch/common/ExternalServerClient.java   | 12 ++--
 1 file changed, 10 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/f31f3f64/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/common/ExternalServerClient.java
--
diff --git 
a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/common/ExternalServerClient.java
 
b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/common/ExternalServerClient.java
index 1207373..230ca8c 100644
--- 
a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/common/ExternalServerClient.java
+++ 
b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/common/ExternalServerClient.java
@@ -23,9 +23,11 @@ import javax.inject.Named;
 import javax.ws.rs.client.Invocation;
 import javax.ws.rs.client.WebTarget;
 import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
 
 import org.apache.ambari.logsearch.conf.AuthPropsConfig;
 import org.apache.ambari.logsearch.util.SSLUtil;
+import org.apache.commons.httpclient.auth.InvalidCredentialsException;
 import org.apache.log4j.Logger;
 import org.glassfish.jersey.client.JerseyClient;
 import org.glassfish.jersey.client.JerseyClientBuilder;
@@ -64,9 +66,15 @@ public class ExternalServerClient {
 WebTarget target = client.target(url);
 LOG.debug("URL: " + url);
 
-Invocation.Builder invocationBuilder =  
target.request(MediaType.APPLICATION_JSON_TYPE);
+Invocation.Builder invocationBuilder =  target.request();
 try {
-  return invocationBuilder.get().readEntity(klass);
+  Response response = invocationBuilder.get();
+  if (response.getStatus() != Response.Status.OK.getStatusCode()
+&& response.getStatus() != Response.Status.FOUND.getStatusCode()) {
+throw new InvalidCredentialsException(String.format("External auth 
failed with status code: %d, response: %s",
+  response.getStatus(), response.readEntity(String.class)));
+  }
+  return response.readEntity(klass);
 } catch (Exception e) {
   throw new Exception(e.getCause());
 } finally {

[53/55] [abbrv] ambari git commit: AMBARI-19011. Fix markup for widgets browser (onechiporenko)

[ncole]

AMBARI-19011. Fix markup for widgets browser (onechiporenko)


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

Branch: refs/heads/branch-feature-AMBARI-18634
Commit: a95284362adf794636c7437e6416ca4389046e63
Parents: 4dda1d7
Author: Oleg Nechiporenko 
Authored: Tue Nov 29 15:03:12 2016 +0200
Committer: Oleg Nechiporenko 
Committed: Tue Nov 29 17:43:16 2016 +0200

--
 ambari-web/app/messages.js  |   3 +
 ambari-web/app/styles/application.less  |  10 +-
 ambari-web/app/styles/bootstrap_overrides.less  |   9 +
 .../app/styles/enhanced_service_dashboard.less  | 343 +++
 ambari-web/app/styles/hosts.less|   3 -
 .../modal_popups/widget_browser_popup.hbs   | 108 +++---
 .../main/service/widgets/create/expression.hbs  |  36 +-
 .../main/service/widgets/create/step1.hbs   |  18 +-
 .../main/service/widgets/create/step2.hbs   |  22 +-
 .../service/widgets/create/step2_add_metric.hbs |  12 +-
 .../main/service/widgets/create/step2_graph.hbs |   4 +-
 .../service/widgets/create/step2_number.hbs |   4 +-
 .../service/widgets/create/step2_template.hbs   |   4 +-
 .../main/service/widgets/create/step3.hbs   |  42 ++-
 .../create/widget_property_threshold.hbs|  18 +-
 ambari-web/app/views/common/chosen_plugin.js|  21 +-
 ambari-web/app/views/common/controls_view.js|   2 +-
 .../main/service/widgets/create/step2_view.js   |   2 +
 18 files changed, 308 insertions(+), 353 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/a9528436/ambari-web/app/messages.js
--
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index a1d84a3..aa43687 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -3071,6 +3071,9 @@ Em.I18n.translations = {
   'widget.create.wizard.step2.body.text':'Define the expression with any 
metrics and valid operators. Use parentheses when necessary.',
   'widget.create.wizard.step2.body.template':'Define the template with any 
number of expressions and any string. An expression can be referenced from a 
template by enclosing its name with double curly braces.',
   'widget.create.wizard.step2.body.warning':'Note: Valid operators are +, -, 
*, /',
+  'widget.create.wizard.step2.body.invalid.expression':'Expression is not 
complete or is invalid!',
+  'widget.create.wizard.step2.body.invalid.expression2':'Invalid expression!',
+  'widget.create.wizard.step2.body.invalid.msg2':'Only numbers or operators 
are allowed in this field.',
   'widget.create.wizard.step2.body.template.invalid.msg':'Invalid expression 
name existed. Should use name "Expression#" with double curly braces.',
   'widget.create.wizard.step2.addExpression': 'Add Expression',
   'widget.create.wizard.step2.addDataset': 'Add data set',

http://git-wip-us.apache.org/repos/asf/ambari/blob/a9528436/ambari-web/app/styles/application.less
--
diff --git a/ambari-web/app/styles/application.less 
b/ambari-web/app/styles/application.less
index d449ccb..4a50af7 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -28,6 +28,10 @@ html, body {
   height: 100%;
 }
 
+.form-text {
+  line-height: 34px;
+}
+
 wbr {
   display: inline-block;
 }
@@ -1075,9 +1079,7 @@ a:focus {
   color: #666;
   font-size: 13px;
   line-height: 16px;
-  .row {
-margin-bottom: 8px;
-  }
+
   .upgrade-status-warning {
 color: @health-status-red;
   }
@@ -1535,6 +1537,8 @@ ul.filter {
   height: 38px;
   border: 1px solid #D4D4D4;
   border-radius: 4px;
+  margin-top: 1px;
+  margin-bottom: 1px;
 }
   }
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/a9528436/ambari-web/app/styles/bootstrap_overrides.less
--
diff --git a/ambari-web/app/styles/bootstrap_overrides.less 
b/ambari-web/app/styles/bootstrap_overrides.less
index 97c25ab..b8cdf49 100644
--- a/ambari-web/app/styles/bootstrap_overrides.less
+++ b/ambari-web/app/styles/bootstrap_overrides.less
@@ -113,6 +113,11 @@ select.form-control {
   }
 }
 
+.row {
+  padding-top: 5px;
+  padding-bottom: 5px;
+}
+
 .form-control {
   float: none;
 }
@@ -358,4 +363,8 @@ select.form-control {
 margin-left: 0;
 margin-right: 0;
   }
+}
+
+.wizard .wizard-body {
+  padding: 0 !important;
 }
\ No newline at end of file

[41/55] [abbrv] ambari git commit: AMBARI-18999 - Unable to Start Multiple Flume Agents Due to Missing Import (jonathanhurley)

[ncole]

AMBARI-18999 - Unable to Start Multiple Flume Agents Due to Missing Import 
(jonathanhurley)


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

Branch: refs/heads/branch-feature-AMBARI-18634
Commit: 80d09892d685a8179e6ece33a41f59de1b7d580b
Parents: 3c8b158
Author: Jonathan Hurley 
Authored: Mon Nov 28 11:22:46 2016 -0500
Committer: Jonathan Hurley 
Committed: Mon Nov 28 14:11:02 2016 -0500

--
 .../common-services/FLUME/1.4.0.2.0/package/scripts/flume.py| 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/80d09892/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/flume.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/flume.py
 
b/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/flume.py
index 5823271..aeb7074 100644
--- 
a/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/flume.py
+++ 
b/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/flume.py
@@ -24,6 +24,7 @@ from resource_management.libraries.script.script import Script
 from resource_management.core.resources.service import ServiceConfig
 from resource_management.core.resources.system import Directory, Execute, File
 from resource_management.core.exceptions import Fail
+from resource_management.core import shell
 from resource_management.core.shell import as_user, as_sudo
 from resource_management.core.source import Template, InlineTemplate
 from resource_management.libraries.functions.format import format

[12/55] [abbrv] ambari git commit: AMBARI-18972. Remove redundant css (part 4) (onechiporenko)

[ncole]

AMBARI-18972. Remove redundant css (part 4) (onechiporenko)


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

Branch: refs/heads/branch-feature-AMBARI-18634
Commit: 6088c17906b784f57adca36af224d63135a49b9a
Parents: 292d279
Author: Oleg Nechiporenko 
Authored: Wed Nov 23 12:49:38 2016 +0200
Committer: Oleg Nechiporenko 
Committed: Wed Nov 23 12:49:38 2016 +0200

--
 .../app/controllers/main/charts/heatmap.js  |   6 +-
 ambari-web/app/styles/application.less  | 213 +--
 ambari-web/app/styles/wizard.less   |  19 +-
 .../common/assign_master_components.hbs |  62 +++---
 .../common/form/check_db_connection.hbs |  26 ++-
 .../templates/common/host_progress_popup.hbs|   7 +-
 .../main/charts/heatmap/heatmap_host_detail.hbs |  70 --
 .../main/charts/heatmap/heatmap_rack.hbs|  37 +---
 .../templates/main/charts/heatmap_dropdown.hbs  |   4 +-
 .../main/host/details/deleteComponentPopup.hbs  |  20 +-
 .../main/host/details/doDeleteHostPopup.hbs |  35 ++-
 .../details/raiseDeleteComponentErrorPopup.hbs  |  21 +-
 .../main/service/info/heatmap_dropdown.hbs  |   2 +-
 ambari-web/app/templates/wizard/step3.hbs   |   2 +-
 .../wizard/step3/step3_host_warnings_popup.hbs  |  18 +-
 .../wizard/step9/step9HostTasksLogPopup.hbs |   2 +-
 .../common/assign_master_components_view.js |   4 +-
 .../views/main/charts/heatmap/heatmap_rack.js   |  23 +-
 .../step1_controller_test.js|  11 +-
 19 files changed, 213 insertions(+), 369 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/6088c179/ambari-web/app/controllers/main/charts/heatmap.js
--
diff --git a/ambari-web/app/controllers/main/charts/heatmap.js 
b/ambari-web/app/controllers/main/charts/heatmap.js
index caa3f2d..e4f35a4 100644
--- a/ambari-web/app/controllers/main/charts/heatmap.js
+++ b/ambari-web/app/controllers/main/charts/heatmap.js
@@ -270,10 +270,10 @@ App.MainChartsHeatmapController = 
Em.Controller.extend(App.WidgetSectionMixin, {
 var rackCount = this.get('racks.length');
 if (rackCount < 2) {
   return "col-md-12";
-} else if (rackCount == 2) {
+}
+if (rackCount === 2) {
   return "col-md-6";
-} else {
-  return "col-md-4";
 }
+return "col-md-4";
   }.property('racks.length')
 });

http://git-wip-us.apache.org/repos/asf/ambari/blob/6088c179/ambari-web/app/styles/application.less
--
diff --git a/ambari-web/app/styles/application.less 
b/ambari-web/app/styles/application.less
index 024679e..aab3287 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -461,16 +461,6 @@ table.diff {
   }
 }
 
-.row .tinyoffset {
-  margin-left: 3%!important;
-}
-
-.row .tinyspan {
-  width: 2%!important;
-  *width: 1.95%!important;
-  float: none;
-}
-
 .hidden-scroll {
   overflow-y: hidden;
 }
@@ -1168,22 +1158,6 @@ a:focus {
 .tab-marker-position (@health-status-yellow);
   }
 
-  .summary-view-host{
-float: right;
-padding-right: 20px;
-a {
-  text-decoration: none;
-  &:hover {
-text-decoration: underline;
-  }
-}
-.category-name {
-  cursor: pointer;
-  color: #23527c;
-  font-size: 14px;
-  margin-left: 10px;
-}
-  }
   .service-summary-component-red-dead {
 color: @health-status-red;
 display: inline;
@@ -1215,30 +1189,6 @@ a:focus {
   }
 }
 
-#security-stages {
-  tr {
-height: 50px;
-  }
-  td {
-width: 180px;
-  }
-  .progress-wrapper {
-width: 50%;
-.progress {
-  margin-bottom: 0;
-}
-  }
-  .progress-percentage {
-margin-left: 10px;
-  }
-  a.remove-link {
-text-decoration:none;
-pointer-events: none;
-color:black;
-cursor: default;
-  }
-}
-
 .faintText {
   color: #999;
 }
@@ -1591,14 +1541,6 @@ table.graphs {
   border-radius: 4px;
   padding: 4px;
   background: #FFFDF6;
-  .warning-details {
-padding-left: 16px;
-padding-top: 5px;
-  }
-  .warning-list {
-font-size: 0.95em;
-font-style: italic;
-  }
 }
 
 .services-menu {
@@ -1660,68 +1602,10 @@ ul.filter {
 
 /*start charts rack*/
 .rack {
-  vertical-align: top;
-  border: 1px solid #D4D4D4;
-  margin-bottom: 10px;
-  margin-top:5px;
-  background-color: #fff;
 
   .rackHeader {
-background-color: #F7F7F7;
 padding: 5px 5px 5px 10px;
-border-bottom: 1px solid #D4D4D4;
-
-.statusName {
-  font-size: 15px;
-  color: 

[02/55] [abbrv] ambari git commit: AMBARI-18826. Stack property definitions made in ambari-web should be made stack agnostic (akovalenko)

[ncole]

http://git-wip-us.apache.org/repos/asf/ambari/blob/2ce9e3b6/ambari-web/app/data/configs/services/storm_properties.js
--
diff --git a/ambari-web/app/data/configs/services/storm_properties.js 
b/ambari-web/app/data/configs/services/storm_properties.js
new file mode 100644
index 000..386bbe6
--- /dev/null
+++ b/ambari-web/app/data/configs/services/storm_properties.js
@@ -0,0 +1,296 @@
+/**
+ * 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.
+ */
+
+module.exports = [
+  {
+"category": "General",
+"filename": "storm-site.xml",
+"name": "storm.zookeeper.root",
+"serviceName": "STORM"
+  },
+  {
+"category": "General",
+"filename": "storm-site.xml",
+"name": "storm.local.dir",
+"serviceName": "STORM"
+  },
+  {
+"category": "General",
+"filename": "storm-site.xml",
+"name": "storm.zookeeper.servers",
+"serviceName": "STORM"
+  },
+  {
+"category": "General",
+"filename": "storm-site.xml",
+"name": "storm.zookeeper.port",
+"serviceName": "STORM"
+  },
+  {
+"category": "General",
+"filename": "storm-site.xml",
+"name": "storm.zookeeper.session.timeout",
+"serviceName": "STORM"
+  },
+  {
+"category": "General",
+"filename": "storm-site.xml",
+"name": "storm.zookeeper.connection.timeout",
+"serviceName": "STORM"
+  },
+  {
+"category": "General",
+"filename": "storm-site.xml",
+"name": "storm.zookeeper.retry.times",
+"serviceName": "STORM"
+  },
+  {
+"category": "General",
+"filename": "storm-site.xml",
+"name": "storm.zookeeper.retry.interval",
+"serviceName": "STORM"
+  },
+  {
+"category": "General",
+"filename": "storm-site.xml",
+"name": "storm.zookeeper.retry.intervalceiling.millis",
+"serviceName": "STORM"
+  },
+  {
+"category": "General",
+"filename": "storm-site.xml",
+"name": "storm.cluster.mode",
+"serviceName": "STORM"
+  },
+  {
+"category": "General",
+"filename": "storm-site.xml",
+"name": "storm.local.mode.zmq",
+"serviceName": "STORM"
+  },
+  {
+"category": "General",
+"filename": "storm-site.xml",
+"name": "storm.messaging.transport",
+"serviceName": "STORM"
+  },
+  {
+"category": "General",
+"filename": "storm-site.xml",
+"name": "storm.messaging.netty.buffer_size",
+"serviceName": "STORM"
+  },
+  {
+"category": "General",
+"filename": "storm-site.xml",
+"name": "storm.messaging.netty.max_retries",
+"serviceName": "STORM"
+  },
+  {
+"category": "General",
+"filename": "storm-site.xml",
+"name": "storm.messaging.netty.max_wait_ms",
+"serviceName": "STORM"
+  },
+  {
+"category": "General",
+"filename": "storm-site.xml",
+"name": "storm.messaging.netty.min_wait_ms",
+"serviceName": "STORM"
+  },
+  {
+"category": "General",
+"filename": "storm-site.xml",
+"name": "storm.messaging.netty.server_worker_threads",
+"serviceName": "STORM"
+  },
+  {
+"category": "General",
+"filename": "storm-site.xml",
+"name": "storm.messaging.netty.client_worker_threads",
+"serviceName": "STORM"
+  },
+  {
+"category": "NIMBUS",
+"filename": "storm-site.xml",
+"name": "nimbus.thrift.port",
+"serviceName": "STORM"
+  },
+  {
+"category": "NIMBUS",
+"filename": "storm-site.xml",
+"name": "nimbus.thrift.max_buffer_size",
+"serviceName": "STORM"
+  },
+  {
+"category": "NIMBUS",
+"filename": "storm-site.xml",
+"name": "nimbus.childopts",
+"serviceName": "STORM"
+  },
+  {
+"category": "NIMBUS",
+"filename": "storm-site.xml",
+"name": "nimbus.task.timeout.secs",
+"serviceName": "STORM"
+  },
+  {
+"category": "NIMBUS",
+"filename": "storm-site.xml",
+"name": "nimbus.supervisor.timeout.secs",
+"serviceName": "STORM"
+  },
+  {
+"category": "NIMBUS",
+"filename": "storm-site.xml",
+"name": "nimbus.monitor.freq.secs",
+"serviceName": "STORM"
+  },
+  {
+"category": "NIMBUS",
+"filename": "storm-site.xml",
+"name": "nimbus.cleanup.inbox.freq.secs",
+"serviceName": "STORM"
+  },
+  {
+"category": "NIMBUS",

[36/55] [abbrv] ambari git commit: AMBARI-18951. Force InnoDB usage for MySQL. (mpapirkovskyy)

[ncole]

AMBARI-18951. Force InnoDB usage for MySQL. (mpapirkovskyy)


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

Branch: refs/heads/branch-feature-AMBARI-18634
Commit: 255725dfc07a4a4fd7fc8b3f6cdbd7cced1c375a
Parents: abf9882
Author: Myroslav Papirkovskyi 
Authored: Mon Nov 28 18:25:07 2016 +0200
Committer: Myroslav Papirkovskyi 
Committed: Mon Nov 28 18:46:01 2016 +0200

--
 .../server/orm/helpers/dbms/MySqlHelper.java| 18 ++
 .../server/upgrade/SchemaUpgradeHelper.java | 35 +++-
 .../main/resources/Ambari-DDL-MySQL-CREATE.sql  |  1 +
 3 files changed, 53 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/255725df/ambari-server/src/main/java/org/apache/ambari/server/orm/helpers/dbms/MySqlHelper.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/orm/helpers/dbms/MySqlHelper.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/orm/helpers/dbms/MySqlHelper.java
index 38fe062..8a83c90 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/orm/helpers/dbms/MySqlHelper.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/orm/helpers/dbms/MySqlHelper.java
@@ -19,8 +19,13 @@
 package org.apache.ambari.server.orm.helpers.dbms;
 
 import org.apache.ambari.server.orm.DBAccessor;
+import org.eclipse.persistence.exceptions.ValidationException;
 import org.eclipse.persistence.platform.database.DatabasePlatform;
 
+import java.io.IOException;
+import java.io.Writer;
+import java.util.List;
+
 public class MySqlHelper extends GenericDbmsHelper {
   public MySqlHelper(DatabasePlatform databasePlatform) {
 super(databasePlatform);
@@ -75,4 +80,17 @@ public class MySqlHelper extends GenericDbmsHelper {
 .append("AND constraints.TABLE_NAME = 
\"").append(tableName).append("\"");
 return statement.toString();
   }
+
+  @Override
+  public Writer writeCreateTableStatement(Writer writer, String tableName,
+  List 
columns,
+  List primaryKeyColumns) {
+Writer defaultWriter = super.writeCreateTableStatement(writer, tableName, 
columns, primaryKeyColumns);
+try {
+  defaultWriter.write(" ENGINE=INNODB");
+} catch (IOException e) {
+  throw ValidationException.fileError(e);
+}
+return defaultWriter;
+  }
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/255725df/ambari-server/src/main/java/org/apache/ambari/server/upgrade/SchemaUpgradeHelper.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/SchemaUpgradeHelper.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/SchemaUpgradeHelper.java
index 5bf7f21..33ec732 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/SchemaUpgradeHelper.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/SchemaUpgradeHelper.java
@@ -45,6 +45,7 @@ import com.google.inject.Inject;
 import com.google.inject.Injector;
 import com.google.inject.multibindings.Multibinder;
 import com.google.inject.persist.PersistService;
+import org.springframework.jdbc.support.JdbcUtils;
 
 public class SchemaUpgradeHelper {
   private static final Logger LOG = LoggerFactory.getLogger
@@ -331,7 +332,7 @@ public class SchemaUpgradeHelper {
   /**
* Checks if source version meets minimal requirements for upgrade
*
-   * @param minUpgradeVersion min allowed version for the upgrade, could be 
obtained via {@link SchemaUpgradeHelper.getMinimalUpgradeCatalogVersion}
+   * @param minUpgradeVersion min allowed version for the upgrade, could be 
obtained via {@link #getMinimalUpgradeCatalogVersion()}
* @param sourceVersion current version of the Database, which need to be 
upgraded
*
* @return  true if upgrade is allowed or false if not
@@ -344,6 +345,29 @@ public class SchemaUpgradeHelper {
 return VersionUtils.compareVersions(sourceVersion, minUpgradeVersion) >= 0;
   }
 
+  private List getMyISAMTables() throws SQLException {
+if 
(!configuration.getDatabaseType().equals(Configuration.DatabaseType.MYSQL)) {
+  return Collections.emptyList();
+}
+List myISAMTables = new ArrayList<>();
+String query = String.format("SELECT table_name FROM 
information_schema.tables WHERE table_schema = '%s' " +
+  "AND engine = 'MyISAM' AND table_type = 'BASE TABLE'", 

[46/55] [abbrv] ambari git commit: AMBARI-19002 Ambari widgets and service checks to honor LLAP clusters with 100% allocation to LLAP daemons. (atkach)

[ncole]

AMBARI-19002 Ambari widgets and service checks to honor LLAP clusters with 100% 
allocation to LLAP daemons. (atkach)


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

Branch: refs/heads/branch-feature-AMBARI-18634
Commit: 5f3b32347451dbaf3c7f980e8ef8dc0ec2aa254b
Parents: 69390ee
Author: Andrii Tkach 
Authored: Tue Nov 29 12:19:48 2016 +0200
Committer: Andrii Tkach 
Committed: Tue Nov 29 12:19:48 2016 +0200

--
 .../stacks/HDP/2.0.6/configuration/cluster-env.xml |  6 ++
 ambari-web/app/views/main/dashboard/widgets.js | 17 +++--
 .../test/views/main/dashboard/widgets_test.js  | 11 ++-
 3 files changed, 31 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/5f3b3234/ambari-server/src/main/resources/stacks/HDP/2.0.6/configuration/cluster-env.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/configuration/cluster-env.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/configuration/cluster-env.xml
index 0d313cc..cc6c8a3 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/configuration/cluster-env.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/configuration/cluster-env.xml
@@ -274,4 +274,10 @@ gpgcheck=0
 For properties handled by handle_mounted_dirs this will make 
Ambari 
 
   
+  
+hide_yarn_memory_widget
+false
+YARN Memory widget should be hidden by default on the 
dashboard.
+
+  
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/5f3b3234/ambari-web/app/views/main/dashboard/widgets.js
--
diff --git a/ambari-web/app/views/main/dashboard/widgets.js 
b/ambari-web/app/views/main/dashboard/widgets.js
index f4603a2..999fc08 100644
--- a/ambari-web/app/views/main/dashboard/widgets.js
+++ b/ambari-web/app/views/main/dashboard/widgets.js
@@ -116,6 +116,16 @@ App.MainDashboardWidgetsView = 
Em.View.extend(App.UserPref, App.LocalStorage, Ap
 }, this);
   },
 
+  resolveConfigDependencies: function(visibleFull, hiddenFull) {
+var clusterEnv = App.router.get('clusterController.clusterEnv').properties;
+
+if (clusterEnv['hide_yarn_memory_widget'] === 'true') {
+  hiddenFull.push(['20', 'YARN Memory']);
+} else {
+  visibleFull.splice(visibleFull.indexOf('19'), 0, '20');
+}
+  },
+
   /**
* Load widget statuses to initPrefObject
*/
@@ -126,7 +136,7 @@ App.MainDashboardWidgetsView = Em.View.extend(App.UserPref, 
App.LocalStorage, Ap
   '6', '7', '8', '9', //host metrics
   '1', '5', '3', '10', //hdfs
   '13', '12', '14', '16', //hbase
-  '17', '18', '19', '20', '23', // all yarn
+  '17', '18', '19', '23', // all yarn
   '21', // storm
   '22', // flume
   '24', // hawq
@@ -135,6 +145,7 @@ App.MainDashboardWidgetsView = Em.View.extend(App.UserPref, 
App.LocalStorage, Ap
 var hiddenFull = [
   ['15', 'Region In Transition']
 ];
+this.resolveConfigDependencies(visibleFull, hiddenFull);
 
 // Display widgets for host metrics if the stack definition has a host 
metrics service to display it.
 if (this.get('host_metrics_model') == null) {
@@ -155,7 +166,9 @@ App.MainDashboardWidgetsView = Em.View.extend(App.UserPref, 
App.LocalStorage, Ap
   hbase.forEach(function (item) {
 visibleFull = visibleFull.without(item);
   }, this);
-  hiddenFull = [];
+  hiddenFull = hiddenFull.filter(function(item) {
+return item[0] !== '15';
+  });
 }
 if (this.get('yarn_model') == null) {
   var yarn = ['17', '18', '19', '20', '23'];

http://git-wip-us.apache.org/repos/asf/ambari/blob/5f3b3234/ambari-web/test/views/main/dashboard/widgets_test.js
--
diff --git a/ambari-web/test/views/main/dashboard/widgets_test.js 
b/ambari-web/test/views/main/dashboard/widgets_test.js
index 49a06a4..0781c79 100644
--- a/ambari-web/test/views/main/dashboard/widgets_test.js
+++ b/ambari-web/test/views/main/dashboard/widgets_test.js
@@ -107,12 +107,21 @@ describe('App.MainDashboardWidgetsView', function () {
   yarn_model: {}
 },
 e: {
-  visibleL: totalWidgetsCount,
+  visibleL: totalWidgetsCount - 1,
   hiddenL: 1
 },
 m: 'All models are not null'
   }
 ]);
+
+beforeEach(function() {
+  sinon.stub(view, 'resolveConfigDependencies');
+});
+
+afterEach(function() {
+  view.resolveConfigDependencies.restore();
+ 

[06/55] [abbrv] ambari git commit: AMBARI-18826. Stack property definitions made in ambari-web should be made stack agnostic (akovalenko)

[ncole]

AMBARI-18826. Stack property definitions made in ambari-web should be made 
stack agnostic (akovalenko)


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

Branch: refs/heads/branch-feature-AMBARI-18634
Commit: 2ce9e3b671ad1687581113dd96fa38be7a0c51a3
Parents: 1ed9416
Author: Aleksandr Kovalenko 
Authored: Tue Nov 22 17:48:27 2016 +0200
Committer: Aleksandr Kovalenko 
Committed: Tue Nov 22 17:48:27 2016 +0200

--
 ambari-web/app/assets/test/tests.js |5 +-
 .../hawq/activateStandby/step2_controller.js|2 +-
 .../hawq/addStandby/step3_controller.js |3 +-
 .../journalNode/step2_controller.js |3 +-
 .../nameNode/step3_controller.js|3 +-
 .../resourceManager/step3_controller.js |2 +-
 ambari-web/app/controllers/main/host/details.js |2 +-
 .../app/controllers/wizard/step7_controller.js  |2 +-
 .../app/controllers/wizard/step8_controller.js  |2 +-
 ambari-web/app/data/HDP2.2/hive_properties.js   |  119 -
 ambari-web/app/data/HDP2.2/site_properties.js   |  275 --
 ambari-web/app/data/HDP2.2/tez_properties.js|   43 -
 ambari-web/app/data/HDP2.2/yarn_properties.js   |   54 -
 .../HDP2.3/hawq_activate_standby_properties.js  |   43 -
 .../app/data/HDP2.3/hawq_ha_properties.js   |   43 -
 ambari-web/app/data/HDP2.3/site_properties.js   |  373 ---
 ambari-web/app/data/HDP2/alert_notification.js  |  145 -
 .../app/data/HDP2/gluster_fs_properties.js  |   94 -
 ambari-web/app/data/HDP2/ha_properties.js   |  538 
 .../data/HDP2/kerberos_descriptor_properties.js |   35 -
 ambari-web/app/data/HDP2/kerberos_identities.js |  129 -
 .../data/HDP2/move_journal_node_properties.js   |   42 -
 ambari-web/app/data/HDP2/rm_ha_properties.js|  206 --
 ambari-web/app/data/HDP2/secure_mapping.js  | 1004 ---
 ambari-web/app/data/HDP2/site_properties.js | 2579 --
 ambari-web/app/data/HDP2/ui_properties.js   |   49 -
 .../app/data/configs/alert_notification.js  |  145 +
 .../configs/services/accumulo_properties.js |  116 +
 .../configs/services/ambari_infra_properties.js |  167 ++
 .../services/ambari_metrics_properties.js   |  188 ++
 .../data/configs/services/falcon_properties.js  |  302 ++
 .../data/configs/services/flume_properties.js   |   38 +
 .../configs/services/glusterfs_properties.js|   93 +
 .../data/configs/services/hawq_properties.js|  110 +
 .../data/configs/services/hbase_properties.js   |  124 +
 .../data/configs/services/hdfs_properties.js|  164 ++
 .../data/configs/services/hive_properties.js|  590 
 .../data/configs/services/kafka_properties.js   |   66 +
 .../configs/services/kerberos_properties.js |  204 ++
 .../data/configs/services/knox_properties.js|   32 +
 .../configs/services/logsearch_properties.js|  447 +++
 .../configs/services/mapreduce2_properties.js   |   45 +
 .../data/configs/services/oozie_properties.js   |   93 +
 .../data/configs/services/ranger_properties.js  |  309 +++
 .../data/configs/services/storm_properties.js   |  296 ++
 .../app/data/configs/services/tez_properties.js |   92 +
 .../data/configs/services/yarn_properties.js|  300 ++
 .../configs/services/zookeeper_properties.js|   67 +
 ambari-web/app/data/configs/site_properties.js  |   55 +
 ambari-web/app/data/configs/ui_properties.js|   49 +
 .../app/data/configs/wizards/ha_properties.js   |  538 
 .../wizards/hawq_activate_standby_properties.js |   43 +
 .../data/configs/wizards/hawq_ha_properties.js  |   43 +
 .../wizards/kerberos_descriptor_properties.js   |   35 +
 .../data/configs/wizards/kerberos_identities.js |  129 +
 .../wizards/move_journal_node_properties.js |   42 +
 .../data/configs/wizards/rm_ha_properties.js|  206 ++
 .../app/data/configs/wizards/secure_mapping.js  | 1004 +++
 ambari-web/app/data/custom_stack_map.js |2 -
 .../configs/stack_config_properties_mapper.js   |2 +-
 .../app/mixins/wizard/addSecurityConfigs.js |2 +-
 ambari-web/app/models/stack_service.js  |   13 +-
 ambari-web/app/utils/config.js  |   25 +-
 ambari-web/app/views/common/controls_view.js|5 +-
 .../views/main/dashboard/widgets/hbase_links.js |6 +-
 .../views/main/service/reassign/step5_view.js   |3 +-
 ambari-web/copy-pluggable-stack-resources.sh|2 +-
 .../test/controllers/main/host/details_test.js  |   25 +-
 .../test/data/HDP2.2/site_properties_test.js|   76 -
 .../test/data/HDP2.3/site_properties_test.js|   77 -
 .../test/data/HDP2/secure_mapping_test.js   |   36 -
 .../test/data/HDP2/site_properties_test.js  |   

[03/55] [abbrv] ambari git commit: AMBARI-18826. Stack property definitions made in ambari-web should be made stack agnostic (akovalenko)

[ncole]

http://git-wip-us.apache.org/repos/asf/ambari/blob/2ce9e3b6/ambari-web/app/data/configs/services/ambari_metrics_properties.js
--
diff --git a/ambari-web/app/data/configs/services/ambari_metrics_properties.js 
b/ambari-web/app/data/configs/services/ambari_metrics_properties.js
new file mode 100644
index 000..22f27e5
--- /dev/null
+++ b/ambari-web/app/data/configs/services/ambari_metrics_properties.js
@@ -0,0 +1,188 @@
+/**
+ * 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.
+ */
+
+module.exports = [
+  {
+"category": "General",
+"filename": "ams-site.xml",
+"index": 1,
+"name": "timeline.metrics.service.operation.mode",
+"serviceName": "AMBARI_METRICS"
+  },
+  {
+"category": "General",
+"filename": "ams-env.xml",
+"index": 2,
+"name": "metrics_collector_log_dir",
+"serviceName": "AMBARI_METRICS"
+  },
+  {
+"category": "General",
+"filename": "ams-env.xml",
+"index": 3,
+"name": "metrics_collector_pid_dir",
+"serviceName": "AMBARI_METRICS"
+  },
+  {
+"category": "General",
+"filename": "ams-env.xml",
+"index": 4,
+"name": "metrics_monitor_log_dir",
+"serviceName": "AMBARI_METRICS"
+  },
+  {
+"category": "General",
+"filename": "ams-env.xml",
+"index": 5,
+"name": "metrics_monitor_pid_dir",
+"serviceName": "AMBARI_METRICS"
+  },
+  {
+"category": "General",
+"filename": "ams-grafana-env.xml",
+"index": 6,
+"name": "metrics_grafana_username",
+"serviceName": "AMBARI_METRICS"
+  },
+  {
+"category": "General",
+"filename": "ams-grafana-env.xml",
+"index": 7,
+"name": "metrics_grafana_password",
+"serviceName": "AMBARI_METRICS"
+  },
+  {
+"category": "MetricCollector",
+"filename": "ams-site.xml",
+"index": 17,
+"name": "timeline.metrics.aggregator.checkpoint.dir",
+"serviceName": "AMBARI_METRICS"
+  },
+  {
+"category": "MetricCollector",
+"filename": "ams-site.xml",
+"index": 16,
+"name": 
"timeline.metrics.cluster.aggregator.hourly.checkpointCutOffMultiplier",
+"serviceName": "AMBARI_METRICS"
+  },
+  {
+"category": "MetricCollector",
+"filename": "ams-site.xml",
+"index": 14,
+"name": "timeline.metrics.cluster.aggregator.hourly.disabled",
+"serviceName": "AMBARI_METRICS"
+  },
+  {
+"category": "MetricCollector",
+"filename": "ams-site.xml",
+"index": 15,
+"name": "timeline.metrics.cluster.aggregator.hourly.interval",
+"serviceName": "AMBARI_METRICS"
+  },
+  {
+"category": "MetricCollector",
+"filename": "ams-site.xml",
+"index": 13,
+"name": 
"timeline.metrics.cluster.aggregator.minute.checkpointCutOffMultiplier",
+"serviceName": "AMBARI_METRICS"
+  },
+  {
+"category": "MetricCollector",
+"filename": "ams-site.xml",
+"index": 10,
+"name": "timeline.metrics.cluster.aggregator.minute.disabled",
+"serviceName": "AMBARI_METRICS"
+  },
+  {
+"category": "MetricCollector",
+"filename": "ams-site.xml",
+"index": 11,
+"name": "timeline.metrics.cluster.aggregator.minute.interval",
+"serviceName": "AMBARI_METRICS"
+  },
+  {
+"category": "MetricCollector",
+"filename": "ams-site.xml",
+"index": 12,
+"name": "timeline.metrics.cluster.aggregator.minute.timeslice.interval",
+"serviceName": "AMBARI_METRICS"
+  },
+  {
+"category": "MetricCollector",
+"filename": "ams-site.xml",
+"index": 9,
+"name": 
"timeline.metrics.host.aggregator.hourly.checkpointCutOffMultiplier",
+"serviceName": "AMBARI_METRICS"
+  },
+  {
+"category": "MetricCollector",
+"filename": "ams-site.xml",
+"index": 7,
+"name": "timeline.metrics.host.aggregator.hourly.disabled",
+"serviceName": "AMBARI_METRICS"
+  },
+  {
+"category": "MetricCollector",
+"filename": "ams-site.xml",
+"index": 8,
+"name": "timeline.metrics.host.aggregator.hourly.interval",
+"serviceName": "AMBARI_METRICS"
+  },
+  {
+"category": "MetricCollector",
+"filename": "ams-site.xml",
+"index": 6,
+"name": 
"timeline.metrics.host.aggregator.minute.checkpointCutOffMultiplier",
+

[44/55] [abbrv] ambari git commit: AMBARI-18834 Add Ranger proxy user under Ranger KMS config during stack upgrade (mugdha)

[ncole]

AMBARI-18834 Add Ranger proxy user under Ranger KMS config during stack upgrade 
(mugdha)


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

Branch: refs/heads/branch-feature-AMBARI-18634
Commit: b5b73d20274a8bbffcebbd9f099e30949220
Parents: bb803fb
Author: Mugdha Varadkar 
Authored: Tue Nov 29 09:38:40 2016 +0530
Committer: Mugdha Varadkar 
Committed: Tue Nov 29 09:41:23 2016 +0530

--
 .../upgrades/RangerKmsProxyConfig.java  |  95 +
 .../HDP/2.3/upgrades/nonrolling-upgrade-2.5.xml |   7 +
 .../HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml |   7 +
 .../stacks/HDP/2.3/upgrades/upgrade-2.5.xml |  11 ++
 .../stacks/HDP/2.3/upgrades/upgrade-2.6.xml |  11 ++
 .../HDP/2.4/upgrades/nonrolling-upgrade-2.5.xml |   7 +
 .../HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml |   7 +
 .../stacks/HDP/2.4/upgrades/upgrade-2.5.xml |  11 ++
 .../stacks/HDP/2.4/upgrades/upgrade-2.6.xml |  11 ++
 .../upgrades/RangerKmsProxyConfigTest.java  | 141 +++
 10 files changed, 308 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/b5b73d20/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/RangerKmsProxyConfig.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/RangerKmsProxyConfig.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/RangerKmsProxyConfig.java
new file mode 100644
index 000..bb88f55
--- /dev/null
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/RangerKmsProxyConfig.java
@@ -0,0 +1,95 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.ambari.server.serveraction.upgrades;
+
+import java.text.MessageFormat;
+import java.util.Map;
+import java.util.concurrent.ConcurrentMap;
+
+import org.apache.ambari.server.AmbariException;
+import org.apache.ambari.server.actionmanager.HostRoleStatus;
+import org.apache.ambari.server.agent.CommandReport;
+import org.apache.ambari.server.serveraction.AbstractServerAction;
+import org.apache.ambari.server.state.Cluster;
+import org.apache.ambari.server.state.Clusters;
+import org.apache.ambari.server.state.Config;
+import org.apache.ambari.server.state.SecurityType;
+import org.apache.commons.lang.StringUtils;
+
+import com.google.inject.Inject;
+
+/**
+* Computes Ranger KMS Proxy properties in kms-site
+*/
+
+public class RangerKmsProxyConfig extends AbstractServerAction {
+  private static final String RANGER_ENV_CONFIG_TYPE = "ranger-env";
+  private static final String RANGER_KMS_SITE_CONFIG_TYPE = "kms-site";
+
+  @Inject
+  private Clusters m_clusters;
+
+  @Override
+  public CommandReport execute(ConcurrentMap 
requestSharedDataContext)
+throws AmbariException, InterruptedException {
+
+String clusterName = getExecutionCommand().getClusterName();
+Cluster cluster = m_clusters.getCluster(clusterName);
+String outputMsg = "";
+
+Config rangerEnv = cluster.getDesiredConfigByType(RANGER_ENV_CONFIG_TYPE);
+
+if (null == rangerEnv) {
+  return createCommandReport(0, HostRoleStatus.COMPLETED, "{}",
+MessageFormat.format("Config source type {0} not found, skipping 
adding properties to {1}.", RANGER_ENV_CONFIG_TYPE, 
RANGER_KMS_SITE_CONFIG_TYPE), "");
+}
+
+String rangerUserProp = "ranger_user";
+String rangerUser = rangerEnv.getProperties().get(rangerUserProp);
+
+if (null == rangerUser) {
+  return createCommandReport(0, HostRoleStatus.COMPLETED, "{}",
+MessageFormat.format("Required user service user value from {0}/{1} 
not found, skipping adding properties to {2}.", RANGER_ENV_CONFIG_TYPE, 
rangerUserProp, RANGER_KMS_SITE_CONFIG_TYPE), "");
+}
+
+Config kmsSite = 

[30/55] [abbrv] ambari git commit: AMBARI-18979. Optimize loading of views in cloud environments (Laszlo Puskas via magyari_sandor)

[ncole]

AMBARI-18979. Optimize loading of views in cloud environments (Laszlo Puskas 
via magyari_sandor)


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

Branch: refs/heads/branch-feature-AMBARI-18634
Commit: 549d7cc86e43664050546355d96ba457c06e7884
Parents: c29
Author: Laszlo Puskas 
Authored: Fri Nov 25 17:35:42 2016 +0100
Committer: Sandor Magyari 
Committed: Fri Nov 25 17:35:42 2016 +0100

--
 .../server/configuration/Configuration.java |  23 +-
 .../ambari/server/events/AmbariEvent.java   |   5 +
 .../events/ClusterConfigFinishedEvent.java  |  53 +++
 .../ambari/server/topology/TopologyManager.java |  16 +-
 .../ambari/server/view/ViewExtractor.java   |   2 +-
 .../apache/ambari/server/view/ViewRegistry.java | 381 +++
 .../ClusterDeployWithStartOnlyTest.java |   2 +-
 ...InstallWithoutStartOnComponentLevelTest.java |   2 +-
 .../ClusterInstallWithoutStartTest.java |   2 +-
 .../ambari/server/view/ViewRegistryTest.java|   2 +
 10 files changed, 314 insertions(+), 174 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/549d7cc8/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
index 863c948..5676091 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
@@ -1863,6 +1863,22 @@ public class Configuration {
   "server.stages.parallel", Boolean.TRUE);
 
   /**
+   *
+   * Property driving the view extraction.
+   * It only applies to  blueprint deployments.
+   *
+   * If set to TRUE on ambari-server startup only the system views are loaded; 
non-system views are extracted upon a cluster
+   * creation request is received and the cluster configuration is 
successfully performed
+   *
+   * It is advised to use this property only in cases when ambari-server 
startup time is critical (eg. cloud environments)
+   *
+   * By default this is FALSE so all views are extracted and deployed at 
server startup.
+   */
+  @Markdown(description = "Drives view extraction in case of blueprint 
deployments; non-system views are deployed when cluster configuration is 
successful")
+  public static final ConfigurationProperty 
VIEW_EXTRACT_AFTER_CLUSTER_CONFIG =  new 
ConfigurationProperty<>("view.extract-after-cluster-config", Boolean.FALSE);
+
+
+  /**
* In case this is set to DEPENDENCY_ORDERED one stage is created for each 
request and command dependencies are
* handled directly by ActionScheduler. In case of STAGE (which is the 
default) one or more stages are
* created depending on dependencies.
@@ -4441,6 +4457,11 @@ public class Configuration {
 return Integer.parseInt(getProperty(VIEW_REQUEST_THREADPOOL_MAX_SIZE));
   }
 
+  public Boolean extractViewsAfterClusterConfig() {
+return 
Boolean.parseBoolean(getProperty(VIEW_EXTRACT_AFTER_CLUSTER_CONFIG));
+  }
+
+
   /**
* Get the time, in ms, that a request to a view will wait for an available
* thread to handle the request before returning an error.
@@ -5760,7 +5781,7 @@ public class Configuration {
 String acceptors = getProperty(SRVR_API_ACCEPTOR_THREAD_COUNT);
 return StringUtils.isEmpty(acceptors) ? null : Integer.parseInt(acceptors);
   }
- 
+
   public String getPamConfigurationFile() {
 return getProperty(PAM_CONFIGURATION_FILE);
   }

http://git-wip-us.apache.org/repos/asf/ambari/blob/549d7cc8/ambari-server/src/main/java/org/apache/ambari/server/events/AmbariEvent.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/events/AmbariEvent.java 
b/ambari-server/src/main/java/org/apache/ambari/server/events/AmbariEvent.java
index 7ec5972..868ce3f 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/events/AmbariEvent.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/events/AmbariEvent.java
@@ -128,6 +128,11 @@ public abstract class AmbariEvent {
 CLUSTER_CONFIG_CHANGED,
 
 /**
+ * Cluster configuration finished.
+ */
+CLUSTER_CONFIG_FINISHED,
+
+/**
  * Metrics Collector force refresh needed.
  */
 METRICS_COLLECTOR_HOST_DOWN,

[42/55] [abbrv] ambari git commit: AMBARI-18992: Stack version input text field on Register Version page should align properly even when resizing the page (dili)

[ncole]

AMBARI-18992: Stack version input text field on Register Version page should 
align properly even when resizing the page (dili)


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

Branch: refs/heads/branch-feature-AMBARI-18634
Commit: 640d85a501e5dbc2b7422bf49f2f94a31aa391b6
Parents: 80d0989
Author: Di Li 
Authored: Mon Nov 28 15:09:54 2016 -0500
Committer: Di Li 
Committed: Mon Nov 28 15:09:54 2016 -0500

--
 .../ui/admin-web/app/views/stackVersions/stackVersionPage.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/640d85a5/ambari-admin/src/main/resources/ui/admin-web/app/views/stackVersions/stackVersionPage.html
--
diff --git 
a/ambari-admin/src/main/resources/ui/admin-web/app/views/stackVersions/stackVersionPage.html
 
b/ambari-admin/src/main/resources/ui/admin-web/app/views/stackVersions/stackVersionPage.html
index a614a0d..b31e2c5 100644
--- 
a/ambari-admin/src/main/resources/ui/admin-web/app/views/stackVersions/stackVersionPage.html
+++ 
b/ambari-admin/src/main/resources/ui/admin-web/app/views/stackVersions/stackVersionPage.html
@@ -83,7 +83,7 @@
 
   
 
-
+
   Name:
   
 

[55/55] [abbrv] ambari git commit: AMBARI-18980. Add manual confirm task before finalizing host-ordered upgrade (Duc Le via ncole)

[ncole]

AMBARI-18980. Add manual confirm task before finalizing host-ordered upgrade 
(Duc Le via ncole)


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

Branch: refs/heads/branch-feature-AMBARI-18634
Commit: 2c7c0a704f4230697b6757bdaad954d8c5d71c79
Parents: f31f3f6
Author: Nate Cole 
Authored: Tue Nov 29 12:45:47 2016 -0500
Committer: Nate Cole 
Committed: Tue Nov 29 12:45:59 2016 -0500

--
 .../stacks/HDP/2.5/upgrades/host-ordered-upgrade.xml | 11 +--
 1 file changed, 9 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/2c7c0a70/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/host-ordered-upgrade.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/host-ordered-upgrade.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/host-ordered-upgrade.xml
index 72241eea..64c79a8 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/host-ordered-upgrade.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/host-ordered-upgrade.xml
@@ -117,14 +117,21 @@
 
   true
   false
-  
+
+  
+UPGRADE
+
+  Please confirm you are ready to finalize.
+
+  
+
   
 
   scripts/namenode.py
   finalize_rolling_upgrade
 
   
-  
+
   
 
 

[11/55] [abbrv] ambari git commit: AMBARI-18948. hive metrics : support hs2 with remote metastore (aonishuk)

[ncole]

AMBARI-18948. hive metrics : support hs2 with remote metastore (aonishuk)


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

Branch: refs/heads/branch-feature-AMBARI-18634
Commit: 292d27987f7c0fa0265ba9d2f6c47f69cb9827c9
Parents: 31ce5f7
Author: Andrew Onishuk 
Authored: Wed Nov 23 11:08:31 2016 +0200
Committer: Andrew Onishuk 
Committed: Wed Nov 23 11:08:31 2016 +0200

--
 .../2.5/services/HIVE/configuration/hivemetastore-site.xml   | 8 
 .../HIVE/configuration/hiveserver2-interactive-site.xml  | 8 
 .../HDP/2.5/services/HIVE/configuration/hiveserver2-site.xml | 8 
 3 files changed, 24 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/292d2798/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hivemetastore-site.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hivemetastore-site.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hivemetastore-site.xml
index b73b1ae..bb248b3 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hivemetastore-site.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hivemetastore-site.xml
@@ -26,6 +26,14 @@ limitations under the License.
 
   
   
+hive.server2.metrics.enabled
+true
+
+  boolean
+
+
+  
+  
 hive.service.metrics.reporter
 JSON_FILE, JMX, HADOOP2
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/292d2798/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hiveserver2-interactive-site.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hiveserver2-interactive-site.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hiveserver2-interactive-site.xml
index 89bf43c..e8b6bc8 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hiveserver2-interactive-site.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hiveserver2-interactive-site.xml
@@ -26,6 +26,14 @@ limitations under the License.
 
   
   
+hive.server2.metrics.enabled
+true
+
+  boolean
+
+
+  
+  
 hive.service.metrics.reporter
 JSON_FILE, JMX, HADOOP2
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/292d2798/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hiveserver2-site.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hiveserver2-site.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hiveserver2-site.xml
index e120ac2..bd1821d 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hiveserver2-site.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hiveserver2-site.xml
@@ -26,6 +26,14 @@ limitations under the License.
 
   
   
+hive.server2.metrics.enabled
+true
+
+  boolean
+
+
+  
+  
 hive.service.metrics.reporter
 JSON_FILE, JMX, HADOOP2
 

[22/55] [abbrv] ambari git commit: Ambari-2.4.2 website updates (jluniya)

[ncole]

Ambari-2.4.2 website updates (jluniya)


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

Branch: refs/heads/branch-feature-AMBARI-18634
Commit: 998baf64d2a6500fba91a1a8e035dcd9cf3a4373
Parents: 99cb902
Author: Jayush Luniya 
Authored: Wed Nov 23 11:57:50 2016 -0800
Committer: Jayush Luniya 
Committed: Wed Nov 23 11:59:54 2016 -0800

--
 docs/pom.xml| 2 +-
 docs/src/site/apt/index.apt | 2 +-
 docs/src/site/apt/whats-new.apt | 4 ++--
 docs/src/site/site.xml  | 2 ++
 4 files changed, 6 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/998baf64/docs/pom.xml
--
diff --git a/docs/pom.xml b/docs/pom.xml
index 82ca6db..625dce3 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -28,7 +28,7 @@
 4.0.0
 
 org.apache.ambari
-2.4.1
+2.4.2
 ambari
 pom
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/998baf64/docs/src/site/apt/index.apt
--
diff --git a/docs/src/site/apt/index.apt b/docs/src/site/apt/index.apt
index 78b6d90..485ea69 100644
--- a/docs/src/site/apt/index.apt
+++ b/docs/src/site/apt/index.apt
@@ -52,7 +52,7 @@ Introduction
 
 Getting Started with Ambari
 
-  Follow the 
{{{https://cwiki.apache.org/confluence/display/AMBARI/Installation+Guide+for+Ambari+2.4.1}
 installation guide for Ambari 2.4.1}}.
+  Follow the 
{{{https://cwiki.apache.org/confluence/display/AMBARI/Installation+Guide+for+Ambari+2.4.2}
 installation guide for Ambari 2.4.2}}.
 
   Note: Ambari currently supports the 64-bit version of the following 
Operating Systems:
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/998baf64/docs/src/site/apt/whats-new.apt
--
diff --git a/docs/src/site/apt/whats-new.apt b/docs/src/site/apt/whats-new.apt
index ba8aadc..ff5698f 100644
--- a/docs/src/site/apt/whats-new.apt
+++ b/docs/src/site/apt/whats-new.apt
@@ -16,7 +16,7 @@
 
 What's New with Ambari?
 
-  * The latest release of Ambari is Ambari 2.4.1. This is a maintainenance 
release of Ambari 2.4.0.
+  * The latest release of Ambari is Ambari 2.4.2. This is a maintainenance 
release of Ambari 2.4.0.
 
   * Ambari 2.4.0 added the following features:
 
@@ -51,7 +51,7 @@ JIRA
 
 User Guide
 
-  Take a look at 
{{{https://cwiki.apache.org/confluence/display/AMBARI/Installation+Guide+for+Ambari+2.4.1}
 how to install a Hadoop cluster using Ambari 2.4.1}}.
+  Take a look at 
{{{https://cwiki.apache.org/confluence/display/AMBARI/Installation+Guide+for+Ambari+2.4.2}
 how to install a Hadoop cluster using Ambari 2.4.2}}.
 
 Stay Tuned
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/998baf64/docs/src/site/site.xml
--
diff --git a/docs/src/site/site.xml b/docs/src/site/site.xml
index e0bad19..3e14e83 100644
--- a/docs/src/site/site.xml
+++ b/docs/src/site/site.xml
@@ -107,6 +107,7 @@
   https://cwiki.apache.org/confluence/display/AMBARI/Quick+Start+Guide"/>
   https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=30755705"/>
   https://github.com/apache/ambari/blob/trunk/ambari-server/docs/api/v1/index.md"/>
+  https://cwiki.apache.org/confluence/display/AMBARI/Installation+Guide+for+Ambari+2.4.2"/>
   https://cwiki.apache.org/confluence/display/AMBARI/Installation+Guide+for+Ambari+2.4.1"/>
   https://cwiki.apache.org/confluence/display/AMBARI/Installation+Guide+for+Ambari+2.4.0"/>
   https://cwiki.apache.org/confluence/display/AMBARI/Installation+Guide+for+Ambari+2.2.2"/>
@@ -137,6 +138,7 @@
 
 
 
+  http://www.apache.org/dyn/closer.cgi/ambari/ambari-2.4.2"/>
   http://www.apache.org/dyn/closer.cgi/ambari/ambari-2.4.1"/>
   http://archive.apache.org/dist/ambari/ambari-2.4.0"/>
   http://archive.apache.org/dist/ambari/ambari-2.2.2"/>

[38/55] [abbrv] ambari git commit: AMBARI-18998. Create smart config tab for Hive and Oozie Database settings (alexantonenko)

[ncole]

AMBARI-18998. Create smart config tab for Hive and Oozie Database settings 
(alexantonenko)


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

Branch: refs/heads/branch-feature-AMBARI-18634
Commit: cf82cf248a2e5178ea3fa35a76df338e7d258eb9
Parents: cad0130
Author: Alex Antonenko 
Authored: Mon Nov 28 19:48:47 2016 +0200
Committer: Alex Antonenko 
Committed: Mon Nov 28 19:48:58 2016 +0200

--
 .../HIVE/0.12.0.2.0/configuration/hive-env.xml  |  19 +++
 .../OOZIE/4.0.0.2.0/configuration/oozie-env.xml |  19 +++
 .../HDP/2.2/services/HIVE/themes/theme.json | 107 -
 .../services/HIVE/configuration/hive-env.xml|  35 ++
 .../services/OOZIE/configuration/oozie-env.xml  |  33 ++
 .../stacks/HDP/2.3/services/OOZIE/metainfo.xml  |   6 +
 .../HDP/2.3/services/OOZIE/themes/theme.json| 116 +++
 .../stacks/HDP/2.5/services/OOZIE/metainfo.xml  |   6 +
 .../HDP/2.5/services/OOZIE/themes/theme.json| 116 +++
 ambari-web/app/app.js   |   4 -
 .../data/configs/services/hive_properties.js|   4 -
 .../data/configs/services/oozie_properties.js   |   4 -
 12 files changed, 456 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/cf82cf24/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-env.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-env.xml
 
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-env.xml
index de088dc..a3ad66a 100644
--- 
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-env.xml
+++ 
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-env.xml
@@ -74,6 +74,25 @@
 
 
   false
+  value-list
+  
+
+  New MySQL Database
+  New MySQL
+
+
+  Existing MySQL / MariaDB Database
+  Existing MySQL / MariaDB
+
+
+  Existing PostgreSQL Database
+  Existing PostgreSQL
+
+
+  Existing Oracle Database
+  Existing Oracle
+
+  
 
 
   

http://git-wip-us.apache.org/repos/asf/ambari/blob/cf82cf24/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-env.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-env.xml
 
b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-env.xml
index 804c662..c966fb7 100644
--- 
a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-env.xml
+++ 
b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-env.xml
@@ -45,6 +45,25 @@
 Oozie Server Database.
 
   false
+  value-list
+  
+
+  New Derby Database
+  New Derby
+
+
+  Existing MySQL / MariaDB Database
+  Existing MySQL / MariaDB
+
+
+  Existing PostgreSQL Database
+  Existing PostgreSQL
+
+
+  Existing Oracle Database
+  Existing Oracle
+
+  
 
 
   

http://git-wip-us.apache.org/repos/asf/ambari/blob/cf82cf24/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/themes/theme.json
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/themes/theme.json
 
b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/themes/theme.json
index 42bc889..f496826 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/themes/theme.json
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/themes/theme.json
@@ -132,6 +132,42 @@
 }
   ]
 }
+  },
+  {
+"name": "hive-database",
+"display-name": "Database",
+"layout": {
+  "tab-rows": 1,
+  "tab-columns": 1,
+  "sections": [
+ {
+  "name": "hive-database-configurations",
+  "display-name": "Database Configurations",
+  "row-index": "0",
+  "column-index": "0",
+  "row-span": "0",
+  "column-span": "0",
+ 

[51/55] [abbrv] ambari git commit: AMBARI-19014. Add Service Wizard: error thrown during transition on deploy step (akovalenko)

[ncole]

AMBARI-19014. Add Service Wizard: error thrown during transition on deploy step 
(akovalenko)


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

Branch: refs/heads/branch-feature-AMBARI-18634
Commit: 1b6a92d5527c68523be755f4e4ab9eb7a8f142e6
Parents: cfeb391
Author: Aleksandr Kovalenko 
Authored: Tue Nov 29 15:27:22 2016 +0200
Committer: Aleksandr Kovalenko 
Committed: Tue Nov 29 17:10:13 2016 +0200

--
 .../controllers/main/service/add_controller.js  | 11 +---
 .../main/service/add_controller_test.js | 29 
 2 files changed, 30 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/1b6a92d5/ambari-web/app/controllers/main/service/add_controller.js
--
diff --git a/ambari-web/app/controllers/main/service/add_controller.js 
b/ambari-web/app/controllers/main/service/add_controller.js
index 4310f8d..f312a5a 100644
--- a/ambari-web/app/controllers/main/service/add_controller.js
+++ b/ambari-web/app/controllers/main/service/add_controller.js
@@ -467,7 +467,7 @@ App.AddServiceController = 
App.WizardController.extend(App.AddSecurityConfigs, {
   installSelectedServices: function (callback) {
 var name = 'common.services.update';
 var selectedServices = 
this.get('content.services').filterProperty('isInstalled', 
false).filterProperty('isSelected', true).mapProperty('serviceName');
-var dependentServices = this.getDependentServices();
+var dependentServices = this.getServicesBySelectedSlaves();
 var data = 
this.generateDataForInstallServices(selectedServices.concat(dependentServices));
 this.installServicesRequest(name, data, callback.bind(this));
   },
@@ -484,14 +484,17 @@ App.AddServiceController = 
App.WizardController.extend(App.AddSecurityConfigs, {
   },
 
   /**
-   * return list of services by dependent slave components
+   * return list of services by selected and not installed slave components
* @returns {Array}
*/
-  getDependentServices: function () {
+  getServicesBySelectedSlaves: function () {
 var result = [];
 this.get('content.slaveComponentHosts').forEach(function (slaveComponent) {
   if (slaveComponent.hosts.someProperty('isInstalled', false)) {
-
result.push(App.StackServiceComponent.find().findProperty('componentName', 
slaveComponent.componentName).get('serviceName'));
+var stackComponent = 
App.StackServiceComponent.find().findProperty('componentName', 
slaveComponent.componentName);
+if (stackComponent) {
+  result.push(stackComponent.get('serviceName'));
+}
   }
 });
 return result.uniq();

http://git-wip-us.apache.org/repos/asf/ambari/blob/1b6a92d5/ambari-web/test/controllers/main/service/add_controller_test.js
--
diff --git a/ambari-web/test/controllers/main/service/add_controller_test.js 
b/ambari-web/test/controllers/main/service/add_controller_test.js
index 7470f89..715f46a 100644
--- a/ambari-web/test/controllers/main/service/add_controller_test.js
+++ b/ambari-web/test/controllers/main/service/add_controller_test.js
@@ -566,14 +566,14 @@ describe('App.AddServiceController', function() {
 
   });
 
-  describe('#getDependentServices', function () {
+  describe('#getServicesBySelectedSlaves', function () {
 
 beforeEach(function () {
   sinon.stub(App.StackServiceComponent, 'find').returns([
-  Em.Object.create({
-componentName: 'c1',
-serviceName: 's1'
-  }),
+Em.Object.create({
+  componentName: 'c1',
+  serviceName: 's1'
+}),
 Em.Object.create({
   componentName: 'c2',
   serviceName: 's2'
@@ -596,6 +596,23 @@ describe('App.AddServiceController', function() {
 expect: []
   },
   {
+title: 'should return empty array if component is absent in 
StackServiceComponent model',
+sch: [
+  {
+componentName: 'c5',
+hosts: [
+  {
+isInstalled: false
+  },
+  {
+isInstalled: true
+  }
+]
+  },
+],
+expect: []
+  },
+  {
 title: 'should return services for not installed slaves',
 sch: [
   {
@@ -638,7 +655,7 @@ describe('App.AddServiceController', function() {
   describe(test.title, function () {
 it(function () {
   

[29/55] [abbrv] ambari git commit: AMBARI-18988. [Intermittent]Ambari-server check-database command took longer (~3) minutes to complete.(vbrodetskyi)

[ncole]

AMBARI-18988. [Intermittent]Ambari-server check-database command took longer 
(~3) minutes to complete.(vbrodetskyi)


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

Branch: refs/heads/branch-feature-AMBARI-18634
Commit: c296e62a5ce592f7b02a9b2885bdef80af8d
Parents: fc46088
Author: Vitaly Brodetskyi 
Authored: Fri Nov 25 14:13:46 2016 +0200
Committer: Vitaly Brodetskyi 
Committed: Fri Nov 25 14:13:46 2016 +0200

--
 .../server/checks/DatabaseConsistencyCheckHelper.java | 10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/c296/ambari-server/src/main/java/org/apache/ambari/server/checks/DatabaseConsistencyCheckHelper.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/checks/DatabaseConsistencyCheckHelper.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/checks/DatabaseConsistencyCheckHelper.java
index 6248a92..89ed987 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/checks/DatabaseConsistencyCheckHelper.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/checks/DatabaseConsistencyCheckHelper.java
@@ -460,11 +460,13 @@ public class DatabaseConsistencyCheckHelper {
   connection = dbAccessor.getConnection();
 }
 
+LOG.info("Getting ambari metainfo instance");
 if (ambariMetaInfo == null) {
   ambariMetaInfo = injector.getInstance(AmbariMetaInfo.class);
 }
 
 try {
+  LOG.info("Executing query 'GET_SERVICES_WITHOUT_CONFIGS'");
   statement = connection.createStatement(ResultSet.TYPE_SCROLL_SENSITIVE, 
ResultSet.CONCUR_UPDATABLE);
 
   rs = statement.executeQuery(GET_SERVICES_WITHOUT_CONFIGS_QUERY);
@@ -479,7 +481,7 @@ public class DatabaseConsistencyCheckHelper {
 }
 
   }
-
+  LOG.info("Executing query 'GET_SERVICE_CONFIG_WITHOUT_MAPPING'");
   rs = statement.executeQuery(GET_SERVICE_CONFIG_WITHOUT_MAPPING_QUERY);
   if (rs != null) {
 String serviceName = null, version = null, clusterName = null;
@@ -509,6 +511,7 @@ public class DatabaseConsistencyCheckHelper {
   }
 
   //get stack info from db
+  LOG.info("Getting stack info from database");
   rs = statement.executeQuery(GET_STACK_NAME_VERSION_QUERY);
   if (rs != null) {
 while (rs.next()) {
@@ -523,6 +526,7 @@ public class DatabaseConsistencyCheckHelper {
   Map>> 
dbClusterServiceVersionConfigs = new HashMap<>();
   Multimap stackServiceConfigs = HashMultimap.create();
 
+  LOG.info("Executing query 'GET_SERVICES_WITH_CONFIGS'");
   rs = statement.executeQuery(GET_SERVICES_WITH_CONFIGS_QUERY);
   if (rs != null) {
 String serviceName = null, configType = null, clusterName = null;
@@ -557,12 +561,14 @@ public class DatabaseConsistencyCheckHelper {
   }
 
   //compare service configs from stack with configs that we got from db
+  LOG.info("Comparing service configs from stack with configs that we got 
from db");
   for (Map.Entry> clusterStackInfoEntry : 
clusterStackInfo.entrySet()) {
 //collect required configs for all services from stack
 String clusterName = clusterStackInfoEntry.getKey();
 Map stackInfo = clusterStackInfoEntry.getValue();
 String stackName = stackInfo.keySet().iterator().next();
 String stackVersion = stackInfo.get(stackName);
+LOG.info("Getting services from metainfo");
 Map serviceInfoMap = 
ambariMetaInfo.getServices(stackName, stackVersion);
 for (String serviceName : serviceNames) {
   LOG.info("Processing {}-{} / {}", stackName, stackVersion, 
serviceName);
@@ -580,6 +586,7 @@ public class DatabaseConsistencyCheckHelper {
 }
 
 //compare required service configs from stack with mapped service 
configs from db
+LOG.info("Comparing required service configs from stack with mapped 
service configs from db");
 Map> dbServiceVersionConfigs = 
dbClusterServiceVersionConfigs.get(clusterName);
 if (dbServiceVersionConfigs != null) {
   for (Integer serviceVersion : dbServiceVersionConfigs.keySet()) {
@@ -603,6 +610,7 @@ public class DatabaseConsistencyCheckHelper {
   }
 
   //getting services which has mapped configs which are not selected in 
clusterconfigmapping
+  LOG.info("Getting services 

[23/55] [abbrv] ambari git commit: AMBARI-18971 Populate Ranger LDAP group configs under LDAP category used for authentication (mugdha)

[ncole]

AMBARI-18971 Populate Ranger LDAP group configs under LDAP category used for 
authentication (mugdha)


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

Branch: refs/heads/branch-feature-AMBARI-18634
Commit: cb1bce2f5af7f4fa6c55b819b23c53ce342d9a45
Parents: 998baf6
Author: Mugdha Varadkar 
Authored: Thu Nov 24 14:24:51 2016 +0530
Committer: Mugdha Varadkar 
Committed: Thu Nov 24 14:28:42 2016 +0530

--
 .../data/configs/services/ranger_properties.js  | 26 +---
 1 file changed, 22 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/cb1bce2f/ambari-web/app/data/configs/services/ranger_properties.js
--
diff --git a/ambari-web/app/data/configs/services/ranger_properties.js 
b/ambari-web/app/data/configs/services/ranger_properties.js
index b78a9df..754e4d4 100644
--- a/ambari-web/app/data/configs/services/ranger_properties.js
+++ b/ambari-web/app/data/configs/services/ranger_properties.js
@@ -181,7 +181,8 @@ module.exports = [
 "category": "LDAPSettings",
 "filename": "ranger-admin-site.xml",
 "name": "ranger.ldap.url",
-"serviceName": "RANGER"
+"serviceName": "RANGER",
+"index": 1
   },
   {
 "category": "LDAPSettings",
@@ -205,13 +206,15 @@ module.exports = [
 "category": "LDAPSettings",
 "filename": "ranger-admin-site.xml",
 "name": "ranger.ldap.bind.dn",
-"serviceName": "RANGER"
+"serviceName": "RANGER",
+"index": 2
   },
   {
 "category": "LDAPSettings",
 "filename": "ranger-admin-site.xml",
 "name": "ranger.ldap.bind.password",
-"serviceName": "RANGER"
+"serviceName": "RANGER",
+"index": 3
   },
   {
 "category": "LDAPSettings",
@@ -223,7 +226,22 @@ module.exports = [
 "category": "LDAPSettings",
 "filename": "ranger-admin-site.xml",
 "name": "ranger.ldap.user.searchfilter",
-"serviceName": "RANGER"
+"serviceName": "RANGER",
+"index": 4
+  },
+  {
+"category": "LDAPSettings",
+"filename": "ranger-admin-site.xml",
+"name": "ranger.ldap.group.searchbase",
+"serviceName": "RANGER",
+"index": 5
+  },
+  {
+"category": "LDAPSettings",
+"filename": "ranger-admin-site.xml",
+"name": "ranger.ldap.group.searchfilter",
+"serviceName": "RANGER",
+"index": 6
   },
   {
 "category": "KnoxSSOSettings",

[32/55] [abbrv] ambari git commit: AMBARI-18993. Perf: Status commands return INSTALLED even if component in STARTED state.(vbrodetskyi)

[ncole]

AMBARI-18993. Perf: Status commands return INSTALLED even if component in 
STARTED state.(vbrodetskyi)


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

Branch: refs/heads/branch-feature-AMBARI-18634
Commit: 9579275eb9cc4bd1896a86eb66f6e9fcb84d503e
Parents: 5c002c6
Author: Vitaly Brodetskyi 
Authored: Sun Nov 27 19:16:22 2016 +0200
Committer: Vitaly Brodetskyi 
Committed: Sun Nov 27 19:16:22 2016 +0200

--
 ambari-agent/conf/unix/agent-multiplier.py | 14 --
 1 file changed, 12 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/9579275e/ambari-agent/conf/unix/agent-multiplier.py
--
diff --git a/ambari-agent/conf/unix/agent-multiplier.py 
b/ambari-agent/conf/unix/agent-multiplier.py
index dec79eb..7c0774c 100644
--- a/ambari-agent/conf/unix/agent-multiplier.py
+++ b/ambari-agent/conf/unix/agent-multiplier.py
@@ -59,10 +59,12 @@ class Multiplier:
 self.log_dir = "/var/log/ambari-agent"
 self.config_dir = "/etc/ambari-agent/conf"
 self.pid_file = "/var/run/ambari-agent/ambari-agent.pid"
+self.prefix_dir = "/var/lib/ambari-agent/data"
 
 # Ambari Agent config file to use as a template
 # Will change hostname and port after copying
 self.source_config_file = "/etc/ambari-agent/conf/ambari-agent.ini"
+self.source_version_file = "/var/lib/ambari-agent/data/version"
 self.base_ping_port = 5000
 
 self.start = 0
@@ -159,11 +161,12 @@ class Multiplier:
   host_config_dir = host_home_dir + self.config_dir
   host_pid_file = host_home_dir + self.pid_file
   host_pid_dir = os.path.dirname(host_pid_file)
+  host_prefix = host_home_dir + self.prefix_dir
 
   if self.verbose:
 print "Analyzing host %s with port %d" % (host_name, host.ping_port)
 
-  for dir in [host_home_dir, host_log_dir, host_config_dir, host_pid_dir]:
+  for dir in [host_home_dir, host_log_dir, host_config_dir, host_pid_dir, 
host_prefix]:
 if not os.path.isdir(dir):
   print "Creating dir %s" % (dir)
   os.makedirs(dir)
@@ -174,6 +177,12 @@ class Multiplier:
 print "Copying config file %s" % str(host_config_file)
 shutil.copyfile(self.source_config_file, host_config_file)
 
+  # Copy version file
+  version_file = os.path.join(host_prefix, "version")
+  if not os.path.isfile(version_file):
+print "Copying version file %s" % str(version_file)
+shutil.copyfile(self.source_version_file, version_file)
+
   # Create hostname.sh script to use custom FQDN for each agent.
   host_name_script = os.path.join(host_config_dir, "hostname.sh")
   self.create_host_name_script(host_name, host_name_script)
@@ -183,7 +192,8 @@ class Multiplier:
  "hostname_script": host_name_script,
  "public_hostname_script": host_name_script,
  "logdir": host_log_dir,
- "piddir": host_pid_dir}
+ "piddir": host_pid_dir,
+ "prefix": host_prefix}
   self.change_config(host_config_file, config_dict)
 
   # Change /etc/hosts file by appending each hostname.

[01/55] [abbrv] ambari git commit: AMBARI-18826. Stack property definitions made in ambari-web should be made stack agnostic (akovalenko)

[ncole]

Repository: ambari
Updated Branches:
  refs/heads/branch-feature-AMBARI-18634 f4c2dbff3 -> 2c7c0a704


http://git-wip-us.apache.org/repos/asf/ambari/blob/2ce9e3b6/ambari-web/app/data/configs/wizards/secure_mapping.js
--
diff --git a/ambari-web/app/data/configs/wizards/secure_mapping.js 
b/ambari-web/app/data/configs/wizards/secure_mapping.js
new file mode 100644
index 000..8d952e8
--- /dev/null
+++ b/ambari-web/app/data/configs/wizards/secure_mapping.js
@@ -0,0 +1,1004 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+var App = require('app');
+// All of the "name" properties have to coincide with how they will appear in 
the *-site.xml file
+// The "template" properties can come from the config properties in 
site_properties.js or secure_properties.js .
+var props = [
+  {
+"name": "hadoop.security.authentication",
+"templateName": [],
+"foreignKey": null,
+"value": "kerberos",
+"nonSecureValue": "simple",
+"filename": "core-site.xml",
+"serviceName": "HDFS"
+  },
+  {
+"name": "hadoop.security.authorization",
+"templateName": [],
+"foreignKey": null,
+"value": "true",
+"nonSecureValue": "false",
+"filename": "core-site.xml",
+"serviceName": "HDFS"
+  },
+  {
+"name": "hadoop.security.auth_to_local",
+"templateName": ["resourcemanager_primary_name", "kerberos_domain", 
"yarn_user", "nodemanager_primary_name", "namenode_primary_name", "hdfs_user", 
"datanode_primary_name", "hbase_master_primary_name", 
"hbase_user","hbase_regionserver_primary_name","oozie_primary_name","oozie_user","jobhistory_primary_name","mapred_user","journalnode_principal_name","falcon_primary_name","falcon_user"],
+"foreignKey": null,
+"value": 
"RULE:[2:$1@$0](@.*)s/.*//\nRULE:[2:$1@$0](@.*)s/.*//\nRULE:[2:$1@$0](@.*)s/.*//\nRULE:[2:$1@$0](@.*)s/.*//\nRULE:[2:$1@$0](@.*)s/.*//\nRULE:[2:$1@$0](@.*)s/.*//\nRULE:[2:$1@$0](@.*)s/.*//\nRULE:[2:$1@$0](@.*)s/.*//\nRULE:[2:$1@$0](@.*)s/.*//\nRULE:[2:$1@$0](@.*)s/.*//\nDEFAULT",
+"filename": "core-site.xml",
+"serviceName": "HDFS",
+"dependedServiceName": [{name: "HBASE", replace: 
"\nRULE:[2:$1@$0](@.*)s/.*//\nRULE:[2:$1@$0](@.*)s/.*//"},{name:
 "OOZIE",replace: 
"\nRULE:[2:$1@$0](@.*)s/.*//"},{name:
 "MAPREDUCE2",replace: 
"\nRULE:[2:$1@$0](@.*)s/.*//"}]
+  },
+  {
+"name": "dfs.namenode.kerberos.principal",
+"templateName": ["namenode_principal_name", "kerberos_domain"],
+"foreignKey": null,
+"value": "@",
+"filename": "hdfs-site.xml",
+"serviceName": "HDFS"
+  },
+  {
+"name": "dfs.namenode.keytab.file",
+"templateName": ["namenode_keytab"],
+"foreignKey": null,
+"value": "",
+"filename": "hdfs-site.xml",
+"serviceName": "HDFS"
+  },
+  {
+"name": "dfs.secondary.namenode.kerberos.principal",
+"templateName": ["snamenode_principal_name", "kerberos_domain"],
+"foreignKey": null,
+"value": "@",
+"filename": "hdfs-site.xml",
+"serviceName": "HDFS"
+  },
+  {
+"name": "dfs.secondary.namenode.keytab.file",
+"templateName": ["snamenode_keytab"],
+"foreignKey": null,
+"value": "",
+"filename": "hdfs-site.xml",
+"serviceName": "HDFS"
+  },
+  {
+"name": "dfs.web.authentication.kerberos.principal",
+"templateName": ["hadoop_http_principal_name", "kerberos_domain"],

[15/55] [abbrv] ambari git commit: AMBARI-18947 Infinite spinner displayed instead of some Flume Agent graphs (dsen)

[ncole]

AMBARI-18947 Infinite spinner displayed instead of some Flume Agent graphs 
(dsen)


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

Branch: refs/heads/branch-feature-AMBARI-18634
Commit: fbf636d3b2d06612ba5258f2587261cb7950e314
Parents: 4551c9f
Author: Dmytro Sen 
Authored: Wed Nov 23 17:01:17 2016 +0200
Committer: Dmytro Sen 
Committed: Wed Nov 23 17:01:17 2016 +0200

--
 .../FLUME/1.4.0.2.0/metrics.json| 62 
 1 file changed, 62 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/fbf636d3/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/metrics.json
--
diff --git 
a/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/metrics.json 
b/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/metrics.json
index 611a1b7..455a22e 100644
--- 
a/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/metrics.json
+++ 
b/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/metrics.json
@@ -357,68 +357,6 @@
   "metric": "EventAcceptedCount",
   "pointInTime": true,
   "temporal": true
-},
-
-
"metrics/flume/flume/CHANNEL/$1.replaceAll(\"^CHANNEL\.\",\"\")/EventTakeSuccessCount/rate/avg":
 {
-  "metric": "EventTakeSuccessCount._rate._avg",
-  "pointInTime": false,
-  "temporal": true
-},
-
"metrics/flume/flume/CHANNEL/$1.replaceAll(\"^CHANNEL\.\",\"\")/EventTakeSuccessCount/rate/max":
 {
-  "metric": "EventTakeSuccessCount._rate._max",
-  "pointInTime": false,
-  "temporal": true
-},
-
"metrics/flume/flume/CHANNEL/$1.replaceAll(\"^CHANNEL\.\",\"\")/EventTakeSuccessCount/rate/min":
 {
-  "metric": "EventTakeSuccessCount._rate._min",
-  "pointInTime": false,
-  "temporal": true
-},
-
"metrics/flume/flume/CHANNEL/$1.replaceAll(\"^CHANNEL\.\",\"\")/EventTakeSuccessCount/rate/sum":
 {
-  "metric": "EventTakeSuccessCount._rate._sum",
-  "pointInTime": false,
-  "temporal": true
-},
-
"metrics/flume/flume/CHANNEL/$1.replaceAll(\"^CHANNEL\.\",\"\")/EventPutSuccessCount/rate/avg":
 {
-  "metric": "EventPutSuccessCount._rate._avg",
-  "pointInTime": false,
-  "temporal": true
-},
-
"metrics/flume/flume/CHANNEL/$1.replaceAll(\"^CHANNEL\.\",\"\")/EventPutSuccessCount/rate/max":
 {
-  "metric": "EventPutSuccessCount._rate._max",
-  "pointInTime": false,
-  "temporal": true
-},
-
"metrics/flume/flume/CHANNEL/$1.replaceAll(\"^CHANNEL\.\",\"\")/EventPutSuccessCount/rate/min":
 {
-  "metric": "EventPutSuccessCount._rate._min",
-  "pointInTime": false,
-  "temporal": true
-},
-
"metrics/flume/flume/CHANNEL/$1.replaceAll(\"^CHANNEL\.\",\"\")/EventPutSuccessCount/rate/sum":
 {
-  "metric": "EventPutSuccessCount._rate._sum",
-  "pointInTime": false,
-  "temporal": true
-},
-
-
"metrics/flume/flume/CHANNEL/$1.replaceAll(\"^CHANNEL\.\",\"\")/ChannelSize/rate/avg":
 {
-  "metric": "ChannelSize._rate._avg",
-  "pointInTime": false,
-  "temporal": true
-},
-
"metrics/flume/flume/CHANNEL/$1.replaceAll(\"^CHANNEL\.\",\"\")/ChannelSize/rate/max":
 {
-  "metric": "ChannelSize._rate._max",
-  "pointInTime": false,
-  "temporal": true
-},
-
"metrics/flume/flume/CHANNEL/$1.replaceAll(\"^CHANNEL\.\",\"\")/ChannelSize/rate/min":
 {
-  "metric": "ChannelSize._rate._min",
-  "pointInTime": false,
-  "temporal": true
-},
-
"metrics/flume/flume/CHANNEL/$1.replaceAll(\"^CHANNEL\.\",\"\")/ChannelSize/rate/sum":
 {
-  "metric": "ChannelSize._rate._sum",
-  "pointInTime": false,
-  "temporal": true
 }
 
   }

[47/55] [abbrv] ambari git commit: AMBARI-19008 Fix input height in filters with dropdown. (ababiichuk)

[ncole]

AMBARI-19008 Fix input height in filters with dropdown. (ababiichuk)


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

Branch: refs/heads/branch-feature-AMBARI-18634
Commit: 3c56dcce5b3c10d29b6b500ce749179eddbc4421
Parents: 5f3b323
Author: ababiichuk 
Authored: Tue Nov 29 13:49:02 2016 +0200
Committer: ababiichuk 
Committed: Tue Nov 29 13:53:27 2016 +0200

--
 ambari-web/app/styles/theme/bootstrap-ambari.css | 5 +
 1 file changed, 1 insertion(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/3c56dcce/ambari-web/app/styles/theme/bootstrap-ambari.css
--
diff --git a/ambari-web/app/styles/theme/bootstrap-ambari.css 
b/ambari-web/app/styles/theme/bootstrap-ambari.css
index f427c0a..d10a13b 100644
--- a/ambari-web/app/styles/theme/bootstrap-ambari.css
+++ b/ambari-web/app/styles/theme/bootstrap-ambari.css
@@ -35,6 +35,7 @@
   outline: none;
   font-family: 'Roboto', sans-serif;
   text-transform: uppercase;
+  height: 34px;
   font-size: 14px;
   padding: 10px 20px;
   line-height: 14px;
@@ -212,10 +213,6 @@
   background-color: #429929;
   border: 1px solid #3FAE2A;
 }
-.navbar-btn {
-  margin-top: 7px;
-  margin-bottom: 7px;
-}
 .btn-regular-default-state {
   background-color: #FFF;
   color: #666;

[39/55] [abbrv] ambari git commit: AMBARI-18841 : Grafana fails to start (Commit 2) (avijayan)

[ncole]

AMBARI-18841 : Grafana fails to start (Commit 2) (avijayan)


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

Branch: refs/heads/branch-feature-AMBARI-18634
Commit: 8de17fadfd00912b9bc7801011905f6c90bc8a97
Parents: cf82cf2
Author: Aravindan Vijayan 
Authored: Mon Nov 28 10:08:33 2016 -0800
Committer: Aravindan Vijayan 
Committed: Mon Nov 28 10:08:33 2016 -0800

--
 .../conf/unix/ambari-metrics-grafana| 34 ++--
 1 file changed, 9 insertions(+), 25 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/8de17fad/ambari-metrics/ambari-metrics-grafana/conf/unix/ambari-metrics-grafana
--
diff --git 
a/ambari-metrics/ambari-metrics-grafana/conf/unix/ambari-metrics-grafana 
b/ambari-metrics/ambari-metrics-grafana/conf/unix/ambari-metrics-grafana
index eeb189b..472942e 100644
--- a/ambari-metrics/ambari-metrics-grafana/conf/unix/ambari-metrics-grafana
+++ b/ambari-metrics/ambari-metrics-grafana/conf/unix/ambari-metrics-grafana
@@ -94,30 +94,14 @@ function isRunning() {
 
 case "$1" in
   start)
-echo -n $"Starting $DESC:  "
+echo $"Starting $DESC:  " >> $LOG_FILE
 
 isRunning
 if [ $? -eq 0 ]; then
-  echo "Already running."
+  echo "Already running." >> $LOG_FILE
   exit 0
 fi
 
-echo "$(date) Checking for previously running Grafana with out of sync 
PID..." >> $LOG_FILE
-if [ -n "`ps ax | grep -w ambari-metrics-grafana/bin/grafana-server`" ]; 
then
-  PID=`ps aux | grep -w ambari-metrics-grafana/bin/grafana-server | head 
-n 1 | awk '{print $2}'`
-  echo "$(date) Grafana Server already running with PID: ${PID}. Killing 
that instance"  >> $LOG_FILE
-  kill "${PID}" >/dev/null 2>&1
-  sleep "${STOP_TIMEOUT}"
-
-  if kill -0 "${PID}" > /dev/null 2>&1; then
-echo "$(date) WARNING: Grafana Server did not stop gracefully. Trying 
to kill with kill -9" >> $LOG_FILE
-kill -9 "${PID}" >/dev/null 2>&1
-  fi
-
-else
-  echo "$(date) No out of sync Grafana server process found" >> $LOG_FILE
-fi
-
 # Prepare environment
 # mkdir -p "$LOG_DIR" "$DATA_DIR" && chown 
"$GRAFANA_USER":"$GRAFANA_GROUP" "$LOG_DIR" "$DATA_DIR"
 # touch "$PID_FILE" && chown "$GRAFANA_USER":"$GRAFANA_GROUP" "$PID_FILE"
@@ -135,7 +119,7 @@ case "$1" in
   sleep 1
   # check if pid file has been written two
   if ! [[ -s $PID_FILE ]]; then
-echo "FAILED"
+echo "Start FAILED" >> $LOG_FILE
 exit 1
   fi
   i=0
@@ -152,11 +136,11 @@ case "$1" in
   done
 fi
 
-echo "OK"
+echo "OK" >> $LOG_FILE
 exit $return
 ;;
   stop)
-echo -n "Stopping $DESC ..."
+echo -n "Stopping $DESC ..." >> $LOG_FILE
 
 if [ -f "$PID_FILE" ]; then
   pid=$(cat "$PID_FILE")
@@ -165,18 +149,18 @@ case "$1" in
   sleep "${STOP_TIMEOUT}"
 
   if kill -0 "${pid}" > /dev/null 2>&1; then
-echo "WARNING: $DESC did not stop gracefully after ${STOP_TIMEOUT} 
seconds: Trying to kill with kill -9"
+echo "WARNING: $DESC did not stop gracefully after ${STOP_TIMEOUT} 
seconds: Trying to kill with kill -9" >> $LOG_FILE
 kill -9 "${pid}" >/dev/null 2>&1
   fi
 
   if ps -p "${pid}" > /dev/null 2>&1; then
-echo "ERROR: Unable to kill ${pid}"
+echo "ERROR: Unable to kill ${pid}" >> $LOG_FILE
   else
-rm -f "${pidfile}" >/dev/null 2>&1
+rm -f "$PID_FILE" >/dev/null 2>&1
   fi
   echo "OK"
 else
-  echo -n "(not running)"
+  echo -n "(not running)" >> $LOG_FILE
 fi
 exit 0
 ;;

[24/55] [abbrv] ambari git commit: AMBARI-18974. A number of Ambari Server Unit Test failures on branch-2.5 (dlysnichenko)

[ncole]

AMBARI-18974. A number of Ambari Server Unit Test failures on branch-2.5 
(dlysnichenko)


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

Branch: refs/heads/branch-feature-AMBARI-18634
Commit: c9f6944b038b73ce41aaa5fc9adb0aa2745e01e8
Parents: cb1bce2
Author: Lisnichenko Dmitro 
Authored: Thu Nov 24 11:51:54 2016 +0200
Committer: Lisnichenko Dmitro 
Committed: Thu Nov 24 11:51:54 2016 +0200

--
 .../controller/internal/StackDefinedPropertyProviderTest.java  | 2 ++
 .../server/controller/metrics/RestMetricsPropertyProviderTest.java | 2 ++
 2 files changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/c9f6944b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackDefinedPropertyProviderTest.java
--
diff --git 
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackDefinedPropertyProviderTest.java
 
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackDefinedPropertyProviderTest.java
index 958957b..75d5bd8 100644
--- 
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackDefinedPropertyProviderTest.java
+++ 
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackDefinedPropertyProviderTest.java
@@ -52,6 +52,7 @@ import org.apache.ambari.server.controller.spi.Resource;
 import org.apache.ambari.server.controller.spi.SystemException;
 import org.apache.ambari.server.controller.spi.TemporalInfo;
 import org.apache.ambari.server.controller.utilities.PropertyHelper;
+import org.apache.ambari.server.events.publishers.AmbariEventPublisher;
 import org.apache.ambari.server.orm.GuiceJpaInitializer;
 import org.apache.ambari.server.orm.InMemoryDefaultTestModule;
 import org.apache.ambari.server.orm.OrmTestHelper;
@@ -157,6 +158,7 @@ public class StackDefinedPropertyProviderTest {
 field.set(null, amc);
 Clusters clustersMock = createNiceMock(Clusters.class);
 Cluster clusterMock = createNiceMock(Cluster.class);
+
expect(amc.getAmbariEventPublisher()).andReturn(createNiceMock(AmbariEventPublisher.class)).anyTimes();
 expect(amc.getClusters()).andReturn(clustersMock).anyTimes();
 
expect(clustersMock.getCluster(CLUSTER_NAME_PROPERTY_ID)).andReturn(clusterMock).anyTimes();
 expect(clusterMock.getResourceId()).andReturn(2L).anyTimes();

http://git-wip-us.apache.org/repos/asf/ambari/blob/c9f6944b/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/RestMetricsPropertyProviderTest.java
--
diff --git 
a/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/RestMetricsPropertyProviderTest.java
 
b/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/RestMetricsPropertyProviderTest.java
index a9934a2..410e2f1 100644
--- 
a/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/RestMetricsPropertyProviderTest.java
+++ 
b/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/RestMetricsPropertyProviderTest.java
@@ -46,6 +46,7 @@ import 
org.apache.ambari.server.controller.spi.SystemException;
 import org.apache.ambari.server.controller.spi.TemporalInfo;
 import org.apache.ambari.server.controller.utilities.PropertyHelper;
 import org.apache.ambari.server.controller.utilities.StreamProvider;
+import org.apache.ambari.server.events.publishers.AmbariEventPublisher;
 import org.apache.ambari.server.orm.GuiceJpaInitializer;
 import org.apache.ambari.server.orm.InMemoryDefaultTestModule;
 import org.apache.ambari.server.security.TestAuthenticationFactory;
@@ -135,6 +136,7 @@ public class RestMetricsPropertyProviderTest {
 
 ConfigHelper configHelperMock = createNiceMock(ConfigHelper.class);
 expect(amc.getClusters()).andReturn(clusters).anyTimes();
+
expect(amc.getAmbariEventPublisher()).andReturn(createNiceMock(AmbariEventPublisher.class)).anyTimes();
 expect(amc.findConfigurationTagsWithOverrides(eq(c1), 
anyString())).andReturn(Collections.singletonMap("storm-site",
 Collections.singletonMap("tag", "version1"))).anyTimes();
 expect(amc.getConfigHelper()).andReturn(configHelperMock).anyTimes();

[05/55] [abbrv] ambari git commit: AMBARI-18826. Stack property definitions made in ambari-web should be made stack agnostic (akovalenko)

[ncole]

http://git-wip-us.apache.org/repos/asf/ambari/blob/2ce9e3b6/ambari-web/app/data/HDP2/rm_ha_properties.js
--
diff --git a/ambari-web/app/data/HDP2/rm_ha_properties.js 
b/ambari-web/app/data/HDP2/rm_ha_properties.js
deleted file mode 100644
index fb1bd13..000
--- a/ambari-web/app/data/HDP2/rm_ha_properties.js
+++ /dev/null
@@ -1,206 +0,0 @@
-/**
- * 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.
- */
-
-module.exports =
-{
-  "haConfig": {
-serviceName: 'MISC',
-displayName: 'MISC',
-configCategories: [
-  App.ServiceConfigCategory.create({ name: 'YARN', displayName: 'YARN'}),
-  App.ServiceConfigCategory.create({ name: 'HAWQ', displayName: 'HAWQ'}),
-  App.ServiceConfigCategory.create({ name: 'HDFS', displayName: 'HDFS'})
-],
-sites: ['yarn-site', 'hawq-site', 'core-site'],
-configs: [
-
/**HDFS***/
-  {
-"name": "yarn.resourcemanager.ha.enabled",
-"displayName": "yarn.resourcemanager.ha.enabled",
-"isReconfigurable": false,
-"recommendedValue": true,
-"isOverridable": false,
-"value": true,
-"displayType": "checkbox",
-"category": "YARN",
-"filename": "yarn-site",
-serviceName: 'MISC'
-  },
-  {
-"name": "yarn.resourcemanager.ha.rm-ids",
-"displayName": "yarn.resourcemanager.ha.rm-ids",
-"isReconfigurable": false,
-"recommendedValue": "rm1,rm2",
-"isOverridable": false,
-"value": "rm1,rm2",
-"category": "YARN",
-"filename": "yarn-site",
-serviceName: 'MISC'
-  },
-  {
-"name": "yarn.resourcemanager.hostname.rm1",
-"displayName": "yarn.resourcemanager.hostname.rm1",
-"isReconfigurable": false,
-"recommendedValue": "",
-"isOverridable": false,
-"value": "",
-"category": "YARN",
-"filename": "yarn-site",
-serviceName: 'MISC'
-  },
-
-  {
-"name": "yarn.resourcemanager.webapp.address.rm1",
-"displayName": "yarn.resourcemanager.webapp.address.rm1",
-"isReconfigurable": false,
-"recommendedValue": "",
-"isOverridable": false,
-"value": "",
-"category": "YARN",
-"filename": "yarn-site",
-serviceName: 'MISC'
-  },
-  {
-"name": "yarn.resourcemanager.webapp.address.rm2",
-"displayName": "yarn.resourcemanager.webapp.address.rm2",
-"isReconfigurable": false,
-"recommendedValue": "",
-"isOverridable": false,
-"value": "",
-"category": "YARN",
-"filename": "yarn-site",
-serviceName: 'MISC'
-  },
-  {
-"name": "yarn.resourcemanager.webapp.https.address.rm1",
-"displayName": "yarn.resourcemanager.webapp.https.address.rm1",
-"isReconfigurable": false,
-"recommendedValue": "",
-"isOverridable": false,
-"value": "",
-"category": "YARN",
-"filename": "yarn-site",
-serviceName: 'MISC'
-  },
-  {
-"name": "yarn.resourcemanager.webapp.https.address.rm2",
-"displayName": "yarn.resourcemanager.webapp.https.address.rm2",
-"isReconfigurable": false,
-"recommendedValue": "",
-"isOverridable": false,
-"value": "",
-"category": "YARN",
-"filename": "yarn-site",
-serviceName: 'MISC'
-  },
-
-  {
-"name": "yarn.resourcemanager.hostname.rm2",
-"displayName": "yarn.resourcemanager.hostname.rm2",
-"isReconfigurable": false,
-"recommendedValue": "",
-"isOverridable": false,
-"value": "",
-"category": "YARN",
-"filename": "yarn-site",
-serviceName: 'MISC'
-  },
-  {
-"name": "yarn.resourcemanager.recovery.enabled",
-"displayName": "yarn.resourcemanager.recovery.enabled",
-"isReconfigurable": false,
-"recommendedValue": true,
-"isOverridable": false,
-"value": true,
-"displayType": "checkbox",
-

[17/55] [abbrv] ambari git commit: AMBARI-18970. Unable to load Grafana Graphs in IE11. (Vivek Subramanian via Jaimin)

[ncole]

AMBARI-18970. Unable to load Grafana Graphs in IE11. (Vivek Subramanian via 
Jaimin)


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

Branch: refs/heads/branch-feature-AMBARI-18634
Commit: a8d6f03f89ff610926f997d6f41f915052a17e88
Parents: 90967bc
Author: Jaimin Jetly 
Authored: Wed Nov 23 09:26:17 2016 -0800
Committer: Jaimin Jetly 
Committed: Wed Nov 23 09:26:17 2016 -0800

--
 .../ambari-metrics-grafana/ambari-metrics/datasource.js| 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/a8d6f03f/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 626439d..eb883e8 100644
--- a/ambari-metrics/ambari-metrics-grafana/ambari-metrics/datasource.js
+++ b/ambari-metrics/ambari-metrics-grafana/ambari-metrics/datasource.js
@@ -604,7 +604,7 @@ define([
 });
   }
   //Templated Variables for Storm Components per Topology
-  if (interpolated.includes("stormComponent")) {
+  if (interpolated.indexOf("stormComponent") >= 0) {
 var componentName = 
interpolated.substring(0,interpolated.indexOf('.'));
 return this.initMetricAppidMapping()
 .then(function () {
@@ -657,7 +657,7 @@ define([
 });
   };
   //Templated Variables for Storm Topics per Topology
-  if (interpolated.includes("stormTopic")) {
+  if (interpolated.indexOf("stormTopic") >= 0) {
 var topicName = 
interpolated.substring(0,interpolated.indexOf('.'));
 return this.getStormEntities().then(function () {
   var topicNames = Object.keys(stormEntities[topicName]);
@@ -669,7 +669,7 @@ define([
 });
   }
   //Templated Variables for Storm Partitions per Topic
-  if (interpolated.includes("stormPartition")) {
+  if (interpolated.indexOf("stormPartition") >= 0) {
 var topicN, topologyN;
 return this.getStormEntities().then(function () {
   var partitionNames = _.uniq(stormEntities[topologyN][topicN]);

[31/55] [abbrv] ambari git commit: AMBARI-18991 Fix Flume agents table. (ababiichuk)

[ncole]

AMBARI-18991 Fix Flume agents table. (ababiichuk)


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

Branch: refs/heads/branch-feature-AMBARI-18634
Commit: 5c002c6408d74b9d7c1a7693f3d01761ed64265a
Parents: 549d7cc
Author: ababiichuk 
Authored: Fri Nov 25 18:34:52 2016 +0200
Committer: ababiichuk 
Committed: Fri Nov 25 19:00:10 2016 +0200

--
 ambari-web/app/models/service/flume.js  |   8 +
 ambari-web/app/styles/application.less  | 112 ---
 .../app/styles/theme/bootstrap-ambari.css   |  25 ++-
 .../templates/main/service/services/flume.hbs   | 196 ---
 .../app/views/main/service/services/flume.js|  32 +--
 ambari-web/test/models/service/flume_test.js|   6 +
 .../views/main/service/services/flume_test.js   |  17 +-
 7 files changed, 178 insertions(+), 218 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/5c002c64/ambari-web/app/models/service/flume.js
--
diff --git a/ambari-web/app/models/service/flume.js 
b/ambari-web/app/models/service/flume.js
index d482ab6..37cfbb5 100644
--- a/ambari-web/app/models/service/flume.js
+++ b/ambari-web/app/models/service/flume.js
@@ -49,6 +49,14 @@ App.FlumeAgent = DS.Model.extend({
 UNKNOWN: App.healthIconClassYellow
   },
 
+  healthIconClass: Em.computed.getByKey('healthIconClassMap', 'status', ''),
+
+  healthIconClassMap: {
+RUNNING: 'health-status-LIVE',
+NOT_RUNNING: 'health-status-DEAD-RED',
+UNKNOWN: 'health-status-DEAD-YELLOW'
+  },
+
   displayStatus: Em.computed.getByKey('displayStatusMap', 'status', 
Em.I18n.t('common.unknown')),
 
   displayStatusMap: {

http://git-wip-us.apache.org/repos/asf/ambari/blob/5c002c64/ambari-web/app/styles/application.less
--
diff --git a/ambari-web/app/styles/application.less 
b/ambari-web/app/styles/application.less
index 7d93778..d449ccb 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -2180,86 +2180,60 @@ input[type="radio"].align-checkbox, 
input[type="checkbox"].align-checkbox {
 }
 
 #flume-summary {
-  text-align:left !important;
   max-height: 490px;
-  #flume-agents-table {
+  .table {
 margin: 0;
-width: 100%;
-.highlight {
-  td, th {
-background-color: #BDC3C7 !important;
-color: #666;
+table-layout: fixed;
+  }
+  #flume-agents-table {
+border-collapse: separate;
+> tbody > tr > td {
+  &:last-of-type {
+padding: 0;
+&.empty-label {
+  padding: 8px;
+  text-align: center;
+}
   }
 }
 th:first-child {
   width: 40%;
+  + th {
+width: 30%;
+~ th {
+  width: 10%;
+}
+  }
 }
-th:first-child + th {
-  width: 30%;
-}
-th:first-child + th + th {
-  width: 10%;
-}
-th:first-child + th + th + th {
-  width: 10%;
-}
-th:first-child + th + th + th + th {
-  width: 10%;
-}
-td.agent-status {
-  width: 125px;
-}
-td.agent-name {
-  width: 20%;
-  overflow: hidden;
-}
-td.agent-host-name {
-  width: 20%;
-  overflow: hidden;
-  max-width: 90px;
-}
-.glyphicon-warning-sign {
-  color: @restart-indicator-color;
-}
-#flume-host-agent-row {
-  cursor: pointer;
-  text-align: left;
-  background-color: #fff;
-}
-.empty-label {
-  border-top: 1px solid #ddd;
-  text-align: center;
-}
-  }
-  .wrapp-flume-status{
-text-align: left;
-  }
-  .btn-wrapper {
-margin: 0 5px 5px 0;
-float: right;
-width:60px;
-position: static;
-  }
-  .flume-agents-actions {
-.btn-group {
-  position: static;
-}
-a {
-  text-decoration: none;
-}
-a.dropdown-toggle {
-  padding: 2px 6px;
-  font-size: 11px;
-  line-height: 17px;
-}
-.dropdown-menu {
-  position: absolute;
+td {
+  &.agent-host-name {
+overflow: hidden;
+border-bottom: 1px solid #eee;
+cursor: pointer;
+  }
+  &.agent-status {
+width: 50%;
+  }
+  &.flume-agent-sources-count, &.flume-agent-channels-count {
+width: 16.667%;
+  }
+  &.flume-agent-sink-count {
+width: 16.666%;
+  }
+  .flume-agents-actions {
+.btn-group {
+  position: static;
+}
+a {
+  text-decoration: none;
+}
+  }
 }
   }
   .scrollable-container {
+

[19/55] [abbrv] ambari git commit: AMBARI-18968. Ambari Server Unit Test failure: org.apache.ambari.server.state.ServicePropertiesTest.validatePropertySchemaOfServiceXMLs (alejandro)

[ncole]

http://git-wip-us.apache.org/repos/asf/ambari/blob/b59dc1dd/ambari-server/src/main/resources/stacks/PERF/1.0/services/YARN/configuration/yarn-site.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/PERF/1.0/services/YARN/configuration/yarn-site.xml
 
b/ambari-server/src/main/resources/stacks/PERF/1.0/services/YARN/configuration/yarn-site.xml
index f395c29..2d56e38 100644
--- 
a/ambari-server/src/main/resources/stacks/PERF/1.0/services/YARN/configuration/yarn-site.xml
+++ 
b/ambari-server/src/main/resources/stacks/PERF/1.0/services/YARN/configuration/yarn-site.xml
@@ -27,7 +27,7 @@
 
   boolean
 
-
+
   
   
 yarn.timeline-service.generic-application-history.store-class
@@ -35,7 +35,7 @@
 
   Store class name for history store, defaulting to file system store
 
-
+
   
   
 yarn.timeline-service.webapp.address
@@ -69,7 +69,7 @@
 
   int
 
-
+
   
   
 Length of time to wait between deletion cycles of leveldb 
timeline store in milliseconds.
@@ -78,7 +78,7 @@
 
   int
 
-
+
   
 
   
@@ -86,7 +86,7 @@
 yarn.application.classpath
 
$HADOOP_CONF_DIR,/usr/hdp/current/hadoop-client/*,/usr/hdp/current/hadoop-client/lib/*,/usr/hdp/current/hadoop-hdfs-client/*,/usr/hdp/current/hadoop-hdfs-client/lib/*,/usr/hdp/current/hadoop-yarn-client/*,/usr/hdp/current/hadoop-yarn-client/lib/*
 Classpath for typical applications.
-
+
   
   
 hadoop.registry.rm.enabled
@@ -94,7 +94,7 @@
 
   Is the registry enabled: does the RM start it up, create the user and 
system paths, and purge service records when containers, application attempts 
and applications complete
 
-
+
   
   
 hadoop.registry.zk.quorum
@@ -108,7 +108,7 @@
 yarn.nodemanager.recovery.enabled
 true
 Enable the node manager to recover after 
starting
-
+
   
   
 yarn.nodemanager.recovery.dir
@@ -117,19 +117,19 @@
   The local filesystem directory in which the node manager will store
   state when recovery is enabled.
 
-
+
   
   
 yarn.client.nodemanager-connect.retry-interval-ms
 1
 Time interval between each attempt to connect to 
NM
-
+
   
   
 yarn.client.nodemanager-connect.max-wait-ms
 6
 Max time to wait to establish a connection to NM
-
+
   
   
 yarn.resourcemanager.recovery.enabled
@@ -138,7 +138,7 @@
   Enable RM to recover state after starting.
   If true, then yarn.resourcemanager.store.class must be specified.
 
-
+
   
   
 yarn.resourcemanager.work-preserving-recovery.enabled
@@ -150,7 +150,7 @@
 
   boolean
 
-
+
   
   
 yarn.resourcemanager.store.class
@@ -161,7 +161,7 @@
   the store is implicitly fenced; meaning a single ResourceManager
   is able to use the store at any point in time.
 
-
+
   
   
 yarn.resourcemanager.zk-address
@@ -175,31 +175,31 @@
 yarn.resourcemanager.zk-state-store.parent-path
 /rmstore
 Full path of the ZooKeeper znode where RM state will be 
stored. This must be supplied when using 
org.apache.hadoop.yarn.server.resourcemanager.recovery.ZKRMStateStore as the 
value for yarn.resourcemanager.store.class
-
+
   
   
 yarn.resourcemanager.zk-acl
 world:anyone:rwcda
 ACL's to be used for ZooKeeper znodes.
-
+
   
   
 
yarn.resourcemanager.work-preserving-recovery.scheduling-wait-ms
 1
 Set the amount of time RM waits before allocating new 
containers on work-preserving-recovery. Such wait period gives RM a chance to 
settle down resyncing with NMs in the cluster on recovery, before assigning new 
containers to applications.
-
+
   
   
 yarn.resourcemanager.connect.retry-interval.ms
 3
 How often to try connecting to the 
ResourceManager.
-
+
   
   
 yarn.resourcemanager.connect.max-wait.ms
 90
 Maximum time to wait to establish connection to 
ResourceManager
-
+
   
   
 yarn.resourcemanager.zk-retry-interval-ms
@@ -209,43 +209,43 @@
   automatically from yarn.resourcemanager.zk-timeout-ms and
   yarn.resourcemanager.zk-num-retries."
 
-
+
   
   
 yarn.resourcemanager.zk-num-retries
 1000
 Number of times RM tries to connect to 
ZooKeeper.
-
+
   
   
 yarn.resourcemanager.zk-timeout-ms
 1
 ZooKeeper session timeout in milliseconds. Session expiration 
is managed by the ZooKeeper cluster itself, not by the client. This value is 
used by the cluster to determine when the client's session expires. Expirations 
happens when the cluster does not hear from the client within the specified 
session timeout period (i.e. no heartbeat).
-
+
   
   
 yarn.resourcemanager.state-store.max-completed-applications
 ${yarn.resourcemanager.max-completed-applications}
 

[14/55] [abbrv] ambari git commit: Revert "AMBARI-18836. Remove group readable from hdfs headless keytab (Shi Wang via rlevas)"

[ncole]

Revert "AMBARI-18836. Remove group readable from hdfs headless keytab (Shi Wang 
via rlevas)"

This reverts commit 38076327525986b780942f33eff01d2de4a70ce2.


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

Branch: refs/heads/branch-feature-AMBARI-18634
Commit: 4551c9f9cbc3e1723a331b038dfee954098f3b44
Parents: 29db227
Author: Robert Levas 
Authored: Wed Nov 23 09:32:37 2016 -0500
Committer: Robert Levas 
Committed: Wed Nov 23 09:32:37 2016 -0500

--
 .../common-services/HDFS/2.1.0.2.0/kerberos.json  |  2 +-
 .../HIVE/0.12.0.2.0/package/scripts/webhcat.py| 10 ++
 .../resources/stacks/HDP/2.5/services/HDFS/kerberos.json  |  2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/4551c9f9/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/kerberos.json
--
diff --git 
a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/kerberos.json 
b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/kerberos.json
index f30c9e4..e8c96cb 100644
--- 
a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/kerberos.json
+++ 
b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/kerberos.json
@@ -56,7 +56,7 @@
 },
 "group": {
   "name": "${cluster-env/user_group}",
-  "access": ""
+  "access": "r"
 },
 "configuration": "hadoop-env/hdfs_user_keytab"
   }

http://git-wip-us.apache.org/repos/asf/ambari/blob/4551c9f9/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/webhcat.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/webhcat.py
 
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/webhcat.py
index 00b057c..a7feb60 100644
--- 
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/webhcat.py
+++ 
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/webhcat.py
@@ -70,6 +70,16 @@ def webhcat():
 group=params.user_group,
 cd_access="a")
 
+  if params.security_enabled:
+kinit_if_needed = format("{kinit_path_local} -kt {hdfs_user_keytab} 
{hdfs_principal_name};")
+  else:
+kinit_if_needed = ""
+
+  if kinit_if_needed:
+Execute(kinit_if_needed,
+user=params.webhcat_user,
+path='/bin'
+)
 
   # Replace _HOST with hostname in relevant principal-related properties
   webhcat_site = params.config['configurations']['webhcat-site'].copy()

http://git-wip-us.apache.org/repos/asf/ambari/blob/4551c9f9/ambari-server/src/main/resources/stacks/HDP/2.5/services/HDFS/kerberos.json
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HDFS/kerberos.json 
b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HDFS/kerberos.json
index 9000e95..974a69c 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HDFS/kerberos.json
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HDFS/kerberos.json
@@ -66,7 +66,7 @@
 },
 "group": {
   "name": "${cluster-env/user_group}",
-  "access": ""
+  "access": "r"
 },
 "configuration": "hadoop-env/hdfs_user_keytab"
   }

[10/55] [abbrv] ambari git commit: AMBARI-18912. Implement Create Alerts: step 1 select alert type.(XIWANG)

[ncole]

AMBARI-18912. Implement Create Alerts: step 1 select alert type.(XIWANG)


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

Branch: refs/heads/branch-feature-AMBARI-18634
Commit: 31ce5f7d3d087af5d0f03f295fe5d680a6ee453d
Parents: e73e783
Author: Xi Wang 
Authored: Wed Nov 16 18:31:35 2016 -0800
Committer: Xi Wang 
Committed: Tue Nov 22 14:21:01 2016 -0800

--
 .../add_alert_definition/step1_controller.js| 41 ++---
 .../alerts/definition_configs_controller.js | 40 ++---
 ambari-web/app/messages.js  | 17 --
 .../app/models/alerts/alert_definition.js   | 54 ++
 ambari-web/app/styles/alerts.less   | 60 
 .../main/alerts/add_alert_definition/step1.hbs  | 30 +-
 .../alerts/add_alert_definition/step1_view.js   |  3 +
 .../step1_controller_test.js| 24 +---
 8 files changed, 186 insertions(+), 83 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/31ce5f7d/ambari-web/app/controllers/main/alerts/add_alert_definition/step1_controller.js
--
diff --git 
a/ambari-web/app/controllers/main/alerts/add_alert_definition/step1_controller.js
 
b/ambari-web/app/controllers/main/alerts/add_alert_definition/step1_controller.js
index 2d4f338..c758fc0 100644
--- 
a/ambari-web/app/controllers/main/alerts/add_alert_definition/step1_controller.js
+++ 
b/ambari-web/app/controllers/main/alerts/add_alert_definition/step1_controller.js
@@ -24,34 +24,25 @@ App.AddAlertDefinitionStep1Controller = 
Em.Controller.extend({
 
   /**
* List of available alert definition types
-   * @type {{value: string, isActive: boolean}[]}
+   * @type {{name: string, isActive: boolean}[]}
*/
-  alertDefinitionsTypes: [
-Em.Object.create({value: 'PORT', isActive: false, icon: 'glyphicon 
glyphicon-signal'}),
-Em.Object.create({value: 'METRIC', isActive: false, icon: 'icon-bolt'}),
-Em.Object.create({value: 'WEB', isActive: false, icon: 'glyphicon 
glyphicon-globe'}),
-Em.Object.create({value: 'AGGREGATE', isActive: false, icon: 'glyphicon 
glyphicon-plus-sign-alt'}),
-Em.Object.create({value: 'SCRIPT', isActive: false, icon: 'glyphicon 
glyphicon-code'}),
-Em.Object.create({value: 'SERVER', isActive: false, icon: 'glyphicon 
glyphicon-desktop'}),
-Em.Object.create({value: 'RECOVERY', isActive: false, icon: 'glyphicon 
glyphicon-desktop'})
-  ],
-
-  /**
-   * "Next"-button is disabled if user doesn't select any alert definition type
-   * @type {boolean}
-   */
-  isSubmitDisabled: Em.computed.everyBy('alertDefinitionsTypes', 'isActive', 
false),
+  alertDefinitionsTypes: function () {
+return App.AlertType.find().map(function(option) {
+  return Em.Object.create({
+name: option.get('name'),
+displayName: option.get('displayName'),
+icon: option.get('iconPath'),
+description: option.get('description')
+  });
+});
+  }.property(),
 
   /**
* Set selectedType if it exists in the wizard controller
* @method loadStep
*/
   loadStep: function() {
-this.get('alertDefinitionsTypes').setEach('isActive', false);
-var selectedType = this.get('content.selectedType');
-if(selectedType) {
-  this.selectType({context: {value: selectedType}});
-}
+this.set('content.selectedType', '');
   },
 
   /**
@@ -61,10 +52,10 @@ App.AddAlertDefinitionStep1Controller = 
Em.Controller.extend({
*/
   selectType: function(e) {
 var type = e.context,
-  types = this.get('alertDefinitionsTypes');
-types.setEach('isActive', false);
-types.findProperty('value', type.value).set('isActive', true);
-this.set('content.selectedType', type.value);
+types = this.get('alertDefinitionsTypes');
+this.set('content.selectedType', type.name);
+$("[rel='selectable-tooltip']").trigger('mouseleave');
+App.router.send('next');
   }
 
 });

http://git-wip-us.apache.org/repos/asf/ambari/blob/31ce5f7d/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 4c82556..138aaa4 100644
--- a/ambari-web/app/controllers/main/alerts/definition_configs_controller.js
+++ b/ambari-web/app/controllers/main/alerts/definition_configs_controller.js
@@ -225,7 +225,7 @@ App.MainAlertDefinitionConfigsController = 

[13/55] [abbrv] ambari git commit: AMBARI-18973 Service Auto Start: discard popup appears even when no changes were made. (atkach)

[ncole]

AMBARI-18973 Service Auto Start: discard popup appears even when no changes 
were made. (atkach)


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

Branch: refs/heads/branch-feature-AMBARI-18634
Commit: 29db2273e77b8fd4f36c15a2001495a08099250a
Parents: 6088c17
Author: Andrii Tkach 
Authored: Wed Nov 23 13:52:31 2016 +0200
Committer: Andrii Tkach 
Committed: Wed Nov 23 15:25:58 2016 +0200

--
 ambari-web/app/assets/test/tests.js |   4 +-
 .../main/admin/service_auto_start.js| 342 +++
 .../templates/main/admin/service_auto_start.hbs |  12 +-
 .../service_auto_start/component_auto_start.hbs |   2 +-
 .../app/views/main/admin/service_auto_start.js  |  68 +---
 .../service_auto_start/component_auto_start.js  |  15 +-
 .../main/admin/service_auto_start_test.js   | 326 ++
 .../component_auto_start_test.js|  64 
 .../views/main/admin/service_auto_start_test.js |  83 +
 9 files changed, 703 insertions(+), 213 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/29db2273/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 959d1c6..4263016 100644
--- a/ambari-web/app/assets/test/tests.js
+++ b/ambari-web/app/assets/test/tests.js
@@ -65,7 +65,7 @@ var files = [
   'test/controllers/main/admin/kerberos/step6_controller_test',
   'test/controllers/main/admin/kerberos/step7_controller_test',
   'test/controllers/main/admin/kerberos/step8_controller_test',
-
+  'test/controllers/main/admin/service_auto_start_test',
   'test/controllers/main/admin/stack_and_upgrade_controller_test',
   'test/controllers/main/admin/stack_upgrade_history_controller_test',
   'test/controllers/main/admin/serviceAccounts_controller_test',
@@ -269,6 +269,8 @@ var files = [
   'test/views/main/admin/stack_upgrade/services_view_test',
   'test/views/main/admin/stack_upgrade/menu_view_test',
   'test/views/main/admin/stack_upgrade/failed_hosts_modal_view_test',
+  'test/views/main/admin/service_auto_start/component_auto_start_test',
+  'test/views/main/admin/service_auto_start_test',
   'test/views/main/dashboard/config_history_view_test',
   'test/views/main/dashboard/widget_test',
   'test/views/main/dashboard/widgets_test',

http://git-wip-us.apache.org/repos/asf/ambari/blob/29db2273/ambari-web/app/controllers/main/admin/service_auto_start.js
--
diff --git a/ambari-web/app/controllers/main/admin/service_auto_start.js 
b/ambari-web/app/controllers/main/admin/service_auto_start.js
index 3365cae..501e6bb 100644
--- a/ambari-web/app/controllers/main/admin/service_auto_start.js
+++ b/ambari-web/app/controllers/main/admin/service_auto_start.js
@@ -21,12 +21,87 @@ var App = require('app');
 App.MainAdminServiceAutoStartController = Em.Controller.extend({
   name: 'mainAdminServiceAutoStartController',
 
+  /**
+   * @type {?object}
+   * @default null
+   */
   clusterConfigs: null,
+
+  /**
+   * @type {Array}
+   */
   componentsConfigs: [],
+
+  /**
+   * @type {boolean}
+   * @default false
+   */
   isSaveDisabled: true,
-  valueChanged: false,
-  syncTrigger: false, // trigger status reset in switch view after "save"
-  revertTrigger: false, // trigger status reset in switch view after "discard"
+
+  /**
+   * Current value of servicesAutoStart
+   * @type {boolean}
+   */
+  servicesAutoStart: false,
+
+  /**
+   * Value of servicesAutoStart saved on server
+   * @type {boolean}
+   */
+  servicesAutoStartSaved: false,
+
+  /**
+   * config version tag,
+   * required to sync cluster configs locally without reload
+   * @type {?object}
+   */
+  tag: null,
+
+  /**
+   * @type {boolean}
+   */
+  isServicesAutoStartChanged: 
Em.computed.notEqualProperties('servicesAutoStart', 'servicesAutoStartSaved'),
+
+  valueChanged: function() {
+var isSaveDisabled = true;
+
+if (this.get('isServicesAutoStartChanged')) {
+  this.set('clusterConfigs.recovery_enabled', 
this.get('servicesAutoStart') + '');
+  isSaveDisabled = false;
+}
+this.get('tabs').forEach(function(tab) {
+  if (isSaveDisabled) {
+isSaveDisabled = !tab.get('components').someProperty('isChanged');
+  }
+});
+
+this.set('isSaveDisabled', isSaveDisabled);
+  },
+
+  load: function() {
+var self = this;
+var dfd = $.Deferred();
+
+return this.loadClusterConfig().done(function (data) {
+  var tag = [
+{
+  siteName: 

ambari git commit: AMBARI-18980. Add manual confirm task before finalizing host-ordered upgrade (Duc Le via ncole)

[ncole]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 268683220 -> aba964062


AMBARI-18980. Add manual confirm task before finalizing host-ordered upgrade 
(Duc Le via ncole)


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

Branch: refs/heads/branch-2.5
Commit: aba9640623d3dd7c33d8544d15876926fece5ab9
Parents: 2686832
Author: Nate Cole 
Authored: Tue Nov 29 12:45:47 2016 -0500
Committer: Nate Cole 
Committed: Tue Nov 29 12:54:15 2016 -0500

--
 .../stacks/HDP/2.5/upgrades/host-upgrade-2.5.xml | 11 +--
 1 file changed, 9 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/aba96406/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/host-upgrade-2.5.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/host-upgrade-2.5.xml 
b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/host-upgrade-2.5.xml
index 72241eea..64c79a8 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/host-upgrade-2.5.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/host-upgrade-2.5.xml
@@ -117,14 +117,21 @@
 
   true
   false
-  
+
+  
+UPGRADE
+
+  Please confirm you are ready to finalize.
+
+  
+
   
 
   scripts/namenode.py
   finalize_rolling_upgrade
 
   
-  
+
   
 
 

ambari git commit: AMBARI-18980. Add manual confirm task before finalizing host-ordered upgrade (Duc Le via ncole)

[ncole]

Repository: ambari
Updated Branches:
  refs/heads/trunk f31f3f646 -> 2c7c0a704


AMBARI-18980. Add manual confirm task before finalizing host-ordered upgrade 
(Duc Le via ncole)


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

Branch: refs/heads/trunk
Commit: 2c7c0a704f4230697b6757bdaad954d8c5d71c79
Parents: f31f3f6
Author: Nate Cole 
Authored: Tue Nov 29 12:45:47 2016 -0500
Committer: Nate Cole 
Committed: Tue Nov 29 12:45:59 2016 -0500

--
 .../stacks/HDP/2.5/upgrades/host-ordered-upgrade.xml | 11 +--
 1 file changed, 9 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/2c7c0a70/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/host-ordered-upgrade.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/host-ordered-upgrade.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/host-ordered-upgrade.xml
index 72241eea..64c79a8 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/host-ordered-upgrade.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/host-ordered-upgrade.xml
@@ -117,14 +117,21 @@
 
   true
   false
-  
+
+  
+UPGRADE
+
+  Please confirm you are ready to finalize.
+
+  
+
   
 
   scripts/namenode.py
   finalize_rolling_upgrade
 
   
-  
+
   
 
 

ambari git commit: AMBARI-19010. Log Search external login credential let every user in (oleewere)

[oleewere]

Repository: ambari
Updated Branches:
  refs/heads/trunk a95284362 -> f31f3f646


AMBARI-19010. Log Search external login credential let every user in (oleewere)

Change-Id: Iab889180bfb4916fd06240588b6cdd80493889a1


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

Branch: refs/heads/trunk
Commit: f31f3f646610a2e480279989d6790437e5362cb8
Parents: a952843
Author: oleewere 
Authored: Tue Nov 29 13:16:51 2016 +0100
Committer: oleewere 
Committed: Tue Nov 29 18:03:42 2016 +0100

--
 .../ambari/logsearch/common/ExternalServerClient.java   | 12 ++--
 1 file changed, 10 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/f31f3f64/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/common/ExternalServerClient.java
--
diff --git 
a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/common/ExternalServerClient.java
 
b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/common/ExternalServerClient.java
index 1207373..230ca8c 100644
--- 
a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/common/ExternalServerClient.java
+++ 
b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/common/ExternalServerClient.java
@@ -23,9 +23,11 @@ import javax.inject.Named;
 import javax.ws.rs.client.Invocation;
 import javax.ws.rs.client.WebTarget;
 import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
 
 import org.apache.ambari.logsearch.conf.AuthPropsConfig;
 import org.apache.ambari.logsearch.util.SSLUtil;
+import org.apache.commons.httpclient.auth.InvalidCredentialsException;
 import org.apache.log4j.Logger;
 import org.glassfish.jersey.client.JerseyClient;
 import org.glassfish.jersey.client.JerseyClientBuilder;
@@ -64,9 +66,15 @@ public class ExternalServerClient {
 WebTarget target = client.target(url);
 LOG.debug("URL: " + url);
 
-Invocation.Builder invocationBuilder =  
target.request(MediaType.APPLICATION_JSON_TYPE);
+Invocation.Builder invocationBuilder =  target.request();
 try {
-  return invocationBuilder.get().readEntity(klass);
+  Response response = invocationBuilder.get();
+  if (response.getStatus() != Response.Status.OK.getStatusCode()
+&& response.getStatus() != Response.Status.FOUND.getStatusCode()) {
+throw new InvalidCredentialsException(String.format("External auth 
failed with status code: %d, response: %s",
+  response.getStatus(), response.readEntity(String.class)));
+  }
+  return response.readEntity(klass);
 } catch (Exception e) {
   throw new Exception(e.getCause());
 } finally {

ambari git commit: AMBARI-19010. Log Search external login credential let every user in (oleewere)

[oleewere]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 6f4055fa1 -> 268683220


AMBARI-19010. Log Search external login credential let every user in (oleewere)

Change-Id: Iab889180bfb4916fd06240588b6cdd80493889a1


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

Branch: refs/heads/branch-2.5
Commit: 268683220382cb1f0061d1e9135cc882b74c0f97
Parents: 6f4055f
Author: oleewere 
Authored: Tue Nov 29 13:16:51 2016 +0100
Committer: oleewere 
Committed: Tue Nov 29 18:02:11 2016 +0100

--
 .../ambari/logsearch/common/ExternalServerClient.java   | 12 ++--
 1 file changed, 10 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/26868322/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/common/ExternalServerClient.java
--
diff --git 
a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/common/ExternalServerClient.java
 
b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/common/ExternalServerClient.java
index 1207373..230ca8c 100644
--- 
a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/common/ExternalServerClient.java
+++ 
b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/common/ExternalServerClient.java
@@ -23,9 +23,11 @@ import javax.inject.Named;
 import javax.ws.rs.client.Invocation;
 import javax.ws.rs.client.WebTarget;
 import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
 
 import org.apache.ambari.logsearch.conf.AuthPropsConfig;
 import org.apache.ambari.logsearch.util.SSLUtil;
+import org.apache.commons.httpclient.auth.InvalidCredentialsException;
 import org.apache.log4j.Logger;
 import org.glassfish.jersey.client.JerseyClient;
 import org.glassfish.jersey.client.JerseyClientBuilder;
@@ -64,9 +66,15 @@ public class ExternalServerClient {
 WebTarget target = client.target(url);
 LOG.debug("URL: " + url);
 
-Invocation.Builder invocationBuilder =  
target.request(MediaType.APPLICATION_JSON_TYPE);
+Invocation.Builder invocationBuilder =  target.request();
 try {
-  return invocationBuilder.get().readEntity(klass);
+  Response response = invocationBuilder.get();
+  if (response.getStatus() != Response.Status.OK.getStatusCode()
+&& response.getStatus() != Response.Status.FOUND.getStatusCode()) {
+throw new InvalidCredentialsException(String.format("External auth 
failed with status code: %d, response: %s",
+  response.getStatus(), response.readEntity(String.class)));
+  }
+  return response.readEntity(klass);
 } catch (Exception e) {
   throw new Exception(e.getCause());
 } finally {

[12/13] ambari git commit: AMBARI-19011. Fix markup for widgets browser (onechiporenko)

[ncole]

AMBARI-19011. Fix markup for widgets browser (onechiporenko)


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

Branch: refs/heads/branch-dev-patch-upgrade
Commit: a95284362adf794636c7437e6416ca4389046e63
Parents: 4dda1d7
Author: Oleg Nechiporenko 
Authored: Tue Nov 29 15:03:12 2016 +0200
Committer: Oleg Nechiporenko 
Committed: Tue Nov 29 17:43:16 2016 +0200

--
 ambari-web/app/messages.js  |   3 +
 ambari-web/app/styles/application.less  |  10 +-
 ambari-web/app/styles/bootstrap_overrides.less  |   9 +
 .../app/styles/enhanced_service_dashboard.less  | 343 +++
 ambari-web/app/styles/hosts.less|   3 -
 .../modal_popups/widget_browser_popup.hbs   | 108 +++---
 .../main/service/widgets/create/expression.hbs  |  36 +-
 .../main/service/widgets/create/step1.hbs   |  18 +-
 .../main/service/widgets/create/step2.hbs   |  22 +-
 .../service/widgets/create/step2_add_metric.hbs |  12 +-
 .../main/service/widgets/create/step2_graph.hbs |   4 +-
 .../service/widgets/create/step2_number.hbs |   4 +-
 .../service/widgets/create/step2_template.hbs   |   4 +-
 .../main/service/widgets/create/step3.hbs   |  42 ++-
 .../create/widget_property_threshold.hbs|  18 +-
 ambari-web/app/views/common/chosen_plugin.js|  21 +-
 ambari-web/app/views/common/controls_view.js|   2 +-
 .../main/service/widgets/create/step2_view.js   |   2 +
 18 files changed, 308 insertions(+), 353 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/a9528436/ambari-web/app/messages.js
--
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index a1d84a3..aa43687 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -3071,6 +3071,9 @@ Em.I18n.translations = {
   'widget.create.wizard.step2.body.text':'Define the expression with any 
metrics and valid operators. Use parentheses when necessary.',
   'widget.create.wizard.step2.body.template':'Define the template with any 
number of expressions and any string. An expression can be referenced from a 
template by enclosing its name with double curly braces.',
   'widget.create.wizard.step2.body.warning':'Note: Valid operators are +, -, 
*, /',
+  'widget.create.wizard.step2.body.invalid.expression':'Expression is not 
complete or is invalid!',
+  'widget.create.wizard.step2.body.invalid.expression2':'Invalid expression!',
+  'widget.create.wizard.step2.body.invalid.msg2':'Only numbers or operators 
are allowed in this field.',
   'widget.create.wizard.step2.body.template.invalid.msg':'Invalid expression 
name existed. Should use name "Expression#" with double curly braces.',
   'widget.create.wizard.step2.addExpression': 'Add Expression',
   'widget.create.wizard.step2.addDataset': 'Add data set',

http://git-wip-us.apache.org/repos/asf/ambari/blob/a9528436/ambari-web/app/styles/application.less
--
diff --git a/ambari-web/app/styles/application.less 
b/ambari-web/app/styles/application.less
index d449ccb..4a50af7 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -28,6 +28,10 @@ html, body {
   height: 100%;
 }
 
+.form-text {
+  line-height: 34px;
+}
+
 wbr {
   display: inline-block;
 }
@@ -1075,9 +1079,7 @@ a:focus {
   color: #666;
   font-size: 13px;
   line-height: 16px;
-  .row {
-margin-bottom: 8px;
-  }
+
   .upgrade-status-warning {
 color: @health-status-red;
   }
@@ -1535,6 +1537,8 @@ ul.filter {
   height: 38px;
   border: 1px solid #D4D4D4;
   border-radius: 4px;
+  margin-top: 1px;
+  margin-bottom: 1px;
 }
   }
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/a9528436/ambari-web/app/styles/bootstrap_overrides.less
--
diff --git a/ambari-web/app/styles/bootstrap_overrides.less 
b/ambari-web/app/styles/bootstrap_overrides.less
index 97c25ab..b8cdf49 100644
--- a/ambari-web/app/styles/bootstrap_overrides.less
+++ b/ambari-web/app/styles/bootstrap_overrides.less
@@ -113,6 +113,11 @@ select.form-control {
   }
 }
 
+.row {
+  padding-top: 5px;
+  padding-bottom: 5px;
+}
+
 .form-control {
   float: none;
 }
@@ -358,4 +363,8 @@ select.form-control {
 margin-left: 0;
 margin-right: 0;
   }
+}
+
+.wizard .wizard-body {
+  padding: 0 !important;
 }
\ No newline at end of file

[07/13] ambari git commit: AMBARI-18989. Log level filter labels not getting updated with host name filter (oleewere)

[ncole]

AMBARI-18989. Log level filter labels not getting updated with host name filter
 (oleewere)

Change-Id: I8f86056048f85f6a5de5763c59d68a9b023e5abb


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

Branch: refs/heads/branch-dev-patch-upgrade
Commit: c705fa7fa995045ea27a36b5d457df0bae8106f1
Parents: 3c56dcc
Author: oleewere 
Authored: Fri Nov 25 16:30:37 2016 +0100
Committer: oleewere 
Committed: Tue Nov 29 15:06:36 2016 +0100

--
 .../org/apache/ambari/logsearch/LogSearch.java  |  15 +--
 .../logsearch/common/LogSearchConstants.java|   1 +
 .../AbstractOperationHolderConverter.java   |   9 ++
 ...actServiceLogRequestFacetQueryConverter.java |  44 +++
 .../BaseServiceLogRequestQueryConverter.java|   1 +
 ...ServiceLogAnyGraphRequestQueryConverter.java |  13 +++
 ...eLogComponentLevelRequestQueryConverter.java |  15 +--
 ...eLogComponentRequestFacetQueryConverter.java |  15 +--
 ...rviceLogLevelCountRequestQueryConverter.java |  16 +++
 ...eLogLevelDateRangeRequestQueryConverter.java |  16 ++-
 ...erviceLogTreeRequestFacetQueryConverter.java |  17 +--
 .../ambari/logsearch/doc/DocConstants.java  |   1 +
 .../logsearch/graph/GraphDataGenerator.java |  26 +++--
 .../logsearch/manager/ServiceLogsManager.java   |   2 +-
 .../request/ServiceLogParamDefinition.java  |   6 +
 .../request/impl/BaseServiceLogRequest.java |  13 +++
 .../dashboard/BubbleGraphTableLayoutView.js |   4 +-
 .../views/dashboard/ComponentListView.js|   2 +-
 .../scripts/views/dashboard/HostListView.js |  14 +--
 .../main/webapp/scripts/views/tabs/TreeView.js  |  10 +-
 .../webapp/templates/tabs/TreeView_tmpl.html| 115 ++-
 ...ComponentLevelRequestQueryConverterTest.java |   7 +-
 ...ComponentRequestFacetQueryConverterTest.java |   4 +-
 23 files changed, 202 insertions(+), 164 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/c705fa7f/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/LogSearch.java
--
diff --git 
a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/LogSearch.java
 
b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/LogSearch.java
index d4be790..2c3f4f5 100644
--- 
a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/LogSearch.java
+++ 
b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/LogSearch.java
@@ -63,12 +63,12 @@ public class LogSearch {
   private static final String HTTP_PROTOCOL = "http";
   private static final String HTTPS_PORT = "61889";
   private static final String HTTP_PORT = "61888";
-  
+
   private static final String WEB_RESOURCE_FOLDER = "webapps/app";
   private static final String ROOT_CONTEXT = "/";
   private static final Integer SESSION_TIMEOUT = 30;
 
- 
+
   public static void main(String[] argv) {
 LogSearch logSearch = new LogSearch();
 ManageStartEndTime.manage();
@@ -78,7 +78,7 @@ public class LogSearch {
   logger.error("Error running logsearch server", e);
 }
   }
-  
+
   public void run(String[] argv) throws Exception {
 Server server = buildSever(argv);
 HandlerList handlers = new HandlerList();
@@ -98,9 +98,10 @@ public class LogSearch {
 
   public Server buildSever(String argv[]) {
 Server server = new Server();
-ServerConnector connector = new ServerConnector(server);
 boolean portSpecified = argv.length > 0;
 String protcolProperty = 
PropertiesHelper.getProperty(LOGSEARCH_PROTOCOL_PROP,HTTP_PROTOCOL);
+HttpConfiguration httpConfiguration = new HttpConfiguration();
+httpConfiguration.setRequestHeaderSize(65535);
 if (StringUtils.isEmpty(protcolProperty)) {
   protcolProperty = HTTP_PROTOCOL;
 }
@@ -109,18 +110,18 @@ public class LogSearch {
   logger.info("Building https server...");
   port = portSpecified ? argv[0] : HTTPS_PORT;
   checkPort(Integer.parseInt(port));
-  HttpConfiguration https = new HttpConfiguration();
-  https.addCustomizer(new SecureRequestCustomizer());
+  httpConfiguration.addCustomizer(new SecureRequestCustomizer());
   SslContextFactory sslContextFactory = SSLUtil.getSslContextFactory();
   ServerConnector sslConnector = new ServerConnector(server,
   new SslConnectionFactory(sslContextFactory, "http/1.1"),
-  new HttpConnectionFactory(https));
+  new HttpConnectionFactory(httpConfiguration));