Explorar o código

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

Dmytro Sen %!s(int64=9) %!d(string=hai) anos
pai
achega
4870e1f89b
Modificáronse 2 ficheiros con 6 adicións e 11 borrados
  1. 6 10
      ambari-metrics/ambari-metrics-grafana/pom.xml
  2. 0 1
      ambari-metrics/pom.xml

+ 6 - 10
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>

+ 0 - 1
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>