AMBARI-8741. Create assembly module to place ambari metrics rpms into single output dir. (mpapirkovskyy via swagle)

3 files changed, 67 insertions, 111 deletions

diff --git a/ambari-metrics/ambari-metrics-host-monitoring/conf/unix/metric_groups.conf b/ambari-metrics/ambari-metrics-host-monitoring/conf/unix/metric_groups.conf
new file mode 100644
index 0000000000..aa03d195c6
--- /dev/null
+++ b/ambari-metrics/ambari-metrics-host-monitoring/conf/unix/metric_groups.conf
@@ -0,0 +1,37 @@
+{#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#}
+
+{
+   "host_metric_groups": {
+      "all": {
+         "collect_every": "10",
+         "metrics": [
+            {
+               "name": "bytes_out",
+               "value_threshold": "128"
+            }
+         ]
+      }
+   },
+   "process_metric_groups": {
+      "": {
+         "collect_every": "15",
+         "metrics": []
+      }
+   }
+}
diff --git a/ambari-metrics/ambari-metrics-host-monitoring/conf/unix/metric_monitor.ini b/ambari-metrics/ambari-metrics-host-monitoring/conf/unix/metric_monitor.ini
new file mode 100644
index 0000000000..5e672fc04d
--- /dev/null
+++ b/ambari-metrics/ambari-metrics-host-monitoring/conf/unix/metric_monitor.ini
@@ -0,0 +1,30 @@
+{#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#}
+
+[default]
+debug_level = INFO
+metrics_server = {{ams_collector_host_single}}:{{ams_collector_port}}
+enable_time_threshold = false
+enable_value_threshold = false
+
+[emitter]
+send_interval = 60
+
+[collector]
+collector_sleep_interval = 5
+max_queue_size = 5000
diff --git a/ambari-metrics/ambari-metrics-host-monitoring/pom.xml b/ambari-metrics/ambari-metrics-host-monitoring/pom.xml
index 206f225268..6080c8d16f 100644
--- a/ambari-metrics/ambari-metrics-host-monitoring/pom.xml
+++ b/ambari-metrics/ambari-metrics-host-monitoring/pom.xml
@@ -100,117 +100,6 @@
         </executions>
       </plugin>
       <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>rpm-maven-plugin</artifactId>
-        <version>2.0.1</version>
-        <executions>
-          <execution>
-            <!-- unbinds rpm creation from maven lifecycle -->
-            <phase>none</phase>
-            <goals>
-              <goal>rpm</goal>
-            </goals>
-          </execution>
-        </executions>
-
-        <configuration>
-          <name>ambari-metrics-monitor</name>
-          <group>Development</group>
-          <needarch>x86_64</needarch>
-          <autoRequires>false</autoRequires>
-          <requires>
-            <require>ambari-metrics-hadoop-sink</require>
-            <require>ambari-metrics-flume-sink</require>
-            <require>${python.ver}</require>
-            <require>gcc</require>
-            <require>python-devel</require>
-          </requires>
-          <preremoveScriptlet>
-            <scriptFile>src/main/package/rpm/preremove.sh</scriptFile>
-            <fileEncoding>utf-8</fileEncoding>
-          </preremoveScriptlet>
-          <defaultDirmode>755</defaultDirmode>
-          <defaultFilemode>644</defaultFilemode>
-          <defaultUsername>root</defaultUsername>
-          <defaultGroupname>root</defaultGroupname>
-          <mappings>
-            <mapping>
-              <directory>${resmonitor.install.dir}</directory>
-              <username>root</username>
-              <groupname>root</groupname>
-              <sources>
-                <source>
-                  <!--<location>-->
-                  <!--${project.build.directory}/${project.artifactId}-${project.version}/resource_monitoring/external/build/*-->
-                  <!--</location>-->
-                  <!--<location>-->
-                  <!--${project.build.directory}/${project.artifactId}-${project.version}/resource_monitoring/core-->
-                  <!--</location>-->
-                  <!--<location>-->
-                  <!--${project.build.directory}/${project.artifactId}-${project.version}/resource_monitoring/__init__.py-->
-                  <!--</location>-->
-                  <location>
-                    ${project.basedir}/src/main/python/__init__.py
-                  </location>
-                </source>
-                <source>
-                  <location>
-                    ${project.basedir}/src/main/python/main.py
-                  </location>
-                </source>
-              </sources>
-            </mapping>
-            <mapping>
-              <directory>${resmonitor.install.dir}/core</directory>
-              <sources>
-                <source>
-                  <location>
-                    ${project.basedir}/src/main/python/core
-                  </location>
-                </source>
-              </sources>
-            </mapping>
-            <mapping>
-              <directory>${resmonitor.install.dir}/psutil</directory>
-              <sources>
-                <source>
-                  <location>
-                    ${project.basedir}/src/main/python/psutil
-                  </location>
-                  <excludes>
-                    <exclude>build/**</exclude>
-                    <exclude>build/*</exclude>
-                  </excludes>
-                </source>
-              </sources>
-            </mapping>
-            <mapping>
-              <directory>/etc/ambari-metrics-monitor/conf</directory>
-              <configuration>true</configuration>
-            </mapping>
-            <mapping>
-              <directory>/var/run/ambari-metrics-monitor</directory>
-            </mapping>
-            <mapping>
-              <directory>/var/log/ambari-metrics-monitor</directory>
-            </mapping>
-            <mapping>
-              <directory>/usr/sbin</directory>
-              <filemode>755</filemode>
-              <username>root</username>
-              <groupname>root</groupname>
-              <directoryIncluded>false</directoryIncluded>
-              <sources>
-                <source>
-                  <location>conf/unix/ambari-metrics-monitor</location>
-                  <filter>true</filter>
-                </source>
-              </sources>
-            </mapping>
-          </mappings>
-        </configuration>
-      </plugin>
-      <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-antrun-plugin</artifactId>
         <version>1.7</version>