Return-Path: 
 <commits-return-24768-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 EC84E18E14
	for <apmail-ambari-commits-archive@www.apache.org>;
 Wed, 10 Feb 2016 18:35:05 +0000 (UTC)
Received: (qmail 51703 invoked by uid 500); 10 Feb 2016 18:35:05 -0000
Delivered-To: apmail-ambari-commits-archive@ambari.apache.org
Received: (qmail 51677 invoked by uid 500); 10 Feb 2016 18:35:05 -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 51668 invoked by uid 99); 10 Feb 2016 18:35:05 -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, 10 Feb 2016 18:35:05 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id 9565FDFE2C; Wed, 10 Feb 2016 18:35:05 +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: <717c9185629a4e1cbcbd183dafc03434@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: ambari git commit: AMBARI-14995 AMS Grafana component should package
 plugin from source code. (dsen)
Date: Wed, 10 Feb 2016 18:35:05 +0000 (UTC)

Repository: ambari
Updated Branches:
  refs/heads/trunk 8f3b9c49d -> 4870e1f89


AMBARI-14995 AMS Grafana component should package plugin from source code. (dsen)


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

Branch: refs/heads/trunk
Commit: 4870e1f89b155521713d63d8feef18f610f44f58
Parents: 8f3b9c4
Author: Dmytro Sen <dsen@apache.org>
Authored: Wed Feb 10 20:34:26 2016 +0200
Committer: Dmytro Sen <dsen@apache.org>
Committed: Wed Feb 10 20:34:26 2016 +0200

----------------------------------------------------------------------
 ambari-metrics/ambari-metrics-grafana/pom.xml | 16 ++++++----------
 ambari-metrics/pom.xml                        |  1 -
 2 files changed, 6 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/4870e1f8/ambari-metrics/ambari-metrics-grafana/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-metrics/ambari-metrics-grafana/pom.xml b/ambari-metrics/ambari-metrics-grafana/pom.xml
index 8304416..c737b2b 100644
--- a/ambari-metrics/ambari-metrics-grafana/pom.xml
+++ b/ambari-metrics/ambari-metrics-grafana/pom.xml
@@ -103,16 +103,12 @@
                   dest="${project.build.directory}/grafana"
                   compression="gzip"
                   />
-                <get
-                  src="${ambari-grafana.tar}"
-                  dest="${project.build.directory}/grafana/ambari-grafana.tgz"
-                  usetimestamp="true"
-                  />
-                <untar
-                  src="${project.build.directory}/grafana/ambari-grafana.tgz"
-                  dest="${project.build.directory}/grafana/${grafana.folder}/public/app/plugins/datasource"
-                  compression="gzip"
-                  />
+                <copy
+                  todir="${project.build.directory}/grafana/${grafana.folder}/public/app/plugins/datasource">
+                  <fileset dir="${project.build.directory}/../">
+                    <include name="ambari-metrics/"/>
+                  </fileset>
+                </copy>
               </target>
             </configuration>
           </execution>

http://git-wip-us.apache.org/repos/asf/ambari/blob/4870e1f8/ambari-metrics/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-metrics/pom.xml b/ambari-metrics/pom.xml
index 9a39122..1f87683 100644
--- a/ambari-metrics/pom.xml
+++ b/ambari-metrics/pom.xml
@@ -52,7 +52,6 @@
     <hadoop.winpkg.folder>hadoop-2.6.0.2.2.4.2-0002</hadoop.winpkg.folder>
     <grafana.folder>grafana-2.6.0</grafana.folder>
     <grafana.tar>https://grafanarel.s3.amazonaws.com/builds/grafana-2.6.0.linux-x64.tar.gz</grafana.tar>
-    <ambari-grafana.tar>https://github.com/u39kun/ambari-grafana/raw/master/dist/ambari-grafana.tgz</ambari-grafana.tar>
     <resmonitor.install.dir>
       /usr/lib/python2.6/site-packages/resource_monitoring
     </resmonitor.install.dir>