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

2016-03-18 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-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-15444. HOST Graph Legends - Grafana. (Prajwal Rao via yusaku)

2016-03-18 Thread yusaku 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.2 8f481496e -> 2b1e7b75d


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

Branch: refs/heads/branch-2.2
Commit: 2b1e7b75d1970f26b0a033cdfac8b53b457b83ff
Parents: 8f48149
Author: Yusaku Sako 
Authored: Wed Mar 16 17:06:25 2016 -0700
Committer: Yusaku Sako 
Committed: Wed Mar 16 17:07:07 2016 -0700

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


http://git-wip-us.apache.org/repos/asf/ambari/blob/2b1e7b75/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)]);

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

2016-03-18 Thread aonishuk 
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/dd846600
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/dd846600
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/dd846600

Branch: refs/heads/branch-2.2
Commit: dd846600ffb4cb34228da0120cfd10fb20026f14
Parents: fa9bed0
Author: Andrew Onishuk 
Authored: Fri Mar 18 14:58:38 2016 +0200
Committer: Andrew Onishuk 
Committed: Fri Mar 18 14:58:38 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/dd846600/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/dd846600/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
 
b/ambari-common/src/main/python/resource_management/libraries/functions/file_system.py
index 39b86dd..2a859ed 100644
---

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

2016-03-18 Thread avijayan 
Repository: ambari
Updated Branches:
  refs/heads/trunk 33eeec800 -> 201961a4a


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

Branch: refs/heads/trunk
Commit: 201961a4a4f86b50a39bbb0cec0e33d05da2c842
Parents: 33eeec8
Author: Aravindan Vijayan 
Authored: Thu Mar 17 12:51:56 2016 -0700
Committer: Aravindan Vijayan 
Committed: Thu Mar 17 12:51:56 2016 -0700

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


http://git-wip-us.apache.org/repos/asf/ambari/blob/201961a4/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..84bb9f3 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,31 @@ 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/201961a4/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-site.xml
--
diff --git

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

2016-03-18 Thread pallavkul 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.2 e3a673f74 -> 3cfea2267


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

Branch: refs/heads/branch-2.2
Commit: 3cfea226791b27d281ffee5eb582927a09576468
Parents: e3a673f
Author: Pallav Kulshreshtha 
Authored: Fri Mar 18 12:06:59 2016 +0530
Committer: Pallav Kulshreshtha 
Committed: Fri Mar 18 12:06:59 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/3cfea226/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/3cfea226/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}}

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

2016-03-18 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-misc.json
--
diff --git 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/grafana-hbase-misc.json
 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/grafana-hbase-misc.json
new file mode 100644
index 000..a1ba3eb
--- /dev/null
+++ 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/grafana-hbase-misc.json
@@ -0,0 +1,1680 @@
+{
+  "id": 20,
+  "title": "HBase - Misc",
+  "originalTitle": "HBase - Misc",
+  "tags": [
+"hbase"
+  ],
+  "style": "dark",
+  "timezone": "browser",
+  "editable": true,
+  "hideControls": false,
+  "sharedCrosshair": false,
+  "rows": [
+{
+  "collapse": false,
+  "editable": true,
+  "height": "25px",
+  "panels": [
+{
+  "content": "Miscellaneous metrics related to 
the HBase cluster for troubleshooting and other purposes. 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": 19,
+  "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": 4,
+  "stack": false,
+  "steppedLine": false,
+  "targets": [
+{
+  "aggregator": "avg",
+  "app": "hbase",
+  "downsampleAggregator": "avg",
+  "errors": {},
+  "metric": "master.AssignmentManger.ritCount",
+  "precision": "",
+  "refId": "A",
+  "templatedHost": ""
+}
+  ],
+  "timeFrom": null,
+  "timeShift": null,
+  "title": "Master - Regions In Transition",
+  "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": 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": 20,
+  "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": 4,
+  "stack": false,
+  "steppedLine": false,
+  "targets": [
+{
+  "aggregator":

ambari git commit: AMBARI-15440 Cover create widget views with unit tests. (atkach)

2016-03-18 Thread atkach 
Repository: ambari
Updated Branches:
  refs/heads/trunk 0503753da -> fac2eece9


AMBARI-15440 Cover create widget views with unit tests. (atkach)


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

Branch: refs/heads/trunk
Commit: fac2eece9fe9b5bf8169f49448417b922bb56b5e
Parents: 0503753
Author: Andrii Tkach 
Authored: Wed Mar 16 15:46:06 2016 +0200
Committer: Andrii Tkach 
Committed: Thu Mar 17 15:20:32 2016 +0200

--
 ambari-web/app/assets/test/tests.js |   4 +
 .../service/widgets/create/expression_view.js   |  18 +-
 .../main/service/widgets/create/step1_view.js   |   3 +-
 .../main/service/widgets/create/step2_view.js   |   7 +-
 .../main/service/widgets/create/step3_view.js   |   3 +-
 .../widgets/create/expression_view_test.js  | 382 ++-
 .../service/widgets/create/step1_view_test.js   |  63 +++
 .../service/widgets/create/step2_view_test.js   | 132 +++
 .../service/widgets/create/step3_view_test.js   |  48 +++
 .../service/widgets/create/wizard_view_test.js  | 109 ++
 10 files changed, 745 insertions(+), 24 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/fac2eece/ambari-web/app/assets/test/tests.js
--
diff --git a/ambari-web/app/assets/test/tests.js 
b/ambari-web/app/assets/test/tests.js
index 1d5f8ad..6e33833 100644
--- a/ambari-web/app/assets/test/tests.js
+++ b/ambari-web/app/assets/test/tests.js
@@ -285,6 +285,10 @@ var files = [
   'test/views/main/service/services/storm_test',
   'test/views/main/service/services/yarn_test',
   'test/views/main/service/widgets/create/expression_view_test',
+  'test/views/main/service/widgets/create/wizard_view_test',
+  'test/views/main/service/widgets/create/step3_view_test',
+  'test/views/main/service/widgets/create/step2_view_test',
+  'test/views/main/service/widgets/create/step1_view_test',
   'test/views/main/admin/highAvailability/nameNode/step1_view_test',
   'test/views/main/admin/highAvailability/nameNode/step3_view_test',
   'test/views/main/admin/highAvailability/nameNode/step4_view_test',

http://git-wip-us.apache.org/repos/asf/ambari/blob/fac2eece/ambari-web/app/views/main/service/widgets/create/expression_view.js
--
diff --git 
a/ambari-web/app/views/main/service/widgets/create/expression_view.js 
b/ambari-web/app/views/main/service/widgets/create/expression_view.js
index 55f4cd0..3688270 100644
--- a/ambari-web/app/views/main/service/widgets/create/expression_view.js
+++ b/ambari-web/app/views/main/service/widgets/create/expression_view.js
@@ -96,9 +96,8 @@ App.WidgetWizardExpressionView = Em.View.extend({
 
   /**
* add operator to expression data
-   * @param event
*/
-  addNumber: function (event) {
+  addNumber: function () {
 var data = this.get('expression.data');
 var lastId = (data.length > 0) ? Math.max.apply(this, 
data.mapProperty('id')) : 0;
 
@@ -424,7 +423,7 @@ App.InputCursorTextfieldView = Ember.TextField.extend({
 });
   }.observes('parentView.expression.data.length'),
 
-  focusOut: function(evt) {
+  focusOut: function() {
 this.saveNumber();
   },
 
@@ -444,7 +443,7 @@ App.InputCursorTextfieldView = Ember.TextField.extend({
   isOperator: true
 }));
 this.set('value', '');
-  } else if (value && value == 'm') {
+  } else if (value && value === 'm') {
 // open add metric menu
 var expressionId = "_" + parentView.get('expression.id');
 $('#add-metric-menu' + expressionId + '> div > a').click();
@@ -458,22 +457,19 @@ App.InputCursorTextfieldView = Ember.TextField.extend({
   }.observes('value'),
 
   keyDown: function (event) {
-if ((event.keyCode == 8 || event.which == 8) && !this.get('value')) { // 
backspace
+if ((event.keyCode === 8 || event.which === 8) && !this.get('value')) { // 
backspace
   var data = this.get('parentView.expression.data');
   if (data.length >= 1) {
 data.removeObject(data[data.length - 1]);
   }
-} else if (event.keyCode == 13) { //Enter
+} else if (event.keyCode === 13) { //Enter
   this.saveNumber();
 }
   },
 
   saveNumber: function() {
-var number_utils = require("utils/number_utils");
-var value = this.get('value');
-if (number_utils.isPositiveNumber(value))  {
-  var parentView = this.get('parentView');
-  var data = parentView.get('expression.data');
+if (number_utils.isPositiveNumber(this.get('value')))  {
+  var data =

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

2016-03-18 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-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": [

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

2016-03-18 Thread jonathanhurley 
Repository: ambari
Updated Branches:
  refs/heads/trunk d752f5ec8 -> 7242a4a18


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

This reverts commit d7596e769f7546e621981f9e5501c1094e6e4f84.


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

Branch: refs/heads/trunk
Commit: 7242a4a1803c6d707d40063d9a708609a5fe4bcf
Parents: f983862
Author: Jonathan Hurley 
Authored: Fri Mar 18 13:04:57 2016 -0400
Committer: Jonathan Hurley 
Committed: Fri Mar 18 13:05:12 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/7242a4a1/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 e312507..7ef62bc 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,20 +55,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
   
@@ -88,7 +74,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/7242a4a1/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..9ff9125 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-15475: Editing tmp dir from single to multiple dir doesn't trigger the backend change

2016-03-18 Thread jaoki 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.2 edfbe19b6 -> e4899550f


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

Branch: refs/heads/branch-2.2
Commit: e4899550fc1f8f1fbfb17228175e15aa4cd8a18c
Parents: edfbe19
Author: Jun Aoki 
Authored: Fri Mar 18 18:16:48 2016 -0700
Committer: Jun Aoki 
Committed: Fri Mar 18 18:16:48 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 ++--
 .../HAWQ/2.0.0/package/scripts/utils.py  |  6 +-
 .../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  |  9 +
 8 files changed, 45 insertions(+), 33 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/e4899550/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 d62332d..20336bc 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/e4899550/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/e4899550/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()

ambari git commit: AMBARI-15486. HiveServerInteractive. Remove Password requirement from hive-interactive-site.xml. (Swapan Shridhar via yusaku)

2016-03-18 Thread yusaku 
Repository: ambari
Updated Branches:
  refs/heads/trunk 74517116a -> 9dc52fc9f


AMBARI-15486. HiveServerInteractive. Remove Password requirement from 
hive-interactive-site.xml. (Swapan Shridhar via yusaku)


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

Branch: refs/heads/trunk
Commit: 9dc52fc9f156252ca206fdb8ca07af09f2bf582e
Parents: 7451711
Author: Yusaku Sako 
Authored: Fri Mar 18 18:44:54 2016 -0700
Committer: Yusaku Sako 
Committed: Fri Mar 18 18:44:54 2016 -0700

--
 .../HIVE/configuration/hive-interactive-site.xml| 12 
 1 file changed, 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/9dc52fc9/ambari-server/src/main/resources/stacks/HDP/2.6/services/HIVE/configuration/hive-interactive-site.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.6/services/HIVE/configuration/hive-interactive-site.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/HIVE/configuration/hive-interactive-site.xml
index e77b379..fb55d2d 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.6/services/HIVE/configuration/hive-interactive-site.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/HIVE/configuration/hive-interactive-site.xml
@@ -133,18 +133,6 @@ limitations under the License.
 
   
 
-  
-javax.jdo.option.ConnectionPassword
-
-PASSWORD
-Database Password
-password to use against metastore database
-
-  password
-  false
-
-  
-
   
 javax.jdo.option.ConnectionURL
 jdbc:mysql://localhost/hive?createDatabaseIfNotExist=true

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

2016-03-18 Thread yusaku 
Repository: ambari
Updated Branches:
  refs/heads/trunk bb6ba25f9 -> 74517116a


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


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

Branch: refs/heads/trunk
Commit: 74517116a666a5d9d72d27efb73c02309fca0b05
Parents: bb6ba25
Author: Yusaku Sako 
Authored: Fri Mar 18 17:15:34 2016 -0700
Committer: Yusaku Sako 
Committed: Fri Mar 18 17:15:34 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| 17 ++---
 4 files changed, 50 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/74517116/ambari-web/app/controllers/experimental.js
--
diff --git a/ambari-web/app/controllers/experimental.js 
b/ambari-web/app/controllers/experimental.js
index 9fa6da5..3642cd9 100644
--- a/ambari-web/app/controllers/experimental.js
+++ b/ambari-web/app/controllers/experimental.js
@@ -53,5 +53,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/74517116/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 1e08161..da25212 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/74517116/ambari-web/app/messages.js
--
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 9289fc2..421143a 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -3013,5 +3013,8 @@ Em.I18n.translations = {
   'admin.serviceAutoStart.save.popup.body': 'You are changing the auto-start 
configuration.' +
   'Click Save to commit the change or Discard to revert your 
changes',
   'admin.serviceAutoStart.save.popup.transition.title': 'Warning',
-  'admin.serviceAutoStart.save.popup.transition.body': 'You have unsaved 
changes'
+  'admin.serviceAutoStart.save.popup.transition.body': 'You have unsaved 
changes',
+
+  '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/74517116/ambari-web/app/templates/experimental.hbs
--
diff --git a/ambari-web/app/templates/experimental.hbs 
b/ambari-web/app/templates/experimental.hbs
index 2873679..5fec5ca 100644
--- a/ambari-web/app/templates/experimental.hbs
+++ b/ambari-web/app/templates/experimental.hbs
@@ -48,12 +48,23 @@
{{/each}}
 
 
-
-   
+
+
  {{t 
form.cancel}}
  {{t common.save}}

- 
+   
+
+
+  {{#isAuthorized "CLUSTER.MANAGE_USER_PERSISTED_DATA"}}
+
+  {{t reset.ui.states}}
+  
+  Reset UI state

[ambari] Git Push Summary

2016-03-18 Thread ncole 
Repository: ambari
Updated Branches:
  refs/heads/branch-dev-patch-upgrade [deleted] db999ae82

ambari git commit: AMBARI-15473. Service version display should be based on Version Definition (ncole)

2016-03-18 Thread ncole 
Repository: ambari
Updated Branches:
  refs/heads/trunk 9ff6b8762 -> fa611afd2


AMBARI-15473. Service version display should be based on Version Definition 
(ncole)


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

Branch: refs/heads/trunk
Commit: fa611afd26075d1d6e4c41550a481c213efcfe77
Parents: 9ff6b87
Author: Nate Cole 
Authored: Thu Mar 17 17:14:06 2016 -0400
Committer: Nate Cole 
Committed: Fri Mar 18 09:52:13 2016 -0400

--
 .../RepositoryVersionResourceProvider.java  | 36 +---
 .../state/repository/ManifestServiceInfo.java   | 55 
 .../state/repository/VersionDefinitionXml.java  | 45 +-
 ...leRepositoryVersionResourceProviderTest.java | 23 +++--
 .../state/repository/VersionDefinitionTest.java | 90 +++-
 .../test/resources/version_definition_test.xml  |  2 +-
 6 files changed, 232 insertions(+), 19 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/fa611afd/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RepositoryVersionResourceProvider.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RepositoryVersionResourceProvider.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RepositoryVersionResourceProvider.java
index c298e0a..4bb0e3b 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RepositoryVersionResourceProvider.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RepositoryVersionResourceProvider.java
@@ -20,6 +20,7 @@ package org.apache.ambari.server.controller.internal;
 import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -59,8 +60,10 @@ import org.apache.ambari.server.state.Cluster;
 import org.apache.ambari.server.state.Clusters;
 import org.apache.ambari.server.state.OperatingSystemInfo;
 import org.apache.ambari.server.state.RepositoryVersionState;
+import org.apache.ambari.server.state.ServiceInfo;
 import org.apache.ambari.server.state.StackId;
 import org.apache.ambari.server.state.StackInfo;
+import org.apache.ambari.server.state.repository.ManifestServiceInfo;
 import org.apache.ambari.server.state.repository.VersionDefinitionXml;
 import org.apache.ambari.server.state.stack.UpgradePack;
 import org.apache.ambari.server.state.stack.upgrade.RepositoryVersionHelper;
@@ -95,6 +98,7 @@ public class RepositoryVersionResourceProvider extends 
AbstractAuthorizedResourc
   public static final String REPOSITORY_VERSION_RELEASE_NOTES  
= "RepositoryVersions/release/notes";
   public static final String REPOSITORY_VERSION_RELEASE_COMPATIBLE_WITH
= "RepositoryVersions/release/compatible_with";
   public static final String REPOSITORY_VERSION_AVAILABLE_SERVICES 
= "RepositoryVersions/services";
+  public static final String REPOSITORY_VERSION_STACK_SERVICES 
= "RepositoryVersions/stack_services";
 
   public static final String REPOSITORY_VERSION_PARENT_ID  
= "RepositoryVersions/parent_id";
   public static final String REPOSITORY_VERSION_HAS_CHILDREN   
= "RepositoryVersions/has_children";
@@ -121,7 +125,8 @@ public class RepositoryVersionResourceProvider extends 
AbstractAuthorizedResourc
   REPOSITORY_VERSION_RELEASE_VERSION,
   REPOSITORY_VERSION_PARENT_ID,
   REPOSITORY_VERSION_HAS_CHILDREN,
-  REPOSITORY_VERSION_AVAILABLE_SERVICES);
+  REPOSITORY_VERSION_AVAILABLE_SERVICES,
+  REPOSITORY_VERSION_STACK_SERVICES);
 
   @SuppressWarnings("serial")
   public static Map keyPropertyIds = new HashMap() 
{
@@ -273,30 +278,41 @@ public class RepositoryVersionResourceProvider extends 
AbstractAuthorizedResourc
   null != children && !children.isEmpty(), requestedIds);
 
   final VersionDefinitionXml xml;
-
   try {
 xml = entity.getRepositoryXml();
   } catch (Exception e) {
 throw new SystemException(String.format("Could not load xml for 
Repository %s", entity.getId()), e);
   }
 
-  if (null != xml) {
-final StackInfo stack;
+  final StackInfo stack;
+  try {
+stack = ambariMetaInfo.getStack(entity.getStackName(), 
entity.getStackVersion());
+  } catch (AmbariException e) {
+throw new SystemException(String.format("Could not load stack %s for

ambari git commit: AMBARI-15427. DB connection verification fails on "customize service" step.(vbrodetskyi)

2016-03-18 Thread vbrodetskyi 
Repository: ambari
Updated Branches:
  refs/heads/trunk 27262b897 -> 6dcb48422


AMBARI-15427. DB connection verification fails on "customize service" 
step.(vbrodetskyi)


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

Branch: refs/heads/trunk
Commit: 6dcb48422b870187f0ea0e12a68a85d5580e64ac
Parents: 27262b8
Author: Vitaly Brodetskyi 
Authored: Wed Mar 16 13:11:30 2016 +0200
Committer: Vitaly Brodetskyi 
Committed: Wed Mar 16 13:11:30 2016 +0200

--
 .../controller/AmbariActionExecutionHelper.java | 44 ++--
 1 file changed, 23 insertions(+), 21 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/6dcb4842/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariActionExecutionHelper.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariActionExecutionHelper.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariActionExecutionHelper.java
index 7a7bc21..4ef215c 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariActionExecutionHelper.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariActionExecutionHelper.java
@@ -18,23 +18,10 @@
 
 package org.apache.ambari.server.controller;
 
-import static 
org.apache.ambari.server.agent.ExecutionCommand.KeyNames.AGENT_STACK_RETRY_ON_UNAVAILABILITY;
-import static 
org.apache.ambari.server.agent.ExecutionCommand.KeyNames.AGENT_STACK_RETRY_COUNT;
-import static 
org.apache.ambari.server.agent.ExecutionCommand.KeyNames.COMMAND_TIMEOUT;
-import static 
org.apache.ambari.server.agent.ExecutionCommand.KeyNames.COMPONENT_CATEGORY;
-import static 
org.apache.ambari.server.agent.ExecutionCommand.KeyNames.REPO_INFO;
-import static org.apache.ambari.server.agent.ExecutionCommand.KeyNames.SCRIPT;
-import static 
org.apache.ambari.server.agent.ExecutionCommand.KeyNames.SCRIPT_TYPE;
-import static 
org.apache.ambari.server.agent.ExecutionCommand.KeyNames.STACK_NAME;
-import static 
org.apache.ambari.server.agent.ExecutionCommand.KeyNames.STACK_VERSION;
-
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeMap;
-
+import com.google.gson.JsonArray;
+import com.google.gson.JsonObject;
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
 import org.apache.ambari.server.AmbariException;
 import org.apache.ambari.server.ObjectNotFoundException;
 import org.apache.ambari.server.Role;
@@ -64,10 +51,22 @@ import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.gson.JsonArray;
-import com.google.gson.JsonObject;
-import com.google.inject.Inject;
-import com.google.inject.Singleton;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeMap;
+
+import static 
org.apache.ambari.server.agent.ExecutionCommand.KeyNames.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.COMMAND_TIMEOUT;
+import static 
org.apache.ambari.server.agent.ExecutionCommand.KeyNames.COMPONENT_CATEGORY;
+import static 
org.apache.ambari.server.agent.ExecutionCommand.KeyNames.REPO_INFO;
+import static org.apache.ambari.server.agent.ExecutionCommand.KeyNames.SCRIPT;
+import static 
org.apache.ambari.server.agent.ExecutionCommand.KeyNames.SCRIPT_TYPE;
+import static 
org.apache.ambari.server.agent.ExecutionCommand.KeyNames.STACK_NAME;
+import static 
org.apache.ambari.server.agent.ExecutionCommand.KeyNames.STACK_VERSION;
 
 /**
  * Helper class containing logic to process custom action execution requests
@@ -418,6 +417,9 @@ public class AmbariActionExecutionHelper {
   Map hostLevelParams = execCmd.getHostLevelParams();
   hostLevelParams.put(AGENT_STACK_RETRY_ON_UNAVAILABILITY, 
configs.isAgentStackRetryOnInstallEnabled());
   hostLevelParams.put(AGENT_STACK_RETRY_COUNT, 
configs.getAgentStackRetryOnInstallCount());
+  for (Map.Entry dbConnectorName : 
configs.getDatabaseConnectorNames().entrySet()) {
+hostLevelParams.put(dbConnectorName.getKey(), 
dbConnectorName.getValue());
+  }
   addRepoInfoToHostLevelParams(cluster, hostLevelParams, hostName);
 
   Map roleParams =

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

2016-03-18 Thread dsen 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.2 e7a15f411 -> 345a52a27


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

Branch: refs/heads/branch-2.2
Commit: 345a52a27bfde11992f6f761d061d501e71b44d1
Parents: e7a15f4
Author: Dmytro Sen 
Authored: Wed Mar 16 16:03:58 2016 +0200
Committer: Dmytro Sen 
Committed: Wed Mar 16 16:07:31 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/345a52a2/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/345a52a2/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-15433: Description of HAWQ temp directories is incorrect (adenissov via bhuvnesh2703)

2016-03-18 Thread bhuvnesh2703 
Repository: ambari
Updated Branches:
  refs/heads/trunk b76a5f566 -> 04620902c


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

Branch: refs/heads/trunk
Commit: 04620902c76ecf32c82a08e146dc8fdfb3229bed
Parents: b76a5f5
Author: Bhuvnesh Chaudhary 
Authored: Wed Mar 16 17:06:31 2016 -0700
Committer: Bhuvnesh Chaudhary 
Committed: Wed Mar 16 17:06:31 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/04620902/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

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

2016-03-18 Thread swagle 
Repository: ambari
Updated Branches:
  refs/heads/trunk 95798ad96 -> 33eeec800


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

Branch: refs/heads/trunk
Commit: 33eeec80051601b7931a186cff1ee405fc64e179
Parents: 95798ad
Author: Siddharth Wagle 
Authored: Thu Mar 17 12:21:34 2016 -0700
Committer: Siddharth Wagle 
Committed: Thu Mar 17 12:21:40 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/33eeec80/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 ]

[2/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-18 Thread aonishuk 
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/b2bc74da
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b2bc74da
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b2bc74da

Branch: refs/heads/branch-2.2
Commit: b2bc74da694f52c3414f8ff048d52225e6755cce
Parents: 45cdf97
Author: Andrew Onishuk 
Authored: Fri Mar 18 20:14:55 2016 +0200
Committer: Andrew Onishuk 
Committed: Fri Mar 18 20:14:55 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/b2bc74da/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 c3a499e..44d4e00 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
@@ -136,10 +136,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")
 
@@ -313,8 +315,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-15485. Update HDP Spark version to 1.6.1. (bikassaha via swagle)

2016-03-18 Thread swagle 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.2 e4899550f -> 55db5cb48


AMBARI-15485. Update HDP Spark version to 1.6.1. (bikassaha via swagle)


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

Branch: refs/heads/branch-2.2
Commit: 55db5cb48f799f7e178843794adb07ab06a5913f
Parents: e489955
Author: Siddharth Wagle 
Authored: Fri Mar 18 19:14:57 2016 -0700
Committer: Siddharth Wagle 
Committed: Fri Mar 18 19:14:57 2016 -0700

--
 .../src/main/resources/stacks/HDP/2.4/services/SPARK/metainfo.xml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/55db5cb4/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/metainfo.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/metainfo.xml 
b/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/metainfo.xml
index 562c977..b8be579 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/metainfo.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/metainfo.xml
@@ -23,7 +23,7 @@
 
 
   SPARK
-  1.6.0.2.4
+  1.6.1.2.4
   
 spark-defaults
 spark-env

ambari git commit: AMBARI-15485. Update HDP Spark version to 1.6.1. (bikassaha via swagle)

2016-03-18 Thread swagle 
Repository: ambari
Updated Branches:
  refs/heads/trunk 9dc52fc9f -> 36ad56111


AMBARI-15485. Update HDP Spark version to 1.6.1. (bikassaha via swagle)


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

Branch: refs/heads/trunk
Commit: 36ad561114236c962397f0383878c78197b5c8e2
Parents: 9dc52fc
Author: Siddharth Wagle 
Authored: Fri Mar 18 19:15:53 2016 -0700
Committer: Siddharth Wagle 
Committed: Fri Mar 18 19:15:53 2016 -0700

--
 .../src/main/resources/stacks/HDP/2.4/services/SPARK/metainfo.xml  | 2 +-
 .../src/main/resources/stacks/HDP/2.6/services/SPARK/metainfo.xml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/36ad5611/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/metainfo.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/metainfo.xml 
b/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/metainfo.xml
index 68f159d..2214bdf 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/metainfo.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/metainfo.xml
@@ -23,7 +23,7 @@
 
 
   SPARK
-  1.6.0.2.4
+  1.6.1.2.4
   
 spark-defaults
 spark-env

http://git-wip-us.apache.org/repos/asf/ambari/blob/36ad5611/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK/metainfo.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK/metainfo.xml 
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK/metainfo.xml
index 71a50ff..da9e4bf 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK/metainfo.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK/metainfo.xml
@@ -23,7 +23,7 @@
   
 
   SPARK
-  1.6.0.2.6
+  1.6.1.2.6