You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ds...@apache.org on 2016/02/05 13:27:34 UTC

ambari git commit: AMBARI-14902 Make AMS Grafana component available as a repo package (additional patch) (dsen)

Repository: ambari
Updated Branches:
  refs/heads/trunk c62233236 -> 691958665


AMBARI-14902 Make AMS Grafana component available as a repo package (additional patch) (dsen)


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

Branch: refs/heads/trunk
Commit: 691958665eb13e58c302a5cf392f4e587853e551
Parents: c622332
Author: Dmytro Sen <ds...@apache.org>
Authored: Fri Feb 5 14:27:25 2016 +0200
Committer: Dmytro Sen <ds...@apache.org>
Committed: Fri Feb 5 14:27:25 2016 +0200

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


http://git-wip-us.apache.org/repos/asf/ambari/blob/69195866/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 511dc1f..130097d 100644
--- a/ambari-metrics/ambari-metrics-assembly/pom.xml
+++ b/ambari-metrics/ambari-metrics-assembly/pom.xml
@@ -130,7 +130,7 @@
               <finalName>ambari-metrics-grafana-${project.version}</finalName>
               <appendAssemblyId>false</appendAssemblyId>
               <descriptors>
-                <descriptor>src/main/assembly/grafana.xml</descriptor>
+                <descriptor>${assemblydescriptor.grafana}</descriptor>
               </descriptors>
               <tarLongFileMode>gnu</tarLongFileMode>
             </configuration>
@@ -208,6 +208,208 @@
               <defaultGroupname>root</defaultGroupname>
             </configuration>
             <executions>
+
+              <!--ambari-metrics-collector-->
+              <execution>
+                <id>ambari-metrics-collector</id>
+                <phase>package</phase>
+                <goals>
+                  <goal>rpm</goal>
+                </goals>
+                <configuration>
+                  <name>ambari-metrics-collector</name>
+                  <copyright>2012, Apache Software Foundation</copyright>
+                  <group>Development</group>
+                  <description>Maven Recipe: RPM Package.</description>
+                  <autoRequires>false</autoRequires>
+                  <requires>
+                    <require>${python.ver}</require>
+                  </requires>
+
+                  <defaultFilemode>644</defaultFilemode>
+                  <defaultDirmode>755</defaultDirmode>
+                  <defaultUsername>root</defaultUsername>
+                  <defaultGroupname>root</defaultGroupname>
+
+                  <mappings>
+                    <mapping>
+                      <!--jars-->
+                      <directory>/usr/lib/ambari-metrics-collector/</directory>
+                      <sources>
+                        <source>
+                          <location>${collector.dir}/target/lib</location>
+                        </source>
+                        <source>
+                          <location>
+                            ${collector.dir}/target/ambari-metrics-timelineservice-${project.version}.jar
+                          </location>
+                        </source>
+                      </sources>
+                    </mapping>
+                    <mapping>
+                      <!--embedded applications-->
+                      <directory>/usr/lib/ams-hbase/</directory>
+                      <sources>
+                        <source>
+                          <location>${collector.dir}/target/embedded/${hbase.folder}</location>
+                          <excludes>
+                            <exclude>bin/**</exclude>
+                            <exclude>bin/*</exclude>
+                          </excludes>
+                        </source>
+                      </sources>
+                    </mapping>
+                    <mapping>
+                      <directory>/usr/lib/ams-hbase/bin</directory>
+                      <filemode>755</filemode>
+                      <sources>
+                        <source>
+                          <location>${collector.dir}/target/embedded/${hbase.folder}/bin</location>
+                        </source>
+                      </sources>
+                    </mapping>
+                    <mapping>
+                      <directory>/usr/lib/ams-hbase/lib/</directory>
+                      <sources>
+                        <source>
+                          <location>${collector.dir}/target/lib</location>
+                          <includes>
+                            <include>phoenix*.jar</include>
+                            <include>antlr*.jar</include>
+                          </includes>
+                        </source>
+                      </sources>
+                    </mapping>
+                    <mapping>
+                      <directory>/usr/lib/ams-hbase/lib/hadoop-native/</directory>
+                      <sources>
+                        <source>
+                          <location>${project.build.directory}/ambari-metrics-collector-${project.version}/ambari-metrics-collector-${project.version}/hbase/lib/hadoop-native</location>
+                        </source>
+                      </sources>
+                    </mapping>
+                    <mapping>
+                      <directory>/usr/sbin</directory>
+                      <filemode>755</filemode>
+                      <username>root</username>
+                      <groupname>root</groupname>
+                      <directoryIncluded>false</directoryIncluded>
+                      <sources>
+                        <source>
+                          <location>${collector.dir}/conf/unix/ambari-metrics-collector</location>
+                          <filter>false</filter>
+                        </source>
+                      </sources>
+                    </mapping>
+                    <mapping>
+                      <directory>/etc/ambari-metrics-collector/conf</directory>
+                      <configuration>true</configuration>
+                      <sources>
+                        <source>
+                          <location>${collector.dir}/conf/unix/ams-env.sh</location>
+                        </source>
+                        <source>
+                          <location>${collector.dir}/conf/unix/ams-site.xml</location>
+                        </source>
+                        <source>
+                          <location>${collector.dir}/conf/unix/log4j.properties</location>
+                        </source>
+                        <source>
+                          <location>${collector.dir}/target/embedded/${hbase.folder}/conf/hbase-site.xml</location>
+                        </source>
+                      </sources>
+                    </mapping>
+                    <mapping>
+                      <directory>/etc/ams-hbase/conf</directory>
+                      <configuration>true</configuration>
+                      <sources>
+                        <source>
+                          <location>${collector.dir}/target/embedded/${hbase.folder}/conf</location>
+                          <includes>
+                            <include>*.*</include>
+                          </includes>
+                        </source>
+                      </sources>
+                    </mapping>
+                    <mapping>
+                      <directory>/var/run/ams-hbase</directory>
+                    </mapping>
+                    <mapping>
+                      <directory>/var/lib/ambari-metrics-collector</directory>
+                    </mapping>
+                  </mappings>
+                </configuration>
+              </execution>
+
+              <!--hadoop-sink-->
+              <execution>
+                <id>ambari-metrics-hadoop-sink</id>
+                <phase>package</phase>
+                <goals>
+                  <goal>rpm</goal>
+                </goals>
+
+                <configuration>
+                  <name>ambari-metrics-hadoop-sink</name>
+                  <copyright>2012, Apache Software Foundation</copyright>
+                  <group>Development</group>
+                  <description>Maven Recipe: RPM Package.</description>
+
+                  <defaultDirmode>755</defaultDirmode>
+                  <defaultFilemode>644</defaultFilemode>
+                  <defaultUsername>root</defaultUsername>
+                  <defaultGroupname>root</defaultGroupname>
+
+                  <postinstallScriptlet>
+                    <scriptFile>${project.build.directory}/resources/rpm/sink/postinstall.sh</scriptFile>
+                    <fileEncoding>utf-8</fileEncoding>
+                  </postinstallScriptlet>
+
+                  <mappings>
+                    <mapping>
+                      <directory>/usr/lib/ambari-metrics-hadoop-sink</directory>
+                      <sources>
+                        <source>
+                          <location>${hadoop-sink.dir}/target/ambari-metrics-hadoop-sink-with-common-${project.version}.jar</location>
+                        </source>
+                      </sources>
+                    </mapping>
+                    <mapping>
+                      <directory>/usr/lib/flume/lib</directory>
+                      <sources>
+                        <source>
+                          <location>${flume-sink.dir}/target/ambari-metrics-flume-sink-with-common-${project.version}.jar</location>
+                        </source>
+                      </sources>
+                    </mapping>
+                    <mapping>
+                      <directory>/usr/lib/storm/lib</directory>
+                      <sources>
+                        <source>
+                          <location>${storm-sink.dir}/target/ambari-metrics-storm-sink-with-common-${project.version}.jar</location>
+                        </source>
+                      </sources>
+                    </mapping>
+                    <mapping>
+                      <directory>/usr/lib/ambari-metrics-kafka-sink</directory>
+                      <sources>
+                        <source>
+                          <location>${kafka-sink.dir}/target/${kafka.sink.jar}</location>
+                        </source>
+                      </sources>
+                    </mapping>
+                    <mapping>
+                      <directory>/usr/lib/ambari-metrics-kafka-sink/lib</directory>
+                      <sources>
+                        <source>
+                          <location>${kafka-sink.dir}/target/lib</location>
+                        </source>
+                      </sources>
+                    </mapping>
+                  </mappings>
+                </configuration>
+              </execution>
+
               <!--ambari-metrics-grafana-->
               <execution>
                 <id>ambari-metrics-grafana</id>