You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by nc...@apache.org on 2016/02/11 14:47:03 UTC
[03/17] ambari git commit: AMBARI-14995 AMS Grafana component should
package plugin from source code. (dsen)
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/branch-dev-patch-upgrade
Commit: 4870e1f89b155521713d63d8feef18f610f44f58
Parents: 8f3b9c4
Author: Dmytro Sen <ds...@apache.org>
Authored: Wed Feb 10 20:34:26 2016 +0200
Committer: Dmytro Sen <ds...@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>