Return-Path: 
 <commits-return-24563-apmail-ambari-commits-archive=ambari.apache.org@ambari.apache.org>
X-Original-To: apmail-ambari-commits-archive@www.apache.org
Delivered-To: apmail-ambari-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id EFF8E185D6
	for <apmail-ambari-commits-archive@www.apache.org>;
 Thu,  4 Feb 2016 17:50:57 +0000 (UTC)
Received: (qmail 76188 invoked by uid 500); 4 Feb 2016 17:50:23 -0000
Delivered-To: apmail-ambari-commits-archive@ambari.apache.org
Received: (qmail 76156 invoked by uid 500); 4 Feb 2016 17:50:23 -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 76147 invoked by uid 99); 4 Feb 2016 17:50:23 -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; Thu, 04 Feb 2016 17:50:23 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id 104C1DFC90; Thu,  4 Feb 2016 17:50:23 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: dsen@apache.org
To: commits@ambari.apache.org
Message-Id: <7ccb946f0f804dfb8f4785fa57ebdf60@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: ambari git commit: AMBARI-14925 Make AMS Grafana component available
 as a DEB package (dsen)
Date: Thu,  4 Feb 2016 17:50:23 +0000 (UTC)

Repository: ambari
Updated Branches:
  refs/heads/trunk 549ee24c3 -> 407822583


AMBARI-14925 Make AMS Grafana component available as a DEB package (dsen)


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

Branch: refs/heads/trunk
Commit: 407822583d2d4f1a21e9d610e80fb32de548d9ac
Parents: 549ee24
Author: Dmytro Sen <dsen@apache.org>
Authored: Thu Feb 4 19:49:57 2016 +0200
Committer: Dmytro Sen <dsen@apache.org>
Committed: Thu Feb 4 19:49:57 2016 +0200

----------------------------------------------------------------------
 ambari-metrics/ambari-metrics-assembly/pom.xml | 53 ++++++++++++++++++++-
 1 file changed, 52 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/40782258/ambari-metrics/ambari-metrics-assembly/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-metrics/ambari-metrics-assembly/pom.xml b/ambari-metrics/ambari-metrics-assembly/pom.xml
index dfc9351..511dc1f 100644
--- a/ambari-metrics/ambari-metrics-assembly/pom.xml
+++ b/ambari-metrics/ambari-metrics-assembly/pom.xml
@@ -501,11 +501,14 @@
                   <type>template</type>
                   <paths>
                     <path>/etc/ambari-metrics-monitor/conf</path>
-                    <path>/usr/lib/ambari-metrics-collector</path>
                     <path>/etc/ambari-metrics-collector/conf</path>
+                    <path>/etc/ambari-metrics-grafana/conf</path>
                     <path>/etc/ams-hbase/conf</path>
                     <path>/var/run/ams-hbase</path>
+                    <path>/var/run/ambari-metrics-grafana</path>
+                    <path>/var/log/ambari-metrics-grafana</path>
                     <path>/var/lib/ambari-metrics-collector</path>
+                    <path>/var/lib/ambari-metrics-grafana</path>
                     <path>/usr/lib/ambari-metrics-hadoop-sink</path>
                     <path>/usr/lib/ambari-metrics-kafka-sink</path>
                     <path>/usr/lib/ambari-metrics-kafka-sink/lib</path>
@@ -655,6 +658,54 @@
                   </mapper>
                 </data>
 
+                <!-- Metric Grafana -->
+
+                <data>
+                  <src>${grafana.dir}/target/grafana/${grafana.folder}</src>
+                  <type>directory</type>
+                  <mapper>
+                    <type>perm</type>
+                    <filemode>644</filemode>
+                    <prefix>/usr/lib/ambari-metrics-grafana</prefix>
+                  </mapper>
+                </data>
+                <data>
+                  <src>${grafana.dir}/target/grafana/${grafana.folder}/bin</src>
+                  <type>directory</type>
+                  <mapper>
+                    <type>perm</type>
+                    <filemode>755</filemode>
+                    <prefix>/usr/lib/ambari-metrics-grafana/bin</prefix>
+                  </mapper>
+                </data>
+                <data>
+                  <src>${grafana.dir}/conf/unix/ambari-metrics-grafana</src>
+                  <type>file</type>
+                  <mapper>
+                    <type>perm</type>
+                    <filemode>755</filemode>
+                    <prefix>/usr/sbin</prefix>
+                  </mapper>
+                </data>
+                <data>
+                  <src>${grafana.dir}/conf/unix/ams-grafana-env.sh</src>
+                  <type>file</type>
+                  <mapper>
+                    <type>perm</type>
+                    <filemode>755</filemode>
+                    <prefix>/etc/ambari-metrics-grafana/conf</prefix>
+                  </mapper>
+                </data>
+                <data>
+                  <src>${grafana.dir}/conf/unix/ams-grafana.ini</src>
+                  <type>file</type>
+                  <mapper>
+                    <type>perm</type>
+                    <filemode>644</filemode>
+                    <prefix>/etc/ambari-metrics-grafana/conf</prefix>
+                  </mapper>
+                </data>
+
                 <!-- hadoop sink -->
 
                 <data>