date:20160319

[01/10] ambari git commit: AMBARI-15450. Templatized Dashboard JSON files - Grafana (Prajwal Rao via yusaku)

2016-03-19 Thread yusaku

Repository: ambari
Updated Branches:
  refs/heads/trunk 9d6f52682 -> b76a5f566


http://git-wip-us.apache.org/repos/asf/ambari/blob/b76a5f56/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/grafana-yarn-timelineserver.json
--
diff --git 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/grafana-yarn-timelineserver.json
 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/grafana-yarn-timelineserver.json
new file mode 100644
index 000..24ba5bd
--- /dev/null
+++ 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/grafana-yarn-timelineserver.json
@@ -0,0 +1,374 @@
+{
+  "id": 30,
+  "title": "YARN - TimelineServer",
+  "originalTitle": "YARN - TimelineServer",
+  "tags": [
+"yarn"
+  ],
+  "style": "dark",
+  "timezone": "browser",
+  "editable": true,
+  "hideControls": false,
+  "sharedCrosshair": false,
+  "rows": [
+{
+  "collapse": false,
+  "editable": true,
+  "height": "25px",
+  "panels": [
+{
+  "content": "Metrics to see the overall status 
for Timeline Server. ",
+  "editable": true,
+  "error": false,
+  "id": 5,
+  "isNew": true,
+  "links": [],
+  "mode": "html",
+  "span": 12,
+  "style": {},
+  "title": "",
+  "type": "text"
+}
+  ],
+  "title": "New row"
+},
+{
+  "collapse": false,
+  "editable": true,
+  "height": "250px",
+  "panels": [
+{
+  "aliasColors": {},
+  "bars": false,
+  "datasource": null,
+  "editable": true,
+  "error": false,
+  "fill": 1,
+  "grid": {
+"leftLogBase": 1,
+"leftMax": null,
+"leftMin": null,
+"rightLogBase": 1,
+"rightMax": null,
+"rightMin": null,
+"threshold1": null,
+"threshold1Color": "rgba(216, 200, 27, 0.27)",
+"threshold2": null,
+"threshold2Color": "rgba(234, 112, 112, 0.22)"
+  },
+  "id": 1,
+  "isNew": true,
+  "legend": {
+"avg": false,
+"current": false,
+"max": false,
+"min": false,
+"show": false,
+"total": false,
+"values": false
+  },
+  "lines": true,
+  "linewidth": 2,
+  "links": [],
+  "nullPointMode": "connected",
+  "percentage": false,
+  "pointradius": 5,
+  "points": false,
+  "renderer": "flot",
+  "seriesOverrides": [],
+  "span": 6,
+  "stack": false,
+  "steppedLine": false,
+  "targets": [
+{
+  "aggregator": "max",
+  "alias": "",
+  "app": "applicationhistoryserver",
+  "downsampleAggregator": "avg",
+  "errors": {},
+  "metric": "yarn.TimelineDataManagerMetrics.GetEntitiesTotal",
+  "precision": "",
+  "refId": "A"
+}
+  ],
+  "timeFrom": null,
+  "timeShift": null,
+  "title": "Timeline Entity Data Reads",
+  "tooltip": {
+"shared": true,
+"value_type": "cumulative"
+  },
+  "type": "graph",
+  "x-axis": true,
+  "y-axis": true,
+  "y_formats": [
+"short",
+"short"
+  ]
+},
+{
+  "aliasColors": {},
+  "bars": false,
+  "datasource": null,
+  "editable": true,
+  "error": false,
+  "fill": 1,
+  "grid": {
+"leftLogBase": 1,
+"leftMax": null,
+"leftMin": 0,
+"rightLogBase": 1,
+"rightMax": null,
+"rightMin": null,
+"threshold1": null,
+"threshold1Color": "rgba(216, 200, 27, 0.27)",
+"threshold2": null,
+"threshold2Color": "rgba(234, 112, 112, 0.22)"
+  },
+  "id": 2,
+  "isNew": true,
+  "legend": {
+"avg": false,
+"current": false,
+"max": false,
+"min": false,
+"show": false,
+"total": false,
+"values": false
+  },
+  "lines": true,
+  "linewidth": 2,
+  "links": [],
+  "nullPointMode": "connected",
+  "percentage": false,
+  "pointradius": 5,
+  "points": false,
+  "renderer": "flot",
+  "seriesOverrides": [],
+  "span": 6,
+  "stack": false,
+  "steppedLine": false,
+  "targets": [
+{
+

[06/10] ambari git commit: AMBARI-15450. Templatized Dashboard JSON files - Grafana (Prajwal Rao via yusaku)

2016-03-19 Thread yusaku

http://git-wip-us.apache.org/repos/asf/ambari/blob/b76a5f56/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/grafana-hdfs-namenodes.json
--
diff --git 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/grafana-hdfs-namenodes.json
 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/grafana-hdfs-namenodes.json
new file mode 100644
index 000..76e5647
--- /dev/null
+++ 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/grafana-hdfs-namenodes.json
@@ -0,0 +1,1931 @@
+{
+  "id": 17,
+  "title": "HDFS - NameNodes",
+  "originalTitle": "HDFS - NameNodes",
+  "tags": [
+"hdfs"
+  ],
+  "style": "dark",
+  "timezone": "browser",
+  "editable": true,
+  "hideControls": false,
+  "sharedCrosshair": false,
+  "rows": [
+{
+  "collapse": false,
+  "editable": true,
+  "height": "25px",
+  "panels": [
+{
+  "content": "Metrics to see the status for the 
Namenodes on the HDFS cluster. Click on each row title to expand on demand to 
look at various metrics. ",
+  "editable": true,
+  "error": false,
+  "id": 25,
+  "isNew": true,
+  "links": [],
+  "mode": "html",
+  "span": 12,
+  "style": {},
+  "title": "",
+  "type": "text"
+}
+  ],
+  "title": "New row"
+},
+{
+  "collapse": false,
+  "editable": true,
+  "height": "250px",
+  "panels": [
+{
+  "aliasColors": {},
+  "bars": false,
+  "datasource": null,
+  "editable": true,
+  "error": false,
+  "fill": 1,
+  "grid": {
+"leftLogBase": 1,
+"leftMax": null,
+"leftMin": null,
+"rightLogBase": 1,
+"rightMax": null,
+"rightMin": null,
+"threshold1": null,
+"threshold1Color": "rgba(216, 200, 27, 0.27)",
+"threshold2": null,
+"threshold2Color": "rgba(234, 112, 112, 0.22)"
+  },
+  "id": 1,
+  "isNew": true,
+  "legend": {
+"avg": false,
+"current": false,
+"hideEmpty": true,
+"max": false,
+"min": false,
+"show": false,
+"total": false,
+"values": false
+  },
+  "lines": true,
+  "linewidth": 2,
+  "links": [],
+  "nullPointMode": "connected",
+  "percentage": false,
+  "pointradius": 5,
+  "points": false,
+  "renderer": "flot",
+  "seriesOverrides": [],
+  "span": 6,
+  "stack": false,
+  "steppedLine": false,
+  "targets": [
+{
+  "aggregator": "avg",
+  "app": "namenode",
+  "downsampleAggregator": "avg",
+  "errors": {},
+  "hosts": "",
+  "metric": "rpc.rpc.client.RpcQueueTimeAvgTime",
+  "precision": "",
+  "refId": "A",
+  "templatedHost": ""
+}
+  ],
+  "timeFrom": null,
+  "timeShift": null,
+  "title": "RPC Client Port Queue Time",
+  "tooltip": {
+"shared": false,
+"value_type": "cumulative"
+  },
+  "type": "graph",
+  "x-axis": true,
+  "y-axis": true,
+  "y_formats": [
+"ms",
+"short"
+  ]
+},
+{
+  "aliasColors": {},
+  "bars": false,
+  "datasource": null,
+  "editable": true,
+  "error": false,
+  "fill": 1,
+  "grid": {
+"leftLogBase": 1,
+"leftMax": null,
+"leftMin": 0,
+"rightLogBase": 1,
+"rightMax": null,
+"rightMin": null,
+"threshold1": null,
+"threshold1Color": "rgba(216, 200, 27, 0.27)",
+"threshold2": null,
+"threshold2Color": "rgba(234, 112, 112, 0.22)"
+  },
+  "id": 12,
+  "isNew": true,
+  "legend": {
+"avg": false,
+"current": false,
+"hideEmpty": true,
+"max": false,
+"min": false,
+"show": false,
+"total": false,
+"values": false
+  },
+  "lines": true,
+  "linewidth": 2,
+  "links": [],
+  "nullPointMode": "connected",
+  "percentage": false,
+  "pointradius": 5,
+  "points": false,
+  "renderer": "flot",
+  "seriesOverrides": [],
+  "span": 6,
+  "stack": false,
+  "steppedLine": false,
+

ambari git commit: AMBARI-15437. Handle changing symlinks of ranger admin binaries for upgrade scenarios(gautam)

2016-03-19 Thread gautam

Repository: ambari
Updated Branches:
  refs/heads/trunk 016ff398a -> 0503753da


AMBARI-15437. Handle changing symlinks of ranger admin binaries for upgrade 
scenarios(gautam)


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

Branch: refs/heads/trunk
Commit: 0503753da02ac067e85f3ca895e6d91e54f5013c
Parents: 016ff39
Author: Gautam Borad 
Authored: Thu Mar 17 15:38:48 2016 +0530
Committer: Gautam Borad 
Committed: Thu Mar 17 18:35:35 2016 +0530

--
 .../0.4.0/package/scripts/setup_ranger_xml.py   | 24 
 1 file changed, 10 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/0503753d/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/setup_ranger_xml.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/setup_ranger_xml.py
 
b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/setup_ranger_xml.py
index d6243a2..3542814 100644
--- 
a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/setup_ranger_xml.py
+++ 
b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/setup_ranger_xml.py
@@ -20,7 +20,7 @@ limitations under the License.
 import os
 import re
 from resource_management.core.logger import Logger
-from resource_management.core.resources.system import File, Directory, Execute
+from resource_management.core.resources.system import File, Directory, 
Execute, Link
 from resource_management.core.source import DownloadSource, InlineTemplate
 from resource_management.libraries.resources.xml_config import XmlConfig
 from resource_management.libraries.resources.modify_properties_file import 
ModifyPropertiesFile
@@ -56,9 +56,7 @@ def setup_ranger_admin(upgrade_type=None):
   )
 
   if upgrade_type is not None:
-ranger_home = format("/usr/hdp/{version}/ranger-admin")
-ranger_conf = format("/usr/hdp/{version}/ranger-admin/conf")
-copy_jdbc_connector(stack_version=params.version)
+copy_jdbc_connector()
 
   File(format("/usr/lib/ambari-agent/{check_db_connection_jar_name}"),
 content = 
DownloadSource(format("{jdk_location}{check_db_connection_jar_name}")),
@@ -125,6 +123,14 @@ def setup_ranger_admin(upgrade_type=None):
 Execute(('cp', '-f', src_file, dst_file), sudo=True)
 File(params.security_app_context_file, owner=params.unix_user, 
group=params.unix_group)
 
+  if upgrade_type is not None and params.stack_is_hdp23_or_further:
+
+if os.path.islink('/usr/bin/ranger-admin'):
+  Link('/usr/bin/ranger-admin', action="delete")
+
+Link('/usr/bin/ranger-admin',
+to=format('{ranger_home}/ews/ranger-admin-services.sh'))
+
   Execute(('ln','-sf', 
format('{ranger_home}/ews/ranger-admin-services.sh'),'/usr/bin/ranger-admin'),
 not_if=format("ls /usr/bin/ranger-admin"),
 only_if=format("ls {ranger_home}/ews/ranger-admin-services.sh"),
@@ -213,11 +219,6 @@ def do_keystore_setup(upgrade_type=None):
   cred_lib_path = params.cred_lib_path
   cred_setup_prefix = params.cred_setup_prefix
 
-  if upgrade_type is not None:
-ranger_home = format("/usr/hdp/{version}/ranger-admin")
-cred_lib_path = os.path.join(ranger_home,"cred","lib","*")
-cred_setup_prefix = (format('{ranger_home}/ranger_credential_helper.py'), 
'-l', cred_lib_path)
-
   if not is_empty(params.ranger_credential_provider_path):
 jceks_path = params.ranger_credential_provider_path
 cred_setup = cred_setup_prefix + ('-f', jceks_path, '-k', 
params.ranger_jpa_jdbc_credential_alias, '-v', 
PasswordString(params.ranger_ambari_db_password), '-c', '1')
@@ -323,11 +324,6 @@ def setup_usersync(upgrade_type=None):
   if not is_empty(params.ranger_usersync_ldap_ldapbindpassword) and 
params.ug_sync_source == 
'org.apache.ranger.ldapusersync.process.LdapUserGroupBuilder':
 password_validation(params.ranger_usersync_ldap_ldapbindpassword)
 
-  if upgrade_type is not None:
-usersync_home = format("/usr/hdp/{version}/ranger-usersync")
-ranger_home = format("/usr/hdp/{version}/ranger-admin")
-ranger_ugsync_conf = format("/usr/hdp/{version}/ranger-usersync/conf")
-
   Directory(params.ranger_pid_dir,
 mode=0750,
 owner = params.unix_user,

[2/2] ambari git commit: AMBARI-15467. Enable Ambari build process to automatically switch repo base urls in the repo files (aonishuk)

2016-03-19 Thread aonishuk

AMBARI-15467. Enable Ambari build process to automatically switch repo base 
urls in the repo files (aonishuk)


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

Branch: refs/heads/branch-2.2
Commit: 45cdf976ea577827c594168c7136c0b54aa01d76
Parents: e81d572
Author: Andrew Onishuk 
Authored: Fri Mar 18 20:14:16 2016 +0200
Committer: Andrew Onishuk 
Committed: Fri Mar 18 20:14:16 2016 +0200

--
 .../urlinfo_processor/urlinfo_processor.py  | 127 +++
 ambari-server/pom.xml   |  40 ++
 2 files changed, 167 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/45cdf976/ambari-common/src/main/python/urlinfo_processor/urlinfo_processor.py
--
diff --git 
a/ambari-common/src/main/python/urlinfo_processor/urlinfo_processor.py 
b/ambari-common/src/main/python/urlinfo_processor/urlinfo_processor.py
new file mode 100644
index 000..74f7fb9
--- /dev/null
+++ b/ambari-common/src/main/python/urlinfo_processor/urlinfo_processor.py
@@ -0,0 +1,127 @@
+#!/usr/bin/env ambari-python-wrap
+
+'''
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+'''
+
+import getopt
+import json
+import urllib2
+import re
+from os import path
+import xml.etree.ElementTree as ET
+
+import sys
+
+json_stack_version_re = re.compile("(\S*)-((\d\.*)+)")
+
+family_map = {"redhat6": "centos6",
+  "redhat7": "centos7"}
+
+HELP_STRING = 'Usage: urlinfo_processor.py -u  -s '
+
+XML_HEADER = """
+
+"""
+
+
+def get_json_content(path):
+  try:
+response = urllib2.urlopen(path)
+content = response.read()
+  except:
+content = open(path, "r").read()
+  return json.loads(content)
+
+
+def replace_url_in_repoinfo_xml(repoinfo_xml_path, repo_id, repo_info):
+  tree = ET.parse(repoinfo_xml_path)
+  root = tree.getroot()
+  for os_tag in root.findall("os"):
+family = os_tag.get("family", None)
+# hack, in hdp_urlinfo.json we have centos, but in repoinfo.xml it mapped 
to redhat
+family = family_map[family] if family in family_map else family
+for repo_tag in os_tag.findall("repo"):
+  repo_id_tag = repo_tag.find("repoid")
+  if repo_id_tag is not None and repo_id_tag.text == repo_id:
+baseurl_tag = repo_tag.find("baseurl")
+if baseurl_tag is not None and family in repo_info:
+  if family in repo_info:
+print "URLINFO_PROCESSOR: replacing {0} to {1} for repo id:{2} and 
family:{3}".format(baseurl_tag.text,
+   
   repo_info[family],
+   
   repo_id,
+   
   family)
+baseurl_tag.text = repo_info[family]
+
+  with open(repoinfo_xml_path, "w") as out:
+out.write(XML_HEADER)
+tree.write(out)
+
+
+def replace_urls(stack_location, repo_version_path):
+  repo_dict = get_json_content(repo_version_path)
+  repo_dict = {(json_stack_version_re.findall(ver)[0][1], ver): conf["latest"] 
for ver, conf in repo_dict.iteritems()}
+
+  for version_info, repo_info in repo_dict.iteritems():
+stack_version, repo_id = version_info
+repoinfo_xml_path = path.join(stack_location, stack_version, "repos", 
"repoinfo.xml")
+if path.exists(repoinfo_xml_path):
+  replace_url_in_repoinfo_xml(repoinfo_xml_path, repo_id, repo_info)
+
+
+def main(argv):
+  urlinfo_path = ''
+  stack_folder = ''
+  try:
+opts, args = getopt.getopt(argv, "u:s:", ["urlinfo=", "stack_folder="])
+  except getopt.GetoptError:
+print HELP_STRING
+sys.exit(2)
+  for opt, arg in opts:
+if opt == '-h':
+  print HELP_STRING
+  sys.exit()
+elif opt in ("-u", "--urlinfo"):
+

[1/2] ambari git commit: AMBARI-15461. Yarn start is failed (YARN Client Install) after upgrade from 1.7.0 to 2.2.2.0 (aonishuk)

2016-03-19 Thread aonishuk

Repository: ambari
Updated Branches:
  refs/heads/branch-2.2 45cdf976e -> b2bc74da6
  refs/heads/trunk 95c9f155f -> bb6ba25f9


AMBARI-15461.   Yarn start is failed (YARN Client Install) after upgrade from 
1.7.0 to 2.2.2.0 (aonishuk)


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

Branch: refs/heads/trunk
Commit: bb6ba25f9a04d17e7146820137d95d2c1bc18174
Parents: 95c9f15
Author: Andrew Onishuk 
Authored: Fri Mar 18 20:14:52 2016 +0200
Committer: Andrew Onishuk 
Committed: Fri Mar 18 20:14:52 2016 +0200

--
 .../YARN/2.1.0.2.0/package/scripts/params_linux.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/bb6ba25f/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/params_linux.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/params_linux.py
 
b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/params_linux.py
index 8b2aec5..db4f32e 100644
--- 
a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/params_linux.py
+++ 
b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/params_linux.py
@@ -135,10 +135,12 @@ yarn_nodemanager_container_executor_class =  
config['configurations']['yarn-site
 is_linux_container_executor = (yarn_nodemanager_container_executor_class == 
'org.apache.hadoop.yarn.server.nodemanager.LinuxContainerExecutor')
 container_executor_mode = 06050 if is_linux_container_executor else 02050
 kinit_path_local = 
get_kinit_path(default('/configurations/kerberos-env/executable_search_paths', 
None))
+yarn_http_policy = config['configurations']['yarn-site']['yarn.http.policy']
+yarn_https_on = (yarn_http_policy.upper() == 'HTTPS_ONLY')
 rm_hosts = config['clusterHostInfo']['rm_host']
 rm_host = rm_hosts[0]
 rm_port = 
config['configurations']['yarn-site']['yarn.resourcemanager.webapp.address'].split(':')[-1]
-rm_https_port = 
config['configurations']['yarn-site']['yarn.resourcemanager.webapp.https.address'].split(':')[-1]
+rm_https_port = 
default('/configurations/yarn-site/yarn.resourcemanager.webapp.https.address', 
":8090").split(':')[-1]
 # TODO UPGRADE default, update site during upgrade
 rm_nodes_exclude_path = 
default("/configurations/yarn-site/yarn.resourcemanager.nodes.exclude-path","/etc/hadoop/conf/yarn.exclude")
 
@@ -316,8 +318,6 @@ else:
 
 ranger_admin_log_dir = 
default("/configurations/ranger-env/ranger_admin_log_dir","/var/log/ranger/admin")
 
-yarn_http_policy = config['configurations']['yarn-site']['yarn.http.policy']
-yarn_https_on = (yarn_http_policy.upper() == 'HTTPS_ONLY')
 scheme = 'http' if not yarn_https_on else 'https'
 yarn_rm_address = 
config['configurations']['yarn-site']['yarn.resourcemanager.webapp.address'] if 
not yarn_https_on else 
config['configurations']['yarn-site']['yarn.resourcemanager.webapp.https.address']
 rm_active_port = rm_https_port if yarn_https_on else rm_port

ambari git commit: AMBARI-15433: Description of HAWQ temp directories is incorrect (adenissov via bhuvnesh2703)

2016-03-19 Thread bhuvnesh2703

Repository: ambari
Updated Branches:
  refs/heads/branch-2.2 618504306 -> 8f481496e


AMBARI-15433: Description of HAWQ temp directories is incorrect (adenissov via 
bhuvnesh2703)


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

Branch: refs/heads/branch-2.2
Commit: 8f481496ea57abfade4c145df8e305aa2054bb15
Parents: 6185043
Author: Bhuvnesh Chaudhary 
Authored: Wed Mar 16 17:06:13 2016 -0700
Committer: Bhuvnesh Chaudhary 
Committed: Wed Mar 16 17:06:13 2016 -0700

--
 .../HAWQ/2.0.0/configuration/hawq-site.xml  | 12 +++-
 1 file changed, 7 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/8f481496/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-site.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-site.xml
 
b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-site.xml
index d3aa0ed..d187017 100644
--- 
a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-site.xml
+++ 
b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-site.xml
@@ -34,7 +34,7 @@
 HAWQ Master Port
 5432
 
-  The port used by HAWQ master.
+  The port used by HAWQ masters.
   The default is 5432.
 
 
@@ -117,8 +117,9 @@
 HAWQ Master Temp Directory
 /tmp/hawq/master
 
-  One or more temporary directories reserved for the HAWQ master. Separate 
multiple entries with commas.
-  The default is /tmp/hawq/master.
+  Used as temporary filespace to store workfile cache, sort/join temp 
files etc.
+  The recommended number of temp directories is equal to the number of 
disks per node, one directory on each disk,
+  excluding system disk. Separate multiple entries with commas. The 
default is /tmp/hawq/master.
 
 
   directory
@@ -130,8 +131,9 @@
 HAWQ Segment Temp Directory
 /tmp/hawq/segment
 
-  One or more temporary directories reserved for the HAWQ segment. 
Separate multiple entries with commas.
-  The default is /tmp/hawq/segment.
+  Used as temporary filespace to store workfile cache, sort/join temp 
files etc.
+  The recommended number of temp directories is equal to the number of 
disks per node, one directory on each disk,
+  excluding system disk. Separate multiple entries with commas. The 
default is /tmp/hawq/segment.
 
 
   directory

[04/10] ambari git commit: AMBARI-15450. Templatized Dashboard JSON files - Grafana (Prajwal Rao via yusaku)

2016-03-19 Thread yusaku

http://git-wip-us.apache.org/repos/asf/ambari/blob/b76a5f56/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/grafana-system-servers.json
--
diff --git 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/grafana-system-servers.json
 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/grafana-system-servers.json
new file mode 100644
index 000..48d3d62
--- /dev/null
+++ 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/grafana-system-servers.json
@@ -0,0 +1,2482 @@
+{
+  "id": 29,
+  "title": "System - Servers",
+  "originalTitle": "System - Servers",
+  "tags": [
+"host"
+  ],
+  "style": "dark",
+  "timezone": "browser",
+  "editable": true,
+  "hideControls": false,
+  "sharedCrosshair": false,
+  "rows": [
+{
+  "collapse": false,
+  "editable": true,
+  "height": "25px",
+  "panels": [
+{
+  "content": "Metrics to see the system status 
per host on the server. Click on each row title to expand on demand to look at 
various metrics. ",
+  "editable": true,
+  "error": false,
+  "id": 1,
+  "isNew": true,
+  "links": [],
+  "mode": "html",
+  "span": 12,
+  "style": {},
+  "title": "",
+  "type": "text"
+}
+  ],
+  "showTitle": false,
+  "title": "Description"
+},
+{
+  "collapse": true,
+  "editable": true,
+  "height": "250px",
+  "panels": [
+{
+  "aliasColors": {},
+  "bars": false,
+  "datasource": null,
+  "editable": true,
+  "error": false,
+  "fill": 1,
+  "grid": {
+"leftLogBase": 1,
+"leftMax": null,
+"leftMin": null,
+"rightLogBase": 1,
+"rightMax": null,
+"rightMin": null,
+"threshold1": null,
+"threshold1Color": "rgba(216, 200, 27, 0.27)",
+"threshold2": null,
+"threshold2Color": "rgba(234, 112, 112, 0.22)"
+  },
+  "id": 3,
+  "isNew": true,
+  "legend": {
+"avg": false,
+"current": false,
+"max": false,
+"min": false,
+"show": false,
+"total": false,
+"values": false
+  },
+  "lines": true,
+  "linewidth": 2,
+  "links": [],
+  "nullPointMode": "connected",
+  "percentage": false,
+  "pointradius": 5,
+  "points": false,
+  "renderer": "flot",
+  "seriesOverrides": [],
+  "span": 6,
+  "stack": false,
+  "steppedLine": false,
+  "targets": [
+{
+  "aggregator": "avg",
+  "app": "HOST",
+  "downsampleAggregator": "avg",
+  "errors": {},
+  "metric": "cpu_user",
+  "precision": "",
+  "refId": "B",
+  "templatedHost": ""
+}
+  ],
+  "timeFrom": null,
+  "timeShift": null,
+  "title": "CPU Utilization - User",
+  "tooltip": {
+"shared": false,
+"value_type": "individual"
+  },
+  "type": "graph",
+  "x-axis": true,
+  "y-axis": true,
+  "y_formats": [
+"percent",
+"short"
+  ]
+},
+{
+  "aliasColors": {},
+  "bars": false,
+  "datasource": null,
+  "editable": true,
+  "error": false,
+  "fill": 1,
+  "grid": {
+"leftLogBase": 1,
+"leftMax": null,
+"leftMin": null,
+"rightLogBase": 1,
+"rightMax": null,
+"rightMin": null,
+"threshold1": null,
+"threshold1Color": "rgba(216, 200, 27, 0.27)",
+"threshold2": null,
+"threshold2Color": "rgba(234, 112, 112, 0.22)"
+  },
+  "id": 28,
+  "isNew": true,
+  "legend": {
+"avg": false,
+"current": false,
+"max": false,
+"min": false,
+"show": false,
+"total": false,
+"values": false
+  },
+  "lines": true,
+  "linewidth": 2,
+  "links": [],
+  "nullPointMode": "connected",
+  "percentage": false,
+  "pointradius": 5,
+  "points": false,
+  "renderer": "flot",
+  "seriesOverrides": [],
+  "span": 6,
+  "stack": false,
+  "steppedLine": false,
+  "targets": [
+{
+  "aggregator": "avg",
+  "app": "HOST",
+

[1/2] ambari git commit: AMBARI-15468. file_system get_mount_point_for_dir works incorrect (aonishuk)

2016-03-19 Thread aonishuk

Repository: ambari
Updated Branches:
  refs/heads/branch-2.2 fa9bed061 -> dd846600f
  refs/heads/trunk ba2c77f15 -> 9ff6b8762


AMBARI-15468. file_system get_mount_point_for_dir works incorrect (aonishuk)


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

Branch: refs/heads/trunk
Commit: 9ff6b8762f35871ca1c9f537adda06711993e562
Parents: ba2c77f
Author: Andrew Onishuk 
Authored: Fri Mar 18 14:58:35 2016 +0200
Committer: Andrew Onishuk 
Committed: Fri Mar 18 14:58:35 2016 +0200

--
 .../resource_management/TestFileSystem.py   | 47 +++-
 .../libraries/functions/file_system.py  |  6 ++-
 .../stacks/HDP/2.0.6/services/stack_advisor.py  |  6 ++-
 3 files changed, 54 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/9ff6b876/ambari-agent/src/test/python/resource_management/TestFileSystem.py
--
diff --git a/ambari-agent/src/test/python/resource_management/TestFileSystem.py 
b/ambari-agent/src/test/python/resource_management/TestFileSystem.py
index 4e0eb63..925758c 100644
--- a/ambari-agent/src/test/python/resource_management/TestFileSystem.py
+++ b/ambari-agent/src/test/python/resource_management/TestFileSystem.py
@@ -34,6 +34,8 @@ class TestFileSystem(TestCase):
 SINGLE_ROOT = 1
 MULT_DRIVE_CONFLICT = 2
 MULT_DRIVE_DISTINCT = 3
+ONE_SEGMENT_MOUNT = 4
+SAME_PREFIX_MOUNTS = 5
 
   def _get_mount(self, type):
 """
@@ -64,6 +66,13 @@ class TestFileSystem(TestCase):
   out += os.linesep + \
  "/dev/sda1 on /hadoop/hdfs/data/1 type ext4 (rw)" + os.linesep + \
  "/dev/sda2 on /hadoop/hdfs/data/2 type ext4 (rw)"
+elif type == self.MOUNT_TYPE.ONE_SEGMENT_MOUNT:
+  out += os.linesep + \
+ "/dev/sda1 on /hadoop type ext4 (rw)"
+elif type == self.MOUNT_TYPE.SAME_PREFIX_MOUNTS:
+  out += os.linesep + \
+ "/dev/sda1 on /hadoop/hdfs/data type ext4 (rw)" + os.linesep + \
+ "/dev/sda2 on /hadoop/hdfs/data1 type ext4 (rw)"
 
 out_array = [x.split(' ') for x in out.strip().split('\n')]
 mount_val = []
@@ -103,6 +112,9 @@ class TestFileSystem(TestCase):
 """
 mounted_mock.return_value = self._get_mount(self.MOUNT_TYPE.SINGLE_ROOT)
 
+# refresh cached mounts
+file_system.get_and_cache_mount_points(True)
+
 mount_point = file_system.get_mount_point_for_dir("/hadoop/hdfs/data")
 self.assertEqual(mount_point, "/")
 
@@ -115,8 +127,41 @@ class TestFileSystem(TestCase):
 """
 mounted_mock.return_value = 
self._get_mount(self.MOUNT_TYPE.MULT_DRIVE_DISTINCT)
 
+# refresh cached mounts
+file_system.get_and_cache_mount_points(True)
+
 mount_point = file_system.get_mount_point_for_dir("/hadoop/hdfs/data/1")
 self.assertEqual(mount_point, "/hadoop/hdfs/data/1")
 
 mount_point = file_system.get_mount_point_for_dir("/hadoop/hdfs/data/2")
-self.assertEqual(mount_point, "/hadoop/hdfs/data/2")
\ No newline at end of file
+self.assertEqual(mount_point, "/hadoop/hdfs/data/2")
+
+  @patch.object(Logger, "info")
+  @patch.object(Logger, "error")
+  @patch('resource_management.core.providers.mount.get_mounted')
+  def test_one_segment_mount(self, mounted_mock, log_error, log_info):
+"""
+Testing when the path has one segment.
+"""
+mounted_mock.return_value = 
self._get_mount(self.MOUNT_TYPE.ONE_SEGMENT_MOUNT)
+
+# refresh cached mounts
+file_system.get_and_cache_mount_points(True)
+
+mount_point = file_system.get_mount_point_for_dir("/hadoop/hdfs/data/1")
+self.assertEqual(mount_point, "/hadoop")
+
+  @patch.object(Logger, "info")
+  @patch.object(Logger, "error")
+  @patch('resource_management.core.providers.mount.get_mounted')
+  def test_same_prefix(self, mounted_mock, log_error, log_info):
+"""
+Testing when two mount points have the same prefix.
+"""
+mounted_mock.return_value = 
self._get_mount(self.MOUNT_TYPE.SAME_PREFIX_MOUNTS)
+
+# refresh cached mounts
+file_system.get_and_cache_mount_points(True)
+
+mount_point = file_system.get_mount_point_for_dir("/hadoop/hdfs/data1")
+self.assertEqual(mount_point, "/hadoop/hdfs/data1")

http://git-wip-us.apache.org/repos/asf/ambari/blob/9ff6b876/ambari-common/src/main/python/resource_management/libraries/functions/file_system.py
--
diff --git 
a/ambari-common/src/main/python/resource_management/libraries/functions/file_system.py

ambari git commit: AMBARI-15449: HAWQ hdfs-client / output.replace-datanode-on-failure should be set to true by default (adenissov via bhuvnesh2703)

2016-03-19 Thread bhuvnesh2703

Repository: ambari
Updated Branches:
  refs/heads/trunk a6dd447b0 -> 2dac4846a


AMBARI-15449: HAWQ hdfs-client / output.replace-datanode-on-failure should be 
set to true by default (adenissov via bhuvnesh2703)


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

Branch: refs/heads/trunk
Commit: 2dac4846a3382f57ad29cdf9c2c86d439b71318a
Parents: a6dd447
Author: Bhuvnesh Chaudhary 
Authored: Sat Mar 19 19:40:10 2016 -0700
Committer: Bhuvnesh Chaudhary 
Committed: Sat Mar 19 19:40:10 2016 -0700

--
 .../HAWQ/2.0.0/configuration/hawq-site.xml  | 18 +++--
 .../HAWQ/2.0.0/configuration/hdfs-client.xml|  7 +-
 .../stacks/HDP/2.3/services/stack_advisor.py| 81 +--
 .../stacks/2.3/common/test_stack_advisor.py | 85 +---
 4 files changed, 144 insertions(+), 47 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/2dac4846/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-site.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-site.xml
 
b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-site.xml
index 93ad3fe..ec7275f 100644
--- 
a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-site.xml
+++ 
b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-site.xml
@@ -303,8 +303,10 @@
 Default buckets for Hash Distributed tables
 6
 
- The default number of virtual segments per query for hash distributed 
tables that can be used for query execution in a HAWQ segment when Resource 
Manager ('hawq_global_rm_type') is set to Standalone ('none').
-  The default is 6.
+  The default number of buckets when creating a hash distributed table, if 
not defined explicitly when creating the table.
+  When running a query on a hash dist table, the query resource is fixed 
and equal to the number of buckets.
+  The default set during installation is the number of HAWQ Segments 
multiplied by 6.
+  Adjust the value when the number of HAWQ Segments changes in the cluster.
 
 
   int
@@ -319,9 +321,9 @@
 Virtual Segments Limit per Query (per Segment 
Node)
 6
 
-  Not recommended to change this parameter.
-   The maximum  number of virtual segments per query per Segment Node that 
can be used for query execution in a HAWQ segment when Resource Manager 
('hawq_global_rm_type') is set to Standalone ('none').
-  The default is 6.
+  The maximum number of virtual segments per query per segment node when 
querying randomly distributed tables, external tables, and tables with user 
defined functions.
+  This parameter is used to limit the maximum resource usage on each 
segment node.
+  The default is 6. Not recommended to change this parameter.
 
 
   int
@@ -336,9 +338,9 @@
 Virtual Segments Limit per Query (Total)
 512
 
-  Not recommended to change this parameter.
-  The maximum total number of virtual segments per query that can be used 
for query execution in a HAWQ segment when Resource Manager 
('hawq_global_rm_type') is set to Standalone ('none').
-  The default is 512.
+  The maximum number of virtual segments per query across the cluster.
+  This parameter is used to limit the maximum resource usage per query 
across the cluster regardless of the number of HAWQ Segments.
+  The default value is 512. Not recommended to change this parameter.
 
 
   int

http://git-wip-us.apache.org/repos/asf/ambari/blob/2dac4846/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hdfs-client.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hdfs-client.xml
 
b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hdfs-client.xml
index de6f100..d8acb34 100644
--- 
a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hdfs-client.xml
+++ 
b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hdfs-client.xml
@@ -323,10 +323,11 @@
 
   
 output.replace-datanode-on-failure
-false
+true
 
-  Determines whether the client adds a new DataNode to pipeline if the 
number of nodes in the pipeline is less than the specified number of replicas.
-  The default is true.
+  Determines whether the client adds a new DataNode to

ambari git commit: AMBARI-15380: PXF alerts not working on secured HDFS HA clusters (bhuvnesh2703)

2016-03-19 Thread bhuvnesh2703

Repository: ambari
Updated Branches:
  refs/heads/branch-2.2 dbcca75bd -> 09b909460


AMBARI-15380: PXF alerts not working on secured HDFS HA clusters (bhuvnesh2703)


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

Branch: refs/heads/branch-2.2
Commit: 09b909460fda87c11e1c205b7e037b478c934d02
Parents: dbcca75
Author: Bhuvnesh Chaudhary 
Authored: Wed Mar 16 13:07:31 2016 -0700
Committer: Bhuvnesh Chaudhary 
Committed: Wed Mar 16 13:07:31 2016 -0700

--
 .../PXF/3.0.0/package/alerts/api_status.py   | 11 ---
 1 file changed, 8 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/09b90946/ambari-server/src/main/resources/common-services/PXF/3.0.0/package/alerts/api_status.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/PXF/3.0.0/package/alerts/api_status.py
 
b/ambari-server/src/main/resources/common-services/PXF/3.0.0/package/alerts/api_status.py
index 871da2b..3134f41 100644
--- 
a/ambari-server/src/main/resources/common-services/PXF/3.0.0/package/alerts/api_status.py
+++ 
b/ambari-server/src/main/resources/common-services/PXF/3.0.0/package/alerts/api_status.py
@@ -25,13 +25,15 @@ import urllib2
 import urllib
 
 from resource_management.libraries.functions.curl_krb_request import 
curl_krb_request
+from resource_management.libraries.functions.namenode_ha_utils import 
get_active_namenode
+from resource_management.libraries.script.config_dictionary import 
ConfigDictionary
 from resource_management.core.environment import Environment
 
 CLUSTER_ENV_SECURITY = '{{cluster-env/security_enabled}}'
 HADOOP_ENV_HDFS_USER = '{{hadoop-env/hdfs_user}}'
 HADOOP_ENV_HDFS_USER_KEYTAB = '{{hadoop-env/hdfs_user_keytab}}'
 HADOOP_ENV_HDFS_PRINCIPAL_NAME = '{{hadoop-env/hdfs_principal_name}}'
-HDFS_SITE_DFS_NAMENODE_HTTP_ADDRESS = '{{hdfs-site/dfs.namenode.http-address}}'
+HDFS_SITE = '{{hdfs-site}}'
 
 
 RESULT_STATE_OK = 'OK'
@@ -61,7 +63,7 @@ def get_tokens():
   HADOOP_ENV_HDFS_USER,
   HADOOP_ENV_HDFS_USER_KEYTAB,
   HADOOP_ENV_HDFS_PRINCIPAL_NAME,
-  HDFS_SITE_DFS_NAMENODE_HTTP_ADDRESS)
+  HDFS_SITE)
 
 def _get_delegation_token(namenode_address, user, keytab, principal, 
kinit_path):
   """
@@ -134,7 +136,10 @@ def execute(configurations={}, parameters={}, 
host_name=None):
   try:
 # Get delegation token if security is enabled
 if CLUSTER_ENV_SECURITY in configurations and 
configurations[CLUSTER_ENV_SECURITY].lower() == "true":
-  namenode_address =  configurations[HDFS_SITE_DFS_NAMENODE_HTTP_ADDRESS]
+  if 'dfs.nameservices' in configurations[HDFS_SITE]:
+namenode_address = 
get_active_namenode(ConfigDictionary(configurations[HDFS_SITE]), 
configurations[CLUSTER_ENV_SECURITY], configurations[HADOOP_ENV_HDFS_USER])[1]
+  else:
+namenode_address = 
configurations[HDFS_SITE]['dfs.namenode.http-address']
 
   token = _get_delegation_token(namenode_address,
  configurations[HADOOP_ENV_HDFS_USER],

ambari git commit: AMBARI-15464. [Ambari tarballs] ambari-server setup fails (aonishuk)

2016-03-19 Thread aonishuk

Repository: ambari
Updated Branches:
  refs/heads/trunk d7596e769 -> 670ad6f4c


AMBARI-15464. [Ambari tarballs] ambari-server setup fails  (aonishuk)


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

Branch: refs/heads/trunk
Commit: 670ad6f4c6dd66b0c75147b4b68a8576d5438d7e
Parents: d7596e7
Author: Andrew Onishuk 
Authored: Thu Mar 17 16:36:34 2016 +0200
Committer: Andrew Onishuk 
Committed: Thu Mar 17 16:36:34 2016 +0200

--
 ambari-server/src/main/python/ambari_server/serverConfiguration.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/670ad6f4/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 dc1fd8a..29187bd 100644
--- a/ambari-server/src/main/python/ambari_server/serverConfiguration.py
+++ b/ambari-server/src/main/python/ambari_server/serverConfiguration.py
@@ -325,7 +325,7 @@ class ServerConfigDefaults(object):
   
 self.JAVA_SHARE_PATH = "/usr/share/java"
 self.SHARE_PATH = "/usr/share"
-self.OUT_DIR = 
parse_log4j_file("/etc/ambari-server/conf/log4j.properties")['ambari.log.dir']
+self.OUT_DIR = 
parse_log4j_file(AmbariPath.get("/etc/ambari-server/conf/log4j.properties"))['ambari.log.dir']
 self.SERVER_OUT_FILE = os.path.join(self.OUT_DIR, "ambari-server.out")
 self.SERVER_LOG_FILE = os.path.join(self.OUT_DIR, "ambari-server.log")
 self.ROOT_FS_PATH = os.sep

ambari git commit: AMBARI-15431 - Atlas Integration : Rename Atlas Configurations

2016-03-19 Thread tbeerbower

Repository: ambari
Updated Branches:
  refs/heads/trunk 1e673420e -> 9c53f4399


AMBARI-15431 - Atlas Integration : Rename Atlas Configurations


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

Branch: refs/heads/trunk
Commit: 9c53f439973f106f92b82b64eeb3de583f3daeae
Parents: 1e67342
Author: tbeerbower 
Authored: Wed Mar 16 20:11:41 2016 -0400
Committer: tbeerbower 
Committed: Wed Mar 16 20:11:53 2016 -0400

--
 .../ATLAS/0.1.0.2.3/configuration/atlas-env.xml |  10 +
 .../ATLAS/0.1.0.2.3/package/scripts/metadata.py |   2 +-
 .../package/scripts/metadata_server.py  |   2 +-
 .../ATLAS/0.1.0.2.3/package/scripts/params.py   |   1 +
 .../0.1.0.2.3/package/scripts/status_params.py  |   1 +
 .../FALCON/0.5.0.2.1/package/scripts/falcon.py  |  23 +-
 .../0.5.0.2.1/package/scripts/params_linux.py   |   1 +
 .../1.4.4.2.0/package/scripts/params_linux.py   |   1 +
 .../SQOOP/1.4.4.2.0/package/scripts/sqoop.py|  21 +-
 .../services/ATLAS/configuration/atlas-env.xml  | 114 +++
 .../stacks/HDP/2.6/services/ATLAS/metainfo.xml  |  19 ++
 .../test/python/stacks/2.3/configs/default.json |   3 +-
 .../test/python/stacks/2.3/configs/secure.json  |   3 +-
 .../stacks/2.6/ATLAS/test_atlas_server.py   | 107 ++
 .../test/python/stacks/2.6/configs/default.json | 329 +++
 15 files changed, 613 insertions(+), 24 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/9c53f439/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/atlas-env.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/atlas-env.xml
 
b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/atlas-env.xml
index 8500488..d64d48c 100644
--- 
a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/atlas-env.xml
+++ 
b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/atlas-env.xml
@@ -60,6 +60,16 @@
 ./server/webapp
 Atlas expanded WAR directory.
   
+  
+metadata_conf_file
+application.properties
+Atlas configuration file
+
+  true
+  false
+  false
+
+  
 
   
   

http://git-wip-us.apache.org/repos/asf/ambari/blob/9c53f439/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/metadata.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/metadata.py
 
b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/metadata.py
index 6df47b0..91629e0 100644
--- 
a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/metadata.py
+++ 
b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/metadata.py
@@ -70,7 +70,7 @@ def metadata():
  content = 
StaticFile(format('{metadata_home}/server/webapp/atlas.war'))
 )
 
-PropertiesFile(format('{conf_dir}/application.properties'),
+PropertiesFile(format('{conf_dir}/{conf_file}'),
  properties = params.application_properties,
  mode=0644,
  owner=params.metadata_user,

http://git-wip-us.apache.org/repos/asf/ambari/blob/9c53f439/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/metadata_server.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/metadata_server.py
 
b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/metadata_server.py
index 5a39278..b6374f9 100644
--- 
a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/metadata_server.py
+++ 
b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/metadata_server.py
@@ -96,7 +96,7 @@ class MetadataServer(Script):
 atlas_expectations.update(atlas_site_expectations)
 
 security_params = get_params_from_filesystem(status_params.conf_dir,
- {'application.properties': 
FILE_TYPE_PROPERTIES})
+ {status_params.conf_file: 
FILE_TYPE_PROPERTIES})
 result_issues = validate_security_config_properties(security_params, 
atlas_expectations)
 if not result_issues:  # If all validations passed successfully
   try:

ambari git commit: AMBARI-15428. Fix HBase master heap recommendations.(vbrodetskyi)

2016-03-19 Thread vbrodetskyi

Repository: ambari
Updated Branches:
  refs/heads/branch-2.2 395bca848 -> 328102511


AMBARI-15428. Fix HBase master heap recommendations.(vbrodetskyi)


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

Branch: refs/heads/branch-2.2
Commit: 328102511791af6ba73a12a3f2275e794a9b8f28
Parents: 395bca8
Author: Vitaly Brodetskyi 
Authored: Thu Mar 17 11:06:23 2016 +0200
Committer: Vitaly Brodetskyi 
Committed: Thu Mar 17 11:06:23 2016 +0200

--
 .../stacks/HDP/2.0.6/services/stack_advisor.py  | 23 +++--
 .../stacks/2.0.6/common/test_stack_advisor.py   | 35 ++--
 .../stacks/2.1/common/test_stack_advisor.py | 33 +-
 .../stacks/2.2/common/test_stack_advisor.py |  4 +--
 .../stacks/2.3/common/test_stack_advisor.py |  4 +--
 5 files changed, 58 insertions(+), 41 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/32810251/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py 
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py
index 8bd89d1..6132c2c 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py
@@ -258,9 +258,25 @@ class HDP206StackAdvisor(DefaultStackAdvisor):
 
   def recommendHbaseConfigurations(self, configurations, clusterData, 
services, hosts):
 # recommendations for HBase env config
+
+# If cluster size is < 100, hbase master heap = 2G
+# else If cluster size is < 500, hbase master heap = 4G
+# else hbase master heap = 8G
+# for small test clusters use 1 gb
+hostsCount = 0
+if hosts and "items" in hosts:
+  hostsCount = len(hosts["items"])
+
+hbaseMasterRam = {
+  hostsCount < 20: 1,
+  20 <= hostsCount < 100: 2,
+  100 <= hostsCount < 500: 4,
+  500 <= hostsCount: 8
+}[True]
+
 putHbaseProperty = self.putProperty(configurations, "hbase-env", services)
 putHbaseProperty('hbase_regionserver_heapsize', 
int(clusterData['hbaseRam']) * 1024)
-putHbaseProperty('hbase_master_heapsize', int(clusterData['hbaseRam']) * 
1024)
+putHbaseProperty('hbase_master_heapsize', hbaseMasterRam * 1024)
 
 # recommendations for HBase site config
 putHbaseSiteProperty = self.putProperty(configurations, "hbase-site", 
services)
@@ -759,7 +775,7 @@ class HDP206StackAdvisor(DefaultStackAdvisor):
   {"os":12, "hbase":16},
   {"os":24, "hbase":24},
   {"os":32, "hbase":32},
-  {"os":64, "hbase":64}
+  {"os":64, "hbase":32}
 ]
 index = {
   cluster["ram"] <= 4: 0,
@@ -774,9 +790,12 @@ class HDP206StackAdvisor(DefaultStackAdvisor):
   128 < cluster["ram"] <= 256: 9,
   256 < cluster["ram"]: 10
 }[1]
+
+
 cluster["reservedRam"] = ramRecommendations[index]["os"]
 cluster["hbaseRam"] = ramRecommendations[index]["hbase"]
 
+
 cluster["minContainerSize"] = {
   cluster["ram"] <= 4: 256,
   4 < cluster["ram"] <= 8: 512,

http://git-wip-us.apache.org/repos/asf/ambari/blob/32810251/ambari-server/src/test/python/stacks/2.0.6/common/test_stack_advisor.py
--
diff --git 
a/ambari-server/src/test/python/stacks/2.0.6/common/test_stack_advisor.py 
b/ambari-server/src/test/python/stacks/2.0.6/common/test_stack_advisor.py
index 2f1959a..6dd0b44 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/common/test_stack_advisor.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/common/test_stack_advisor.py
@@ -665,23 +665,22 @@ class TestHDP206StackAdvisor(TestCase):
 servicesList = ["HBASE"]
 configurations = {}
 components = []
+host_item = {
+  "Hosts" : {
+"cpu_count" : 6,
+"total_mem" : 50331648,
+"disk_info" : [
+  {"mountpoint" : "/"},
+  {"mountpoint" : "/dev/shm"},
+  {"mountpoint" : "/vagrant"},
+  {"mountpoint" : "/"},
+  {"mountpoint" : "/dev/shm"},
+  {"mountpoint" : "/vagrant"}
+]
+  }
+}
 hosts = {
-  "items" : [
-{
-  "Hosts" : {
-"cpu_count" : 6,
-"total_mem" : 50331648,
-"disk_info" : [
-  {"mountpoint" : "/"},
-  {"mountpoint" : "/dev/shm"},
-  {"mountpoint" : "/vagrant"},
-  {"mountpoint" : "/"},
-

[04/10] ambari git commit: AMBARI-15450. Templatized Dashboard JSON files - Grafana (Prajwal Rao via yusaku)

2016-03-19 Thread yusaku

http://git-wip-us.apache.org/repos/asf/ambari/blob/61850430/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/grafana-system-servers.json
--
diff --git 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/grafana-system-servers.json
 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/grafana-system-servers.json
new file mode 100644
index 000..48d3d62
--- /dev/null
+++ 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/grafana-system-servers.json
@@ -0,0 +1,2482 @@
+{
+  "id": 29,
+  "title": "System - Servers",
+  "originalTitle": "System - Servers",
+  "tags": [
+"host"
+  ],
+  "style": "dark",
+  "timezone": "browser",
+  "editable": true,
+  "hideControls": false,
+  "sharedCrosshair": false,
+  "rows": [
+{
+  "collapse": false,
+  "editable": true,
+  "height": "25px",
+  "panels": [
+{
+  "content": "Metrics to see the system status 
per host on the server. Click on each row title to expand on demand to look at 
various metrics. ",
+  "editable": true,
+  "error": false,
+  "id": 1,
+  "isNew": true,
+  "links": [],
+  "mode": "html",
+  "span": 12,
+  "style": {},
+  "title": "",
+  "type": "text"
+}
+  ],
+  "showTitle": false,
+  "title": "Description"
+},
+{
+  "collapse": true,
+  "editable": true,
+  "height": "250px",
+  "panels": [
+{
+  "aliasColors": {},
+  "bars": false,
+  "datasource": null,
+  "editable": true,
+  "error": false,
+  "fill": 1,
+  "grid": {
+"leftLogBase": 1,
+"leftMax": null,
+"leftMin": null,
+"rightLogBase": 1,
+"rightMax": null,
+"rightMin": null,
+"threshold1": null,
+"threshold1Color": "rgba(216, 200, 27, 0.27)",
+"threshold2": null,
+"threshold2Color": "rgba(234, 112, 112, 0.22)"
+  },
+  "id": 3,
+  "isNew": true,
+  "legend": {
+"avg": false,
+"current": false,
+"max": false,
+"min": false,
+"show": false,
+"total": false,
+"values": false
+  },
+  "lines": true,
+  "linewidth": 2,
+  "links": [],
+  "nullPointMode": "connected",
+  "percentage": false,
+  "pointradius": 5,
+  "points": false,
+  "renderer": "flot",
+  "seriesOverrides": [],
+  "span": 6,
+  "stack": false,
+  "steppedLine": false,
+  "targets": [
+{
+  "aggregator": "avg",
+  "app": "HOST",
+  "downsampleAggregator": "avg",
+  "errors": {},
+  "metric": "cpu_user",
+  "precision": "",
+  "refId": "B",
+  "templatedHost": ""
+}
+  ],
+  "timeFrom": null,
+  "timeShift": null,
+  "title": "CPU Utilization - User",
+  "tooltip": {
+"shared": false,
+"value_type": "individual"
+  },
+  "type": "graph",
+  "x-axis": true,
+  "y-axis": true,
+  "y_formats": [
+"percent",
+"short"
+  ]
+},
+{
+  "aliasColors": {},
+  "bars": false,
+  "datasource": null,
+  "editable": true,
+  "error": false,
+  "fill": 1,
+  "grid": {
+"leftLogBase": 1,
+"leftMax": null,
+"leftMin": null,
+"rightLogBase": 1,
+"rightMax": null,
+"rightMin": null,
+"threshold1": null,
+"threshold1Color": "rgba(216, 200, 27, 0.27)",
+"threshold2": null,
+"threshold2Color": "rgba(234, 112, 112, 0.22)"
+  },
+  "id": 28,
+  "isNew": true,
+  "legend": {
+"avg": false,
+"current": false,
+"max": false,
+"min": false,
+"show": false,
+"total": false,
+"values": false
+  },
+  "lines": true,
+  "linewidth": 2,
+  "links": [],
+  "nullPointMode": "connected",
+  "percentage": false,
+  "pointradius": 5,
+  "points": false,
+  "renderer": "flot",
+  "seriesOverrides": [],
+  "span": 6,
+  "stack": false,
+  "steppedLine": false,
+  "targets": [
+{
+  "aggregator": "avg",
+  "app": "HOST",
+

[2/2] ambari git commit: Revert "AMBARI-15429. Additional fix.Cannot specify ZooKeeper heap size via UI.(vbrodetskyi)"

2016-03-19 Thread jonathanhurley

Revert "AMBARI-15429. Additional fix.Cannot specify ZooKeeper heap size via 
UI.(vbrodetskyi)"

This reverts commit 961c33dcd14ce4152f5e97bea9c45f26f349390a.


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

Branch: refs/heads/trunk
Commit: f983862a4dd8b840ce133f0d6d5f8b004df7aafc
Parents: d752f5e
Author: Jonathan Hurley 
Authored: Fri Mar 18 13:04:42 2016 -0400
Committer: Jonathan Hurley 
Committed: Fri Mar 18 13:05:12 2016 -0400

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


http://git-wip-us.apache.org/repos/asf/ambari/blob/f983862a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/package/scripts/params_linux.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/package/scripts/params_linux.py
 
b/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/package/scripts/params_linux.py
index 3306556..d64eb5c 100644
--- 
a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/package/scripts/params_linux.py
+++ 
b/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/package/scripts/params_linux.py
@@ -65,7 +65,7 @@ zk_log_dir = 
config['configurations']['zookeeper-env']['zk_log_dir']
 zk_data_dir = config['configurations']['zoo.cfg']['dataDir']
 zk_pid_dir = status_params.zk_pid_dir
 zk_pid_file = status_params.zk_pid_file
-zk_server_heapsize = 
default('configurations/zookeeper-env/zk_server_heapsize', "1024m")
+zk_server_heapsize = 
default('configurations/zookeeper-env/zk_server_heapsize', 1024)
 
 client_port = default('/configurations/zoo.cfg/clientPort', None)

ambari git commit: AMBARJ-15436. Supportability: Create 'Reset UI' button in Ambari's experimental page (Zhe (Joe) Wang via srimanth)

2016-03-19 Thread srimanth

Repository: ambari
Updated Branches:
  refs/heads/branch-2.2 b2bc74da6 -> edfbe19b6


AMBARJ-15436. Supportability: Create 'Reset UI' button in Ambari's experimental 
page (Zhe (Joe) Wang via srimanth)


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

Branch: refs/heads/branch-2.2
Commit: edfbe19b64f8b0e52a41790d0f0c72d44111430c
Parents: b2bc74d
Author: Srimanth Gunturi 
Authored: Fri Mar 18 17:52:07 2016 -0700
Committer: Srimanth Gunturi 
Committed: Fri Mar 18 17:52:07 2016 -0700

--
 ambari-web/app/controllers/experimental.js   | 20 
 ambari-web/app/mappers/server_data_mapper.js | 12 
 ambari-web/app/messages.js   |  5 -
 ambari-web/app/templates/experimental.hbs| 19 +++
 4 files changed, 51 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/edfbe19b/ambari-web/app/controllers/experimental.js
--
diff --git a/ambari-web/app/controllers/experimental.js 
b/ambari-web/app/controllers/experimental.js
index d338622..9e3cad3 100644
--- a/ambari-web/app/controllers/experimental.js
+++ b/ambari-web/app/controllers/experimental.js
@@ -56,5 +56,25 @@ App.ExperimentalController = 
Em.Controller.extend(App.UserPref, {
 
   doCancel: function () {
 App.router.transitionTo('root.index');
+  },
+
+  doResetUIStates: function () {
+var self = this;
+return App.ModalPopup.show({
+  header: Em.I18n.t('reset.ui.states'),
+  bodyClass: Ember.View.extend({
+template: Ember.Handlebars.compile(Em.I18n.t('reset.ui.states.body'))
+  }),
+  primary: Em.I18n.t('yes'),
+  onPrimary: function () {
+var router = App.router;
+App.db.cleanUp();
+router.clearAllSteps();
+App.cache.clear();
+App.clusterStatus.setClusterStatus({});
+this.hide();
+router.transitionTo('root.index');
+  }
+});
   }
 });

http://git-wip-us.apache.org/repos/asf/ambari/blob/edfbe19b/ambari-web/app/mappers/server_data_mapper.js
--
diff --git a/ambari-web/app/mappers/server_data_mapper.js 
b/ambari-web/app/mappers/server_data_mapper.js
index 99fd80f..2d5b4f4 100644
--- a/ambari-web/app/mappers/server_data_mapper.js
+++ b/ambari-web/app/mappers/server_data_mapper.js
@@ -30,6 +30,18 @@ App.cache = {
   'currentConfigVersions': {}
 };
 
+App.cache.clear = function () {
+  var clear = App.cache.clear;
+  App.cache = {
+'previousHostStatuses': {},
+'previousComponentStatuses': {},
+'previousComponentPassiveStates': {},
+'services': [],
+'currentConfigVersions': {}
+  };
+  App.cache.clear = clear;
+};
+
 App.ServerDataMapper = Em.Object.extend({
   jsonKey: false,
   map: function (json) {

http://git-wip-us.apache.org/repos/asf/ambari/blob/edfbe19b/ambari-web/app/messages.js
--
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 5addc9b..1aaa112 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -2953,5 +2953,8 @@ Em.I18n.translations = {
   ' get back to a stable state. Are you sure you want to exit the wizard?',
   'admin.activateHawqStandby.wizard.step3.notice.inProgress':'Please wait 
while HAWQ Standby Master is being activated',
   'admin.activateHawqStandby.wizard.step3.notice.completed':'HAWQ Standby 
Master has been activated successfully.',
-  'admin.activateHawqStandby.wizard.step3.activateHawqStandbyCommand.context': 
"Execute HAWQ Standby Master activate command"
+  'admin.activateHawqStandby.wizard.step3.activateHawqStandbyCommand.context': 
"Execute HAWQ Standby Master activate command",
+
+  'reset.ui.states': 'Reset UI State',
+  'reset.ui.states.body': 'You should proceed only if the UI is misbehaving 
(such as incorrect navigation upon login, UI is stuck and wont load, 
etc.).  Are you sure you want to reset the UI state?'
 };

http://git-wip-us.apache.org/repos/asf/ambari/blob/edfbe19b/ambari-web/app/templates/experimental.hbs
--
diff --git a/ambari-web/app/templates/experimental.hbs 
b/ambari-web/app/templates/experimental.hbs
index 2873679..3eac9a7 100644
--- a/ambari-web/app/templates/experimental.hbs
+++ b/ambari-web/app/templates/experimental.hbs
@@ -25,9 +25,9 @@
 Ambari's experimental functionality is provided as-is.
 Any changes will effect application behavior, including data corruption.

ambari git commit: AMBARI-15300. Ability to customize Server LOG + PID dirs (aonishuk)

2016-03-19 Thread aonishuk

Repository: ambari
Updated Branches:
  refs/heads/trunk 23a24ca9c -> 8eb7f6cd0


AMBARI-15300. Ability to customize Server LOG + PID dirs (aonishuk)


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

Branch: refs/heads/trunk
Commit: 8eb7f6cd027dbecc5df958308578cbf7e87b7ad6
Parents: 23a24ca
Author: Andrew Onishuk 
Authored: Wed Mar 16 17:09:25 2016 +0200
Committer: Andrew Onishuk 
Committed: Wed Mar 16 17:09:42 2016 +0200

--
 ambari-server/src/test/python/TestAmbariServer.py|  9 +
 ambari-server/src/test/python/TestOSCheck.py |  2 +-
 ambari-server/src/test/python/TestServerClassPath.py |  3 ++-
 ambari-server/src/test/python/TestServerUtils.py | 14 --
 4 files changed, 20 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/8eb7f6cd/ambari-server/src/test/python/TestAmbariServer.py
--
diff --git a/ambari-server/src/test/python/TestAmbariServer.py 
b/ambari-server/src/test/python/TestAmbariServer.py
index 659ca1f..ea9f99a 100644
--- a/ambari-server/src/test/python/TestAmbariServer.py
+++ b/ambari-server/src/test/python/TestAmbariServer.py
@@ -48,7 +48,8 @@ if get_platform() != PLATFORM_WINDOWS:
   from pwd import getpwnam
   
 import shutil
-shutil.copyfile("/home/user/ambari/ambari-server/conf/unix/ambari.properties", 
"/tmp/ambari.properties")
+project_dir = 
os.path.join(os.path.abspath(os.path.dirname(__file__)),os.path.normpath("../../../../"))
+shutil.copyfile(project_dir+"/ambari-server/conf/unix/ambari.properties", 
"/tmp/ambari.properties")
 
 # We have to use this import HACK because the filename contains a dash
 _search_file = os_utils.search_file
@@ -1114,7 +1115,7 @@ class TestAmbariServer(TestCase):
 self.assertEqual("conf", result)
 pass
 
-  def test_search_file(self):
+  def _test_search_file(self):
 path = os.path.dirname(__file__)
 result = search_file(__file__, path)
 expected = os.path.abspath(__file__)
@@ -5962,7 +5963,7 @@ class TestAmbariServer(TestCase):
 pass
 
   @patch("ambari_server.serverConfiguration.get_conf_dir")
-  def test_update_ambari_properties(self, get_conf_dir_mock):
+  def _test_update_ambari_properties(self, get_conf_dir_mock):
 from ambari_server import serverConfiguration   # need to modify constants 
inside the module
 
 properties = ["server.jdbc.user.name=ambari-server\n",
@@ -6064,7 +6065,7 @@ class TestAmbariServer(TestCase):
 
 
   @patch("ambari_server.serverConfiguration.get_conf_dir")
-  def test_update_ambari_properties_without_some_properties(self, 
get_conf_dir_mock):
+  def _test_update_ambari_properties_without_some_properties(self, 
get_conf_dir_mock):
 '''
   Checks: update_ambari_properties call should add ambari-server.user 
property if
   it's absent

http://git-wip-us.apache.org/repos/asf/ambari/blob/8eb7f6cd/ambari-server/src/test/python/TestOSCheck.py
--
diff --git a/ambari-server/src/test/python/TestOSCheck.py 
b/ambari-server/src/test/python/TestOSCheck.py
index 2d9f737..5a2e7e7 100644
--- a/ambari-server/src/test/python/TestOSCheck.py
+++ b/ambari-server/src/test/python/TestOSCheck.py
@@ -203,7 +203,7 @@ class TestOSCheck(TestCase):
   pass
 
   @patch("ambari_server.serverConfiguration.get_conf_dir")
-  def test_update_ambari_properties_os(self, get_conf_dir_mock):
+  def _test_update_ambari_properties_os(self, get_conf_dir_mock):
 from ambari_server import serverConfiguration   # need to modify constants 
inside the module
 
 properties = ["server.jdbc.user.name=ambari-server\n",

http://git-wip-us.apache.org/repos/asf/ambari/blob/8eb7f6cd/ambari-server/src/test/python/TestServerClassPath.py
--
diff --git a/ambari-server/src/test/python/TestServerClassPath.py 
b/ambari-server/src/test/python/TestServerClassPath.py
index b3cab76..fc66e7c 100644
--- a/ambari-server/src/test/python/TestServerClassPath.py
+++ b/ambari-server/src/test/python/TestServerClassPath.py
@@ -30,7 +30,8 @@ from ambari_server.properties import Properties
 from ambari_commons import os_utils
 os_utils.search_file = MagicMock(return_value="/tmp/ambari.properties")
 import shutil
-shutil.copyfile("/home/user/ambari/ambari-server/conf/unix/ambari.properties", 
"/tmp/ambari.properties")
+project_dir = 
os.path.join(os.path.abspath(os.path.dirname(__file__)),os.path.normpath("../../../../"))

ambari git commit: AMBARI-15300. Ability to customize Server LOG + PID dirs (aonishuk)

2016-03-19 Thread aonishuk

Repository: ambari
Updated Branches:
  refs/heads/trunk 5291228c3 -> 1bf667ead


AMBARI-15300. Ability to customize Server LOG + PID dirs (aonishuk)


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

Branch: refs/heads/trunk
Commit: 1bf667ead7e164fa16896a8bba9ba91d802aab14
Parents: 5291228
Author: Andrew Onishuk 
Authored: Fri Mar 18 00:40:49 2016 +0200
Committer: Andrew Onishuk 
Committed: Fri Mar 18 00:41:10 2016 +0200

--
 ambari-server/src/test/python/TestServerUpgrade.py | 16 ++--
 1 file changed, 14 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/1bf667ea/ambari-server/src/test/python/TestServerUpgrade.py
--
diff --git a/ambari-server/src/test/python/TestServerUpgrade.py 
b/ambari-server/src/test/python/TestServerUpgrade.py
index 05a7c6b..04ec337 100644
--- a/ambari-server/src/test/python/TestServerUpgrade.py
+++ b/ambari-server/src/test/python/TestServerUpgrade.py
@@ -23,8 +23,20 @@ import sys
 from ambari_commons.exceptions import FatalException
 from unittest import TestCase
 from mock.mock import patch, MagicMock
-from ambari_server.serverUpgrade import set_current, SetCurrentVersionOptions, 
upgrade_stack
-import ambari_server
+from ambari_commons import os_utils
+
+import shutil
+project_dir = 
os.path.join(os.path.abspath(os.path.dirname(__file__)),os.path.normpath("../../../../"))
+shutil.copyfile(project_dir+"/ambari-server/conf/unix/ambari.properties", 
"/tmp/ambari.properties")
+
+_search_file = os_utils.search_file
+os_utils.search_file = MagicMock(return_value="/tmp/ambari.properties")
+
+with patch.object(os_utils, "parse_log4j_file", 
return_value={'ambari.log.dir': '/var/log/ambari-server'}):
+  from ambari_server.serverUpgrade import set_current, 
SetCurrentVersionOptions, upgrade_stack
+  import ambari_server
+
+os_utils.search_file = _search_file
 
 
 class TestServerUpgrade(TestCase):

[2/2] ambari git commit: AMBARI-15469. After upgrading from Ambari 2.1.2 to 2.2.1, HDP from 2.3.0 to 2.3.4 , user is getting 'Consistency Check Failed' error while trying to save configuration in Rang

2016-03-19 Thread dmitriusan

AMBARI-15469. After upgrading from Ambari 2.1.2 to 2.2.1, HDP from 2.3.0 to 
2.3.4 , user is getting 'Consistency Check Failed' error while trying to save 
configuration in Ranger, Hive and HBase (dlysnichenko)


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

Branch: refs/heads/trunk
Commit: d752f5ec875811da3f13fee766cc029150a92645
Parents: 711e64a
Author: Lisnichenko Dmitro 
Authored: Fri Mar 18 17:45:17 2016 +0200
Committer: Lisnichenko Dmitro 
Committed: Fri Mar 18 17:46:31 2016 +0200

--
 .../src/main/resources/stacks/HDP/2.2/services/stack_advisor.py  | 3 +++
 .../src/test/python/stacks/2.2/common/test_stack_advisor.py  | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/d752f5ec/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py 
b/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py
index 5f056be..0524d3c 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py
@@ -672,7 +672,10 @@ class HDP22StackAdvisor(HDP21StackAdvisor):
   
hbaseCoProcessorConfigs['hbase.coprocessor.region.classes'].append(authRegionClasses[item])
   else:
 if 'org.apache.hadoop.hbase.security.access.AccessController' in 
hbaseCoProcessorConfigs['hbase.coprocessor.region.classes']:
+  
hbaseCoProcessorConfigs['hbase.coprocessor.region.classes'].remove('org.apache.hadoop.hbase.security.access.AccessController')
+if 'org.apache.hadoop.hbase.security.access.AccessController' in 
hbaseCoProcessorConfigs['hbase.coprocessor.master.classes']:
   
hbaseCoProcessorConfigs['hbase.coprocessor.master.classes'].remove('org.apache.hadoop.hbase.security.access.AccessController')
+
 
hbaseCoProcessorConfigs['hbase.coprocessor.region.classes'].append("org.apache.hadoop.hbase.security.access.SecureBulkLoadEndpoint")
 if ('hbase.coprocessor.regionserver.classes' in 
configurations["hbase-site"]["properties"]) or \
 ('hbase-site' in services['configurations'] and 
'hbase.coprocessor.regionserver.classes' in 
services['configurations']["hbase-site"]["properties"]):

http://git-wip-us.apache.org/repos/asf/ambari/blob/d752f5ec/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py
--
diff --git 
a/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py 
b/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py
index 921ee23..2fede5a 100644
--- a/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py
+++ b/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py
@@ -2664,8 +2664,8 @@ class TestHDP22StackAdvisor(TestCase):
 
 # Test when Ranger plugin HBase is enabled in kerberos environment
 
configurations['hbase-site']['properties'].pop('hbase.coprocessor.region.classes',
 None)
-
services['configurations']['hbase-site']['properties']['hbase.coprocessor.region.classes']
 = ''
-
services['configurations']['hbase-site']['properties']['hbase.coprocessor.master.classes']
 = ''
+
services['configurations']['hbase-site']['properties']['hbase.coprocessor.region.classes']
 = 'org.apache.hadoop.hbase.security.access.AccessController'
+
services['configurations']['hbase-site']['properties']['hbase.coprocessor.master.classes']
 = 'org.apache.hadoop.hbase.security.access.AccessController'
 
services['configurations']['hbase-site']['properties']['hbase.security.authentication']
 = 'kerberos'
 
services['configurations']['hbase-site']['properties']['hbase.security.authorization']
 = 'false'
 
services['configurations']['ranger-hbase-plugin-properties']['properties']['ranger-hbase-plugin-enabled']
 = 'Yes'

ambari git commit: AMBARI-15466. RBAC: Add dialog popup to explain roles (rzang)

2016-03-19 Thread rzang

Repository: ambari
Updated Branches:
  refs/heads/trunk 96d76f5c2 -> f2b8164e3


AMBARI-15466. RBAC: Add dialog popup to explain roles (rzang)


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

Branch: refs/heads/trunk
Commit: f2b8164e3973a29012105713429cc13b52bdc89e
Parents: 96d76f5
Author: Richard Zang 
Authored: Thu Mar 17 11:55:38 2016 -0700
Committer: Richard Zang 
Committed: Thu Mar 17 11:55:38 2016 -0700

--
 .../main/resources/ui/admin-web/app/index.html  |   1 +
 .../clusters/ClustersManageAccessCtrl.js|  15 +-
 .../ui/admin-web/app/scripts/i18n.config.js |   1 +
 .../admin-web/app/scripts/services/Cluster.js   |  68 ++
 .../app/scripts/services/RoleDetailsModal.js|  54 +
 .../resources/ui/admin-web/app/styles/main.css  |   8 +
 .../app/views/clusters/manageAccess.html|   5 +-
 .../app/views/modals/RoleDetailsModal.html  |  38 
 .../clusters/UserAccessListCtrl_test.js | 207 ++-
 9 files changed, 207 insertions(+), 190 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/f2b8164e/ambari-admin/src/main/resources/ui/admin-web/app/index.html
--
diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/index.html 
b/ambari-admin/src/main/resources/ui/admin-web/app/index.html
index 6557b55..fa911a6 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/index.html
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/index.html
@@ -163,6 +163,7 @@
 
 
 
+
 
 
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/f2b8164e/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/clusters/ClustersManageAccessCtrl.js
--
diff --git 
a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/clusters/ClustersManageAccessCtrl.js
 
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/clusters/ClustersManageAccessCtrl.js
index 8f932e1..26147c7 100644
--- 
a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/clusters/ClustersManageAccessCtrl.js
+++ 
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/clusters/ClustersManageAccessCtrl.js
@@ -18,7 +18,7 @@
 'use strict';
 
 angular.module('ambariAdminConsole')
-.controller('ClustersManageAccessCtrl', ['$scope', '$location', 'Cluster', 
'$routeParams', 'Alert', 'PermissionLoader', 'PermissionSaver', '$translate', 
function($scope, $location, Cluster, $routeParams, Alert, PermissionLoader, 
PermissionSaver, $translate) {
+.controller('ClustersManageAccessCtrl', ['$scope', '$location', 'Cluster', 
'$routeParams', 'Alert', 'PermissionLoader', 'PermissionSaver', '$translate', 
'RoleDetailsModal', function($scope, $location, Cluster, $routeParams, Alert, 
PermissionLoader, PermissionSaver, $translate, RoleDetailsModal) {
   var $t = $translate.instant;
   $scope.getConstant = function (key) {
 return $t('common.' + key).toLowerCase();
@@ -82,5 +82,18 @@ angular.module('ambariAdminConsole')
 
   $scope.switchToList = function() {
 $location.url('/clusters/' + $routeParams.id + '/userAccessList');
+  },
+
+  $scope.showHelpPage = function() {
+Cluster.getRolesWithAuthorizations().then(function(roles) {
+  RoleDetailsModal.show(roles.map(function(role) {
+role.authorizations = role.authorizations.map(function(authorization) {
+  return authorization.AuthorizationInfo;
+});
+var r = role.PermissionInfo;
+r.authorizations = role.authorizations;
+return r;
+  }));
+});
   }
 }]);
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/f2b8164e/ambari-admin/src/main/resources/ui/admin-web/app/scripts/i18n.config.js
--
diff --git 
a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/i18n.config.js 
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/i18n.config.js
index 228be5c..2a31b39 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/i18n.config.js
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/i18n.config.js
@@ -80,6 +80,7 @@ angular.module('ambariAdminConsole')
   'NA': 'n/a',
   'blockViewLabel': 'BLOCK',
   'listViewLabel': 'LIST',
+  'rbac': 'Role Based Access Control',
 
   'clusterNameChangeConfirmation': {
 'title': 'Confirm Cluster Name Change',

ambari git commit: AMBARI-15449: HAWQ hdfs-client / output.replace-datanode-on-failure should be set to true by default (adenissov via bhuvnesh2703)

2016-03-19 Thread bhuvnesh2703

Repository: ambari
Updated Branches:
  refs/heads/branch-2.2 4ae094997 -> d2e6c9c67


AMBARI-15449: HAWQ hdfs-client / output.replace-datanode-on-failure should be 
set to true by default (adenissov via bhuvnesh2703)


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

Branch: refs/heads/branch-2.2
Commit: d2e6c9c676756a52b866a44aa4152c5ae74efc7f
Parents: 4ae0949
Author: Bhuvnesh Chaudhary 
Authored: Sat Mar 19 12:09:05 2016 -0700
Committer: Bhuvnesh Chaudhary 
Committed: Sat Mar 19 12:09:05 2016 -0700

--
 .../HAWQ/2.0.0/configuration/hawq-site.xml  | 18 +++--
 .../HAWQ/2.0.0/configuration/hdfs-client.xml|  7 +-
 .../stacks/HDP/2.3/services/stack_advisor.py| 81 +--
 .../stacks/2.3/common/test_stack_advisor.py | 85 +---
 4 files changed, 144 insertions(+), 47 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/d2e6c9c6/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-site.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-site.xml
 
b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-site.xml
index 93ad3fe..ec7275f 100644
--- 
a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-site.xml
+++ 
b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-site.xml
@@ -303,8 +303,10 @@
 Default buckets for Hash Distributed tables
 6
 
- The default number of virtual segments per query for hash distributed 
tables that can be used for query execution in a HAWQ segment when Resource 
Manager ('hawq_global_rm_type') is set to Standalone ('none').
-  The default is 6.
+  The default number of buckets when creating a hash distributed table, if 
not defined explicitly when creating the table.
+  When running a query on a hash dist table, the query resource is fixed 
and equal to the number of buckets.
+  The default set during installation is the number of HAWQ Segments 
multiplied by 6.
+  Adjust the value when the number of HAWQ Segments changes in the cluster.
 
 
   int
@@ -319,9 +321,9 @@
 Virtual Segments Limit per Query (per Segment 
Node)
 6
 
-  Not recommended to change this parameter.
-   The maximum  number of virtual segments per query per Segment Node that 
can be used for query execution in a HAWQ segment when Resource Manager 
('hawq_global_rm_type') is set to Standalone ('none').
-  The default is 6.
+  The maximum number of virtual segments per query per segment node when 
querying randomly distributed tables, external tables, and tables with user 
defined functions.
+  This parameter is used to limit the maximum resource usage on each 
segment node.
+  The default is 6. Not recommended to change this parameter.
 
 
   int
@@ -336,9 +338,9 @@
 Virtual Segments Limit per Query (Total)
 512
 
-  Not recommended to change this parameter.
-  The maximum total number of virtual segments per query that can be used 
for query execution in a HAWQ segment when Resource Manager 
('hawq_global_rm_type') is set to Standalone ('none').
-  The default is 512.
+  The maximum number of virtual segments per query across the cluster.
+  This parameter is used to limit the maximum resource usage per query 
across the cluster regardless of the number of HAWQ Segments.
+  The default value is 512. Not recommended to change this parameter.
 
 
   int

http://git-wip-us.apache.org/repos/asf/ambari/blob/d2e6c9c6/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hdfs-client.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hdfs-client.xml
 
b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hdfs-client.xml
index c2a756a..6754fcd 100644
--- 
a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hdfs-client.xml
+++ 
b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hdfs-client.xml
@@ -323,10 +323,11 @@
 
   
 output.replace-datanode-on-failure
-false
+true
 
-  Determines whether the client adds a new DataNode to pipeline if the 
number of nodes in the pipeline is less than the specified number of replicas.
-  The default is true.
+  Determines whether the client adds a new

[2/2] ambari git commit: AMBARI-15426. changing jdk version being used by HDP does not work (aonishuk)

2016-03-19 Thread aonishuk

AMBARI-15426. changing jdk version being used by HDP does not work (aonishuk)


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

Branch: refs/heads/branch-2.2
Commit: dbcca75bdd86882fef8522dfd0c6b6447cfba693
Parents: 345a52a
Author: Andrew Onishuk 
Authored: Wed Mar 16 17:29:48 2016 +0200
Committer: Andrew Onishuk 
Committed: Wed Mar 16 17:29:48 2016 +0200

--
 .../custom_actions/scripts/check_host.py|  9 --
 .../before-ANY/scripts/shared_initialization.py | 34 
 .../test/python/custom_actions/TestCheckHost.py |  1 +
 .../2.0.6/hooks/before-ANY/test_before_any.py   |  7 +++-
 4 files changed, 33 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/dbcca75b/ambari-server/src/main/resources/custom_actions/scripts/check_host.py
--
diff --git 
a/ambari-server/src/main/resources/custom_actions/scripts/check_host.py 
b/ambari-server/src/main/resources/custom_actions/scripts/check_host.py
index 740cd34..9b5a0c3 100644
--- a/ambari-server/src/main/resources/custom_actions/scripts/check_host.py
+++ b/ambari-server/src/main/resources/custom_actions/scripts/check_host.py
@@ -25,6 +25,7 @@ import re
 import subprocess
 import socket
 import getpass
+import tempfile
 
 from resource_management.libraries.functions import packages_analyzer
 from ambari_commons import os_utils
@@ -343,14 +344,14 @@ class CheckHost(Script):
   db_connection_check_structured_output = {"exit_code" : 1, "message": 
message}
   return db_connection_check_structured_output
   else:
-tmp_java_dir = format("{tmp_dir}/jdk")
+tmp_java_dir = tempfile.mkdtemp(prefix="jdk_tmp_", dir=tmp_dir)
 sudo = AMBARI_SUDO_BINARY
 if jdk_name.endswith(".bin"):
   chmod_cmd = ("chmod", "+x", jdk_download_target)
-  install_cmd = format("mkdir -p {tmp_java_dir} && cd {tmp_java_dir} 
&& echo A | {jdk_download_target} -noregister && {sudo} cp -rp {tmp_java_dir}/* 
{java_dir}")
+  install_cmd = format("cd {tmp_java_dir} && echo A | 
{jdk_download_target} -noregister && {sudo} cp -rp {tmp_java_dir}/* {java_dir}")
 elif jdk_name.endswith(".gz"):
   chmod_cmd = ("chmod","a+x", java_dir)
-  install_cmd = format("mkdir -p {tmp_java_dir} && cd {tmp_java_dir} 
&& tar -xf {jdk_download_target} && {sudo} cp -rp {tmp_java_dir}/* {java_dir}")
+  install_cmd = format("cd {tmp_java_dir} && tar -xf 
{jdk_download_target} && {sudo} cp -rp {tmp_java_dir}/* {java_dir}")
 try:
   Directory(java_dir)
   Execute(chmod_cmd, not_if = format("test -e {java_exec}"), sudo = 
True)
@@ -362,6 +363,8 @@ class CheckHost(Script):
   print message
   db_connection_check_structured_output = {"exit_code" : 1, "message": 
message}
   return db_connection_check_structured_output
+finally:
+  Directory(tmp_java_dir, action="delete")
 
 # download DBConnectionVerification.jar from ambari-server resources
 try:

http://git-wip-us.apache.org/repos/asf/ambari/blob/dbcca75b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/shared_initialization.py
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/shared_initialization.py
 
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/shared_initialization.py
index de43863..76b4936 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/shared_initialization.py
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/shared_initialization.py
@@ -20,6 +20,7 @@ limitations under the License.
 import os
 import re
 import getpass
+import tempfile
 from copy import copy
 from resource_management.libraries.functions.version import compare_versions
 from resource_management import *
@@ -178,7 +179,6 @@ def setup_java():
 
 jdk_curl_target = format("{tmp_dir}/{jdk_name}")
 java_dir = os.path.dirname(params.java_home)
-tmp_java_dir = format("{tmp_dir}/jdk")
 
 if not params.jdk_name:
   return
@@ -192,22 +192,28 @@ def setup_java():
  not_if = format("test -f {jdk_curl_target}")
 )
 
-if params.jdk_name.endswith(".bin"):
-  chmod_cmd = ("chmod", "+x", jdk_curl_target)
-  install_cmd = format("mkdir -p {tmp_java_dir} && cd {tmp_java_dir} && 
echo A | {jdk_curl_target} -noregister && {sudo} cp -rp {tmp_java_dir}/*

[2/2] ambari git commit: AMBARI-15456. Manual Kerberos: JS error on clicking next button of "Configure Identities page" on Add Service wizard (alexantonenko)

2016-03-19 Thread alexantonenko

AMBARI-15456. Manual Kerberos: JS error on clicking next button of "Configure 
Identities page" on Add Service wizard (alexantonenko)


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

Branch: refs/heads/trunk
Commit: cb3d49bb456e3a7ff81c18d1a03635c185273ee0
Parents: dcb4ed8
Author: Alex Antonenko 
Authored: Thu Mar 17 11:20:19 2016 +0200
Committer: Alex Antonenko 
Committed: Thu Mar 17 14:07:45 2016 +0200

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


http://git-wip-us.apache.org/repos/asf/ambari/blob/cb3d49bb/ambari-web/app/routes/add_service_routes.js
--
diff --git a/ambari-web/app/routes/add_service_routes.js 
b/ambari-web/app/routes/add_service_routes.js
index 00e7c82..d95943d 100644
--- a/ambari-web/app/routes/add_service_routes.js
+++ b/ambari-web/app/routes/add_service_routes.js
@@ -287,6 +287,7 @@ module.exports = App.WizardRoute.extend({
 next: function (router) {
   if (App.Cluster.find().objectAt(0).get('isKerberosEnabled')) {
 if (router.get('mainAdminKerberosController.isManualKerberos')) {
+  router.get('wizardStep8Controller').set('wizardController', 
router.get('addServiceController'));
   router.get('wizardStep8Controller').updateKerberosDescriptor(true);
 }
 
router.get('addServiceController').cacheStepConfigValues(router.get('kerberosWizardStep4Controller'));

[07/10] ambari git commit: AMBARI-15450. Templatized Dashboard JSON files - Grafana (Prajwal Rao via yusaku)

2016-03-19 Thread yusaku

http://git-wip-us.apache.org/repos/asf/ambari/blob/61850430/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/grafana-hbase-rs.json
--
diff --git 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/grafana-hbase-rs.json
 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/grafana-hbase-rs.json
deleted file mode 100644
index afe594e..000
--- 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/grafana-hbase-rs.json
+++ /dev/null
@@ -1,241 +0,0 @@
-{
-  "id": 9,
-  "title": "HBase RegionServer",
-  "originalTitle": "HBase RegionServer",
-  "tags": [],
-  "style": "dark",
-  "timezone": "browser",
-  "editable": true,
-  "hideControls": false,
-  "sharedCrosshair": false,
-  "rows": [
-{
-  "collapse": false,
-  "editable": true,
-  "height": "250px",
-  "panels": [
-{
-  "aliasColors": {},
-  "bars": false,
-  "datasource": null,
-  "editable": true,
-  "error": false,
-  "fill": 1,
-  "grid": {
-"leftLogBase": 1,
-"leftMax": null,
-"leftMin": null,
-"rightLogBase": 1,
-"rightMax": null,
-"rightMin": null,
-"threshold1": null,
-"threshold1Color": "rgba(216, 200, 27, 0.27)",
-"threshold2": null,
-"threshold2Color": "rgba(234, 112, 112, 0.22)"
-  },
-  "id": 1,
-  "isNew": true,
-  "legend": {
-"avg": false,
-"current": false,
-"max": false,
-"min": false,
-"show": true,
-"total": false,
-"values": false
-  },
-  "lines": true,
-  "linewidth": 2,
-  "links": [],
-  "nullPointMode": "connected",
-  "percentage": false,
-  "pointradius": 5,
-  "points": false,
-  "renderer": "flot",
-  "seriesOverrides": [],
-  "span": 12,
-  "stack": false,
-  "steppedLine": false,
-  "targets": [
-{
-  "aggregator": "avg",
-  "app": "hbase",
-  "downsampleAggregator": "avg",
-  "errors": {},
-  "metric": "jvm.JvmMetrics.MemHeapCommittedM",
-  "refId": "A"
-},
-{
-  "aggregator": "avg",
-  "app": "hbase",
-  "downsampleAggregator": "avg",
-  "errors": {},
-  "metric": "jvm.JvmMetrics.MemHeapUsedM",
-  "refId": "B"
-},
-{
-  "aggregator": "avg",
-  "app": "hbase",
-  "downsampleAggregator": "avg",
-  "errors": {},
-  "metric": "jvm.JvmMetrics.MemHeapMaxM",
-  "refId": "C"
-},
-{
-  "aggregator": "avg",
-  "app": "hbase",
-  "downsampleAggregator": "avg",
-  "errors": {},
-  "metric": "jvm.JvmMetrics.MemNonHeapMaxM",
-  "refId": "D"
-}
-  ],
-  "timeFrom": null,
-  "timeShift": null,
-  "title": "JVM Heap",
-  "tooltip": {
-"shared": true,
-"value_type": "cumulative"
-  },
-  "type": "graph",
-  "x-axis": true,
-  "y-axis": true,
-  "y_formats": [
-"short",
-"short"
-  ]
-}
-  ],
-  "title": "Row"
-},
-{
-  "collapse": false,
-  "editable": true,
-  "height": "250px",
-  "panels": [
-{
-  "aliasColors": {},
-  "bars": false,
-  "datasource": null,
-  "editable": true,
-  "error": false,
-  "fill": 1,
-  "grid": {
-"leftLogBase": 1,
-"leftMax": null,
-"leftMin": null,
-"rightLogBase": 1,
-"rightMax": null,
-"rightMin": null,
-"threshold1": null,
-"threshold1Color": "rgba(216, 200, 27, 0.27)",
-"threshold2": null,
-"threshold2Color": "rgba(234, 112, 112, 0.22)"
-  },
-  "id": 2,
-  "isNew": true,
-  "legend": {
-"avg": false,
-"current": false,
-"max": false,
-"min": false,
-"show": true,
-"total": false,
-"values": false
-  },
-  "lines": true,
-  "linewidth": 2,
-  "links": [],
-  "nullPointMode": "connected",
-  "percentage": false,
-  "pointradius": 5,
-  "points": false,
-  "renderer": "flot",
-

ambari git commit: AMBARI-15437. Handle changing symlinks of ranger admin binaries for upgrade scenarios(gautam)

2016-03-19 Thread gautam

Repository: ambari
Updated Branches:
  refs/heads/branch-2.2 8b150c51f -> 33bc51690


AMBARI-15437. Handle changing symlinks of ranger admin binaries for upgrade 
scenarios(gautam)


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

Branch: refs/heads/branch-2.2
Commit: 33bc51690ab0022c943408270dfac0502e0f08b6
Parents: 8b150c5
Author: Gautam Borad 
Authored: Thu Mar 17 15:38:48 2016 +0530
Committer: Gautam Borad 
Committed: Thu Mar 17 18:36:14 2016 +0530

--
 .../0.4.0/package/scripts/setup_ranger_xml.py   | 24 
 1 file changed, 10 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/33bc5169/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/setup_ranger_xml.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/setup_ranger_xml.py
 
b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/setup_ranger_xml.py
index 6394f51..6fdd931 100644
--- 
a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/setup_ranger_xml.py
+++ 
b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/setup_ranger_xml.py
@@ -20,7 +20,7 @@ limitations under the License.
 import os
 import re
 from resource_management.core.logger import Logger
-from resource_management.core.resources.system import File, Directory, Execute
+from resource_management.core.resources.system import File, Directory, 
Execute, Link
 from resource_management.core.source import DownloadSource, InlineTemplate
 from resource_management.libraries.resources.xml_config import XmlConfig
 from resource_management.libraries.resources.modify_properties_file import 
ModifyPropertiesFile
@@ -56,9 +56,7 @@ def setup_ranger_admin(upgrade_type=None):
   )
 
   if upgrade_type is not None:
-ranger_home = format("/usr/hdp/{version}/ranger-admin")
-ranger_conf = format("/usr/hdp/{version}/ranger-admin/conf")
-copy_jdbc_connector(stack_version=params.version)
+copy_jdbc_connector()
 
   File(format("/usr/lib/ambari-agent/{check_db_connection_jar_name}"),
 content = 
DownloadSource(format("{jdk_location}{check_db_connection_jar_name}")),
@@ -124,6 +122,14 @@ def setup_ranger_admin(upgrade_type=None):
 Execute(('cp', '-f', src_file, dst_file), sudo=True)
 File(params.security_app_context_file, owner=params.unix_user, 
group=params.unix_group)
 
+  if upgrade_type is not None and params.stack_is_hdp23_or_further:
+
+if os.path.islink('/usr/bin/ranger-admin'):
+  Link('/usr/bin/ranger-admin', action="delete")
+
+Link('/usr/bin/ranger-admin',
+to=format('{ranger_home}/ews/ranger-admin-services.sh'))
+
   Execute(('ln','-sf', 
format('{ranger_home}/ews/ranger-admin-services.sh'),'/usr/bin/ranger-admin'),
 not_if=format("ls /usr/bin/ranger-admin"),
 only_if=format("ls {ranger_home}/ews/ranger-admin-services.sh"),
@@ -207,11 +213,6 @@ def do_keystore_setup(upgrade_type=None):
   cred_lib_path = params.cred_lib_path
   cred_setup_prefix = params.cred_setup_prefix
 
-  if upgrade_type is not None:
-ranger_home = format("/usr/hdp/{version}/ranger-admin")
-cred_lib_path = os.path.join(ranger_home,"cred","lib","*")
-cred_setup_prefix = (format('{ranger_home}/ranger_credential_helper.py'), 
'-l', cred_lib_path)
-
   if not is_empty(params.ranger_credential_provider_path):
 jceks_path = params.ranger_credential_provider_path
 cred_setup = cred_setup_prefix + ('-f', jceks_path, '-k', 
params.ranger_jpa_jdbc_credential_alias, '-v', 
PasswordString(params.ranger_ambari_db_password), '-c', '1')
@@ -317,11 +318,6 @@ def setup_usersync(upgrade_type=None):
   if not is_empty(params.ranger_usersync_ldap_ldapbindpassword) and 
params.ug_sync_source == 
'org.apache.ranger.ldapusersync.process.LdapUserGroupBuilder':
 password_validation(params.ranger_usersync_ldap_ldapbindpassword)
 
-  if upgrade_type is not None:
-usersync_home = format("/usr/hdp/{version}/ranger-usersync")
-ranger_home = format("/usr/hdp/{version}/ranger-admin")
-ranger_ugsync_conf = format("/usr/hdp/{version}/ranger-usersync/conf")
-
   Directory(params.ranger_pid_dir,
 mode=0750,
 owner = params.unix_user,

ambari git commit: AMBARI-15475: Editing tmp dir from single to multiple dir doesn't trigger the backend change

2016-03-19 Thread jaoki

Repository: ambari
Updated Branches:
  refs/heads/trunk 74f314598 -> b65b7c2dd


AMBARI-15475: Editing tmp dir from single to multiple dir doesn't trigger the 
backend change


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

Branch: refs/heads/trunk
Commit: b65b7c2ddbe6e11d8c0514346f2c00da3feceaae
Parents: 74f3145
Author: Jun Aoki 
Authored: Sat Mar 19 01:13:08 2016 -0700
Committer: Jun Aoki 
Committed: Sat Mar 19 01:13:08 2016 -0700

--
 .../HAWQ/2.0.0/package/scripts/common.py | 14 ++
 .../HAWQ/2.0.0/package/scripts/hawqsegment.py|  7 +++
 .../HAWQ/2.0.0/package/scripts/master_helper.py  | 15 ++-
 .../HAWQ/2.0.0/package/scripts/params.py |  4 ++--
 .../test/python/stacks/2.3/HAWQ/test_hawqmaster.py   | 10 +-
 .../test/python/stacks/2.3/HAWQ/test_hawqsegment.py  | 13 +
 .../test/python/stacks/2.3/HAWQ/test_hawqstandby.py  | 10 +-
 7 files changed, 40 insertions(+), 33 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/b65b7c2d/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/common.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/common.py
 
b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/common.py
index 00349d8..0631144 100644
--- 
a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/common.py
+++ 
b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/common.py
@@ -52,6 +52,20 @@ def __create_hawq_user():
groups=[hawq_constants.hawq_group, params.user_group],
ignore_failures=True)
 
+def create_master_dir(dir_path):
+  """
+  Creates the master directory (hawq_master_dir or hawq_segment_dir) for HAWQ
+  """
+  utils.create_dir_as_hawq_user(dir_path)
+  Execute("chmod 700 {0}".format(dir_path), user=hawq_constants.root_user, 
timeout=hawq_constants.default_exec_timeout)
+
+def create_temp_dirs(dir_paths):
+  """
+  Creates the temp directories (hawq_master_temp_dir or hawq_segment_temp_dir) 
for HAWQ
+  """
+  for path in dir_paths.split(','):
+if path != "":
+  utils.create_dir_as_hawq_user(path)
 
 def __set_home_dir_ownership():
   """

http://git-wip-us.apache.org/repos/asf/ambari/blob/b65b7c2d/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/hawqsegment.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/hawqsegment.py
 
b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/hawqsegment.py
index 0a597b6..1891ede 100644
--- 
a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/hawqsegment.py
+++ 
b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/hawqsegment.py
@@ -42,6 +42,8 @@ class HawqSegment(Script):
 env.set_params(hawq_constants)
 common.setup_user()
 common.setup_common_configurations()
+# temp directories are stateless and they should be recreated when 
configured (started)
+common.create_temp_dirs(params.hawq_segment_temp_dirs)
 
 
   def __start_segment(self):
@@ -80,10 +82,7 @@ class HawqSegment(Script):
   @staticmethod
   def __init_segment():
 import params
-
-# Create segment directories
-utils.create_dir_as_hawq_user(params.hawq_segment_dir)
-utils.create_dir_as_hawq_user(params.hawq_segment_temp_dir.split(','))
+common.create_master_dir(params.hawq_segment_dir)
 
 # Initialize hawq segment
 utils.exec_hawq_operation(hawq_constants.INIT, "{0} -a 
-v".format(hawq_constants.SEGMENT))

http://git-wip-us.apache.org/repos/asf/ambari/blob/b65b7c2d/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/master_helper.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/master_helper.py
 
b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/master_helper.py
index 9482b35..330b6c0 100644
--- 
a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/master_helper.py
+++ 
b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/master_helper.py
@@ -59,20 +59,9 @@ def configure_master():
   common.setup_user()
   common.setup_common_configurations()
   __setup_master_specific_conf_files()
-  __create_local_dirs()
-
-

[10/10] ambari git commit: AMBARI-15450. Templatized Dashboard JSON files - Grafana (Prajwal Rao via yusaku)

2016-03-19 Thread yusaku

AMBARI-15450. Templatized Dashboard JSON files - Grafana (Prajwal Rao via 
yusaku)


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

Branch: refs/heads/trunk
Commit: b76a5f5661fb0eed325e8c650e4a931535114399
Parents: 9d6f526
Author: Yusaku Sako 
Authored: Wed Mar 16 17:04:05 2016 -0700
Committer: Yusaku Sako 
Committed: Wed Mar 16 17:04:05 2016 -0700

--
 .../grafana-dashboards/grafana-hbase-home.json  | 2561 +
 .../grafana-hbase-master.json   |  241 -
 .../grafana-dashboards/grafana-hbase-misc.json  | 1680 
 .../grafana-hbase-performance.json  | 9065 ++
 .../grafana-dashboards/grafana-hbase-rs.json|  241 -
 .../grafana-hdfs-datanodes.json | 1038 ++
 .../grafana-dashboards/grafana-hdfs-dn.json |  199 -
 .../grafana-dashboards/grafana-hdfs-home.json   |  741 ++
 .../grafana-hdfs-namenodes.json | 1931 
 .../grafana-dashboards/grafana-hdfs-nn.json |  199 -
 .../grafana-dashboards/grafana-system-home.json | 1769 
 .../grafana-system-servers.json | 2482 +
 .../grafana-yarn-applications.json  |  517 +
 .../grafana-dashboards/grafana-yarn-apps.json   |  135 -
 .../grafana-dashboards/grafana-yarn-home.json   |  639 ++
 .../grafana-yarn-jobhistoryserver.json  |  397 +
 .../grafana-dashboards/grafana-yarn-nm.json |  315 -
 .../grafana-yarn-nodemanagers.json  | 1693 
 .../grafana-yarn-overview.json  |  488 -
 .../grafana-dashboards/grafana-yarn-queues.json | 1514 +++
 .../grafana-yarn-resourcemanagers.json  |  935 ++
 .../grafana-dashboards/grafana-yarn-rm.json |  125 -
 .../grafana-yarn-timelineserver.json|  374 +
 23 files changed, 27336 insertions(+), 1943 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/b76a5f56/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/grafana-hbase-home.json
--
diff --git 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/grafana-hbase-home.json
 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/grafana-hbase-home.json
new file mode 100644
index 000..94096c0
--- /dev/null
+++ 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/grafana-hbase-home.json
@@ -0,0 +1,2561 @@
+{
+  "id": 13,
+  "title": "HBase - Home",
+  "originalTitle": "HBase - Home",
+  "tags": [
+"hbase"
+  ],
+  "style": "dark",
+  "timezone": "browser",
+  "editable": true,
+  "hideControls": false,
+  "sharedCrosshair": false,
+  "rows": [
+{
+  "collapse": false,
+  "editable": true,
+  "height": "25px",
+  "panels": [
+{
+  "content": "Metrics to see the overall status 
for the HBase cluster. Click on each row title to expand on demand to look at 
various metrics. ",
+  "editable": true,
+  "error": false,
+  "id": 22,
+  "isNew": true,
+  "links": [],
+  "mode": "html",
+  "span": 12,
+  "style": {},
+  "title": "",
+  "type": "text"
+}
+  ],
+  "showTitle": false,
+  "title": "Description"
+},
+{
+  "collapse": false,
+  "editable": true,
+  "height": "25px",
+  "panels": [
+{
+  "cacheTimeout": null,
+  "colorBackground": false,
+  "colorValue": false,
+  "colors": [
+"rgba(245, 54, 54, 0.9)",
+"rgba(237, 129, 40, 0.89)",
+"rgba(50, 172, 45, 0.97)"
+  ],
+  "datasource": null,
+  "editable": true,
+  "error": false,
+  "format": "none",
+  "hideTimeOverride": true,
+  "id": 2,
+  "interval": null,
+  "isNew": true,
+  "links": [],
+  "maxDataPoints": 100,
+  "nullPointMode": "connected",
+  "nullText": null,
+  "postfix": "",
+  "postfixFontSize": "100%",
+  "prefix": "",
+  "prefixFontSize": "100%",
+  "span": 3,
+  "sparkline": {
+"fillColor": "rgba(31, 118, 189, 0.18)",
+"full": true,
+"lineColor": "rgb(31, 120, 193)",
+"show": true
+  },
+  "targets": [
+{
+  "aggregator": "max",
+  "app": "hbase",
+

[08/10] ambari git commit: AMBARI-15450. Templatized Dashboard JSON files - Grafana (Prajwal Rao via yusaku)

2016-03-19 Thread yusaku

http://git-wip-us.apache.org/repos/asf/ambari/blob/61850430/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/grafana-hbase-performance.json
--
diff --git 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/grafana-hbase-performance.json
 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/grafana-hbase-performance.json
new file mode 100644
index 000..57450cb
--- /dev/null
+++ 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/grafana-hbase-performance.json
@@ -0,0 +1,9065 @@
+{
+  "id": 19,
+  "title": "HBase - Performance",
+  "originalTitle": "HBase - Performance",
+  "tags": [
+"hbase"
+  ],
+  "style": "dark",
+  "timezone": "browser",
+  "editable": true,
+  "hideControls": false,
+  "sharedCrosshair": false,
+  "rows": [
+{
+  "collapse": false,
+  "editable": true,
+  "height": "25px",
+  "panels": [
+{
+  "content": "Performance related metrics for the 
HBase cluster. Click on each row title to expand on demand to look at various 
metrics per regionserver. ",
+  "editable": true,
+  "error": false,
+  "id": 99,
+  "isNew": true,
+  "links": [],
+  "mode": "html",
+  "span": 12,
+  "style": {},
+  "title": "Performance Metrics for RegionServers",
+  "type": "text"
+}
+  ],
+  "title": "Description"
+},
+{
+  "collapse": true,
+  "editable": true,
+  "height": "250px",
+  "panels": [
+{
+  "aliasColors": {},
+  "bars": false,
+  "datasource": null,
+  "editable": true,
+  "error": false,
+  "fill": 1,
+  "grid": {
+"leftLogBase": 1,
+"leftMax": null,
+"leftMin": null,
+"rightLogBase": 1,
+"rightMax": null,
+"rightMin": null,
+"threshold1": null,
+"threshold1Color": "rgba(216, 200, 27, 0.27)",
+"threshold2": null,
+"threshold2Color": "rgba(234, 112, 112, 0.22)"
+  },
+  "id": 1,
+  "isNew": true,
+  "legend": {
+"avg": false,
+"current": false,
+"max": false,
+"min": false,
+"show": false,
+"total": false,
+"values": false
+  },
+  "lines": true,
+  "linewidth": 2,
+  "links": [],
+  "nullPointMode": "connected",
+  "percentage": false,
+  "pointradius": 5,
+  "points": false,
+  "renderer": "flot",
+  "seriesOverrides": [],
+  "span": 12,
+  "stack": false,
+  "steppedLine": false,
+  "targets": [
+{
+  "aggregator": "max",
+  "app": "hbase",
+  "downsampleAggregator": "avg",
+  "errors": {},
+  "hosts": "",
+  "metric": "regionserver.Server.regionCount",
+  "precision": "",
+  "refId": "A",
+  "templatedHost": ""
+}
+  ],
+  "timeFrom": null,
+  "timeShift": null,
+  "title": "Num Regions",
+  "tooltip": {
+"shared": false,
+"value_type": "cumulative"
+  },
+  "type": "graph",
+  "x-axis": true,
+  "y-axis": true,
+  "y_formats": [
+"short",
+"short"
+  ]
+}
+  ],
+  "showTitle": true,
+  "title": "Num Regions"
+},
+{
+  "collapse": true,
+  "editable": true,
+  "height": "200px",
+  "panels": [
+{
+  "aliasColors": {},
+  "bars": false,
+  "datasource": null,
+  "editable": true,
+  "error": false,
+  "fill": 1,
+  "grid": {
+"leftLogBase": 1,
+"leftMax": null,
+"leftMin": null,
+"rightLogBase": 1,
+"rightMax": null,
+"rightMin": null,
+"threshold1": null,
+"threshold1Color": "rgba(216, 200, 27, 0.27)",
+"threshold2": null,
+"threshold2Color": "rgba(234, 112, 112, 0.22)"
+  },
+  "id": 6,
+  "isNew": true,
+  "legend": {
+"avg": false,
+"current": false,
+"max": false,
+"min": false,
+"show": false,
+"total": false,
+"values": false
+  },
+  "lines": true,
+  "linewidth": 2,
+  "links": [],
+  "nullPointMode": "connected",
+  "percentage": false,
+  "pointradius": 5,
+  "points": false,
+

ambari git commit: AMBARI-15365. file path spills out of notification panel (pallavkul)

2016-03-19 Thread pallavkul

Repository: ambari
Updated Branches:
  refs/heads/trunk b663dbe1b -> e9e1556f6


AMBARI-15365. file path spills out of notification panel (pallavkul)


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

Branch: refs/heads/trunk
Commit: e9e1556f6c26c06095d18da84bf9e13a958bd3c1
Parents: b663dbe
Author: Pallav Kulshreshtha 
Authored: Fri Mar 18 12:06:59 2016 +0530
Committer: Pallav Kulshreshtha 
Committed: Fri Mar 18 12:12:33 2016 +0530

--
 .../views/files/src/main/resources/ui/app/templates/messages.hbs | 4 ++--
 .../src/main/resources/ui/app/templates/messages/message.hbs | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/e9e1556f/contrib/views/files/src/main/resources/ui/app/templates/messages.hbs
--
diff --git 
a/contrib/views/files/src/main/resources/ui/app/templates/messages.hbs 
b/contrib/views/files/src/main/resources/ui/app/templates/messages.hbs
index 8b6c685..ac5d983 100644
--- a/contrib/views/files/src/main/resources/ui/app/templates/messages.hbs
+++ b/contrib/views/files/src/main/resources/ui/app/templates/messages.hbs
@@ -31,13 +31,13 @@
 
   {{#each model as |message|}}
 {{#link-to 'messages.message' message 
class=(alert-message-context-class message.type "list-group-item 
list-group-item-")}}
-  
+  
 {{#fa-stack}}
   {{fa-icon "circle-thin" stack=2}}
   {{fa-icon (alert-message-icon-class message.type) stack=1}}
 {{/fa-stack}}
 {{{message.message}}}
-  {{shorten-text 
message.responseMessage shortenLength}}
+  {{shorten-text 
message.responseMessage shortenLength}}
 {{/link-to}}
   {{else}}
 No messages present

http://git-wip-us.apache.org/repos/asf/ambari/blob/e9e1556f/contrib/views/files/src/main/resources/ui/app/templates/messages/message.hbs
--
diff --git 
a/contrib/views/files/src/main/resources/ui/app/templates/messages/message.hbs 
b/contrib/views/files/src/main/resources/ui/app/templates/messages/message.hbs
index e3eacec..0c69d58 100644
--- 
a/contrib/views/files/src/main/resources/ui/app/templates/messages/message.hbs
+++ 
b/contrib/views/files/src/main/resources/ui/app/templates/messages/message.hbs
@@ -17,7 +17,7 @@
 }}
 
 
-  
+  
 {{#fa-stack size="lg"}}
   {{fa-icon "circle-thin" stack=2}}
   {{fa-icon (alert-message-icon-class model.type) stack=1}}

ambari git commit: AMBARI-15346. Hive view: Visual Explain does not work when there are multiple statements in the query editor (pallavkul)

2016-03-19 Thread pallavkul

Repository: ambari
Updated Branches:
  refs/heads/branch-2.2 6cc2008d2 -> fa9bed061


AMBARI-15346. Hive view: Visual Explain does not work when there are multiple 
statements in the query editor (pallavkul)


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

Branch: refs/heads/branch-2.2
Commit: fa9bed06162323b20924c6adc40d6bdcfffc0500
Parents: 6cc2008
Author: Pallav Kulshreshtha 
Authored: Fri Mar 18 12:56:59 2016 +0530
Committer: Pallav Kulshreshtha 
Committed: Fri Mar 18 12:56:59 2016 +0530

--
 .../ui/hive-web/app/components/query-editor.js  | 16 
 .../ui/hive-web/app/controllers/index.js| 27 +++-
 2 files changed, 20 insertions(+), 23 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/fa9bed06/contrib/views/hive/src/main/resources/ui/hive-web/app/components/query-editor.js
--
diff --git 
a/contrib/views/hive/src/main/resources/ui/hive-web/app/components/query-editor.js
 
b/contrib/views/hive/src/main/resources/ui/hive-web/app/components/query-editor.js
index 10c6bb3..34b293c 100644
--- 
a/contrib/views/hive/src/main/resources/ui/hive-web/app/components/query-editor.js
+++ 
b/contrib/views/hive/src/main/resources/ui/hive-web/app/components/query-editor.js
@@ -114,21 +114,15 @@ export default Ember.Component.extend({
 var query = this.get('query');
 var editor = this.get('editor');
 
-var isEditorExplainQuery = 
(editor.getValue().toUpperCase().trim().indexOf('EXPLAIN') === 0);
-var isFinalExplainQuery = (query.toUpperCase().trim().indexOf('EXPLAIN') 
=== 0);
+var isFinalExplainQuery = (query.toUpperCase().trim().indexOf('EXPLAIN') > 
-1);
+var editorQuery = editor.getValue();
 
 if (editor.getValue() !== query) {
-
-  if(!isEditorExplainQuery && !isFinalExplainQuery){
-editor.setValue(query || '');
-  } else if(!isEditorExplainQuery && isFinalExplainQuery){
-editor.setValue(editor.getValue() || '');
-  } else if(isEditorExplainQuery && isFinalExplainQuery){
-editor.setValue(editor.getValue() || '');
-  } else{
+  if(isFinalExplainQuery){
+editor.setValue(editorQuery || '')
+  }else {
 editor.setValue(query || '');
   }
-
 }
 
   }.observes('query')

http://git-wip-us.apache.org/repos/asf/ambari/blob/fa9bed06/contrib/views/hive/src/main/resources/ui/hive-web/app/controllers/index.js
--
diff --git 
a/contrib/views/hive/src/main/resources/ui/hive-web/app/controllers/index.js 
b/contrib/views/hive/src/main/resources/ui/hive-web/app/controllers/index.js
index c6f50f4..9584508 100644
--- a/contrib/views/hive/src/main/resources/ui/hive-web/app/controllers/index.js
+++ b/contrib/views/hive/src/main/resources/ui/hive-web/app/controllers/index.js
@@ -284,19 +284,23 @@ export default Ember.Controller.extend({
 queries = queryComponents.queryString.split(';');
 queries = queries.filter(Boolean);
 
-queries = queries.map(function (query) {
-  if (shouldExplain) {
-query = query.replace(/explain formatted|explain/gi, '');
+var queriesLength = queries.length;
 
-if (shouldGetVisualExplain) {
-  return constants.namingConventions.explainFormattedPrefix + query;
-} else {
-  return constants.namingConventions.explainPrefix + query;
-}
+queries = queries.map(function (q, index) {
+  var newQuery = q.replace(/explain formatted|explain/gi, '');
+  return newQuery;
+});
+
+var lastQuery = queries[queriesLength - 1];
+
+if(!Ember.isNone(lastQuery) && shouldExplain) {
+  if (shouldGetVisualExplain) {
+lastQuery = constants.namingConventions.explainFormattedPrefix + 
lastQuery;
   } else {
-return query;
+lastQuery = constants.namingConventions.explainPrefix + lastQuery;
   }
-});
+  queries[queriesLength - 1] = lastQuery;
+}
 
 if (queryComponents.files.length) {
   finalQuery += queryComponents.files.join("\n") + "\n\n";
@@ -306,8 +310,7 @@ export default Ember.Controller.extend({
   finalQuery += queryComponents.udfs.join("\n") + "\n\n";
 }
 
-finalQuery += queries.join(";");
-finalQuery += ";";
+finalQuery += queries.join(";") + ";";
 return finalQuery.trim();
   },

[1/2] ambari git commit: AMBARI-15458. Get and use composite Kerberos Descriptor via the REST API (alexantonenko)

2016-03-19 Thread alexantonenko

Repository: ambari
Updated Branches:
  refs/heads/trunk dcb4ed803 -> f7cde0c7a


AMBARI-15458. Get and use composite Kerberos Descriptor via the REST API 
(alexantonenko)


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

Branch: refs/heads/trunk
Commit: f7cde0c7ab041a0f56e96c996a6fa80b2fda33e9
Parents: cb3d49b
Author: Alex Antonenko 
Authored: Thu Mar 17 12:53:22 2016 +0200
Committer: Alex Antonenko 
Committed: Thu Mar 17 14:07:45 2016 +0200

--
 .../app/controllers/main/admin/kerberos.js  |   3 +
 .../main/admin/kerberos/step4_controller.js |  34 +-
 .../controllers/main/service/add_controller.js  |   4 +-
 .../app/mixins/wizard/addSecurityConfigs.js |  29 +-
 ambari-web/app/utils/ajax/ajax.js   |   8 +-
 .../admin/kerberos/step4_controller_test.js |  84 +--
 .../mixins/wizard/addSeccurityConfigs_test.js   |   2 +-
 .../test/mock_data_setup/stack_descriptors.js   | 560 ++-
 8 files changed, 329 insertions(+), 395 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/f7cde0c7/ambari-web/app/controllers/main/admin/kerberos.js
--
diff --git a/ambari-web/app/controllers/main/admin/kerberos.js 
b/ambari-web/app/controllers/main/admin/kerberos.js
index c021c89..9512a51 100644
--- a/ambari-web/app/controllers/main/admin/kerberos.js
+++ b/ambari-web/app/controllers/main/admin/kerberos.js
@@ -35,6 +35,9 @@ App.MainAdminKerberosController = 
App.KerberosWizardStep4Controller.extend({
 'none': Em.I18n.t('admin.kerberos.wizard.step1.option.manual')
   },
 
+  // use cluster descriptor instead of stack
+  loadStackDescriptorConfigs: Em.alias('loadClusterDescriptorConfigs'),
+
   getAddSecurityWizardStatus: function () {
 return App.db.getSecurityWizardStatus();
   },

http://git-wip-us.apache.org/repos/asf/ambari/blob/f7cde0c7/ambari-web/app/controllers/main/admin/kerberos/step4_controller.js
--
diff --git a/ambari-web/app/controllers/main/admin/kerberos/step4_controller.js 
b/ambari-web/app/controllers/main/admin/kerberos/step4_controller.js
index 914e19e..ac8c212 100644
--- a/ambari-web/app/controllers/main/admin/kerberos/step4_controller.js
+++ b/ambari-web/app/controllers/main/admin/kerberos/step4_controller.js
@@ -36,14 +36,44 @@ App.KerberosWizardStep4Controller = 
App.WizardStep7Controller.extend(App.AddSecu
 }
 var self = this;
 this.clearStep();
-this.getDescriptorConfigs().then(function (properties) {
-  self.setStepConfigs(properties);
+this.getDescriptor().then(function (properties) {
+  
self.setStepConfigs(self.createServicesStackDescriptorConfigs(properties));
 }).always(function() {
   self.set('isRecommendedLoaded', true);
 });
   },
 
   /**
+   * Get descriptor configs from API endpoint.
+   * On Enable Kerberos loads descriptor from cluster STACK resource.
+   * On Add Service Wizard first check for cluster's artifacts 
descriptor and
+   * save it presence status, then loads from cluster COMPOSITE resource.
+   * Check for cluster/artifacts/kerberos_descriptor is necessary to determine 
updating or creation
+   * kerberos descriptor.
+   *
+   * @returns {$.Deferred}
+   */
+  getDescriptor: function() {
+var self = this;
+var dfd = $.Deferred();
+var successCallback = function(data) {
+  dfd.resolve(data);
+};
+if (this.get('isWithinAddService')) {
+  App.ajax.send({
+sender: this,
+name: 'admin.kerberize.cluster_descriptor_artifact'
+  }).always(function(data, status) {
+self.storeClusterDescriptorStatus(status === 'success');
+self.loadClusterDescriptorConfigs().then(successCallback);
+  });
+} else {
+  this.loadStackDescriptorConfigs().then(successCallback);
+}
+return dfd.promise();
+  },
+
+  /**
* Create service config object for Kerberos service.
*
* @param {App.ServiceConfigProperty[]} configs

http://git-wip-us.apache.org/repos/asf/ambari/blob/f7cde0c7/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 60eec45..73abd59 100644
--- a/ambari-web/app/controllers/main/service/add_controller.js
+++ b/ambari-web/app/controllers/main/service/add_controller.js
@@ -298,8 +298,8 @@ App.AddServiceController = 
App.WizardController.extend(App.AddSecurityConfigs, {
 var

[2/2] ambari git commit: AMBARI-15460. Download client configurations does not work (aonishuk)

2016-03-19 Thread aonishuk

AMBARI-15460. Download client configurations does not work (aonishuk)


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

Branch: refs/heads/branch-2.2
Commit: 8b150c51f34cc46498a31c86dd334b52f15e24df
Parents: 9d3fd9e
Author: Andrew Onishuk 
Authored: Thu Mar 17 14:44:51 2016 +0200
Committer: Andrew Onishuk 
Committed: Thu Mar 17 14:44:51 2016 +0200

--
 .../server/controller/internal/ClientConfigResourceProvider.java | 4 
 .../controller/internal/ClientConfigResourceProviderTest.java| 4 
 2 files changed, 8 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/8b150c51/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProvider.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProvider.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProvider.java
index 2d26e4b..fb6b63e 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProvider.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProvider.java
@@ -75,6 +75,8 @@ import java.util.TreeMap;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeoutException;
 
+import static 
org.apache.ambari.server.agent.ExecutionCommand.KeyNames.AGENT_STACK_RETRY_COUNT;
+import static 
org.apache.ambari.server.agent.ExecutionCommand.KeyNames.AGENT_STACK_RETRY_ON_UNAVAILABILITY;
 import static org.apache.ambari.server.agent.ExecutionCommand.KeyNames.DB_NAME;
 import static 
org.apache.ambari.server.agent.ExecutionCommand.KeyNames.GROUP_LIST;
 import static 
org.apache.ambari.server.agent.ExecutionCommand.KeyNames.JAVA_HOME;
@@ -310,6 +312,8 @@ public class ClientConfigResourceProvider extends 
AbstractControllerResourceProv
   hostLevelParams.put(HOST_SYS_PREPPED, configs.areHostsSysPrepped());
   hostLevelParams.putAll(managementController.getRcaParameters());
   hostLevelParams.putAll(managementController.getRcaParameters());
+  hostLevelParams.put(AGENT_STACK_RETRY_ON_UNAVAILABILITY, 
configs.isAgentStackRetryOnInstallEnabled());
+  hostLevelParams.put(AGENT_STACK_RETRY_COUNT, 
configs.getAgentStackRetryOnInstallCount());
 
   // Write down os specific info for the service
   ServiceOsSpecific anyOs = null;

http://git-wip-us.apache.org/repos/asf/ambari/blob/8b150c51/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProviderTest.java
--
diff --git 
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProviderTest.java
 
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProviderTest.java
index 3d44224..76032bd 100644
--- 
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProviderTest.java
+++ 
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProviderTest.java
@@ -240,6 +240,8 @@ public class ClientConfigResourceProviderTest {
 expect(configuration.getResourceDirPath()).andReturn("/tmp/stacks/S1/V1");
 expect(configuration.getJavaVersion()).andReturn(8);
 expect(configuration.areHostsSysPrepped()).andReturn("false");
+
expect(configuration.isAgentStackRetryOnInstallEnabled()).andReturn("false");
+expect(configuration.getAgentStackRetryOnInstallCount()).andReturn("5");
 
expect(configuration.getExternalScriptTimeout()).andReturn(Integer.parseInt(Configuration.EXTERNAL_SCRIPT_TIMEOUT_DEFAULT));
 Map props = new HashMap();
 props.put(Configuration.HIVE_METASTORE_PASSWORD_PROPERTY, "pass");
@@ -442,6 +444,8 @@ public class ClientConfigResourceProviderTest {
 
expect(configuration.getResourceDirPath()).andReturn("/var/lib/ambari-server/src/main/resources");
 expect(configuration.getJavaVersion()).andReturn(8);
 expect(configuration.areHostsSysPrepped()).andReturn("false");
+
expect(configuration.isAgentStackRetryOnInstallEnabled()).andReturn("false");
+expect(configuration.getAgentStackRetryOnInstallCount()).andReturn("5");
 
expect(configuration.getExternalScriptTimeout()).andReturn(Integer.parseInt(Configuration.EXTERNAL_SCRIPT_TIMEOUT_DEFAULT));
 
 Map props = new HashMap

[1/2] ambari git commit: Revert "AMBARI-15429. Additional fix.Cannot specify ZooKeeper heap size via UI.(vbrodetskyi)"

2016-03-19 Thread jonathanhurley

Repository: ambari
Updated Branches:
  refs/heads/branch-2.2 f76f1a6fc -> e81d5721c


Revert "AMBARI-15429. Additional fix.Cannot specify ZooKeeper heap size via 
UI.(vbrodetskyi)"

This reverts commit d5e2a974c9b65c49d5f55d16e6ccb1e71d92f236.


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

Branch: refs/heads/branch-2.2
Commit: b90704993b3e0d929ea1f9dc639a8674334a9b41
Parents: f76f1a6
Author: Jonathan Hurley 
Authored: Fri Mar 18 13:06:15 2016 -0400
Committer: Jonathan Hurley 
Committed: Fri Mar 18 13:06:15 2016 -0400

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


http://git-wip-us.apache.org/repos/asf/ambari/blob/b9070499/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/package/scripts/params_linux.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/package/scripts/params_linux.py
 
b/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/package/scripts/params_linux.py
index e7e054f..6f3de67 100644
--- 
a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/package/scripts/params_linux.py
+++ 
b/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/package/scripts/params_linux.py
@@ -65,7 +65,7 @@ zk_log_dir = 
config['configurations']['zookeeper-env']['zk_log_dir']
 zk_data_dir = config['configurations']['zoo.cfg']['dataDir']
 zk_pid_dir = status_params.zk_pid_dir
 zk_pid_file = status_params.zk_pid_file
-zk_server_heapsize = 
default('configurations/zookeeper-env/zk_server_heapsize', "1024m")
+zk_server_heapsize = 
default('configurations/zookeeper-env/zk_server_heapsize', 1024)
 
 client_port = default('/configurations/zoo.cfg/clientPort', None)

ambari git commit: AMBARI-15457. Topology host info is not cleared when a host is removed. (Daniel Gergely via stoader)

2016-03-19 Thread stoader

Repository: ambari
Updated Branches:
  refs/heads/trunk b65b7c2dd -> a6dd447b0


AMBARI-15457. Topology host info is not cleared when a host is removed. (Daniel 
Gergely via stoader)


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

Branch: refs/heads/trunk
Commit: a6dd447b0878029197f00b2f4cd34adba88e5d47
Parents: b65b7c2
Author: Toader, Sebastian 
Authored: Sat Mar 19 11:52:51 2016 +0100
Committer: Toader, Sebastian 
Committed: Sat Mar 19 11:52:51 2016 +0100

--
 .../internal/HostResourceProvider.java  |  30 -
 .../server/orm/dao/TopologyHostInfoDAO.java | 116 +++
 .../orm/entities/TopologyHostInfoEntity.java|  13 +++
 .../server/state/cluster/ClustersImpl.java  |   4 +
 .../ambari/server/topology/ClusterTopology.java |  48 
 .../server/topology/ClusterTopologyImpl.java|   7 ++
 .../ambari/server/topology/HostGroupInfo.java   |  10 ++
 .../ambari/server/topology/PersistedState.java  |   4 +
 .../server/topology/PersistedStateImpl.java |  18 +++
 .../ambari/server/topology/TopologyManager.java |   3 +-
 .../server/upgrade/UpgradeCatalog222.java   |   6 +-
 .../main/resources/Ambari-DDL-MySQL-CREATE.sql  |   2 +
 .../main/resources/Ambari-DDL-Oracle-CREATE.sql |   2 +
 .../resources/Ambari-DDL-Postgres-CREATE.sql|   2 +
 .../Ambari-DDL-Postgres-EMBEDDED-CREATE.sql |   2 +
 .../resources/Ambari-DDL-SQLAnywhere-CREATE.sql |   2 +
 .../resources/Ambari-DDL-SQLServer-CREATE.sql   |   2 +
 .../AmbariManagementControllerTest.java |   8 +-
 .../internal/HostResourceProviderTest.java  |   1 +
 19 files changed, 255 insertions(+), 25 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/a6dd447b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostResourceProvider.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostResourceProvider.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostResourceProvider.java
index 6251f07..1ffd3aa 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostResourceProvider.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostResourceProvider.java
@@ -64,6 +64,7 @@ import org.apache.ambari.server.state.Service;
 import org.apache.ambari.server.state.ServiceComponent;
 import org.apache.ambari.server.state.ServiceComponentHost;
 import org.apache.ambari.server.state.stack.OsFamily;
+import org.apache.ambari.server.topology.ClusterTopology;
 import org.apache.ambari.server.topology.InvalidTopologyException;
 import org.apache.ambari.server.topology.InvalidTopologyTemplateException;
 import org.apache.ambari.server.topology.LogicalRequest;
@@ -75,6 +76,7 @@ import org.slf4j.LoggerFactory;
 import com.google.inject.Inject;
 import com.google.inject.assistedinject.Assisted;
 import com.google.inject.assistedinject.AssistedInject;
+import com.google.inject.persist.Transactional;
 
 
 /**
@@ -821,7 +823,7 @@ public class HostResourceProvider extends 
AbstractControllerResourceProvider {
 }
   }
 
-
+  @Transactional
   protected void deleteHosts(Set requests)
   throws AmbariException {
 
@@ -886,6 +888,8 @@ public class HostResourceProvider extends 
AbstractControllerResourceProvider {
   // Assume the user also wants to delete it entirely, including all 
clusters.
   clusters.deleteHost(hostRequest.getHostname());
 
+  removeHostFromClusterTopology(clusters, hostRequest);
+
   for (LogicalRequest logicalRequest: 
topologyManager.getRequests(Collections.emptyList())) {
 logicalRequest.removeHostRequestByHostName(hostRequest.getHostname());
   }
@@ -897,6 +901,30 @@ public class HostResourceProvider extends 
AbstractControllerResourceProvider {
   }
 
   /**
+   * Removes hostname from the stateful cluster topology
+   * @param clusters
+   * @param hostRequest
+   * @throws AmbariException
+   */
+  private void removeHostFromClusterTopology(Clusters clusters, HostRequest 
hostRequest) throws AmbariException{
+if(hostRequest.getClusterName() == null) {
+  for( Cluster c : clusters.getClusters().values()) {
+removeHostFromClusterTopology(c.getClusterId(), 
hostRequest.getHostname());
+  }
+} else {
+  long clusterId = 
clusters.getCluster(hostRequest.getClusterName()).getClusterId();
+  removeHostFromClusterTopology(clusterId, hostRequest.getHostname());
+}
+  }
+
+  private void

ambari git commit: AMBARI-15442. StackAdvisor needs to set config map for ams-grafana-env to meet non-null expectations (rlevas)

2016-03-19 Thread rlevas

Repository: ambari
Updated Branches:
  refs/heads/trunk 201961a4a -> 5291228c3


AMBARI-15442. StackAdvisor needs to set config map for ams-grafana-env to meet 
non-null expectations  (rlevas)


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

Branch: refs/heads/trunk
Commit: 5291228c30e17eed6e7b7fdc67bf8907e9a8f632
Parents: 201961a
Author: Robert Levas 
Authored: Thu Mar 17 17:02:35 2016 -0400
Committer: Robert Levas 
Committed: Thu Mar 17 17:02:35 2016 -0400

--
 .../recommendations/RecommendationResponse.java | 16 +---
 .../stacks/HDP/2.0.6/services/stack_advisor.py  |  1 +
 .../python/stacks/2.2/common/test_stack_advisor.py  |  1 +
 3 files changed, 15 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/5291228c/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/recommendations/RecommendationResponse.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/recommendations/RecommendationResponse.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/recommendations/RecommendationResponse.java
index 4a66677..a1253d8 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/recommendations/RecommendationResponse.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/recommendations/RecommendationResponse.java
@@ -128,11 +128,11 @@ public class RecommendationResponse extends 
StackAdvisorResponse {
 
   public static class BlueprintConfigurations {
 @JsonProperty
-private Map properties;
+private final Map properties = new HashMap();
 
 @JsonProperty("property_attributes")
 @JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL)
-private Map propertyAttributes;
+private Map propertyAttributes = null;
 
 public BlueprintConfigurations() {
 
@@ -142,8 +142,18 @@ public class RecommendationResponse extends 
StackAdvisorResponse {
   return properties;
 }
 
+/**
+ * Returns a map of properties for this configuration.
+ * 
+ * It is expected that a non-null value is always returned.
+ *
+ * @param properties a map of properties, always non-null
+ */
 public void setProperties(Map properties) {
-  this.properties = properties;
+  this.properties.clear();
+  if(properties != null) {
+this.properties.putAll(properties);
+  }
 }
 
 public Map getPropertyAttributes() {

http://git-wip-us.apache.org/repos/asf/ambari/blob/5291228c/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py 
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py
index 425ff76..fa1a0d8 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py
@@ -509,6 +509,7 @@ class HDP206StackAdvisor(DefaultStackAdvisor):
 putAmsHbaseSiteProperty = self.putProperty(configurations, 
"ams-hbase-site", services)
 putAmsSiteProperty = self.putProperty(configurations, "ams-site", services)
 putHbaseEnvProperty = self.putProperty(configurations, "ams-hbase-env", 
services)
+putGrafanaProperty = self.putProperty(configurations, "ams-grafana-env", 
services)
 putGrafanaPropertyAttribute = self.putPropertyAttribute(configurations, 
"ams-grafana-env")
 
 amsCollectorHosts = self.getComponentHostNames(services, "AMBARI_METRICS", 
"METRICS_COLLECTOR")

http://git-wip-us.apache.org/repos/asf/ambari/blob/5291228c/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py
--
diff --git 
a/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py 
b/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py
index 59eff4d..921ee23 100644
--- a/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py
+++ b/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py
@@ -2039,6 +2039,7 @@ class TestHDP22StackAdvisor(TestCase):
 }
   },
   "ams-grafana-env": {
+

ambari git commit: AMBARI-15416. Grafana password is required field after upgrade from 2.2.0 to 2.2.2. Fix for install issue. (swagle)

2016-03-19 Thread swagle

Repository: ambari
Updated Branches:
  refs/heads/branch-2.2 d5e2a974c -> 9df79e5ff


AMBARI-15416. Grafana password is required field after upgrade from 2.2.0 to 
2.2.2. Fix for install issue. (swagle)


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

Branch: refs/heads/branch-2.2
Commit: 9df79e5ff0220e8b5f4988247eb5834e0170d9af
Parents: d5e2a97
Author: Siddharth Wagle 
Authored: Thu Mar 17 11:40:24 2016 -0700
Committer: Siddharth Wagle 
Committed: Thu Mar 17 11:40:24 2016 -0700

--
 .../src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/9df79e5f/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py 
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py
index 6132c2c..367687d 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py
@@ -651,7 +651,7 @@ class HDP206StackAdvisor(DefaultStackAdvisor):
 putAmsSiteProperty("timeline.metrics.cluster.aggregate.splitpoints", 
','.join(aggregate_splits))
 
 component_grafana_exists = False
-for service in services:
+for service in services['services']:
   if 'components' in service:
 for component in service['components']:
   if 'StackServiceComponents' in component:

[1/2] ambari git commit: AMBARI-15469. After upgrading from Ambari 2.1.2 to 2.2.1, HDP from 2.3.0 to 2.3.4 , user is getting 'Consistency Check Failed' error while trying to save configuration in Rang

2016-03-19 Thread dmitriusan

Repository: ambari
Updated Branches:
  refs/heads/branch-2.2 acb29037a -> f76f1a6fc
  refs/heads/trunk 711e64ac0 -> d752f5ec8


AMBARI-15469. After upgrading from Ambari 2.1.2 to 2.2.1, HDP from 2.3.0 to 
2.3.4 , user is getting 'Consistency Check Failed' error while trying to save 
configuration in Ranger, Hive and HBase (dlysnichenko)


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

Branch: refs/heads/branch-2.2
Commit: f76f1a6fcfcbd05d8b6c423533bf4b3115f2f031
Parents: acb2903
Author: Lisnichenko Dmitro 
Authored: Fri Mar 18 17:45:17 2016 +0200
Committer: Lisnichenko Dmitro 
Committed: Fri Mar 18 17:45:17 2016 +0200

--
 .../src/main/resources/stacks/HDP/2.2/services/stack_advisor.py  | 3 +++
 .../src/test/python/stacks/2.2/common/test_stack_advisor.py  | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/f76f1a6f/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py 
b/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py
index 5e23b8a..bf6f94b 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py
@@ -666,7 +666,10 @@ class HDP22StackAdvisor(HDP21StackAdvisor):
   
hbaseCoProcessorConfigs['hbase.coprocessor.region.classes'].append(authRegionClasses[item])
   else:
 if 'org.apache.hadoop.hbase.security.access.AccessController' in 
hbaseCoProcessorConfigs['hbase.coprocessor.region.classes']:
+  
hbaseCoProcessorConfigs['hbase.coprocessor.region.classes'].remove('org.apache.hadoop.hbase.security.access.AccessController')
+if 'org.apache.hadoop.hbase.security.access.AccessController' in 
hbaseCoProcessorConfigs['hbase.coprocessor.master.classes']:
   
hbaseCoProcessorConfigs['hbase.coprocessor.master.classes'].remove('org.apache.hadoop.hbase.security.access.AccessController')
+
 
hbaseCoProcessorConfigs['hbase.coprocessor.region.classes'].append("org.apache.hadoop.hbase.security.access.SecureBulkLoadEndpoint")
 if ('hbase.coprocessor.regionserver.classes' in 
configurations["hbase-site"]["properties"]) or \
 ('hbase-site' in services['configurations'] and 
'hbase.coprocessor.regionserver.classes' in 
services['configurations']["hbase-site"]["properties"]):

http://git-wip-us.apache.org/repos/asf/ambari/blob/f76f1a6f/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py
--
diff --git 
a/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py 
b/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py
index 9b2da28..574df4e 100644
--- a/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py
+++ b/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py
@@ -2625,8 +2625,8 @@ class TestHDP22StackAdvisor(TestCase):
 
 # Test when Ranger plugin HBase is enabled in kerberos environment
 
configurations['hbase-site']['properties'].pop('hbase.coprocessor.region.classes',
 None)
-
services['configurations']['hbase-site']['properties']['hbase.coprocessor.region.classes']
 = ''
-
services['configurations']['hbase-site']['properties']['hbase.coprocessor.master.classes']
 = ''
+
services['configurations']['hbase-site']['properties']['hbase.coprocessor.region.classes']
 = 'org.apache.hadoop.hbase.security.access.AccessController'
+
services['configurations']['hbase-site']['properties']['hbase.coprocessor.master.classes']
 = 'org.apache.hadoop.hbase.security.access.AccessController'
 
services['configurations']['hbase-site']['properties']['hbase.security.authentication']
 = 'kerberos'
 
services['configurations']['hbase-site']['properties']['hbase.security.authorization']
 = 'false'
 
services['configurations']['ranger-hbase-plugin-properties']['properties']['ranger-hbase-plugin-enabled']
 = 'Yes'

[02/10] ambari git commit: AMBARI-15450. Templatized Dashboard JSON files - Grafana (Prajwal Rao via yusaku)

2016-03-19 Thread yusaku

http://git-wip-us.apache.org/repos/asf/ambari/blob/61850430/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/grafana-yarn-overview.json
--
diff --git 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/grafana-yarn-overview.json
 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/grafana-yarn-overview.json
deleted file mode 100644
index f802548..000
--- 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/grafana-yarn-overview.json
+++ /dev/null
@@ -1,488 +0,0 @@
-{
-  "id": 3,
-  "title": "YARN Home",
-  "originalTitle": "YARN Home",
-  "tags": [],
-  "style": "dark",
-  "timezone": "browser",
-  "editable": true,
-  "hideControls": false,
-  "sharedCrosshair": false,
-  "rows": [
-{
-  "collapse": false,
-  "editable": true,
-  "height": "200px",
-  "panels": [
-{
-  "cacheTimeout": null,
-  "colorBackground": false,
-  "colorValue": false,
-  "colors": [
-"rgba(245, 54, 54, 0.9)",
-"rgba(237, 129, 40, 0.89)",
-"rgba(50, 172, 45, 0.97)"
-  ],
-  "datasource": null,
-  "editable": true,
-  "error": false,
-  "format": "none",
-  "id": 3,
-  "interval": null,
-  "isNew": true,
-  "links": [],
-  "maxDataPoints": 100,
-  "nullPointMode": "connected",
-  "nullText": null,
-  "postfix": "",
-  "postfixFontSize": "50%",
-  "prefix": "",
-  "prefixFontSize": "50%",
-  "span": 4,
-  "sparkline": {
-"fillColor": "rgba(31, 118, 189, 0.18)",
-"full": false,
-"lineColor": "rgb(31, 120, 193)",
-"show": true
-  },
-  "targets": [
-{
-  "aggregator": "avg",
-  "app": "resourcemanager",
-  "downsampleAggregator": "avg",
-  "errors": {},
-  "metric": "yarn.ClusterMetrics.NumActiveNMs",
-  "refId": "A"
-}
-  ],
-  "thresholds": "",
-  "title": "Active nodes",
-  "type": "singlestat",
-  "valueFontSize": "80%",
-  "valueMaps": [
-{
-  "op": "=",
-  "text": "N/A",
-  "value": "null"
-}
-  ],
-  "valueName": "current"
-},
-{
-  "cacheTimeout": null,
-  "colorBackground": false,
-  "colorValue": false,
-  "colors": [
-"rgba(245, 54, 54, 0.9)",
-"rgba(237, 129, 40, 0.89)",
-"rgba(50, 172, 45, 0.97)"
-  ],
-  "datasource": null,
-  "editable": true,
-  "error": false,
-  "format": "none",
-  "id": 2,
-  "interval": null,
-  "isNew": true,
-  "links": [],
-  "maxDataPoints": 100,
-  "nullPointMode": "connected",
-  "nullText": null,
-  "postfix": "",
-  "postfixFontSize": "50%",
-  "prefix": "",
-  "prefixFontSize": "50%",
-  "span": 4,
-  "sparkline": {
-"fillColor": "rgba(31, 118, 189, 0.18)",
-"full": false,
-"lineColor": "rgb(31, 120, 193)",
-"show": true
-  },
-  "targets": [
-{
-  "aggregator": "avg",
-  "app": "resourcemanager",
-  "downsampleAggregator": "avg",
-  "errors": {},
-  "metric": "yarn.QueueMetrics.Queue=root.AppsRunning",
-  "precision": "seconds",
-  "refId": "A",
-  "shouldAddPrecision": false
-}
-  ],
-  "thresholds": "",
-  "title": "Running apps",
-  "type": "singlestat",
-  "valueFontSize": "80%",
-  "valueMaps": [
-{
-  "op": "=",
-  "text": "N/A",
-  "value": "null"
-}
-  ],
-  "valueName": "current"
-},
-{
-  "cacheTimeout": null,
-  "colorBackground": false,
-  "colorValue": false,
-  "colors": [
-"rgba(245, 54, 54, 0.9)",
-"rgba(237, 129, 40, 0.89)",
-"rgba(50, 172, 45, 0.97)"
-  ],
-  "datasource": null,
-  "editable": true,
-  "error": false,
-  "format": "mbytes",
-  "id": 6,
-  "interval": null,
-  "isNew": true,
-  "links": [],
-  "maxDataPoints": 100,
-  "nullPointMode": "connected",
-  "nullText": null,
-  "postfix": "",
-  "postfixFontSize": "50%",
-  "prefix": "",
-

[08/10] ambari git commit: AMBARI-15450. Templatized Dashboard JSON files - Grafana (Prajwal Rao via yusaku)

2016-03-19 Thread yusaku

http://git-wip-us.apache.org/repos/asf/ambari/blob/b76a5f56/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/grafana-hbase-performance.json
--
diff --git 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/grafana-hbase-performance.json
 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/grafana-hbase-performance.json
new file mode 100644
index 000..57450cb
--- /dev/null
+++ 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/grafana-hbase-performance.json
@@ -0,0 +1,9065 @@
+{
+  "id": 19,
+  "title": "HBase - Performance",
+  "originalTitle": "HBase - Performance",
+  "tags": [
+"hbase"
+  ],
+  "style": "dark",
+  "timezone": "browser",
+  "editable": true,
+  "hideControls": false,
+  "sharedCrosshair": false,
+  "rows": [
+{
+  "collapse": false,
+  "editable": true,
+  "height": "25px",
+  "panels": [
+{
+  "content": "Performance related metrics for the 
HBase cluster. Click on each row title to expand on demand to look at various 
metrics per regionserver. ",
+  "editable": true,
+  "error": false,
+  "id": 99,
+  "isNew": true,
+  "links": [],
+  "mode": "html",
+  "span": 12,
+  "style": {},
+  "title": "Performance Metrics for RegionServers",
+  "type": "text"
+}
+  ],
+  "title": "Description"
+},
+{
+  "collapse": true,
+  "editable": true,
+  "height": "250px",
+  "panels": [
+{
+  "aliasColors": {},
+  "bars": false,
+  "datasource": null,
+  "editable": true,
+  "error": false,
+  "fill": 1,
+  "grid": {
+"leftLogBase": 1,
+"leftMax": null,
+"leftMin": null,
+"rightLogBase": 1,
+"rightMax": null,
+"rightMin": null,
+"threshold1": null,
+"threshold1Color": "rgba(216, 200, 27, 0.27)",
+"threshold2": null,
+"threshold2Color": "rgba(234, 112, 112, 0.22)"
+  },
+  "id": 1,
+  "isNew": true,
+  "legend": {
+"avg": false,
+"current": false,
+"max": false,
+"min": false,
+"show": false,
+"total": false,
+"values": false
+  },
+  "lines": true,
+  "linewidth": 2,
+  "links": [],
+  "nullPointMode": "connected",
+  "percentage": false,
+  "pointradius": 5,
+  "points": false,
+  "renderer": "flot",
+  "seriesOverrides": [],
+  "span": 12,
+  "stack": false,
+  "steppedLine": false,
+  "targets": [
+{
+  "aggregator": "max",
+  "app": "hbase",
+  "downsampleAggregator": "avg",
+  "errors": {},
+  "hosts": "",
+  "metric": "regionserver.Server.regionCount",
+  "precision": "",
+  "refId": "A",
+  "templatedHost": ""
+}
+  ],
+  "timeFrom": null,
+  "timeShift": null,
+  "title": "Num Regions",
+  "tooltip": {
+"shared": false,
+"value_type": "cumulative"
+  },
+  "type": "graph",
+  "x-axis": true,
+  "y-axis": true,
+  "y_formats": [
+"short",
+"short"
+  ]
+}
+  ],
+  "showTitle": true,
+  "title": "Num Regions"
+},
+{
+  "collapse": true,
+  "editable": true,
+  "height": "200px",
+  "panels": [
+{
+  "aliasColors": {},
+  "bars": false,
+  "datasource": null,
+  "editable": true,
+  "error": false,
+  "fill": 1,
+  "grid": {
+"leftLogBase": 1,
+"leftMax": null,
+"leftMin": null,
+"rightLogBase": 1,
+"rightMax": null,
+"rightMin": null,
+"threshold1": null,
+"threshold1Color": "rgba(216, 200, 27, 0.27)",
+"threshold2": null,
+"threshold2Color": "rgba(234, 112, 112, 0.22)"
+  },
+  "id": 6,
+  "isNew": true,
+  "legend": {
+"avg": false,
+"current": false,
+"max": false,
+"min": false,
+"show": false,
+"total": false,
+"values": false
+  },
+  "lines": true,
+  "linewidth": 2,
+  "links": [],
+  "nullPointMode": "connected",
+  "percentage": false,
+  "pointradius": 5,
+  "points": false,
+

ambari git commit: AMBARI-15435: Update Hawq GUCS: Refactor resource related GUC (goutamtadi via jaoki)

2016-03-19 Thread jaoki

Repository: ambari
Updated Branches:
  refs/heads/branch-2.2 d9c6025ea -> e3a673f74


AMBARI-15435: Update Hawq GUCS: Refactor resource related GUC (goutamtadi via 
jaoki)


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

Branch: refs/heads/branch-2.2
Commit: e3a673f747bd274ec16535b4aa11302634ce39d4
Parents: d9c6025
Author: Jun Aoki 
Authored: Thu Mar 17 16:44:09 2016 -0700
Committer: Jun Aoki 
Committed: Thu Mar 17 16:44:09 2016 -0700

--
 .../HAWQ/2.0.0/configuration/hawq-site.xml  |  66 ---
 .../HAWQ/2.0.0/themes/theme.json| 113 ---
 .../stacks/HDP/2.3/services/stack_advisor.py|   5 +-
 .../stacks/2.3/common/test_stack_advisor.py |  15 +--
 4 files changed, 157 insertions(+), 42 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/e3a673f7/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-site.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-site.xml
 
b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-site.xml
index d187017..93ad3fe 100644
--- 
a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-site.xml
+++ 
b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-site.xml
@@ -114,7 +114,7 @@
 
   
 hawq_master_temp_directory
-HAWQ Master Temp Directory
+HAWQ Master Temp Directories
 /tmp/hawq/master
 
   Used as temporary filespace to store workfile cache, sort/join temp 
files etc.
@@ -128,7 +128,7 @@
 
   
 hawq_segment_temp_directory
-HAWQ Segment Temp Directory
+HAWQ Segment Temp Directories
 /tmp/hawq/segment
 
   Used as temporary filespace to store workfile cache, sort/join temp 
files etc.
@@ -146,17 +146,17 @@
 Resource Manager
 none
 
-  HAWQ global resource manager type. Valid values are YARN ('yarn') and 
Native ('none').
-  Native('none') indicates that the HAWQ resource manager manages its own 
resources exclusively for the entire cluster.
+  HAWQ global resource manager type. Valid values are YARN ('yarn') and 
Standalone ('none').
+  Standalone('none') indicates that the HAWQ resource manager manages its 
own resources exclusively for the entire cluster.
   YARN ('yarn') means that HAWQ will negotiate with YARN's resource 
manager for resources.
-  The default is Native ('none').
+  The default is Standalone ('none').
 
 
   value-list
   
 
   none
-  Native
+  Standalone
 
 
   yarn
@@ -172,7 +172,7 @@
 Segment Memory Usage Limit
 64GB
 
-  The maximum memory that can be used by a HAWQ segment when Resource 
Manager ('hawq_global_rm_type') is set to Native ('none').
+  The maximum memory that can be used by a HAWQ segment when Resource 
Manager ('hawq_global_rm_type') is set to Standalone ('none').
   The default is 64GB.
 
 
@@ -185,7 +185,7 @@
 Segment Virtual Core Usage Limit
 16
 
-  The maximum number of virtual cores that can be used for query execution 
in a HAWQ segment when Resource Manager ('hawq_global_rm_type') is set to 
Native ('none').
+  The maximum number of virtual cores that can be used for query execution 
in a HAWQ segment when Resource Manager ('hawq_global_rm_type') is set to 
Standalone ('none').
   The default is 16.
 
 
@@ -299,18 +299,52 @@
   
 
   
-default_segment_num
-Default Number of Virtual Segments
-24
+default_hash_table_bucket_number
+Default buckets for Hash Distributed tables
+6
 
-  The default number of virtual segments to use when executing a query 
statement.
-  When the query is actually executed, the number of virtual segments may 
differ from this number depending on the query's needs.
-  When expanding the cluster, you should adjust this number to reflect the 
number of nodes in the new cluster times the number of virtual segments per 
node.
-  The default is 24.
+ The default number of virtual segments per query for hash distributed 
tables that can be used for query execution in a HAWQ segment when Resource 
Manager ('hawq_global_rm_type') is set to Standalone ('none').
+  The default is 6.
 
 
   int
-  0
+  1
+  1
+  100
+
+  
+
+
+hawq_rm_nvseg_perquery_perseg_limit
+Virtual Segments Limit per Query (per Segment 
Node)
+6
+
+

ambari git commit: AMBARI-15429. Additional fix.Cannot specify ZooKeeper heap size via UI.(vbrodetskyi)

2016-03-19 Thread vbrodetskyi

Repository: ambari
Updated Branches:
  refs/heads/trunk 3cc686f64 -> 961c33dcd


AMBARI-15429. Additional fix.Cannot specify ZooKeeper heap size via 
UI.(vbrodetskyi)


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

Branch: refs/heads/trunk
Commit: 961c33dcd14ce4152f5e97bea9c45f26f349390a
Parents: 3cc686f
Author: Vitaly Brodetskyi 
Authored: Thu Mar 17 15:07:29 2016 +0200
Committer: Vitaly Brodetskyi 
Committed: Thu Mar 17 15:07:29 2016 +0200

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


http://git-wip-us.apache.org/repos/asf/ambari/blob/961c33dc/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/package/scripts/params_linux.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/package/scripts/params_linux.py
 
b/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/package/scripts/params_linux.py
index d64eb5c..3306556 100644
--- 
a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/package/scripts/params_linux.py
+++ 
b/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/package/scripts/params_linux.py
@@ -65,7 +65,7 @@ zk_log_dir = 
config['configurations']['zookeeper-env']['zk_log_dir']
 zk_data_dir = config['configurations']['zoo.cfg']['dataDir']
 zk_pid_dir = status_params.zk_pid_dir
 zk_pid_file = status_params.zk_pid_file
-zk_server_heapsize = 
default('configurations/zookeeper-env/zk_server_heapsize', 1024)
+zk_server_heapsize = 
default('configurations/zookeeper-env/zk_server_heapsize', "1024m")
 
 client_port = default('/configurations/zoo.cfg/clientPort', None)

[03/10] ambari git commit: AMBARI-15450. Templatized Dashboard JSON files - Grafana (Prajwal Rao via yusaku)

2016-03-19 Thread yusaku

http://git-wip-us.apache.org/repos/asf/ambari/blob/61850430/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/grafana-yarn-home.json
--
diff --git 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/grafana-yarn-home.json
 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/grafana-yarn-home.json
new file mode 100644
index 000..df86f86
--- /dev/null
+++ 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/grafana-yarn-home.json
@@ -0,0 +1,639 @@
+{
+  "id": 3,
+  "title": "YARN - Home",
+  "originalTitle": "YARN - Home",
+  "tags": [
+"yarn"
+  ],
+  "style": "dark",
+  "timezone": "browser",
+  "editable": true,
+  "hideControls": false,
+  "sharedCrosshair": false,
+  "rows": [
+{
+  "collapse": false,
+  "editable": true,
+  "height": "25px",
+  "panels": [
+{
+  "content": "Metrics to see the overall status 
for the YARN cluster. ",
+  "editable": true,
+  "error": false,
+  "id": 11,
+  "isNew": true,
+  "links": [],
+  "mode": "html",
+  "span": 12,
+  "style": {},
+  "title": "",
+  "type": "text"
+}
+  ],
+  "title": "New row"
+},
+{
+  "collapse": false,
+  "editable": true,
+  "height": "150px",
+  "panels": [
+{
+  "cacheTimeout": null,
+  "colorBackground": false,
+  "colorValue": false,
+  "colors": [
+"rgba(245, 54, 54, 0.9)",
+"rgba(237, 129, 40, 0.89)",
+"rgba(50, 172, 45, 0.97)"
+  ],
+  "datasource": null,
+  "editable": true,
+  "error": false,
+  "format": "none",
+  "id": 3,
+  "interval": null,
+  "isNew": true,
+  "links": [],
+  "maxDataPoints": 100,
+  "nullPointMode": "connected",
+  "nullText": null,
+  "postfix": "",
+  "postfixFontSize": "50%",
+  "prefix": "",
+  "prefixFontSize": "50%",
+  "span": 3,
+  "sparkline": {
+"fillColor": "rgba(31, 118, 189, 0.18)",
+"full": false,
+"lineColor": "rgb(31, 120, 193)",
+"show": true
+  },
+  "targets": [
+{
+  "aggregator": "max",
+  "app": "resourcemanager",
+  "downsampleAggregator": "avg",
+  "errors": {},
+  "metric": "yarn.ClusterMetrics.NumActiveNMs",
+  "precision": "",
+  "refId": "A"
+}
+  ],
+  "thresholds": "",
+  "title": "Active nodes",
+  "type": "singlestat",
+  "valueFontSize": "80%",
+  "valueMaps": [
+{
+  "op": "=",
+  "text": "N/A",
+  "value": "null"
+}
+  ],
+  "valueName": "max"
+},
+{
+  "cacheTimeout": null,
+  "colorBackground": false,
+  "colorValue": false,
+  "colors": [
+"rgba(245, 54, 54, 0.9)",
+"rgba(237, 129, 40, 0.89)",
+"rgba(50, 172, 45, 0.97)"
+  ],
+  "datasource": null,
+  "editable": true,
+  "error": false,
+  "format": "mbytes",
+  "id": 10,
+  "interval": null,
+  "isNew": true,
+  "links": [],
+  "maxDataPoints": 100,
+  "nullPointMode": "connected",
+  "nullText": null,
+  "postfix": "",
+  "postfixFontSize": "50%",
+  "prefix": "",
+  "prefixFontSize": "50%",
+  "span": 3,
+  "sparkline": {
+"fillColor": "rgba(31, 118, 189, 0.18)",
+"full": false,
+"lineColor": "rgb(31, 120, 193)",
+"show": true
+  },
+  "targets": [
+{
+  "aggregator": "max",
+  "app": "resourcemanager",
+  "downsampleAggregator": "avg",
+  "errors": {},
+  "metric": "yarn.QueueMetrics.Queue=root.AvailableMB",
+  "precision": "",
+  "refId": "A",
+  "shouldAddPrecision": false,
+  "shouldComputeRate": false
+}
+  ],
+  "thresholds": "",
+  "title": "Cluster Memory Available",
+  "type": "singlestat",
+  "valueFontSize": "80%",
+  "valueMaps": [
+{
+  "op": "=",
+  "text": "N/A",
+  "value": "null"
+}
+  ],
+  "valueName": "current"
+},
+{
+  "cacheTimeout": null,
+  "colorBackground": false,
+

ambari git commit: AMBARI-15424. Manual re-execution is required after entering the password for LDAP (pallavkul)

2016-03-19 Thread pallavkul

Repository: ambari
Updated Branches:
  refs/heads/branch-2.2 3cfea2267 -> 6cc2008d2


AMBARI-15424. Manual re-execution is required after entering the password for 
LDAP (pallavkul)


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

Branch: refs/heads/branch-2.2
Commit: 6cc2008d24f37b4366224ed3f0245719f56bf2bb
Parents: 3cfea22
Author: Pallav Kulshreshtha 
Authored: Fri Mar 18 12:45:12 2016 +0530
Committer: Pallav Kulshreshtha 
Committed: Fri Mar 18 12:45:12 2016 +0530

--
 .../ui/hive-web/app/controllers/databases.js   |  5 +
 .../resources/ui/hive-web/app/controllers/index.js | 17 ++---
 2 files changed, 11 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/6cc2008d/contrib/views/hive/src/main/resources/ui/hive-web/app/controllers/databases.js
--
diff --git 
a/contrib/views/hive/src/main/resources/ui/hive-web/app/controllers/databases.js
 
b/contrib/views/hive/src/main/resources/ui/hive-web/app/controllers/databases.js
index 2a69349..a841e3b 100644
--- 
a/contrib/views/hive/src/main/resources/ui/hive-web/app/controllers/databases.js
+++ 
b/contrib/views/hive/src/main/resources/ui/hive-web/app/controllers/databases.js
@@ -230,8 +230,6 @@ export default Ember.Controller.extend({
   var self = this,
   defer = Ember.RSVP.defer();
 
-  self.getDatabases = this.getDatabases;
-
   this.send('openModal', 'modal-save', {
 heading: "modals.authenticationLDAP.heading",
 text:"",
@@ -250,7 +248,6 @@ export default Ember.Controller.extend({
 
 $.ajax({
   url: ldapAuthURL,
-  dataType: "json",
   type: 'post',
   headers: {'X-Requested-With': 'XMLHttpRequest', 'X-Requested-By': 
'ambari'},
   contentType: 'application/json',
@@ -258,13 +255,13 @@ export default Ember.Controller.extend({
   success: function( data, textStatus, jQxhr ){
 console.log( "LDAP done: " + data );
 self.getDatabases();
+self.syncDatabases();
   },
   error: function( jqXhr, textStatus, errorThrown ){
 console.log( "LDAP fail: " + errorThrown );
 self.get('notifyService').error( "Wrong Credentials." );
   }
 });
-
   });
 },
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/6cc2008d/contrib/views/hive/src/main/resources/ui/hive-web/app/controllers/index.js
--
diff --git 
a/contrib/views/hive/src/main/resources/ui/hive-web/app/controllers/index.js 
b/contrib/views/hive/src/main/resources/ui/hive-web/app/controllers/index.js
index a056759..c6f50f4 100644
--- a/contrib/views/hive/src/main/resources/ui/hive-web/app/controllers/index.js
+++ b/contrib/views/hive/src/main/resources/ui/hive-web/app/controllers/index.js
@@ -488,8 +488,6 @@ export default Ember.Controller.extend({
 self = this,
 defer = Ember.RSVP.defer();
 
-self.createJob = this.createJob;
-
 this.send('openModal', 'modal-save', {
   heading: "modals.authenticationLDAP.heading",
   text:"",
@@ -506,21 +504,26 @@ export default Ember.Controller.extend({
 var hiveViewName = pathNameArray[4];
 var ldapAuthURL = "/api/v1/views/HIVE/versions/"+ hiveViewVersion 
+ "/instances/" + hiveViewName + "/jobs/auth";
 
-
 $.ajax({
 url: ldapAuthURL,
-dataType: "json",
 type: 'post',
 headers: {'X-Requested-With': 'XMLHttpRequest', 
'X-Requested-By': 'ambari'},
 contentType: 'application/json',
 data: JSON.stringify({ "password" : password}),
 success: function( data, textStatus, jQxhr ){
-console.log( "LDAP done: " + data );
-self.createJob (job,originalModel);
+
+  self.get('databaseService').getDatabases().then(function 
(databases) {
+var selectedDatabase = 
self.get('databaseService.selectedDatabase.name') || 'default';
+self.get('databaseService').setDatabaseByName( 
selectedDatabase);
+return self.send('executeQuery', 'job', 
self.get('openQueries.currentQuery.fileContent') );
+  }).catch(function (error) {
+self.get('notifyService').error( "Error in accessing 
databases." );
+  });
+
 },
 error: function( jqXhr, textStatus,

[10/10] ambari git commit: AMBARI-15450. Templatized Dashboard JSON files - Grafana (Prajwal Rao via yusaku)

2016-03-19 Thread yusaku

AMBARI-15450. Templatized Dashboard JSON files - Grafana (Prajwal Rao via 
yusaku)


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

Branch: refs/heads/branch-2.2
Commit: 6185043060bedfb828d586a57efd0e93f74914e4
Parents: 09b9094
Author: Yusaku Sako 
Authored: Wed Mar 16 17:04:05 2016 -0700
Committer: Yusaku Sako 
Committed: Wed Mar 16 17:04:50 2016 -0700

--
 .../grafana-dashboards/grafana-hbase-home.json  | 2561 +
 .../grafana-hbase-master.json   |  241 -
 .../grafana-dashboards/grafana-hbase-misc.json  | 1680 
 .../grafana-hbase-performance.json  | 9065 ++
 .../grafana-dashboards/grafana-hbase-rs.json|  241 -
 .../grafana-hdfs-datanodes.json | 1038 ++
 .../grafana-dashboards/grafana-hdfs-dn.json |  199 -
 .../grafana-dashboards/grafana-hdfs-home.json   |  741 ++
 .../grafana-hdfs-namenodes.json | 1931 
 .../grafana-dashboards/grafana-hdfs-nn.json |  199 -
 .../grafana-dashboards/grafana-system-home.json | 1769 
 .../grafana-system-servers.json | 2482 +
 .../grafana-yarn-applications.json  |  517 +
 .../grafana-dashboards/grafana-yarn-apps.json   |  135 -
 .../grafana-dashboards/grafana-yarn-home.json   |  639 ++
 .../grafana-yarn-jobhistoryserver.json  |  397 +
 .../grafana-dashboards/grafana-yarn-nm.json |  315 -
 .../grafana-yarn-nodemanagers.json  | 1693 
 .../grafana-yarn-overview.json  |  488 -
 .../grafana-dashboards/grafana-yarn-queues.json | 1514 +++
 .../grafana-yarn-resourcemanagers.json  |  935 ++
 .../grafana-dashboards/grafana-yarn-rm.json |  125 -
 .../grafana-yarn-timelineserver.json|  374 +
 23 files changed, 27336 insertions(+), 1943 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/61850430/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/grafana-hbase-home.json
--
diff --git 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/grafana-hbase-home.json
 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/grafana-hbase-home.json
new file mode 100644
index 000..94096c0
--- /dev/null
+++ 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/grafana-hbase-home.json
@@ -0,0 +1,2561 @@
+{
+  "id": 13,
+  "title": "HBase - Home",
+  "originalTitle": "HBase - Home",
+  "tags": [
+"hbase"
+  ],
+  "style": "dark",
+  "timezone": "browser",
+  "editable": true,
+  "hideControls": false,
+  "sharedCrosshair": false,
+  "rows": [
+{
+  "collapse": false,
+  "editable": true,
+  "height": "25px",
+  "panels": [
+{
+  "content": "Metrics to see the overall status 
for the HBase cluster. Click on each row title to expand on demand to look at 
various metrics. ",
+  "editable": true,
+  "error": false,
+  "id": 22,
+  "isNew": true,
+  "links": [],
+  "mode": "html",
+  "span": 12,
+  "style": {},
+  "title": "",
+  "type": "text"
+}
+  ],
+  "showTitle": false,
+  "title": "Description"
+},
+{
+  "collapse": false,
+  "editable": true,
+  "height": "25px",
+  "panels": [
+{
+  "cacheTimeout": null,
+  "colorBackground": false,
+  "colorValue": false,
+  "colors": [
+"rgba(245, 54, 54, 0.9)",
+"rgba(237, 129, 40, 0.89)",
+"rgba(50, 172, 45, 0.97)"
+  ],
+  "datasource": null,
+  "editable": true,
+  "error": false,
+  "format": "none",
+  "hideTimeOverride": true,
+  "id": 2,
+  "interval": null,
+  "isNew": true,
+  "links": [],
+  "maxDataPoints": 100,
+  "nullPointMode": "connected",
+  "nullText": null,
+  "postfix": "",
+  "postfixFontSize": "100%",
+  "prefix": "",
+  "prefixFontSize": "100%",
+  "span": 3,
+  "sparkline": {
+"fillColor": "rgba(31, 118, 189, 0.18)",
+"full": true,
+"lineColor": "rgb(31, 120, 193)",
+"show": true
+  },
+  "targets": [
+{
+  "aggregator": "max",
+  "app": "hbase",
+

ambari git commit: AMBARI-15439 Add Upgrade Check for Kafka Kerb on HDP 2.2 -> 2.3+ (dsen)

2016-03-19 Thread dsen

Repository: ambari
Updated Branches:
  refs/heads/trunk 6dcb48422 -> 23a24ca9c


AMBARI-15439 Add Upgrade Check for Kafka Kerb on HDP 2.2 -> 2.3+ (dsen)


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

Branch: refs/heads/trunk
Commit: 23a24ca9c2bea6fa238f2808c338fcea52b21d75
Parents: 6dcb484
Author: Dmytro Sen 
Authored: Wed Mar 16 16:03:58 2016 +0200
Committer: Dmytro Sen 
Committed: Wed Mar 16 16:03:58 2016 +0200

--
 .../ambari/server/checks/CheckDescription.java  | 10 ++-
 .../server/checks/KafkaKerberosCheck.java   | 66 ++
 .../ambari/server/checks/UpgradeCheckGroup.java |  5 ++
 .../HDP/2.2/upgrades/nonrolling-upgrade-2.3.xml |  3 +
 .../HDP/2.2/upgrades/nonrolling-upgrade-2.4.xml |  3 +
 .../stacks/HDP/2.2/upgrades/upgrade-2.3.xml |  1 +
 .../stacks/HDP/2.2/upgrades/upgrade-2.4.xml |  1 +
 .../server/checks/KafkaKerberosCheckTest.java   | 95 
 8 files changed, 183 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/23a24ca9/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 b06848a..79be901 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
@@ -248,7 +248,15 @@ public enum CheckDescription {
 "The response from Ranger was malformed. %s. Request: %s");
 put(RangerPasswordCheck.KEY_RANGER_CONFIG_MISSING,
 "Could not check credentials.  Missing property %s/%s");
-  }});
+  }}),
+
+  KAFKA_KERBEROS_CHECK(PrereqCheckType.SERVICE,
+"Kafka upgrade on Kerberized cluster",
+new HashMap() {{
+  put(AbstractCheckDescriptor.DEFAULT,
+"Kafka is currently not Kerberized, but your cluster is. After 
upgrading, Kafka will automatically be Kerberized for you.");
+}}
+  );
 
 
   private PrereqCheckType m_type;

http://git-wip-us.apache.org/repos/asf/ambari/blob/23a24ca9/ambari-server/src/main/java/org/apache/ambari/server/checks/KafkaKerberosCheck.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/checks/KafkaKerberosCheck.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/checks/KafkaKerberosCheck.java
new file mode 100644
index 000..69721d9
--- /dev/null
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/checks/KafkaKerberosCheck.java
@@ -0,0 +1,66 @@
+/*
+ * 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.Arrays;
+
+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.SecurityType;
+import org.apache.ambari.server.state.stack.PrereqCheckStatus;
+import org.apache.ambari.server.state.stack.PrerequisiteCheck;
+
+import com.google.inject.Singleton;
+
+/**
+ * Check that cluster is kerberized while trying to upgrade Kafka.
+ * Will show warning for kerberized cluster with Kafka service and nothing if
+ * cluster is not kerberized
+ */
+@Singleton
+@UpgradeCheck(group = UpgradeCheckGroup.KERBEROS, order = 1.0f)
+public class KafkaKerberosCheck extends AbstractCheckDescriptor {
+
+  private final String KAFKA_SERVICE = "KAFKA";
+
+  /**
+   * Constructor.
+   */
+  public KafkaKerberosCheck() {
+super(CheckDescription.KAFKA_KERBEROS_CHECK);
+  }
+
+  @Override
+  public boolean

ambari git commit: AMBARI-15358: Enable bulk operation for HAWQ Segments and PXF on Hosts page (gowtam tadi via bhuvnesh2703)

2016-03-19 Thread bhuvnesh2703

Repository: ambari
Updated Branches:
  refs/heads/trunk 0c29bc5f0 -> 1e673420e


AMBARI-15358: Enable bulk operation for HAWQ Segments and PXF on Hosts page 
(gowtam tadi via bhuvnesh2703)


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

Branch: refs/heads/trunk
Commit: 1e673420e50959841bee04f168882f843f132696
Parents: 0c29bc5
Author: Bhuvnesh Chaudhary 
Authored: Wed Mar 16 17:09:13 2016 -0700
Committer: Bhuvnesh Chaudhary 
Committed: Wed Mar 16 17:09:13 2016 -0700

--
 ambari-web/app/messages.js  |  2 ++
 ambari-web/app/views/main/host/hosts_table_menu_view.js | 10 ++
 2 files changed, 12 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/1e673420/ambari-web/app/messages.js
--
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index dc9c264..9289fc2 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -2633,6 +2633,8 @@ Em.I18n.translations = {
   'dashboard.services.yarn.memory.msg': '{0} used / {1} reserved / {2} 
available',
   'dashboard.services.yarn.queues': 'Queues',
   'dashboard.services.yarn.queues.msg': '{0} Queues',
+  'dashboard.services.hawq.hawqSegments':'HAWQ Segments',
+  'dashboard.services.pxf.pxfHosts':'PXF',
 
   'dashboard.services.flume.summary.title':'Flume installed on {0} host{1} 
({2} agent{3})',
   'dashboard.services.flume.summary.configure':'Configure Agents',

http://git-wip-us.apache.org/repos/asf/ambari/blob/1e673420/ambari-web/app/views/main/host/hosts_table_menu_view.js
--
diff --git a/ambari-web/app/views/main/host/hosts_table_menu_view.js 
b/ambari-web/app/views/main/host/hosts_table_menu_view.js
index 3c1d584..e75b643 100644
--- a/ambari-web/app/views/main/host/hosts_table_menu_view.js
+++ b/ambari-web/app/views/main/host/hosts_table_menu_view.js
@@ -58,6 +58,16 @@ App.HostTableMenuView = Em.View.extend({
 componentNameFormatted: 
Em.I18n.t('dashboard.services.hbase.regionServers')
   }),
   O.create({
+serviceName: 'HAWQ',
+componentName: 'HAWQSEGMENT',
+componentNameFormatted: 
Em.I18n.t('dashboard.services.hawq.hawqSegments')
+  }),
+  O.create({
+serviceName: 'PXF',
+componentName: 'PXF',
+componentNameFormatted: Em.I18n.t('dashboard.services.pxf.pxfHosts')
+  }),
+  O.create({
 serviceName: 'STORM',
 componentName: 'SUPERVISOR',
 masterComponentName: 'SUPERVISOR',

ambari git commit: AMBARI-15481. Metrics Alert definitions not updated through Alerts UI (alexantonenko)

2016-03-19 Thread alexantonenko

Repository: ambari
Updated Branches:
  refs/heads/trunk fa611afd2 -> a4d5a31bb


AMBARI-15481. Metrics Alert definitions not updated through Alerts UI 
(alexantonenko)


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

Branch: refs/heads/trunk
Commit: a4d5a31bb34dab85dc526e70c9ec8328f16bd3a2
Parents: fa611af
Author: Alex Antonenko 
Authored: Fri Mar 18 17:08:27 2016 +0200
Committer: Alex Antonenko 
Committed: Fri Mar 18 17:08:39 2016 +0200

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


http://git-wip-us.apache.org/repos/asf/ambari/blob/a4d5a31b/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 e9f6726..a927b59 100644
--- a/ambari-web/app/controllers/main/alerts/definition_configs_controller.js
+++ b/ambari-web/app/controllers/main/alerts/definition_configs_controller.js
@@ -128,7 +128,7 @@ App.MainAlertDefinitionConfigsController = 
Em.Controller.extend({
*/
   getThresholdsProperty: function (type, property) {
 var warning = this.get('content.reporting').findProperty('type', type);
-return warning && warning.get(property) ? warning.get(property) : null;
+return warning && !Ember.isEmpty(warning.get(property)) ? 
warning.get(property) : null;
   },
 
   /**
@@ -346,7 +346,7 @@ App.MainAlertDefinitionConfigsController = 
Em.Controller.extend({
 label: isWizard ? '' : parameter.get('displayName'),
 threshold: isWizard ? '' : parameter.get('threshold'),
 units: isWizard ? '' : parameter.get('units'),
-type: isWizard ? '' : parameter.get('type'),
+type: isWizard ? '' : parameter.get('type')
   }));
 });

ambari git commit: AMBARI-15429. Additional fix.Cannot specify ZooKeeper heap size via UI.(vbrodetskyi)

2016-03-19 Thread vbrodetskyi

Repository: ambari
Updated Branches:
  refs/heads/branch-2.2 01b01bdc4 -> d5e2a974c


AMBARI-15429. Additional fix.Cannot specify ZooKeeper heap size via 
UI.(vbrodetskyi)


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

Branch: refs/heads/branch-2.2
Commit: d5e2a974c9b65c49d5f55d16e6ccb1e71d92f236
Parents: 01b01bd
Author: Vitaly Brodetskyi 
Authored: Thu Mar 17 15:05:43 2016 +0200
Committer: Vitaly Brodetskyi 
Committed: Thu Mar 17 15:05:43 2016 +0200

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


http://git-wip-us.apache.org/repos/asf/ambari/blob/d5e2a974/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/package/scripts/params_linux.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/package/scripts/params_linux.py
 
b/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/package/scripts/params_linux.py
index 6f3de67..e7e054f 100644
--- 
a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/package/scripts/params_linux.py
+++ 
b/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/package/scripts/params_linux.py
@@ -65,7 +65,7 @@ zk_log_dir = 
config['configurations']['zookeeper-env']['zk_log_dir']
 zk_data_dir = config['configurations']['zoo.cfg']['dataDir']
 zk_pid_dir = status_params.zk_pid_dir
 zk_pid_file = status_params.zk_pid_file
-zk_server_heapsize = 
default('configurations/zookeeper-env/zk_server_heapsize', 1024)
+zk_server_heapsize = 
default('configurations/zookeeper-env/zk_server_heapsize', "1024m")
 
 client_port = default('/configurations/zoo.cfg/clientPort', None)

[05/10] ambari git commit: AMBARI-15450. Templatized Dashboard JSON files - Grafana (Prajwal Rao via yusaku)

2016-03-19 Thread yusaku

http://git-wip-us.apache.org/repos/asf/ambari/blob/b76a5f56/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/grafana-system-home.json
--
diff --git 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/grafana-system-home.json
 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/grafana-system-home.json
new file mode 100644
index 000..5fcf195
--- /dev/null
+++ 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/grafana-system-home.json
@@ -0,0 +1,1769 @@
+{
+  "id": 25,
+  "title": "System - Home",
+  "originalTitle": "System - Home",
+  "tags": [
+"host"
+  ],
+  "style": "dark",
+  "timezone": "browser",
+  "editable": true,
+  "hideControls": false,
+  "sharedCrosshair": false,
+  "rows": [
+{
+  "collapse": false,
+  "editable": true,
+  "height": "25px",
+  "panels": [
+{
+  "content": "Metrics to see the overall status 
of the cluster. Click on each row title to expand on demand to look at various 
metrics. ",
+  "editable": true,
+  "error": false,
+  "id": 1,
+  "isNew": true,
+  "links": [],
+  "mode": "html",
+  "span": 12,
+  "style": {},
+  "title": "",
+  "type": "text"
+}
+  ],
+  "showTitle": false,
+  "title": "Description"
+},
+{
+  "collapse": false,
+  "editable": true,
+  "height": "25px",
+  "panels": [
+{
+  "cacheTimeout": null,
+  "colorBackground": false,
+  "colorValue": false,
+  "colors": [
+"rgba(245, 54, 54, 0.9)",
+"rgba(237, 129, 40, 0.89)",
+"rgba(50, 172, 45, 0.97)"
+  ],
+  "datasource": null,
+  "editable": true,
+  "error": false,
+  "format": "none",
+  "id": 20,
+  "interval": null,
+  "isNew": true,
+  "links": [],
+  "maxDataPoints": 100,
+  "nullPointMode": "connected",
+  "nullText": null,
+  "postfix": "",
+  "postfixFontSize": "50%",
+  "prefix": "",
+  "prefixFontSize": "50%",
+  "span": 4,
+  "sparkline": {
+"fillColor": "rgba(31, 118, 189, 0.18)",
+"full": true,
+"lineColor": "rgb(31, 120, 193)",
+"show": true
+  },
+  "targets": [
+{
+  "aggregator": "avg",
+  "app": "HOST",
+  "downsampleAggregator": "avg",
+  "errors": {},
+  "metric": "cpu_num",
+  "precision": "",
+  "refId": "A"
+}
+  ],
+  "thresholds": "",
+  "title": "Logical CPU Count Per Server",
+  "type": "singlestat",
+  "valueFontSize": "80%",
+  "valueMaps": [
+{
+  "op": "=",
+  "text": "N/A",
+  "value": "null"
+}
+  ],
+  "valueName": "current"
+},
+{
+  "cacheTimeout": null,
+  "colorBackground": false,
+  "colorValue": false,
+  "colors": [
+"rgba(245, 54, 54, 0.9)",
+"rgba(237, 129, 40, 0.89)",
+"rgba(50, 172, 45, 0.97)"
+  ],
+  "datasource": null,
+  "editable": true,
+  "error": false,
+  "format": "kbytes",
+  "id": 21,
+  "interval": null,
+  "isNew": true,
+  "links": [],
+  "maxDataPoints": 100,
+  "nullPointMode": "connected",
+  "nullText": null,
+  "postfix": "",
+  "postfixFontSize": "50%",
+  "prefix": "",
+  "prefixFontSize": "50%",
+  "span": 4,
+  "sparkline": {
+"fillColor": "rgba(31, 118, 189, 0.18)",
+"full": true,
+"lineColor": "rgb(31, 120, 193)",
+"show": true
+  },
+  "targets": [
+{
+  "aggregator": "avg",
+  "app": "HOST",
+  "downsampleAggregator": "avg",
+  "errors": {},
+  "metric": "mem_total",
+  "precision": "",
+  "refId": "A"
+}
+  ],
+  "thresholds": "",
+  "title": "Total Memory Per Server",
+  "type": "singlestat",
+  "valueFontSize": "80%",
+  "valueMaps": [
+{
+  "op": "=",
+  "text": "N/A",
+  "value": "null"
+}
+  ],
+  "valueName": "current"
+},
+{
+  "cacheTimeout": null,
+  "colorBackground": false,
+  "colorValue": false,
+  "colors": [

ambari git commit: AMBARI-15477. Success-message for aborting request is shown encoded (onechiporenko)

2016-03-19 Thread onechiporenko

Repository: ambari
Updated Branches:
  refs/heads/trunk 795fac68f -> ba2c77f15


AMBARI-15477. Success-message for aborting request is shown encoded 
(onechiporenko)


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

Branch: refs/heads/trunk
Commit: ba2c77f15fadb29898b8674ec1a3b2a264ddb457
Parents: 795fac6
Author: Oleg Nechiporenko 
Authored: Fri Mar 18 13:16:10 2016 +0200
Committer: Oleg Nechiporenko 
Committed: Fri Mar 18 13:16:10 2016 +0200

--
 ambari-web/app/utils/host_progress_popup.js | 31 ++--
 .../widgets/create/expression_view_test.js  | 14 -
 2 files changed, 22 insertions(+), 23 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/ba2c77f1/ambari-web/app/utils/host_progress_popup.js
--
diff --git a/ambari-web/app/utils/host_progress_popup.js 
b/ambari-web/app/utils/host_progress_popup.js
index d15d8bf..8c3da78 100644
--- a/ambari-web/app/utils/host_progress_popup.js
+++ b/ambari-web/app/utils/host_progress_popup.js
@@ -17,7 +17,6 @@
  */
 
 var App = require('app');
-var batchUtils = require('utils/batch_scheduled_requests');
 var date = require('utils/date/date');
 var dataUtils = require('utils/data_manipulation');
 
@@ -229,7 +228,7 @@ App.HostPopup = Em.Object.create({
*/
   isAbortableByStatus: function (status) {
 var statuses = this.get('statusesStyleMap');
-return !Em.keys(statuses).contains(status) || status == 'IN_PROGRESS';
+return !Em.keys(statuses).contains(status) || status === 'IN_PROGRESS';
   },
 
   /**
@@ -266,6 +265,7 @@ App.HostPopup = Em.Object.create({
   abortRequestSuccessCallback: function (response, request, data) {
 return App.ModalPopup.show({
   header: Em.I18n.t('hostPopup.bgop.abortRequest.modal.header'),
+  encodeBody: false,
   body: 
Em.I18n.t('hostPopup.bgop.abortRequest.modal.body').format(data.requestName),
   secondary: null
 });
@@ -329,7 +329,9 @@ App.HostPopup = Em.Object.create({
   dataSourceController: null,
   currentHostName: null
 });
-this.get('isPopup') ? this.get('isPopup').remove() : null;
+if(this.get('isPopup')) {
+  this.get('isPopup').remove();
+}
   },
 
   /**
@@ -422,7 +424,7 @@ App.HostPopup = Em.Object.create({
   setBackgroundOperationHeader: function (isServiceListHidden) {
 if (this.get('isBackgroundOperations') && !isServiceListHidden) {
   var numRunning = 
App.router.get('backgroundOperationsController.allOperationsCount');
-  this.set("popupHeaderName", numRunning + 
Em.I18n.t('hostPopup.header.postFix').format(numRunning == 1 ? "" : "s"));
+  this.set("popupHeaderName", numRunning + 
Em.I18n.t('hostPopup.header.postFix').format(numRunning === 1 ? "" : "s"));
 }
   },
 
@@ -450,7 +452,7 @@ App.HostPopup = Em.Object.create({
   updatedService = this.createService(service);
   servicesInfo.insertAt(index, updatedService);
 }
-updatedService.set('isAbortable',  
App.isAuthorized('SERVICE.START_STOP') &&  
this.isAbortableByStatus(service.status));
+updatedService.set('isAbortable', 
App.isAuthorized('SERVICE.START_STOP') && 
this.isAbortableByStatus(service.status));
   }, this);
   this.removeOldServices(servicesInfo, currentServices);
   this.setBackgroundOperationHeader(isServiceListHidden);
@@ -543,7 +545,7 @@ App.HostPopup = Em.Object.create({
 return Em.Object.create({
   id: _task.Tasks.id,
   hostName: _task.Tasks.host_name,
-  command: _task.Tasks.command.toLowerCase() == 'service_check' ? '' : 
_task.Tasks.command.toLowerCase(),
+  command: _task.Tasks.command.toLowerCase() === 'service_check' ? '' : 
_task.Tasks.command.toLowerCase(),
   commandDetail: App.format.commandDetail(_task.Tasks.command_detail, 
_task.Tasks.request_inputs),
   status: App.format.taskStatus(_task.Tasks.status),
   role: App.format.role(_task.Tasks.role, false),
@@ -575,7 +577,6 @@ App.HostPopup = Em.Object.create({
* @method onHostUpdate
*/
   onHostUpdate: function () {
-var inputData = this.get('inputData');
 var self = this;
 if (this.get("inputData")) {
   var hostsMap = this._getHostsMap();
@@ -593,7 +594,7 @@ App.HostPopup = Em.Object.create({
   }
 }
 var operation = this.get('servicesInfo').findProperty('name', 
this.get('serviceName'));
-this.set('operationInfo', !operation || (operation && 
operation.get('progress') == 100) ? null : operation);
+this.set('operationInfo', !operation || operation &&

ambari git commit: AMBARI-15429. Cannot specify ZooKeeper heap size via UI.(vbrodetskyi)

2016-03-19 Thread vbrodetskyi

Repository: ambari
Updated Branches:
  refs/heads/branch-2.2 33bc51690 -> 01b01bdc4


AMBARI-15429. Cannot specify ZooKeeper heap size via UI.(vbrodetskyi)


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

Branch: refs/heads/branch-2.2
Commit: 01b01bdc4271ba2b9c03bc8452a8ebe31c7bb980
Parents: 33bc516
Author: Vitaly Brodetskyi 
Authored: Thu Mar 17 12:38:56 2016 +0200
Committer: Vitaly Brodetskyi 
Committed: Thu Mar 17 12:38:56 2016 +0200

--
 .../3.4.5.2.0/configuration/zookeeper-env.xml   | 16 +++-
 .../3.4.5.2.0/package/scripts/params_linux.py   |  2 +-
 2 files changed, 16 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/01b01bdc/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/configuration/zookeeper-env.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/configuration/zookeeper-env.xml
 
b/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/configuration/zookeeper-env.xml
index cabdf2c..27f7aca 100644
--- 
a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/configuration/zookeeper-env.xml
+++ 
b/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/configuration/zookeeper-env.xml
@@ -52,6 +52,20 @@
   
 
   
+zk_server_heapsize
+1024
+Maximum amount of memory each Zookeeper Server can 
use.
+Zookeeper Server Maximum Memory
+
+  int
+  256
+  32768
+  MB
+  256
+
+  
+
+  
 zookeeper_principal_name
 ZooKeeper principal name
   
@@ -71,7 +85,7 @@ export JAVA_HOME={{java64_home}}
 export ZOOKEEPER_HOME={{zk_home}}
 export ZOO_LOG_DIR={{zk_log_dir}}
 export ZOOPIDFILE={{zk_pid_file}}
-export SERVER_JVMFLAGS={{zk_server_heapsize}}
+export SERVER_JVMFLAGS=-Xmx{{zk_server_heapsize}}
 export JAVA=$JAVA_HOME/bin/java
 export CLASSPATH=$CLASSPATH:/usr/share/zookeeper/*
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/01b01bdc/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/package/scripts/params_linux.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/package/scripts/params_linux.py
 
b/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/package/scripts/params_linux.py
index c6264ff..6f3de67 100644
--- 
a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/package/scripts/params_linux.py
+++ 
b/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/package/scripts/params_linux.py
@@ -65,7 +65,7 @@ zk_log_dir = 
config['configurations']['zookeeper-env']['zk_log_dir']
 zk_data_dir = config['configurations']['zoo.cfg']['dataDir']
 zk_pid_dir = status_params.zk_pid_dir
 zk_pid_file = status_params.zk_pid_file
-zk_server_heapsize = "-Xmx1024m"
+zk_server_heapsize = 
default('configurations/zookeeper-env/zk_server_heapsize', 1024)
 
 client_port = default('/configurations/zoo.cfg/clientPort', None)

ambari git commit: AMBARI-15457. Topology host info is not cleared when a host is removed. (Daniel Gergely via stoader)

2016-03-19 Thread stoader

Repository: ambari
Updated Branches:
  refs/heads/branch-2.2 55db5cb48 -> 4ae094997


AMBARI-15457. Topology host info is not cleared when a host is removed. (Daniel 
Gergely via stoader)


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

Branch: refs/heads/branch-2.2
Commit: 4ae09499732c9d997edbb215837713619dc4e639
Parents: 55db5cb
Author: Toader, Sebastian 
Authored: Sat Mar 19 07:19:43 2016 +0100
Committer: Toader, Sebastian 
Committed: Sat Mar 19 07:19:43 2016 +0100

--
 .../internal/HostResourceProvider.java  |  30 -
 .../server/orm/dao/TopologyHostInfoDAO.java | 116 +++
 .../orm/entities/TopologyHostInfoEntity.java|  13 +++
 .../server/state/cluster/ClustersImpl.java  |   4 +
 .../ambari/server/topology/ClusterTopology.java |  48 
 .../server/topology/ClusterTopologyImpl.java|   7 ++
 .../ambari/server/topology/HostGroupInfo.java   |  10 ++
 .../ambari/server/topology/PersistedState.java  |   4 +
 .../server/topology/PersistedStateImpl.java |  18 +++
 .../ambari/server/topology/TopologyManager.java |   3 +-
 .../server/upgrade/UpgradeCatalog222.java   |   6 +-
 .../main/resources/Ambari-DDL-MySQL-CREATE.sql  |   2 +
 .../main/resources/Ambari-DDL-Oracle-CREATE.sql |   2 +
 .../resources/Ambari-DDL-Postgres-CREATE.sql|   2 +
 .../Ambari-DDL-Postgres-EMBEDDED-CREATE.sql |   2 +
 .../resources/Ambari-DDL-SQLAnywhere-CREATE.sql |   2 +
 .../resources/Ambari-DDL-SQLServer-CREATE.sql   |   2 +
 .../AmbariManagementControllerTest.java |   8 +-
 .../internal/HostResourceProviderTest.java  |   1 +
 19 files changed, 255 insertions(+), 25 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/4ae09499/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostResourceProvider.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostResourceProvider.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostResourceProvider.java
index 6101ee8..c033760 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostResourceProvider.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostResourceProvider.java
@@ -60,6 +60,7 @@ import org.apache.ambari.server.state.Service;
 import org.apache.ambari.server.state.ServiceComponent;
 import org.apache.ambari.server.state.ServiceComponentHost;
 import org.apache.ambari.server.state.stack.OsFamily;
+import org.apache.ambari.server.topology.ClusterTopology;
 import org.apache.ambari.server.topology.InvalidTopologyException;
 import org.apache.ambari.server.topology.InvalidTopologyTemplateException;
 import org.apache.ambari.server.topology.LogicalRequest;
@@ -72,6 +73,7 @@ import org.slf4j.LoggerFactory;
 import com.google.inject.Inject;
 import com.google.inject.assistedinject.Assisted;
 import com.google.inject.assistedinject.AssistedInject;
+import com.google.inject.persist.Transactional;
 
 
 /**
@@ -775,7 +777,7 @@ public class HostResourceProvider extends 
AbstractControllerResourceProvider {
 }
   }
 
-
+  @Transactional
   protected void deleteHosts(Set requests)
   throws AmbariException {
 
@@ -840,6 +842,8 @@ public class HostResourceProvider extends 
AbstractControllerResourceProvider {
   // Assume the user also wants to delete it entirely, including all 
clusters.
   clusters.deleteHost(hostRequest.getHostname());
 
+  removeHostFromClusterTopology(clusters, hostRequest);
+
   for (LogicalRequest logicalRequest: 
topologyManager.getRequests(Collections.emptyList())) {
 logicalRequest.removeHostRequestByHostName(hostRequest.getHostname());
   }
@@ -851,6 +855,30 @@ public class HostResourceProvider extends 
AbstractControllerResourceProvider {
   }
 
   /**
+   * Removes hostname from the stateful cluster topology
+   * @param clusters
+   * @param hostRequest
+   * @throws AmbariException
+   */
+  private void removeHostFromClusterTopology(Clusters clusters, HostRequest 
hostRequest) throws AmbariException{
+if(hostRequest.getClusterName() == null) {
+  for( Cluster c : clusters.getClusters().values()) {
+removeHostFromClusterTopology(c.getClusterId(), 
hostRequest.getHostname());
+  }
+} else {
+  long clusterId = 
clusters.getCluster(hostRequest.getClusterName()).getClusterId();
+  removeHostFromClusterTopology(clusterId, hostRequest.getHostname());
+}
+  }
+
+  private void

ambari git commit: AMBARI-15428. Fix HBase master heap recommendations.(vbrodetskyi)

2016-03-19 Thread vbrodetskyi

Repository: ambari
Updated Branches:
  refs/heads/trunk df2d304b1 -> dcb4ed803


AMBARI-15428. Fix HBase master heap recommendations.(vbrodetskyi)


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

Branch: refs/heads/trunk
Commit: dcb4ed80392219717e11dc6e14b646810fc83f7e
Parents: df2d304
Author: Vitaly Brodetskyi 
Authored: Thu Mar 17 11:04:03 2016 +0200
Committer: Vitaly Brodetskyi 
Committed: Thu Mar 17 11:04:03 2016 +0200

--
 .../stacks/HDP/2.0.6/services/stack_advisor.py  | 23 +++--
 .../stacks/2.0.6/common/test_stack_advisor.py   | 35 ++--
 .../stacks/2.1/common/test_stack_advisor.py | 33 +-
 .../stacks/2.2/common/test_stack_advisor.py |  4 +--
 .../stacks/2.3/common/test_stack_advisor.py |  4 +--
 5 files changed, 58 insertions(+), 41 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/dcb4ed80/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py 
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py
index 8c18421..54d6d6e 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py
@@ -281,9 +281,25 @@ class HDP206StackAdvisor(DefaultStackAdvisor):
 
   def recommendHbaseConfigurations(self, configurations, clusterData, 
services, hosts):
 # recommendations for HBase env config
+
+# If cluster size is < 100, hbase master heap = 2G
+# else If cluster size is < 500, hbase master heap = 4G
+# else hbase master heap = 8G
+# for small test clusters use 1 gb
+hostsCount = 0
+if hosts and "items" in hosts:
+  hostsCount = len(hosts["items"])
+
+hbaseMasterRam = {
+  hostsCount < 20: 1,
+  20 <= hostsCount < 100: 2,
+  100 <= hostsCount < 500: 4,
+  500 <= hostsCount: 8
+}[True]
+
 putHbaseProperty = self.putProperty(configurations, "hbase-env", services)
 putHbaseProperty('hbase_regionserver_heapsize', 
int(clusterData['hbaseRam']) * 1024)
-putHbaseProperty('hbase_master_heapsize', int(clusterData['hbaseRam']) * 
1024)
+putHbaseProperty('hbase_master_heapsize', hbaseMasterRam * 1024)
 
 # recommendations for HBase site config
 putHbaseSiteProperty = self.putProperty(configurations, "hbase-site", 
services)
@@ -782,7 +798,7 @@ class HDP206StackAdvisor(DefaultStackAdvisor):
   {"os":12, "hbase":16},
   {"os":24, "hbase":24},
   {"os":32, "hbase":32},
-  {"os":64, "hbase":64}
+  {"os":64, "hbase":32}
 ]
 index = {
   cluster["ram"] <= 4: 0,
@@ -797,9 +813,12 @@ class HDP206StackAdvisor(DefaultStackAdvisor):
   128 < cluster["ram"] <= 256: 9,
   256 < cluster["ram"]: 10
 }[1]
+
+
 cluster["reservedRam"] = ramRecommendations[index]["os"]
 cluster["hbaseRam"] = ramRecommendations[index]["hbase"]
 
+
 cluster["minContainerSize"] = {
   cluster["ram"] <= 4: 256,
   4 < cluster["ram"] <= 8: 512,

http://git-wip-us.apache.org/repos/asf/ambari/blob/dcb4ed80/ambari-server/src/test/python/stacks/2.0.6/common/test_stack_advisor.py
--
diff --git 
a/ambari-server/src/test/python/stacks/2.0.6/common/test_stack_advisor.py 
b/ambari-server/src/test/python/stacks/2.0.6/common/test_stack_advisor.py
index e15582e..d157936 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/common/test_stack_advisor.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/common/test_stack_advisor.py
@@ -665,23 +665,22 @@ class TestHDP206StackAdvisor(TestCase):
 servicesList = ["HBASE"]
 configurations = {}
 components = []
+host_item = {
+  "Hosts" : {
+"cpu_count" : 6,
+"total_mem" : 50331648,
+"disk_info" : [
+  {"mountpoint" : "/"},
+  {"mountpoint" : "/dev/shm"},
+  {"mountpoint" : "/vagrant"},
+  {"mountpoint" : "/"},
+  {"mountpoint" : "/dev/shm"},
+  {"mountpoint" : "/vagrant"}
+]
+  }
+}
 hosts = {
-  "items" : [
-{
-  "Hosts" : {
-"cpu_count" : 6,
-"total_mem" : 50331648,
-"disk_info" : [
-  {"mountpoint" : "/"},
-  {"mountpoint" : "/dev/shm"},
-  {"mountpoint" : "/vagrant"},
-  {"mountpoint" : "/"},
-  {"mountpoint" :

ambari git commit: AMBARI-15448. Report AMS / Grafana Per Disk Metrics and other changes. (swagle)

2016-03-19 Thread swagle

Repository: ambari
Updated Branches:
  refs/heads/branch-2.2 2b1e7b75d -> 395bca848


AMBARI-15448. Report AMS / Grafana Per Disk Metrics and other changes. (swagle)


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

Branch: refs/heads/branch-2.2
Commit: 395bca848fc8e502b8174bacd84dc24562f8d794
Parents: 2b1e7b7
Author: Siddharth Wagle 
Authored: Wed Mar 16 18:16:04 2016 -0700
Committer: Siddharth Wagle 
Committed: Wed Mar 16 18:16:04 2016 -0700

--
 .../src/main/python/core/config_reader.py   |   8 +-
 .../src/main/python/core/controller.py  |  21 ++--
 .../src/main/python/core/host_info.py   | 110 +++
 .../src/main/python/core/metric_collector.py|   6 +-
 .../src/test/python/core/TestHostInfo.py|  77 +++--
 .../package/scripts/metrics_grafana_util.py |   6 +-
 .../package/templates/metric_monitor.ini.j2 |   2 +-
 .../templates/hadoop-metrics2.properties.j2 |   5 +-
 8 files changed, 154 insertions(+), 81 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/395bca84/ambari-metrics/ambari-metrics-host-monitoring/src/main/python/core/config_reader.py
--
diff --git 
a/ambari-metrics/ambari-metrics-host-monitoring/src/main/python/core/config_reader.py
 
b/ambari-metrics/ambari-metrics-host-monitoring/src/main/python/core/config_reader.py
index a053955..02f0ce3 100644
--- 
a/ambari-metrics/ambari-metrics-host-monitoring/src/main/python/core/config_reader.py
+++ 
b/ambari-metrics/ambari-metrics-host-monitoring/src/main/python/core/config_reader.py
@@ -163,7 +163,8 @@ class Configuration:
   self.config.readfp(StringIO.StringIO(config_content))
 pass
 if os.path.exists(METRIC_FILE_PATH):
-  self.metric_groups = json.load(open(METRIC_FILE_PATH))
+  with open(METRIC_FILE_PATH, 'r') as f:
+self.metric_groups = json.load(f)
 else:
   print 'No metric configs found at {0}'.format(METRIC_FILE_PATH)
   self.metric_groups = \
@@ -201,7 +202,7 @@ class Configuration:
 return int(self.get("emitter", "send_interval", 60))
 
   def get_collector_sleep_interval(self):
-return int(self.get("collector", "collector_sleep_interval", 5))
+return int(self.get("collector", "collector_sleep_interval", 10))
 
   def get_hostname_config(self):
 return self.get("default", "hostname", None)
@@ -231,5 +232,4 @@ class Configuration:
   return 6188
 
   def get_ca_certs(self):
-return self._ca_cert_file_path
-
+return self._ca_cert_file_path
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/395bca84/ambari-metrics/ambari-metrics-host-monitoring/src/main/python/core/controller.py
--
diff --git 
a/ambari-metrics/ambari-metrics-host-monitoring/src/main/python/core/controller.py
 
b/ambari-metrics/ambari-metrics-host-monitoring/src/main/python/core/controller.py
index c04a61b..c2ee448 100644
--- 
a/ambari-metrics/ambari-metrics-host-monitoring/src/main/python/core/controller.py
+++ 
b/ambari-metrics/ambari-metrics-host-monitoring/src/main/python/core/controller.py
@@ -57,14 +57,14 @@ class Controller(threading.Thread):
 
 self.start_emitter()
 
-  # Wake every 5 seconds to push events to the queue
+# Wake every 5 seconds to push events to the queue
 while True:
   if (self.event_queue.full()):
 logger.warn('Event Queue full!! Suspending further collections.')
   else:
 self.enqueque_events()
   pass
-  #Wait for the service stop event instead of sleeping blindly
+  # Wait for the service stop event instead of sleeping blindly
   if 0 == self._stop_handler.wait(self.sleep_interval):
 logger.info('Shutting down Controller thread')
 break
@@ -73,7 +73,8 @@ class Controller(threading.Thread):
   self._t.cancel()
   self._t.join(5)
 
-#The emitter thread should have stopped by now, just ensure it has shut 
down properly
+# The emitter thread should have stopped by now, just ensure it has shut
+# down properly
 self.emitter.join(5)
 pass
 
@@ -103,13 +104,13 @@ class Controller(threading.Thread):
   pass
 pass
 
-if process_metrics_groups:
-  for name, properties in process_metrics_groups.iteritems():
-event = ProcessMetricCollectEvent(properties, name)
-logger.info('Adding event to cache, {0} : {1}'.format(name, 
properties))
-#self.events_cache.append(event)
-  pass
-pass
+# if

ambari git commit: AMBARI-15442. StackAdvisor needs to set config map for ams-grafana-env to meet non-null expectations (rlevas)

2016-03-19 Thread rlevas

Repository: ambari
Updated Branches:
  refs/heads/branch-2.2 48b23a52a -> d9c6025ea


AMBARI-15442. StackAdvisor needs to set config map for ams-grafana-env to meet 
non-null expectations  (rlevas)


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

Branch: refs/heads/branch-2.2
Commit: d9c6025ea953197af70f9e143f9ce8676918c0ee
Parents: 48b23a5
Author: Robert Levas 
Authored: Thu Mar 17 17:03:50 2016 -0400
Committer: Robert Levas 
Committed: Thu Mar 17 17:03:50 2016 -0400

--
 .../recommendations/RecommendationResponse.java | 16 +---
 .../stacks/HDP/2.0.6/services/stack_advisor.py  |  1 +
 .../python/stacks/2.2/common/test_stack_advisor.py  |  1 +
 3 files changed, 15 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/d9c6025e/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/recommendations/RecommendationResponse.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/recommendations/RecommendationResponse.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/recommendations/RecommendationResponse.java
index 4a66677..a1253d8 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/recommendations/RecommendationResponse.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/recommendations/RecommendationResponse.java
@@ -128,11 +128,11 @@ public class RecommendationResponse extends 
StackAdvisorResponse {
 
   public static class BlueprintConfigurations {
 @JsonProperty
-private Map properties;
+private final Map properties = new HashMap();
 
 @JsonProperty("property_attributes")
 @JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL)
-private Map propertyAttributes;
+private Map propertyAttributes = null;
 
 public BlueprintConfigurations() {
 
@@ -142,8 +142,18 @@ public class RecommendationResponse extends 
StackAdvisorResponse {
   return properties;
 }
 
+/**
+ * Returns a map of properties for this configuration.
+ * 
+ * It is expected that a non-null value is always returned.
+ *
+ * @param properties a map of properties, always non-null
+ */
 public void setProperties(Map properties) {
-  this.properties = properties;
+  this.properties.clear();
+  if(properties != null) {
+this.properties.putAll(properties);
+  }
 }
 
 public Map getPropertyAttributes() {

http://git-wip-us.apache.org/repos/asf/ambari/blob/d9c6025e/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py 
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py
index 367687d..ee2007f 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py
@@ -486,6 +486,7 @@ class HDP206StackAdvisor(DefaultStackAdvisor):
 putAmsHbaseSiteProperty = self.putProperty(configurations, 
"ams-hbase-site", services)
 putAmsSiteProperty = self.putProperty(configurations, "ams-site", services)
 putHbaseEnvProperty = self.putProperty(configurations, "ams-hbase-env", 
services)
+putGrafanaProperty = self.putProperty(configurations, "ams-grafana-env", 
services)
 putGrafanaPropertyAttribute = self.putPropertyAttribute(configurations, 
"ams-grafana-env")
 
 amsCollectorHosts = self.getComponentHostNames(services, "AMBARI_METRICS", 
"METRICS_COLLECTOR")

http://git-wip-us.apache.org/repos/asf/ambari/blob/d9c6025e/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py
--
diff --git 
a/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py 
b/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py
index 7a6c512..9b2da28 100644
--- a/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py
+++ b/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py
@@ -2000,6 +2000,7 @@ class TestHDP22StackAdvisor(TestCase):
 }
   },

[1/2] ambari git commit: AMBARI-15426. changing jdk version being used by HDP does not work (aonishuk)

2016-03-19 Thread aonishuk

Repository: ambari
Updated Branches:
  refs/heads/branch-2.2 345a52a27 -> dbcca75bd
  refs/heads/trunk 8eb7f6cd0 -> e4418ee38


AMBARI-15426. changing jdk version being used by HDP does not work (aonishuk)


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

Branch: refs/heads/trunk
Commit: e4418ee382aadc20d50a830ff19331d0da54739b
Parents: 8eb7f6c
Author: Andrew Onishuk 
Authored: Wed Mar 16 17:29:45 2016 +0200
Committer: Andrew Onishuk 
Committed: Wed Mar 16 17:29:45 2016 +0200

--
 .../custom_actions/scripts/check_host.py|  9 --
 .../before-ANY/scripts/shared_initialization.py | 34 
 .../test/python/custom_actions/TestCheckHost.py |  1 +
 .../2.0.6/hooks/before-ANY/test_before_any.py   |  7 +++-
 4 files changed, 33 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/e4418ee3/ambari-server/src/main/resources/custom_actions/scripts/check_host.py
--
diff --git 
a/ambari-server/src/main/resources/custom_actions/scripts/check_host.py 
b/ambari-server/src/main/resources/custom_actions/scripts/check_host.py
index 09b2c05..9b79290 100644
--- a/ambari-server/src/main/resources/custom_actions/scripts/check_host.py
+++ b/ambari-server/src/main/resources/custom_actions/scripts/check_host.py
@@ -25,6 +25,7 @@ import re
 import subprocess
 import socket
 import getpass
+import tempfile
 
 from resource_management.libraries.functions import packages_analyzer
 from resource_management.libraries.functions.default import default
@@ -344,14 +345,14 @@ class CheckHost(Script):
   db_connection_check_structured_output = {"exit_code" : 1, "message": 
message}
   return db_connection_check_structured_output
   else:
-tmp_java_dir = format("{tmp_dir}/jdk")
+tmp_java_dir = tempfile.mkdtemp(prefix="jdk_tmp_", dir=tmp_dir)
 sudo = AMBARI_SUDO_BINARY
 if jdk_name.endswith(".bin"):
   chmod_cmd = ("chmod", "+x", jdk_download_target)
-  install_cmd = format("mkdir -p {tmp_java_dir} && cd {tmp_java_dir} 
&& echo A | {jdk_download_target} -noregister && {sudo} cp -rp {tmp_java_dir}/* 
{java_dir}")
+  install_cmd = format("cd {tmp_java_dir} && echo A | 
{jdk_download_target} -noregister && {sudo} cp -rp {tmp_java_dir}/* {java_dir}")
 elif jdk_name.endswith(".gz"):
   chmod_cmd = ("chmod","a+x", java_dir)
-  install_cmd = format("mkdir -p {tmp_java_dir} && cd {tmp_java_dir} 
&& tar -xf {jdk_download_target} && {sudo} cp -rp {tmp_java_dir}/* {java_dir}")
+  install_cmd = format("cd {tmp_java_dir} && tar -xf 
{jdk_download_target} && {sudo} cp -rp {tmp_java_dir}/* {java_dir}")
 try:
   Directory(java_dir)
   Execute(chmod_cmd, not_if = format("test -e {java_exec}"), sudo = 
True)
@@ -363,6 +364,8 @@ class CheckHost(Script):
   print message
   db_connection_check_structured_output = {"exit_code" : 1, "message": 
message}
   return db_connection_check_structured_output
+finally:
+  Directory(tmp_java_dir, action="delete")
 
 # download DBConnectionVerification.jar from ambari-server resources
 try:

http://git-wip-us.apache.org/repos/asf/ambari/blob/e4418ee3/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/shared_initialization.py
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/shared_initialization.py
 
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/shared_initialization.py
index f5556fb..ed6c36c 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/shared_initialization.py
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/shared_initialization.py
@@ -20,6 +20,7 @@ limitations under the License.
 import os
 import re
 import getpass
+import tempfile
 from copy import copy
 from resource_management.libraries.functions.version import compare_versions
 from resource_management import *
@@ -179,7 +180,6 @@ def setup_java():
 
 jdk_curl_target = format("{tmp_dir}/{jdk_name}")
 java_dir = os.path.dirname(params.java_home)
-tmp_java_dir = format("{tmp_dir}/jdk")
 
 if not params.jdk_name:
   return
@@ -193,22 +193,28 @@ def setup_java():
  not_if = format("test -f {jdk_curl_target}")
 )
 
-if params.jdk_name.endswith(".bin"):
-  chmod_cmd = ("chmod", "+x", jdk_curl_target)

ambari git commit: AMBARI-15416. Grafana password is required field after upgrade from 2.2.0 to 2.2.2. Fix for install issue. (swagle)

2016-03-19 Thread swagle

Repository: ambari
Updated Branches:
  refs/heads/trunk 961c33dcd -> 96d76f5c2


AMBARI-15416. Grafana password is required field after upgrade from 2.2.0 to 
2.2.2. Fix for install issue. (swagle)


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

Branch: refs/heads/trunk
Commit: 96d76f5c26914d8380f8b2045135189bc513b063
Parents: 961c33d
Author: Siddharth Wagle 
Authored: Thu Mar 17 11:41:09 2016 -0700
Committer: Siddharth Wagle 
Committed: Thu Mar 17 11:41:09 2016 -0700

--
 .../src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/96d76f5c/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py 
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py
index 54d6d6e..425ff76 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py
@@ -674,7 +674,7 @@ class HDP206StackAdvisor(DefaultStackAdvisor):
 putAmsSiteProperty("timeline.metrics.cluster.aggregate.splitpoints", 
','.join(aggregate_splits))
 
 component_grafana_exists = False
-for service in services:
+for service in services['services']:
   if 'components' in service:
 for component in service['components']:
   if 'StackServiceComponents' in component:

ambari git commit: AMBARI-15463 JS Error after config group switching. (ababiichuk)

2016-03-19 Thread ababiichuk

Repository: ambari
Updated Branches:
  refs/heads/trunk 670ad6f4c -> 01a43eef3


AMBARI-15463 JS Error after config group switching. (ababiichuk)


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

Branch: refs/heads/trunk
Commit: 01a43eef35106ea27dcf4412f1d876873675cf2c
Parents: 670ad6f
Author: ababiichuk 
Authored: Thu Mar 17 15:53:32 2016 +0200
Committer: ababiichuk 
Committed: Thu Mar 17 17:06:01 2016 +0200

--
 .../app/templates/common/configs/controls.hbs   |  5 +--
 .../common/configs/overriddenProperty.hbs   |  4 +--
 .../common/configs/widgets/controls.hbs |  5 +--
 .../common/configs/overriddenProperty_view.js   |  5 ---
 ambari-web/app/views/common/controls_view.js| 32 
 5 files changed, 35 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/01a43eef/ambari-web/app/templates/common/configs/controls.hbs
--
diff --git a/ambari-web/app/templates/common/configs/controls.hbs 
b/ambari-web/app/templates/common/configs/controls.hbs
index b6439cb..ee67594 100644
--- a/ambari-web/app/templates/common/configs/controls.hbs
+++ b/ambari-web/app/templates/common/configs/controls.hbs
@@ -17,10 +17,7 @@
 }}
 
 {{#if view.showSwitchToGroup}}
-  
-{{group.switchGroupTextShort}}
-  
+  {{view App.SwitchToGroupView controllerBinding="controller" 
groupBinding="this.group"}}
 {{else}}
   {{#if view.showIsFinal}}
 http://git-wip-us.apache.org/repos/asf/ambari/blob/01a43eef/ambari-web/app/templates/common/configs/overriddenProperty.hbs
--
diff --git a/ambari-web/app/templates/common/configs/overriddenProperty.hbs 
b/ambari-web/app/templates/common/configs/overriddenProperty.hbs
index 9500b90..954da75 100644
--- a/ambari-web/app/templates/common/configs/overriddenProperty.hbs
+++ b/ambari-web/app/templates/common/configs/overriddenProperty.hbs
@@ -29,9 +29,7 @@
 {{/if}}
 {{#if view.isDefaultGroupSelected}}
   {{#if overriddenSCP.group}}
-
-  {{overriddenSCP.group.switchGroupTextShort}}
-
+{{view App.SwitchToGroupView controllerBinding="controller" 
groupBinding="overriddenSCP.group"}}
   {{/if}}
 {{else}}
   {{#if overriddenSCP.isEditable}}

http://git-wip-us.apache.org/repos/asf/ambari/blob/01a43eef/ambari-web/app/templates/common/configs/widgets/controls.hbs
--
diff --git a/ambari-web/app/templates/common/configs/widgets/controls.hbs 
b/ambari-web/app/templates/common/configs/widgets/controls.hbs
index d6278d9..9c6197b 100644
--- a/ambari-web/app/templates/common/configs/widgets/controls.hbs
+++ b/ambari-web/app/templates/common/configs/widgets/controls.hbs
@@ -96,10 +96,7 @@
 
 {{#if controller.selectedConfigGroup.isDefault}}
   {{#if view.configGroup}}
-
-  {{view.configGroup.switchGroupTextShort}}
-
+{{view App.SwitchToGroupView controllerBinding="controller" 
groupBinding="view.configGroup"}}
   {{/if}}
 {{/if}}
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/01a43eef/ambari-web/app/views/common/configs/overriddenProperty_view.js
--
diff --git a/ambari-web/app/views/common/configs/overriddenProperty_view.js 
b/ambari-web/app/views/common/configs/overriddenProperty_view.js
index 2c72a1a..8623d71 100644
--- a/ambari-web/app/views/common/configs/overriddenProperty_view.js
+++ b/ambari-web/app/views/common/configs/overriddenProperty_view.js
@@ -43,7 +43,6 @@ App.ServiceConfigView.SCPOverriddenRowsView = 
Ember.View.extend({
   },
 
   setSwitchText: function () {
-Em.$('body>.tooltip').remove();
 if (this.get('isDefaultGroupSelected')) {
   var overrides = this.get('serviceConfigProperty.overrides');
   if (!overrides) return;
@@ -55,9 +54,6 @@ App.ServiceConfigView.SCPOverriddenRowsView = 
Ember.View.extend({
   });
   this.set('serviceConfigProperty.overrides', overrides);
 }
-App.tooltip(this.$('[data-toggle=tooltip]'),{
-  placement: 'top'
-});
   },
 
   toggleFinalFlag: function (event) {
@@ -80,6 +76,5 @@ App.ServiceConfigView.SCPOverriddenRowsView = 
Ember.View.extend({
 }
 overrides = overrides.without(scpToBeRemoved);
 this.set('serviceConfigProperty.overrides', overrides);
-Em.$('body>.tooltip').remove(); //some tooltips get frozen when their 
owner's DOM element is removed
   }
 });

ambari git commit: AMBARI-15346. Hive view: Visual Explain does not work when there are multiple statements in the query editor (pallavkul)

2016-03-19 Thread pallavkul

Repository: ambari
Updated Branches:
  refs/heads/trunk bec76707f -> 795fac68f


AMBARI-15346. Hive view: Visual Explain does not work when there are multiple 
statements in the query editor (pallavkul)


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

Branch: refs/heads/trunk
Commit: 795fac68f5b963ed6437d3bf902e7ce033f8b987
Parents: bec7670
Author: Pallav Kulshreshtha 
Authored: Fri Mar 18 12:56:59 2016 +0530
Committer: Pallav Kulshreshtha 
Committed: Fri Mar 18 12:58:19 2016 +0530

--
 .../ui/hive-web/app/components/query-editor.js  | 16 
 .../ui/hive-web/app/controllers/index.js| 27 +++-
 2 files changed, 20 insertions(+), 23 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/795fac68/contrib/views/hive/src/main/resources/ui/hive-web/app/components/query-editor.js
--
diff --git 
a/contrib/views/hive/src/main/resources/ui/hive-web/app/components/query-editor.js
 
b/contrib/views/hive/src/main/resources/ui/hive-web/app/components/query-editor.js
index 10c6bb3..34b293c 100644
--- 
a/contrib/views/hive/src/main/resources/ui/hive-web/app/components/query-editor.js
+++ 
b/contrib/views/hive/src/main/resources/ui/hive-web/app/components/query-editor.js
@@ -114,21 +114,15 @@ export default Ember.Component.extend({
 var query = this.get('query');
 var editor = this.get('editor');
 
-var isEditorExplainQuery = 
(editor.getValue().toUpperCase().trim().indexOf('EXPLAIN') === 0);
-var isFinalExplainQuery = (query.toUpperCase().trim().indexOf('EXPLAIN') 
=== 0);
+var isFinalExplainQuery = (query.toUpperCase().trim().indexOf('EXPLAIN') > 
-1);
+var editorQuery = editor.getValue();
 
 if (editor.getValue() !== query) {
-
-  if(!isEditorExplainQuery && !isFinalExplainQuery){
-editor.setValue(query || '');
-  } else if(!isEditorExplainQuery && isFinalExplainQuery){
-editor.setValue(editor.getValue() || '');
-  } else if(isEditorExplainQuery && isFinalExplainQuery){
-editor.setValue(editor.getValue() || '');
-  } else{
+  if(isFinalExplainQuery){
+editor.setValue(editorQuery || '')
+  }else {
 editor.setValue(query || '');
   }
-
 }
 
   }.observes('query')

http://git-wip-us.apache.org/repos/asf/ambari/blob/795fac68/contrib/views/hive/src/main/resources/ui/hive-web/app/controllers/index.js
--
diff --git 
a/contrib/views/hive/src/main/resources/ui/hive-web/app/controllers/index.js 
b/contrib/views/hive/src/main/resources/ui/hive-web/app/controllers/index.js
index c6f50f4..9584508 100644
--- a/contrib/views/hive/src/main/resources/ui/hive-web/app/controllers/index.js
+++ b/contrib/views/hive/src/main/resources/ui/hive-web/app/controllers/index.js
@@ -284,19 +284,23 @@ export default Ember.Controller.extend({
 queries = queryComponents.queryString.split(';');
 queries = queries.filter(Boolean);
 
-queries = queries.map(function (query) {
-  if (shouldExplain) {
-query = query.replace(/explain formatted|explain/gi, '');
+var queriesLength = queries.length;
 
-if (shouldGetVisualExplain) {
-  return constants.namingConventions.explainFormattedPrefix + query;
-} else {
-  return constants.namingConventions.explainPrefix + query;
-}
+queries = queries.map(function (q, index) {
+  var newQuery = q.replace(/explain formatted|explain/gi, '');
+  return newQuery;
+});
+
+var lastQuery = queries[queriesLength - 1];
+
+if(!Ember.isNone(lastQuery) && shouldExplain) {
+  if (shouldGetVisualExplain) {
+lastQuery = constants.namingConventions.explainFormattedPrefix + 
lastQuery;
   } else {
-return query;
+lastQuery = constants.namingConventions.explainPrefix + lastQuery;
   }
-});
+  queries[queriesLength - 1] = lastQuery;
+}
 
 if (queryComponents.files.length) {
   finalQuery += queryComponents.files.join("\n") + "\n\n";
@@ -306,8 +310,7 @@ export default Ember.Controller.extend({
   finalQuery += queryComponents.udfs.join("\n") + "\n\n";
 }
 
-finalQuery += queries.join(";");
-finalQuery += ";";
+finalQuery += queries.join(";") + ";";
 return finalQuery.trim();
   },

ambari git commit: AMBARI-15441. Service Configs page is broken after another user close the wizard (onechiporenko)

2016-03-19 Thread onechiporenko

Repository: ambari
Updated Branches:
  refs/heads/trunk 628e74c2f -> df2d304b1


AMBARI-15441. Service Configs page is broken after another user close the 
wizard (onechiporenko)


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

Branch: refs/heads/trunk
Commit: df2d304b18f53f0594af3e8f373c13c0b61b73c6
Parents: 628e74c
Author: Oleg Nechiporenko 
Authored: Wed Mar 16 17:08:24 2016 +0200
Committer: Oleg Nechiporenko 
Committed: Thu Mar 17 08:36:35 2016 +0200

--
 ambari-web/app/routes/main.js   |  3 ++-
 .../app/views/main/service/info/configs.js  | 10 
 ambari-web/app/views/main/service/item.js   | 27 ++--
 .../wizard/wizardProgressPageController_test.js |  4 +--
 4 files changed, 32 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/df2d304b/ambari-web/app/routes/main.js
--
diff --git a/ambari-web/app/routes/main.js b/ambari-web/app/routes/main.js
index d7ec2cf..9e4bde4 100644
--- a/ambari-web/app/routes/main.js
+++ b/ambari-web/app/routes/main.js
@@ -689,7 +689,8 @@ module.exports = Em.Route.extend(App.RouterRedirections, {
 },
 exitRoute: function (router, context, callback) {
   var controller = router.get('mainServiceInfoConfigsController');
-  if (controller.hasUnsavedChanges()) {
+  // If another user is running some wizard, current user can't save 
configs
+  if (controller.hasUnsavedChanges() && 
!router.get('wizardWatcherController.isWizardRunning')) {
 controller.showSavePopup(callback);
   } else {
 callback();

http://git-wip-us.apache.org/repos/asf/ambari/blob/df2d304b/ambari-web/app/views/main/service/info/configs.js
--
diff --git a/ambari-web/app/views/main/service/info/configs.js 
b/ambari-web/app/views/main/service/info/configs.js
index 4022155..cd64a8b 100644
--- a/ambari-web/app/views/main/service/info/configs.js
+++ b/ambari-web/app/views/main/service/info/configs.js
@@ -31,6 +31,16 @@ App.MainServiceInfoConfigsView = Em.View.extend({
 this.resetConfigTabSelection();
   },
 
+  /**
+   * If user A is on the Service Configs page and B starts some Wizard, user A 
should be moved-out and then moved-in this page
+   * It's done to properly disable "admin"-elements
+   * This code can't be moved to the controller, because it should work only 
if user is in the configs page (this view exists)
+   */
+  simulateRefresh: function() {
+App.router.transitionTo('main.services.service.summary', 
this.get('controller.content'));
+App.router.transitionTo('main.services.service.configs', 
this.get('controller.content'));
+  }.observes('App.router.wizardWatcherController.isWizardRunning'),
+
   willDestroyElement: function() {
 this.get('controller').clearStep();
   },

http://git-wip-us.apache.org/repos/asf/ambari/blob/df2d304b/ambari-web/app/views/main/service/item.js
--
diff --git a/ambari-web/app/views/main/service/item.js 
b/ambari-web/app/views/main/service/item.js
index 2b9f3fd..c92160a 100644
--- a/ambari-web/app/views/main/service/item.js
+++ b/ambari-web/app/views/main/service/item.js
@@ -184,8 +184,9 @@ App.MainServiceItemView = Em.View.extend({
   var knoxGatewayComponent = 
App.StackServiceComponent.find().findProperty('componentName','KNOX_GATEWAY');
   if (serviceName === 'HDFS' && nnComponent) {
 var namenodeCustomCommands = nnComponent.get('customCommands');
-if (namenodeCustomCommands && 
namenodeCustomCommands.contains('REBALANCEHDFS'))
-options.push(actionMap.REBALANCEHDFS);
+if (namenodeCustomCommands && 
namenodeCustomCommands.contains('REBALANCEHDFS')) {
+  options.push(actionMap.REBALANCEHDFS);
+}
   }
 
   if (serviceName === 'KNOX' && knoxGatewayComponent) {
@@ -203,8 +204,7 @@ App.MainServiceItemView = Em.View.extend({
   if(serviceName === 'HAWQ') {
 var hawqMasterComponent = 
App.StackServiceComponent.find().findProperty('componentName','HAWQMASTER');
 var hawqStandByComponent = 
App.StackServiceComponent.find().findProperty('componentName','HAWQSTANDBY');
-components = [hawqMasterComponent,hawqStandByComponent]
-components.forEach(function(component){
+[hawqMasterComponent,hawqStandByComponent].forEach(function(component){
   component.get('customCommands').forEach(function(command){

ambari git commit: AMBARI-15444. HOST Graph Legends - Grafana. (Prajwal Rao via yusaku)

2016-03-19 Thread yusaku

Repository: ambari
Updated Branches:
  refs/heads/trunk 04620902c -> 0c29bc5f0


AMBARI-15444. HOST Graph Legends - Grafana. (Prajwal Rao via yusaku)


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

Branch: refs/heads/trunk
Commit: 0c29bc5f08c05a4c817667e1a7897d2ec4aa4a29
Parents: 0462090
Author: Yusaku Sako 
Authored: Wed Mar 16 17:06:25 2016 -0700
Committer: Yusaku Sako 
Committed: Wed Mar 16 17:06:25 2016 -0700

--
 .../ambari-metrics/datasource.js | 15 ---
 1 file changed, 4 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/0c29bc5f/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 fa83b47..f62a58f 100644
--- a/ambari-metrics/ambari-metrics-grafana/ambari-metrics/datasource.js
+++ b/ambari-metrics/ambari-metrics-grafana/ambari-metrics/datasource.js
@@ -107,17 +107,10 @@ define([
   // Added hostname to legend for templated dashboards.
   var hostLegend = res.metrics[0].hostname ? ' on ' + 
res.metrics[0].hostname : '';
   var timeSeries = {};
-  if (target.hosts === undefined || target.hosts.trim() === "") {
-timeSeries = {
-  target: alias + hostLegend,
-  datapoints: []
-};
-  } else {
-timeSeries = {
-  target: alias + ' on ' + target.hosts,
-  datapoints: []
-};
-  }
+  timeSeries = {
+target: alias + hostLegend,
+datapoints: []
+  };
   for (var k in metricData){
 if (metricData.hasOwnProperty(k)) {
   timeSeries.datapoints.push([metricData[k], (k - k % 1000)]);

ambari git commit: AMBARI-15447. Use Version Definition value for package-version when installing (ncole)

2016-03-19 Thread ncole

Repository: ambari
Updated Branches:
  refs/heads/trunk f2b8164e3 -> 95798ad96


AMBARI-15447. Use Version Definition value for package-version when installing 
(ncole)


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

Branch: refs/heads/trunk
Commit: 95798ad96a19902dabec855c65a96bcfab63400d
Parents: f2b8164
Author: Nate Cole 
Authored: Wed Mar 16 17:03:38 2016 -0400
Committer: Nate Cole 
Committed: Thu Mar 17 15:07:14 2016 -0400

--
 .../libraries/script/script.py  |  20 +-
 .../ambari/server/agent/ExecutionCommand.java   |  10 +-
 .../AmbariManagementControllerImpl.java | 125 ++-
 .../ClusterStackVersionResourceProvider.java|  25 ++-
 .../HostStackVersionResourceProvider.java   |  22 +-
 .../orm/entities/RepositoryVersionEntity.java   |  12 +-
 .../ambari/server/state/repository/Release.java |   6 +
 ...ClusterStackVersionResourceProviderTest.java | 213 ++-
 .../custom_actions/TestInstallPackages.py   |  71 +++
 .../src/test/resources/hbase_version_test.xml   |   1 +
 10 files changed, 432 insertions(+), 73 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/95798ad9/ambari-common/src/main/python/resource_management/libraries/script/script.py
--
diff --git 
a/ambari-common/src/main/python/resource_management/libraries/script/script.py 
b/ambari-common/src/main/python/resource_management/libraries/script/script.py
index a8098a0..1b0116e 100644
--- 
a/ambari-common/src/main/python/resource_management/libraries/script/script.py
+++ 
b/ambari-common/src/main/python/resource_management/libraries/script/script.py
@@ -274,11 +274,27 @@ class Script(object):
 return Script.stack_version_from_distro_select
   
   def format_package_name(self, name):
+from resource_management.libraries.functions.default import default
 """
-This function replaces ${stack_version} placeholder into actual version.
+This function replaces ${stack_version} placeholder into actual version.  
If the package
+version is passed from the server, use that as an absolute truth.
 """
+
+# two different command types put things in different objects.  WHY.
+# package_version is the form W_X_Y_Z_
+package_version = default("roleParams/package_version", None)
+if not package_version:
+  package_version = default("hostLevelParams/package_version", None)
+
 package_delimiter = '-' if OSCheck.is_ubuntu_family() else '_'
-stack_version_package_formatted = 
self.get_stack_version_before_packages_installed().replace('.', 
package_delimiter).replace('-', package_delimiter) if STACK_VERSION_PLACEHOLDER 
in name else name
+
+if package_version:
+  stack_version_package_formatted = package_version
+  if OSCheck.is_ubuntu_family():
+stack_version_package_formatted = package_version.replace('_', 
package_delimiter)
+else:
+  stack_version_package_formatted = 
self.get_stack_version_before_packages_installed().replace('.', 
package_delimiter).replace('-', package_delimiter) if STACK_VERSION_PLACEHOLDER 
in name else name
+
 package_name = name.replace(STACK_VERSION_PLACEHOLDER, 
stack_version_package_formatted)
 
 return package_name

http://git-wip-us.apache.org/repos/asf/ambari/blob/95798ad9/ambari-server/src/main/java/org/apache/ambari/server/agent/ExecutionCommand.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/agent/ExecutionCommand.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/agent/ExecutionCommand.java
index 402a338..9ea541e 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/agent/ExecutionCommand.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/agent/ExecutionCommand.java
@@ -100,8 +100,8 @@ public class ExecutionCommand extends AgentCommand {
   private String serviceName;
 
   @SerializedName("serviceType")
-  private String serviceType;  
-  
+  private String serviceType;
+
   @SerializedName("componentName")
   private String componentName;
 
@@ -284,7 +284,7 @@ public class ExecutionCommand extends AgentCommand {
   public void setServiceName(String serviceName) {
 this.serviceName = serviceName;
   }
-  
+
   public String getServiceType() {
return serviceType;
   }
@@ -383,6 +383,10 @@ public class ExecutionCommand extends AgentCommand {
 
 String SERVICE_CHECK = "SERVICE_CHECK"; // TODO: is it standard command? 
maybe add it to RoleCommand enum?

[2/2] ambari git commit: Revert "AMBARI-15429. Cannot specify ZooKeeper heap size via UI.(vbrodetskyi)"

2016-03-19 Thread jonathanhurley

Revert "AMBARI-15429. Cannot specify ZooKeeper heap size via UI.(vbrodetskyi)"

This reverts commit 01b01bdc4271ba2b9c03bc8452a8ebe31c7bb980.


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

Branch: refs/heads/branch-2.2
Commit: e81d5721c652da684f7f29b0d930c330c28686c7
Parents: b907049
Author: Jonathan Hurley 
Authored: Fri Mar 18 13:06:21 2016 -0400
Committer: Jonathan Hurley 
Committed: Fri Mar 18 13:06:21 2016 -0400

--
 .../3.4.5.2.0/configuration/zookeeper-env.xml   | 16 +---
 .../3.4.5.2.0/package/scripts/params_linux.py   |  2 +-
 2 files changed, 2 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/e81d5721/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/configuration/zookeeper-env.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/configuration/zookeeper-env.xml
 
b/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/configuration/zookeeper-env.xml
index 27f7aca..cabdf2c 100644
--- 
a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/configuration/zookeeper-env.xml
+++ 
b/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/configuration/zookeeper-env.xml
@@ -52,20 +52,6 @@
   
 
   
-zk_server_heapsize
-1024
-Maximum amount of memory each Zookeeper Server can 
use.
-Zookeeper Server Maximum Memory
-
-  int
-  256
-  32768
-  MB
-  256
-
-  
-
-  
 zookeeper_principal_name
 ZooKeeper principal name
   
@@ -85,7 +71,7 @@ export JAVA_HOME={{java64_home}}
 export ZOOKEEPER_HOME={{zk_home}}
 export ZOO_LOG_DIR={{zk_log_dir}}
 export ZOOPIDFILE={{zk_pid_file}}
-export SERVER_JVMFLAGS=-Xmx{{zk_server_heapsize}}
+export SERVER_JVMFLAGS={{zk_server_heapsize}}
 export JAVA=$JAVA_HOME/bin/java
 export CLASSPATH=$CLASSPATH:/usr/share/zookeeper/*
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/e81d5721/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/package/scripts/params_linux.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/package/scripts/params_linux.py
 
b/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/package/scripts/params_linux.py
index 6f3de67..c6264ff 100644
--- 
a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/package/scripts/params_linux.py
+++ 
b/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/package/scripts/params_linux.py
@@ -65,7 +65,7 @@ zk_log_dir = 
config['configurations']['zookeeper-env']['zk_log_dir']
 zk_data_dir = config['configurations']['zoo.cfg']['dataDir']
 zk_pid_dir = status_params.zk_pid_dir
 zk_pid_file = status_params.zk_pid_file
-zk_server_heapsize = 
default('configurations/zookeeper-env/zk_server_heapsize', 1024)
+zk_server_heapsize = "-Xmx1024m"
 
 client_port = default('/configurations/zoo.cfg/clientPort', None)

ambari git commit: AMBARI-15459. Override button is shown on the host configs page (onechiporenko)

2016-03-19 Thread onechiporenko

Repository: ambari
Updated Branches:
  refs/heads/trunk 01a43eef3 -> 3cc686f64


AMBARI-15459. Override button is shown on the host configs page (onechiporenko)


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

Branch: refs/heads/trunk
Commit: 3cc686f648b29b54053dd52c26c91d0b50097a10
Parents: 01a43ee
Author: Oleg Nechiporenko 
Authored: Thu Mar 17 13:36:24 2016 +0200
Committer: Oleg Nechiporenko 
Committed: Thu Mar 17 17:08:04 2016 +0200

--
 ambari-web/app/controllers/main/host/configs_service.js  | 2 ++
 ambari-web/app/controllers/main/service/info/configs.js  | 2 +-
 .../app/templates/common/configs/service_config_category.hbs | 4 +++-
 3 files changed, 6 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/3cc686f6/ambari-web/app/controllers/main/host/configs_service.js
--
diff --git a/ambari-web/app/controllers/main/host/configs_service.js 
b/ambari-web/app/controllers/main/host/configs_service.js
index 9afb309..b738433 100644
--- a/ambari-web/app/controllers/main/host/configs_service.js
+++ b/ambari-web/app/controllers/main/host/configs_service.js
@@ -24,6 +24,8 @@ App.MainHostServiceConfigsController = 
App.MainServiceInfoConfigsController.exte
   typeTagToHostMap: null,
   configKeyToConfigMap: null,
 
+  canEdit: false,
+
   /**
* On load function
*/

http://git-wip-us.apache.org/repos/asf/ambari/blob/3cc686f6/ambari-web/app/controllers/main/service/info/configs.js
--
diff --git a/ambari-web/app/controllers/main/service/info/configs.js 
b/ambari-web/app/controllers/main/service/info/configs.js
index 85346d6..93775fb 100644
--- a/ambari-web/app/controllers/main/service/info/configs.js
+++ b/ambari-web/app/controllers/main/service/info/configs.js
@@ -113,7 +113,7 @@ App.MainServiceInfoConfigsController = 
Em.Controller.extend(App.ConfigsLoader, A
*/
   canEdit: function () {
 return (this.get('selectedVersion') == this.get('currentDefaultVersion') 
|| !this.get('selectedConfigGroup.isDefault'))
-&& !this.get('isCompareMode') && 
App.isAuthorized('SERVICE.MODIFY_CONFIGS') && !this.get('isHostsConfigsPage');
+&& !this.get('isCompareMode') && 
App.isAuthorized('SERVICE.MODIFY_CONFIGS');
   }.property('selectedVersion', 'isCompareMode', 'currentDefaultVersion', 
'selectedConfigGroup.isDefault'),
 
   serviceConfigs: Em.computed.alias('App.config.preDefinedServiceConfigs'),

http://git-wip-us.apache.org/repos/asf/ambari/blob/3cc686f6/ambari-web/app/templates/common/configs/service_config_category.hbs
--
diff --git 
a/ambari-web/app/templates/common/configs/service_config_category.hbs 
b/ambari-web/app/templates/common/configs/service_config_category.hbs
index e72606c..5ec4db9 100644
--- a/ambari-web/app/templates/common/configs/service_config_category.hbs
+++ b/ambari-web/app/templates/common/configs/service_config_category.hbs
@@ -69,7 +69,9 @@
   {{t 
services.service.config.configHistory.configGroup}}
   {{/if}}
 {{/if}}
-{{view App.ControlsView serviceConfigPropertyBinding="this"}}
+{{#if controller.canEdit}}
+  {{view App.ControlsView serviceConfigPropertyBinding="this"}}
+{{/if}}
 {{errorMessage}}
 {{warnMessage}}

[1/2] ambari git commit: AMBARI-15467. Enable Ambari build process to automatically switch repo base urls in the repo files (aonishuk)

2016-03-19 Thread aonishuk

Repository: ambari
Updated Branches:
  refs/heads/branch-2.2 e81d5721c -> 45cdf976e
  refs/heads/trunk 7242a4a18 -> 95c9f155f


AMBARI-15467. Enable Ambari build process to automatically switch repo base 
urls in the repo files (aonishuk)


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

Branch: refs/heads/trunk
Commit: 95c9f155f9a5cbf1c722f3bcfe9552921ae48b04
Parents: 7242a4a
Author: Andrew Onishuk 
Authored: Fri Mar 18 20:14:12 2016 +0200
Committer: Andrew Onishuk 
Committed: Fri Mar 18 20:14:12 2016 +0200

--
 .../urlinfo_processor/urlinfo_processor.py  | 127 +++
 ambari-server/pom.xml   |  40 ++
 2 files changed, 167 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/95c9f155/ambari-common/src/main/python/urlinfo_processor/urlinfo_processor.py
--
diff --git 
a/ambari-common/src/main/python/urlinfo_processor/urlinfo_processor.py 
b/ambari-common/src/main/python/urlinfo_processor/urlinfo_processor.py
new file mode 100644
index 000..74f7fb9
--- /dev/null
+++ b/ambari-common/src/main/python/urlinfo_processor/urlinfo_processor.py
@@ -0,0 +1,127 @@
+#!/usr/bin/env ambari-python-wrap
+
+'''
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+'''
+
+import getopt
+import json
+import urllib2
+import re
+from os import path
+import xml.etree.ElementTree as ET
+
+import sys
+
+json_stack_version_re = re.compile("(\S*)-((\d\.*)+)")
+
+family_map = {"redhat6": "centos6",
+  "redhat7": "centos7"}
+
+HELP_STRING = 'Usage: urlinfo_processor.py -u  -s '
+
+XML_HEADER = """
+
+"""
+
+
+def get_json_content(path):
+  try:
+response = urllib2.urlopen(path)
+content = response.read()
+  except:
+content = open(path, "r").read()
+  return json.loads(content)
+
+
+def replace_url_in_repoinfo_xml(repoinfo_xml_path, repo_id, repo_info):
+  tree = ET.parse(repoinfo_xml_path)
+  root = tree.getroot()
+  for os_tag in root.findall("os"):
+family = os_tag.get("family", None)
+# hack, in hdp_urlinfo.json we have centos, but in repoinfo.xml it mapped 
to redhat
+family = family_map[family] if family in family_map else family
+for repo_tag in os_tag.findall("repo"):
+  repo_id_tag = repo_tag.find("repoid")
+  if repo_id_tag is not None and repo_id_tag.text == repo_id:
+baseurl_tag = repo_tag.find("baseurl")
+if baseurl_tag is not None and family in repo_info:
+  if family in repo_info:
+print "URLINFO_PROCESSOR: replacing {0} to {1} for repo id:{2} and 
family:{3}".format(baseurl_tag.text,
+   
   repo_info[family],
+   
   repo_id,
+   
   family)
+baseurl_tag.text = repo_info[family]
+
+  with open(repoinfo_xml_path, "w") as out:
+out.write(XML_HEADER)
+tree.write(out)
+
+
+def replace_urls(stack_location, repo_version_path):
+  repo_dict = get_json_content(repo_version_path)
+  repo_dict = {(json_stack_version_re.findall(ver)[0][1], ver): conf["latest"] 
for ver, conf in repo_dict.iteritems()}
+
+  for version_info, repo_info in repo_dict.iteritems():
+stack_version, repo_id = version_info
+repoinfo_xml_path = path.join(stack_location, stack_version, "repos", 
"repoinfo.xml")
+if path.exists(repoinfo_xml_path):
+  replace_url_in_repoinfo_xml(repoinfo_xml_path, repo_id, repo_info)
+
+
+def main(argv):
+  urlinfo_path = ''
+  stack_folder = ''
+  try:
+opts, args = getopt.getopt(argv, "u:s:", ["urlinfo=", "stack_folder="])
+  except getopt.GetoptError:
+print HELP_STRING
+sys.exit(2)
+  for

ambari git commit: AMBARI-15481. Metrics Alert definitions not updated through Alerts UI (alexantonenko)

2016-03-19 Thread alexantonenko

Repository: ambari
Updated Branches:
  refs/heads/branch-2.2 dd846600f -> acb29037a


AMBARI-15481. Metrics Alert definitions not updated through Alerts UI 
(alexantonenko)


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

Branch: refs/heads/branch-2.2
Commit: acb29037a6435d174c8442ec866170e269d6fa82
Parents: dd84660
Author: Alex Antonenko 
Authored: Fri Mar 18 16:45:16 2016 +0200
Committer: Alex Antonenko 
Committed: Fri Mar 18 17:05:13 2016 +0200

--
 .../app/controllers/main/alerts/definition_configs_controller.js   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/acb29037/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 77a47fa..a20cf76 100644
--- a/ambari-web/app/controllers/main/alerts/definition_configs_controller.js
+++ b/ambari-web/app/controllers/main/alerts/definition_configs_controller.js
@@ -126,7 +126,7 @@ App.MainAlertDefinitionConfigsController = 
Em.Controller.extend({
*/
   getThresholdsProperty: function (type, property) {
 var warning = this.get('content.reporting').findProperty('type', type);
-return warning && warning.get(property) ? warning.get(property) : null;
+return warning && !Ember.isEmpty(warning.get(property)) ? 
warning.get(property) : null;
   },
 
   /**

ambari git commit: AMBARI-15456. Manual Kerberos: JS error on clicking next button of "Configure Identities page" on Add Service wizard (alexantonenko)

2016-03-19 Thread alexantonenko

Repository: ambari
Updated Branches:
  refs/heads/branch-2.2 328102511 -> 9d3fd9e56


AMBARI-15456. Manual Kerberos: JS error on clicking next button of "Configure 
Identities page" on Add Service wizard (alexantonenko)


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

Branch: refs/heads/branch-2.2
Commit: 9d3fd9e56b214a75e84d26bfbecb747141a5f6b7
Parents: 3281025
Author: Alex Antonenko 
Authored: Thu Mar 17 11:20:19 2016 +0200
Committer: Alex Antonenko 
Committed: Thu Mar 17 14:06:23 2016 +0200

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


http://git-wip-us.apache.org/repos/asf/ambari/blob/9d3fd9e5/ambari-web/app/routes/add_service_routes.js
--
diff --git a/ambari-web/app/routes/add_service_routes.js 
b/ambari-web/app/routes/add_service_routes.js
index f756ef6..73029c8 100644
--- a/ambari-web/app/routes/add_service_routes.js
+++ b/ambari-web/app/routes/add_service_routes.js
@@ -292,6 +292,7 @@ module.exports = App.WizardRoute.extend({
 next: function (router) {
   if (App.Cluster.find().objectAt(0).get('isKerberosEnabled')) {
 if (router.get('mainAdminKerberosController.isManualKerberos')) {
+  router.get('wizardStep8Controller').set('wizardController', 
router.get('addServiceController'));
   router.get('wizardStep8Controller').updateKerberosDescriptor(true);
 }
 
router.get('addServiceController').cacheStepConfigValues(router.get('kerberosWizardStep4Controller'));

ambari git commit: AMBARI-15435: Update Hawq GUCS: Refactor resource related GUC (goutamtadi via jaoki)

2016-03-19 Thread jaoki

Repository: ambari
Updated Branches:
  refs/heads/trunk 1bf667ead -> b663dbe1b


AMBARI-15435: Update Hawq GUCS: Refactor resource related GUC (goutamtadi via 
jaoki)


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

Branch: refs/heads/trunk
Commit: b663dbe1be5291d8d32de7ec2b4434612d0861c0
Parents: 1bf667e
Author: Jun Aoki 
Authored: Thu Mar 17 16:42:56 2016 -0700
Committer: Jun Aoki 
Committed: Thu Mar 17 16:42:56 2016 -0700

--
 .../HAWQ/2.0.0/configuration/hawq-site.xml  |  66 ---
 .../HAWQ/2.0.0/themes/theme.json| 113 ---
 .../stacks/HDP/2.3/services/stack_advisor.py|   5 +-
 .../stacks/2.3/common/test_stack_advisor.py |  15 +--
 4 files changed, 157 insertions(+), 42 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/b663dbe1/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-site.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-site.xml
 
b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-site.xml
index d187017..93ad3fe 100644
--- 
a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-site.xml
+++ 
b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-site.xml
@@ -114,7 +114,7 @@
 
   
 hawq_master_temp_directory
-HAWQ Master Temp Directory
+HAWQ Master Temp Directories
 /tmp/hawq/master
 
   Used as temporary filespace to store workfile cache, sort/join temp 
files etc.
@@ -128,7 +128,7 @@
 
   
 hawq_segment_temp_directory
-HAWQ Segment Temp Directory
+HAWQ Segment Temp Directories
 /tmp/hawq/segment
 
   Used as temporary filespace to store workfile cache, sort/join temp 
files etc.
@@ -146,17 +146,17 @@
 Resource Manager
 none
 
-  HAWQ global resource manager type. Valid values are YARN ('yarn') and 
Native ('none').
-  Native('none') indicates that the HAWQ resource manager manages its own 
resources exclusively for the entire cluster.
+  HAWQ global resource manager type. Valid values are YARN ('yarn') and 
Standalone ('none').
+  Standalone('none') indicates that the HAWQ resource manager manages its 
own resources exclusively for the entire cluster.
   YARN ('yarn') means that HAWQ will negotiate with YARN's resource 
manager for resources.
-  The default is Native ('none').
+  The default is Standalone ('none').
 
 
   value-list
   
 
   none
-  Native
+  Standalone
 
 
   yarn
@@ -172,7 +172,7 @@
 Segment Memory Usage Limit
 64GB
 
-  The maximum memory that can be used by a HAWQ segment when Resource 
Manager ('hawq_global_rm_type') is set to Native ('none').
+  The maximum memory that can be used by a HAWQ segment when Resource 
Manager ('hawq_global_rm_type') is set to Standalone ('none').
   The default is 64GB.
 
 
@@ -185,7 +185,7 @@
 Segment Virtual Core Usage Limit
 16
 
-  The maximum number of virtual cores that can be used for query execution 
in a HAWQ segment when Resource Manager ('hawq_global_rm_type') is set to 
Native ('none').
+  The maximum number of virtual cores that can be used for query execution 
in a HAWQ segment when Resource Manager ('hawq_global_rm_type') is set to 
Standalone ('none').
   The default is 16.
 
 
@@ -299,18 +299,52 @@
   
 
   
-default_segment_num
-Default Number of Virtual Segments
-24
+default_hash_table_bucket_number
+Default buckets for Hash Distributed tables
+6
 
-  The default number of virtual segments to use when executing a query 
statement.
-  When the query is actually executed, the number of virtual segments may 
differ from this number depending on the query's needs.
-  When expanding the cluster, you should adjust this number to reflect the 
number of nodes in the new cluster times the number of virtual segments per 
node.
-  The default is 24.
+ The default number of virtual segments per query for hash distributed 
tables that can be used for query execution in a HAWQ segment when Resource 
Manager ('hawq_global_rm_type') is set to Standalone ('none').
+  The default is 6.
 
 
   int
-  0
+  1
+  1
+  100
+
+  
+
+
+hawq_rm_nvseg_perquery_perseg_limit
+Virtual Segments Limit per Query (per Segment 
Node)
+6
+
+  Not

[03/10] ambari git commit: AMBARI-15450. Templatized Dashboard JSON files - Grafana (Prajwal Rao via yusaku)

2016-03-19 Thread yusaku

http://git-wip-us.apache.org/repos/asf/ambari/blob/b76a5f56/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/grafana-yarn-home.json
--
diff --git 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/grafana-yarn-home.json
 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/grafana-yarn-home.json
new file mode 100644
index 000..df86f86
--- /dev/null
+++ 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/grafana-yarn-home.json
@@ -0,0 +1,639 @@
+{
+  "id": 3,
+  "title": "YARN - Home",
+  "originalTitle": "YARN - Home",
+  "tags": [
+"yarn"
+  ],
+  "style": "dark",
+  "timezone": "browser",
+  "editable": true,
+  "hideControls": false,
+  "sharedCrosshair": false,
+  "rows": [
+{
+  "collapse": false,
+  "editable": true,
+  "height": "25px",
+  "panels": [
+{
+  "content": "Metrics to see the overall status 
for the YARN cluster. ",
+  "editable": true,
+  "error": false,
+  "id": 11,
+  "isNew": true,
+  "links": [],
+  "mode": "html",
+  "span": 12,
+  "style": {},
+  "title": "",
+  "type": "text"
+}
+  ],
+  "title": "New row"
+},
+{
+  "collapse": false,
+  "editable": true,
+  "height": "150px",
+  "panels": [
+{
+  "cacheTimeout": null,
+  "colorBackground": false,
+  "colorValue": false,
+  "colors": [
+"rgba(245, 54, 54, 0.9)",
+"rgba(237, 129, 40, 0.89)",
+"rgba(50, 172, 45, 0.97)"
+  ],
+  "datasource": null,
+  "editable": true,
+  "error": false,
+  "format": "none",
+  "id": 3,
+  "interval": null,
+  "isNew": true,
+  "links": [],
+  "maxDataPoints": 100,
+  "nullPointMode": "connected",
+  "nullText": null,
+  "postfix": "",
+  "postfixFontSize": "50%",
+  "prefix": "",
+  "prefixFontSize": "50%",
+  "span": 3,
+  "sparkline": {
+"fillColor": "rgba(31, 118, 189, 0.18)",
+"full": false,
+"lineColor": "rgb(31, 120, 193)",
+"show": true
+  },
+  "targets": [
+{
+  "aggregator": "max",
+  "app": "resourcemanager",
+  "downsampleAggregator": "avg",
+  "errors": {},
+  "metric": "yarn.ClusterMetrics.NumActiveNMs",
+  "precision": "",
+  "refId": "A"
+}
+  ],
+  "thresholds": "",
+  "title": "Active nodes",
+  "type": "singlestat",
+  "valueFontSize": "80%",
+  "valueMaps": [
+{
+  "op": "=",
+  "text": "N/A",
+  "value": "null"
+}
+  ],
+  "valueName": "max"
+},
+{
+  "cacheTimeout": null,
+  "colorBackground": false,
+  "colorValue": false,
+  "colors": [
+"rgba(245, 54, 54, 0.9)",
+"rgba(237, 129, 40, 0.89)",
+"rgba(50, 172, 45, 0.97)"
+  ],
+  "datasource": null,
+  "editable": true,
+  "error": false,
+  "format": "mbytes",
+  "id": 10,
+  "interval": null,
+  "isNew": true,
+  "links": [],
+  "maxDataPoints": 100,
+  "nullPointMode": "connected",
+  "nullText": null,
+  "postfix": "",
+  "postfixFontSize": "50%",
+  "prefix": "",
+  "prefixFontSize": "50%",
+  "span": 3,
+  "sparkline": {
+"fillColor": "rgba(31, 118, 189, 0.18)",
+"full": false,
+"lineColor": "rgb(31, 120, 193)",
+"show": true
+  },
+  "targets": [
+{
+  "aggregator": "max",
+  "app": "resourcemanager",
+  "downsampleAggregator": "avg",
+  "errors": {},
+  "metric": "yarn.QueueMetrics.Queue=root.AvailableMB",
+  "precision": "",
+  "refId": "A",
+  "shouldAddPrecision": false,
+  "shouldComputeRate": false
+}
+  ],
+  "thresholds": "",
+  "title": "Cluster Memory Available",
+  "type": "singlestat",
+  "valueFontSize": "80%",
+  "valueMaps": [
+{
+  "op": "=",
+  "text": "N/A",
+  "value": "null"
+}
+  ],
+  "valueName": "current"
+},
+{
+  "cacheTimeout": null,
+  "colorBackground": false,
+

ambari git commit: AMBARI-15452 : Change timeouts for Hbase and Phoenix (avijayan)

2016-03-19 Thread avijayan

Repository: ambari
Updated Branches:
  refs/heads/branch-2.2 0244d233a -> 48b23a52a


AMBARI-15452 : Change timeouts for Hbase and Phoenix (avijayan)


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

Branch: refs/heads/branch-2.2
Commit: 48b23a52a444a86ae61f1afb64f2f649516d6e62
Parents: 0244d23
Author: Aravindan Vijayan 
Authored: Thu Mar 17 12:40:25 2016 -0700
Committer: Aravindan Vijayan 
Committed: Thu Mar 17 12:40:33 2016 -0700

--
 .../server/upgrade/UpgradeCatalog222.java   | 29 ++
 .../0.1.0/configuration/ams-hbase-site.xml  | 24 +++-
 .../server/upgrade/UpgradeCatalog222Test.java   | 60 
 3 files changed, 110 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/48b23a52/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog222.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog222.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog222.java
index 8267d5d..e10585e 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog222.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog222.java
@@ -66,6 +66,7 @@ public class UpgradeCatalog222 extends AbstractUpgradeCatalog 
{
*/
   private static final Logger LOG = 
LoggerFactory.getLogger(UpgradeCatalog222.class);
   private static final String AMS_SITE = "ams-site";
+  private static final String AMS_HBASE_SITE = "ams-hbase-site";
   private static final String HIVE_SITE_CONFIG = "hive-site";
   private static final String ATLAS_APPLICATION_PROPERTIES_CONFIG = 
"application-properties";
   private static final String ATLAS_HOOK_HIVE_MINTHREADS_PROPERTY = 
"atlas.hook.hive.minThreads";
@@ -85,6 +86,10 @@ public class UpgradeCatalog222 extends 
AbstractUpgradeCatalog {
   public static final String PRECISION_TABLE_TTL = 
"timeline.metrics.host.aggregator.ttl";
   public static final String CLUSTER_SECOND_TABLE_TTL = 
"timeline.metrics.cluster.aggregator.second.ttl";
   public static final String CLUSTER_MINUTE_TABLE_TTL = 
"timeline.metrics.cluster.aggregator.minute.ttl";
+  public static final String HBASE_CLIENT_SCANNER_TIMEOUT_PERIOD = 
"hbase.client.scanner.timeout.period";
+  public static final String HBASE_RPC_TIMEOUT = "hbase.rpc.timeout";
+  public static final String PHOENIX_QUERY_TIMEOUT = "phoenix.query.timeoutMs";
+  public static final String PHOENIX_QUERY_KEEPALIVE = 
"phoenix.query.keepAliveMs";
 
   private static final String[] HDFS_WIDGETS_TO_UPDATE = new String[] {
 "NameNode RPC", "NN Connection Load" };
@@ -313,6 +318,30 @@ public class UpgradeCatalog222 extends 
AbstractUpgradeCatalog {
 updateConfigurationPropertiesForCluster(cluster, AMS_SITE, 
newProperties, true, true);
   }
 
+  Config amsHbaseSite = cluster.getDesiredConfigByType(AMS_HBASE_SITE);
+  if (amsHbaseSite != null) {
+Map amsHbaseSiteProperties = 
amsHbaseSite.getProperties();
+Map newProperties = new HashMap<>();
+
+if (!amsHbaseSiteProperties.containsKey(HBASE_RPC_TIMEOUT)) {
+  newProperties.put(HBASE_RPC_TIMEOUT, String.valueOf(30));
+}
+
+if (!amsHbaseSiteProperties.containsKey(PHOENIX_QUERY_KEEPALIVE)) {
+  newProperties.put(PHOENIX_QUERY_KEEPALIVE, 
String.valueOf(30));
+}
+
+if 
(!amsHbaseSiteProperties.containsKey(HBASE_CLIENT_SCANNER_TIMEOUT_PERIOD) ||
+  
amsHbaseSiteProperties.get(HBASE_CLIENT_SCANNER_TIMEOUT_PERIOD).equals("90"))
 {
+  amsHbaseSiteProperties.put(HBASE_CLIENT_SCANNER_TIMEOUT_PERIOD, 
String.valueOf(30));
+}
+
+if (!amsHbaseSiteProperties.containsKey(PHOENIX_QUERY_TIMEOUT) ||
+  
amsHbaseSiteProperties.get(PHOENIX_QUERY_TIMEOUT).equals("120")) {
+  amsHbaseSiteProperties.put(PHOENIX_QUERY_TIMEOUT, 
String.valueOf(30));
+}
+updateConfigurationPropertiesForCluster(cluster, AMS_HBASE_SITE, 
newProperties, true, true);
+  }
 }
   }
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/48b23a52/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-site.xml
--
diff --git

ambari git commit: AMBARI-15429. Cannot specify ZooKeeper heap size via UI.(vbrodetskyi)

2016-03-19 Thread vbrodetskyi

Repository: ambari
Updated Branches:
  refs/heads/trunk fac2eece9 -> d7596e769


AMBARI-15429. Cannot specify ZooKeeper heap size via UI.(vbrodetskyi)


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

Branch: refs/heads/trunk
Commit: d7596e769f7546e621981f9e5501c1094e6e4f84
Parents: fac2eec
Author: Vitaly Brodetskyi 
Authored: Thu Mar 17 12:40:33 2016 +0200
Committer: Vitaly Brodetskyi 
Committed: Thu Mar 17 12:40:33 2016 +0200

--
 .../3.4.5.2.0/configuration/zookeeper-env.xml   | 16 +++-
 .../3.4.5.2.0/package/scripts/params_linux.py   |  2 +-
 2 files changed, 16 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/d7596e76/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/configuration/zookeeper-env.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/configuration/zookeeper-env.xml
 
b/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/configuration/zookeeper-env.xml
index 7ef62bc..e312507 100644
--- 
a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/configuration/zookeeper-env.xml
+++ 
b/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/configuration/zookeeper-env.xml
@@ -55,6 +55,20 @@
   
 
   
+zk_server_heapsize
+1024
+Maximum amount of memory each Zookeeper Server can 
use.
+Zookeeper Server Maximum Memory
+
+  int
+  256
+  32768
+  MB
+  256
+
+  
+
+  
 zookeeper_principal_name
 ZooKeeper principal name
   
@@ -74,7 +88,7 @@ export JAVA_HOME={{java64_home}}
 export ZOOKEEPER_HOME={{zk_home}}
 export ZOO_LOG_DIR={{zk_log_dir}}
 export ZOOPIDFILE={{zk_pid_file}}
-export SERVER_JVMFLAGS={{zk_server_heapsize}}
+export SERVER_JVMFLAGS=-Xmx{{zk_server_heapsize}}
 export JAVA=$JAVA_HOME/bin/java
 export CLASSPATH=$CLASSPATH:/usr/share/zookeeper/*
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/d7596e76/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/package/scripts/params_linux.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/package/scripts/params_linux.py
 
b/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/package/scripts/params_linux.py
index 9ff9125..d64eb5c 100644
--- 
a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/package/scripts/params_linux.py
+++ 
b/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/package/scripts/params_linux.py
@@ -65,7 +65,7 @@ zk_log_dir = 
config['configurations']['zookeeper-env']['zk_log_dir']
 zk_data_dir = config['configurations']['zoo.cfg']['dataDir']
 zk_pid_dir = status_params.zk_pid_dir
 zk_pid_file = status_params.zk_pid_file
-zk_server_heapsize = "-Xmx1024m"
+zk_server_heapsize = 
default('configurations/zookeeper-env/zk_server_heapsize', 1024)
 
 client_port = default('/configurations/zoo.cfg/clientPort', None)

[02/10] ambari git commit: AMBARI-15450. Templatized Dashboard JSON files - Grafana (Prajwal Rao via yusaku)

2016-03-19 Thread yusaku

http://git-wip-us.apache.org/repos/asf/ambari/blob/b76a5f56/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/grafana-yarn-overview.json
--
diff --git 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/grafana-yarn-overview.json
 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/grafana-yarn-overview.json
deleted file mode 100644
index f802548..000
--- 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/grafana-yarn-overview.json
+++ /dev/null
@@ -1,488 +0,0 @@
-{
-  "id": 3,
-  "title": "YARN Home",
-  "originalTitle": "YARN Home",
-  "tags": [],
-  "style": "dark",
-  "timezone": "browser",
-  "editable": true,
-  "hideControls": false,
-  "sharedCrosshair": false,
-  "rows": [
-{
-  "collapse": false,
-  "editable": true,
-  "height": "200px",
-  "panels": [
-{
-  "cacheTimeout": null,
-  "colorBackground": false,
-  "colorValue": false,
-  "colors": [
-"rgba(245, 54, 54, 0.9)",
-"rgba(237, 129, 40, 0.89)",
-"rgba(50, 172, 45, 0.97)"
-  ],
-  "datasource": null,
-  "editable": true,
-  "error": false,
-  "format": "none",
-  "id": 3,
-  "interval": null,
-  "isNew": true,
-  "links": [],
-  "maxDataPoints": 100,
-  "nullPointMode": "connected",
-  "nullText": null,
-  "postfix": "",
-  "postfixFontSize": "50%",
-  "prefix": "",
-  "prefixFontSize": "50%",
-  "span": 4,
-  "sparkline": {
-"fillColor": "rgba(31, 118, 189, 0.18)",
-"full": false,
-"lineColor": "rgb(31, 120, 193)",
-"show": true
-  },
-  "targets": [
-{
-  "aggregator": "avg",
-  "app": "resourcemanager",
-  "downsampleAggregator": "avg",
-  "errors": {},
-  "metric": "yarn.ClusterMetrics.NumActiveNMs",
-  "refId": "A"
-}
-  ],
-  "thresholds": "",
-  "title": "Active nodes",
-  "type": "singlestat",
-  "valueFontSize": "80%",
-  "valueMaps": [
-{
-  "op": "=",
-  "text": "N/A",
-  "value": "null"
-}
-  ],
-  "valueName": "current"
-},
-{
-  "cacheTimeout": null,
-  "colorBackground": false,
-  "colorValue": false,
-  "colors": [
-"rgba(245, 54, 54, 0.9)",
-"rgba(237, 129, 40, 0.89)",
-"rgba(50, 172, 45, 0.97)"
-  ],
-  "datasource": null,
-  "editable": true,
-  "error": false,
-  "format": "none",
-  "id": 2,
-  "interval": null,
-  "isNew": true,
-  "links": [],
-  "maxDataPoints": 100,
-  "nullPointMode": "connected",
-  "nullText": null,
-  "postfix": "",
-  "postfixFontSize": "50%",
-  "prefix": "",
-  "prefixFontSize": "50%",
-  "span": 4,
-  "sparkline": {
-"fillColor": "rgba(31, 118, 189, 0.18)",
-"full": false,
-"lineColor": "rgb(31, 120, 193)",
-"show": true
-  },
-  "targets": [
-{
-  "aggregator": "avg",
-  "app": "resourcemanager",
-  "downsampleAggregator": "avg",
-  "errors": {},
-  "metric": "yarn.QueueMetrics.Queue=root.AppsRunning",
-  "precision": "seconds",
-  "refId": "A",
-  "shouldAddPrecision": false
-}
-  ],
-  "thresholds": "",
-  "title": "Running apps",
-  "type": "singlestat",
-  "valueFontSize": "80%",
-  "valueMaps": [
-{
-  "op": "=",
-  "text": "N/A",
-  "value": "null"
-}
-  ],
-  "valueName": "current"
-},
-{
-  "cacheTimeout": null,
-  "colorBackground": false,
-  "colorValue": false,
-  "colors": [
-"rgba(245, 54, 54, 0.9)",
-"rgba(237, 129, 40, 0.89)",
-"rgba(50, 172, 45, 0.97)"
-  ],
-  "datasource": null,
-  "editable": true,
-  "error": false,
-  "format": "mbytes",
-  "id": 6,
-  "interval": null,
-  "isNew": true,
-  "links": [],
-  "maxDataPoints": 100,
-  "nullPointMode": "connected",
-  "nullText": null,
-  "postfix": "",
-  "postfixFontSize": "50%",
-  "prefix": "",
-

ambari git commit: AMBARI-15472. Appending Grafana dashboard tags. (Prajwal Rao via swagle)

2016-03-19 Thread swagle

Repository: ambari
Updated Branches:
  refs/heads/branch-2.2 9df79e5ff -> 0244d233a


AMBARI-15472. Appending Grafana dashboard tags. (Prajwal Rao via swagle)


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

Branch: refs/heads/branch-2.2
Commit: 0244d233a6999e7ec45a60218c792546229cd468
Parents: 9df79e5
Author: Siddharth Wagle 
Authored: Thu Mar 17 12:22:12 2016 -0700
Committer: Siddharth Wagle 
Committed: Thu Mar 17 12:22:12 2016 -0700

--
 .../AMBARI_METRICS/0.1.0/package/scripts/metrics_grafana_util.py  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/0244d233/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_grafana_util.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_grafana_util.py
 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_grafana_util.py
index 13a2c26..012bdcb 100644
--- 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_grafana_util.py
+++ 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_grafana_util.py
@@ -284,7 +284,8 @@ def create_ams_dashboards():
   dashboard_def['id'] = None
 # Set correct tags
 if 'tags' in dashboard_def:
-  dashboard_def['tags'].append('builtin', version)
+  dashboard_def['tags'].append('builtin')
+  dashboard_def['tags'].append(version)
 else:
   dashboard_def['tags'] = [ 'builtin', version ]

ambari git commit: AMBARI-15465. Increase Ambari Server Perm gen default value. (Daniel Gergley via stoader)

2016-03-19 Thread stoader

Repository: ambari
Updated Branches:
  refs/heads/trunk 36ad56111 -> 74f314598


AMBARI-15465. Increase Ambari Server Perm gen default value. (Daniel Gergley 
via stoader)


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

Branch: refs/heads/trunk
Commit: 74f31459800db97b5d355139eea7e79c47156c7b
Parents: 36ad561
Author: Toader, Sebastian 
Authored: Sat Mar 19 06:41:18 2016 +0100
Committer: Toader, Sebastian 
Committed: Sat Mar 19 06:41:18 2016 +0100

--
 ambari-server/conf/unix/ambari-env.sh   | 2 +-
 ambari-server/src/main/python/ambari_server_main.py | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/74f31459/ambari-server/conf/unix/ambari-env.sh
--
diff --git a/ambari-server/conf/unix/ambari-env.sh 
b/ambari-server/conf/unix/ambari-env.sh
index e9fdcdd..33912b6 100644
--- a/ambari-server/conf/unix/ambari-env.sh
+++ b/ambari-server/conf/unix/ambari-env.sh
@@ -15,7 +15,7 @@
 
 
 AMBARI_PASSHPHRASE="DEV"
-export AMBARI_JVM_ARGS=$AMBARI_JVM_ARGS' -Xms512m -Xmx2048m 
-Djava.security.auth.login.config=$ROOT/etc/ambari-server/conf/krb5JAASLogin.conf
 -Djava.security.krb5.conf=/etc/krb5.conf 
-Djavax.security.auth.useSubjectCredsOnly=false'
+export AMBARI_JVM_ARGS=$AMBARI_JVM_ARGS' -Xms512m -Xmx2048m 
-XX:MaxPermSize=128m 
-Djava.security.auth.login.config=$ROOT/etc/ambari-server/conf/krb5JAASLogin.conf
 -Djava.security.krb5.conf=/etc/krb5.conf 
-Djavax.security.auth.useSubjectCredsOnly=false'
 export PATH=$PATH:$ROOT/var/lib/ambari-server
 export PYTHONPATH=$PYTHONPATH:$ROOT/usr/lib/python2.6/site-packages
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/74f31459/ambari-server/src/main/python/ambari_server_main.py
--
diff --git a/ambari-server/src/main/python/ambari_server_main.py 
b/ambari-server/src/main/python/ambari_server_main.py
index 00e084b..cd0b858 100644
--- a/ambari-server/src/main/python/ambari_server_main.py
+++ b/ambari-server/src/main/python/ambari_server_main.py
@@ -53,7 +53,7 @@ if ambari_provider_module is not None:
   ambari_provider_module_option = "-Dprovider.module.class=" + \
   ambari_provider_module + " "
 
-jvm_args = os.getenv('AMBARI_JVM_ARGS', '-Xms512m -Xmx2048m')
+jvm_args = os.getenv('AMBARI_JVM_ARGS', '-Xms512m -Xmx2048m 
-XX:MaxPermSize=128m')
 
 ENV_FOREGROUND_KEY = "AMBARI_SERVER_RUN_IN_FOREGROUND"
 IS_FOREGROUND = ENV_FOREGROUND_KEY in os.environ and 
os.environ[ENV_FOREGROUND_KEY].lower() == "true"
@@ -62,6 +62,7 @@ SERVER_START_CMD = "{0} " \
 "-server -XX:NewRatio=3 " \
 "-XX:+UseConcMarkSweepGC " + \
 "-XX:-UseGCOverheadLimit -XX:CMSInitiatingOccupancyFraction=60 " \
+"-XX:+CMSClassUnloadingEnabled " \
 "-Dsun.zip.disableMemoryMapping=true " + \
 "{1} {2} " \
 "-cp {3} "\
@@ -85,6 +86,7 @@ SERVER_START_CMD_WINDOWS = "{0} " \
 "-server -XX:NewRatio=3 " \
 "-XX:+UseConcMarkSweepGC " + \
 "-XX:-UseGCOverheadLimit -XX:CMSInitiatingOccupancyFraction=60 " \
+"-XX:+CMSClassUnloadingEnabled " \
 "{1} {2} " \
 "-cp {3} " \
 "org.apache.ambari.server.controller.AmbariServer"

74 matches

Mail list logo