Return-Path: <commits-return-28061-archive-asf-public=cust-asf.ponee.io@ambari.apache.org>
X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io
Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io
Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183])
	by cust-asf2.ponee.io (Postfix) with ESMTP id F2DC1200A5B
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Wed, 25 May 2016 12:35:09 +0200 (CEST)
Received: by cust-asf.ponee.io (Postfix)
	id F1DAD160A18; Wed, 25 May 2016 10:35:09 +0000 (UTC)
Delivered-To: archive-asf-public@cust-asf.ponee.io
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by cust-asf.ponee.io (Postfix) with SMTP id 471A9160A17
	for <archive-asf-public@cust-asf.ponee.io>; Wed, 25 May 2016 12:35:09 +0200 (CEST)
Received: (qmail 95270 invoked by uid 500); 25 May 2016 10:35:08 -0000
Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@ambari.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@ambari.apache.org>
List-Post: <mailto:commits@ambari.apache.org>
List-Id: <commits.ambari.apache.org>
Reply-To: ambari-dev@ambari.apache.org
Delivered-To: mailing list commits@ambari.apache.org
Received: (qmail 95261 invoked by uid 99); 25 May 2016 10:35:08 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 25 May 2016 10:35:08 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33)
	id 628C7DFC74; Wed, 25 May 2016 10:35:08 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: pallavkul@apache.org
To: commits@ambari.apache.org
Message-Id: <ed10d9fdb0ec47e18430253d78db6899@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: ambari git commit: AMBARI-16818. Ambari Quick link missing from
 Zeppelin (Renjith Kamath via pallavkul)
Date: Wed, 25 May 2016 10:35:08 +0000 (UTC)
archived-at: Wed, 25 May 2016 10:35:10 -0000

Repository: ambari
Updated Branches:
  refs/heads/trunk b052df6b9 -> 763093b4b


AMBARI-16818. Ambari Quick link missing from Zeppelin (Renjith Kamath via pallavkul)


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

Branch: refs/heads/trunk
Commit: 763093b4bc2cc496c1f44056f67cd570f5aeb2f0
Parents: b052df6
Author: Pallav Kulshreshtha <pallav.kul@gmail.com>
Authored: Wed May 25 16:04:52 2016 +0530
Committer: Pallav Kulshreshtha <pallav.kul@gmail.com>
Committed: Wed May 25 16:04:52 2016 +0530

----------------------------------------------------------------------
 .../ZEPPELIN/0.6.0.2.5/metainfo.xml             |  7 +++++
 .../0.6.0.2.5/quicklinks/quicklinks.json        | 28 ++++++++++++++++++++
 2 files changed, 35 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/763093b4/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/metainfo.xml b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/metainfo.xml
index 1b760ac..0e10596 100644
--- a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/metainfo.xml
+++ b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/metainfo.xml
@@ -65,6 +65,13 @@ limitations under the License.
         <config-type>zeppelin-config</config-type>
       </configuration-dependencies>
       <restartRequiredAfterChange>false</restartRequiredAfterChange>
+
+      <quickLinksConfigurations>
+        <quickLinksConfiguration>
+          <fileName>quicklinks.json</fileName>
+          <default>true</default>
+        </quickLinksConfiguration>
+      </quickLinksConfigurations>
     </service>
   </services>
 </metainfo>

http://git-wip-us.apache.org/repos/asf/ambari/blob/763093b4/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/quicklinks/quicklinks.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/quicklinks/quicklinks.json b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/quicklinks/quicklinks.json
new file mode 100644
index 0000000..7777fcc
--- /dev/null
+++ b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/quicklinks/quicklinks.json
@@ -0,0 +1,28 @@
+{
+  "name": "default",
+  "description": "default quick links configuration",
+  "configuration": {
+    "protocol":
+    {
+      "type":"HTTP_ONLY"
+    },
+
+    "links": [
+      {
+        "name": "zeppelin_ui",
+        "label": "Zeppelin UI",
+        "requires_user_name": "false",
+        "component_name": "ZEPPELIN_MASTER",
+        "url":"%@://%@:%@/",
+        "port":{
+          "http_property": "zeppelin_host",
+          "http_default_port": "9995",
+          "https_property": "zeppelin_host",
+          "https_default_port": "9995",
+          "regex": "^(\\d+)$",
+          "site": "zeppelin-site"
+        }
+      }
+    ]
+  }
+}