[AMBARI-24705] Fix build issues in ambari-metrics repo. (#2)
* [AMBARI-24705] Fix build issues in ambari-metrics repo.
* [AMBARI-24705] Fix build issues in ambari-metrics repo. (Make ambari-python-wrap executable)
diff --git a/ambari-metrics-assembly/pom.xml b/ambari-metrics-assembly/pom.xml
index 4f36e5a..6244649 100644
--- a/ambari-metrics-assembly/pom.xml
+++ b/ambari-metrics-assembly/pom.xml
@@ -54,6 +54,7 @@
<storm.sink.jar>ambari-metrics-storm-sink-with-common-${project.version}.jar</storm.sink.jar>
<flume.sink.jar>ambari-metrics-flume-sink-with-common-${project.version}.jar</flume.sink.jar>
<kafka.sink.jar>ambari-metrics-kafka-sink-with-common-${project.version}.jar</kafka.sink.jar>
+ <ambari.commons.location>${monitor.dir}/target/ambari-python/site-packages/ambari_commons</ambari.commons.location>
</properties>
<build>
@@ -589,9 +590,7 @@
<directory>${resmonitor.install.dir}/ambari_commons</directory>
<sources>
<source>
- <location>
- ${project.basedir}/../../ambari-common/src/main/python/ambari_commons
- </location>
+ <location>${ambari.commons.location}</location>
</source>
</sources>
</mapping>
@@ -736,7 +735,7 @@
</data>
<data>
<type>directory</type>
- <src>${project.basedir}/../../ambari-common/src/main/python/ambari_commons</src>
+ <src>${ambari.commons.location}</src>
<mapper>
<type>perm</type>
<prefix>${resmonitor.install.dir}/ambari_commons</prefix>
@@ -1049,7 +1048,7 @@
<envClassifier>linux</envClassifier>
<dirsep>/</dirsep>
<pathsep>:</pathsep>
- <executable.python>${project.basedir}/../ambari-common/src/main/unix/ambari-python-wrap</executable.python>
+ <executable.python>${monitor.dir}/src/main/unix/ambari-python-wrap</executable.python>
<executable.shell>sh</executable.shell>
<fileextension.shell>sh</fileextension.shell>
<fileextension.dot.shell-default></fileextension.dot.shell-default>
@@ -1108,184 +1107,6 @@
</plugins>
</build>
</profile>
- <profile>
- <id>windows</id>
- <activation>
- <os>
- <family>win</family>
- </os>
- </activation>
- <properties>
- <envClassifier>win</envClassifier>
- <dirsep>\</dirsep>
- <pathsep>;</pathsep>
- <executable.python>python</executable.python>
- <executable.shell>cmd</executable.shell>
- <fileextension.shell>cmd</fileextension.shell>
- <fileextension.dot.shell-default>.cmd</fileextension.dot.shell-default>
- <assemblydescriptor.collector>src/main/assembly/collector-windows.xml</assemblydescriptor.collector>
- <assemblydescriptor.monitor>src/main/assembly/monitor-windows.xml</assemblydescriptor.monitor>
- <assemblydescriptor.sink>src/main/assembly/sink-windows.xml</assemblydescriptor.sink>
- <assemblydescriptor.collector.choco>src/main/assembly/collector-windows-choco.xml</assemblydescriptor.collector.choco>
- <assemblydescriptor.monitor.choco>src/main/assembly/monitor-windows-choco.xml</assemblydescriptor.monitor.choco>
- <assemblydescriptor.sink.choco>src/main/assembly/sink-windows-choco.xml</assemblydescriptor.sink.choco>
- <packagingFormat>jar</packagingFormat>
- <python.build.version>2.7</python.build.version>
- </properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.7</version>
- <executions>
- <execution>
- <id>download-hadoop</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <target name="Downloading Hadoop">
- <mkdir dir="${project.build.directory}/embedded" />
- <get
- src="${hadoop.winpkg.zip}"
- dest="${project.build.directory}/embedded/hadoop.zip"
- usetimestamp="true"
- />
- <unzip
- src="${project.build.directory}/embedded/hadoop.zip"
- dest="${project.build.directory}/embedded/hadoop.temp"
- />
- </target>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>choco</id>
- <activation>
- <os>
- <family>Windows</family>
- </os>
- </activation>
- <build>
- <plugins>
- <!-- choco package creation -->
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>collector-choco-dir</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <attach>false</attach>
- <finalName>ambari-metrics-collector-${project.version}-choco</finalName>
- <appendAssemblyId>false</appendAssemblyId>
- <descriptors>
- <descriptor>${assemblydescriptor.collector.choco}</descriptor>
- </descriptors>
- <tarLongFileMode>gnu</tarLongFileMode>
- </configuration>
- </execution>
- <execution>
- <id>monitor-choco-dir</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <attach>false</attach>
- <finalName>ambari-metrics-monitor-${project.version}-choco</finalName>
- <appendAssemblyId>false</appendAssemblyId>
- <descriptors>
- <descriptor>${assemblydescriptor.monitor.choco}</descriptor>
- </descriptors>
- <tarLongFileMode>gnu</tarLongFileMode>
- </configuration>
- </execution>
- <execution>
- <id>hadoop-sink-choco-dir</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <attach>false</attach>
- <finalName>ambari-metrics-hadoop-sink-${project.version}-choco</finalName>
- <appendAssemblyId>false</appendAssemblyId>
- <descriptors>
- <descriptor>${assemblydescriptor.sink.choco}</descriptor>
- </descriptors>
- <tarLongFileMode>gnu</tarLongFileMode>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <version>1.2.1</version>
- <executions>
- <execution>
- <id>collector-choco-package</id>
- <phase>package</phase>
- <goals>
- <goal>exec</goal>
- </goals>
- <configuration>
- <executable>choco.exe</executable>
- <arguments>
- <argument>pack</argument>
- <argument>--version=${project.version}</argument>
- <argument>${basedir}/target/ambari-metrics-collector-${project.version}-choco/ambari-metrics-collector.nuspec</argument>
- </arguments>
- <workingDirectory>target/ambari-metrics-collector-${project.version}-choco</workingDirectory>
- </configuration>
- </execution>
- <execution>
- <id>monitor-choco-package</id>
- <phase>package</phase>
- <goals>
- <goal>exec</goal>
- </goals>
- <configuration>
- <executable>choco.exe</executable>
- <arguments>
- <argument>pack</argument>
- <argument>--version=${project.version}</argument>
- <argument>${basedir}/target/ambari-metrics-monitor-${project.version}-choco/ambari-metrics-monitor.nuspec</argument>
- </arguments>
- <workingDirectory>target/ambari-metrics-monitor-${project.version}-choco</workingDirectory>
- </configuration>
- </execution>
- <execution>
- <id>hadoop-sink-choco-package</id>
- <phase>package</phase>
- <goals>
- <goal>exec</goal>
- </goals>
- <configuration>
- <executable>choco.exe</executable>
- <arguments>
- <argument>pack</argument>
- <argument>--version=${project.version}</argument>
- <argument>${basedir}/target/ambari-metrics-hadoop-sink-${project.version}-choco/ambari-metrics-hadoop-sink.nuspec</argument>
- </arguments>
- <workingDirectory>target/ambari-metrics-hadoop-sink-${project.version}-choco</workingDirectory>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
</profiles>
diff --git a/ambari-metrics-assembly/src/main/assembly/collector-windows-choco.xml b/ambari-metrics-assembly/src/main/assembly/collector-windows-choco.xml
deleted file mode 100644
index af09d3f..0000000
--- a/ambari-metrics-assembly/src/main/assembly/collector-windows-choco.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0"?>
-<!--
- 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.
--->
-<assembly>
- <id>choco</id>
- <formats>
- <format>dir</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <files>
- <file>
- <source>${project.build.directory}/ambari-metrics-collector-${artifact.version}.zip</source>
- <outputDirectory>content</outputDirectory>
- </file>
- <file>
- <source>${basedir}/src/main/package/choco/collector/ambari-metrics-collector.nuspec</source>
- </file>
- <file>
- <source>${basedir}/src/main/package/choco/collector/chocolateyinstall.ps1</source>
- <outputDirectory>tools</outputDirectory>
- </file>
- <file>
- <source>${basedir}/src/main/package/choco/collector/chocolateyuninstall.ps1</source>
- <outputDirectory>tools</outputDirectory>
- </file>
- </files>
- <fileSets>
- <fileSet>
- <directory>${basedir}/../../ambari-common/src/main/windows</directory>
- <outputDirectory>modules</outputDirectory>
- <includes>
- <include>*.psm1</include>
- </includes>
- </fileSet>
- </fileSets>
-</assembly>
diff --git a/ambari-metrics-assembly/src/main/assembly/collector-windows.xml b/ambari-metrics-assembly/src/main/assembly/collector-windows.xml
deleted file mode 100644
index 8b7a021..0000000
--- a/ambari-metrics-assembly/src/main/assembly/collector-windows.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
- ~ 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.
- -->
-
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1 http://maven.apache.org/xsd/assembly-1.1.1.xsd">
- <id>collector</id>
- <formats>
- <format>dir</format>
- <format>zip</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <fileSets>
- <fileSet>
- <directory>${collector.dir}/target/embedded/${hbase.winpkg.folder}</directory>
- <outputDirectory>hbase</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>${collector.dir}/conf/windows</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>ambari-metrics-collector.cmd</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>${collector.dir}/conf/windows</directory>
- <outputDirectory>conf</outputDirectory>
- <includes>
- <include>ams.properties</include>
- <include>ams-env.cmd</include>
- <include>ams-site.xml</include>
- <include>log4j.properties</include>
- <include>metrics_whitelist</include>
- <include>amshbase_metrics_whitelist</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>${collector.dir}/target/lib</directory>
- <outputDirectory>lib</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>${collector.dir}/src/main/python</directory>
- <outputDirectory>/sbin</outputDirectory>
- <includes>
- <include>*.py</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>${collector.dir}/src/main/python/ambari_metrics_collector</directory>
- <outputDirectory>/sbin/ambari_metrics_collector</outputDirectory>
- <includes>
- <include>*.py</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>${project.basedir}/../../ambari-common/src/main/python/ambari_commons</directory>
- <outputDirectory>/sbin/ambari_commons</outputDirectory>
- <includes>
- <include>*.py</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>${project.basedir}/../../ambari-common/src/main/python/ambari_commons/resources</directory>
- <outputDirectory>/sbin/ambari_commons/resources</outputDirectory>
- <includes>
- <include>*.json</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>${project.build.directory}/embedded/hadoop.temp/resources/${hadoop.winpkg.folder}/bin</directory>
- <outputDirectory>hbase/bin</outputDirectory>
- <includes>
- <include>*.dll</include>
- <include>*.exe</include>
- </includes>
- </fileSet>
- </fileSets>
- <dependencySets>
- <dependencySet>
- <unpack>false</unpack>
- <outputDirectory>hbase/lib</outputDirectory>
- <useProjectArtifact>false</useProjectArtifact>
- <includes>
- <include>org.antlr:antlr*</include>
- <include>org.apache.phoenix:phoenix-core</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <unpack>false</unpack>
- <outputDirectory>lib</outputDirectory>
- <useProjectArtifact>false</useProjectArtifact>
- <includes>
- <include>org.apache.ambari:ambari-metrics-timelineservice</include>
- </includes>
- </dependencySet>
- </dependencySets>
-</assembly>
diff --git a/ambari-metrics-assembly/src/main/assembly/monitor-windows-choco.xml b/ambari-metrics-assembly/src/main/assembly/monitor-windows-choco.xml
deleted file mode 100644
index fe65dab..0000000
--- a/ambari-metrics-assembly/src/main/assembly/monitor-windows-choco.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0"?>
-<!--
- 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.
--->
-<assembly>
- <id>choco</id>
- <formats>
- <format>dir</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <files>
- <file>
- <source>${project.build.directory}/ambari-metrics-monitor-${artifact.version}.zip</source>
- <outputDirectory>content</outputDirectory>
- </file>
- <file>
- <source>${basedir}/src/main/package/choco/monitor/ambari-metrics-monitor.nuspec</source>
- </file>
- <file>
- <source>${basedir}/src/main/package/choco/monitor/chocolateyinstall.ps1</source>
- <outputDirectory>tools</outputDirectory>
- </file>
- <file>
- <source>${basedir}/src/main/package/choco/monitor/chocolateyuninstall.ps1</source>
- <outputDirectory>tools</outputDirectory>
- </file>
- </files>
- <fileSets>
- <fileSet>
- <directory>${basedir}/../../ambari-common/src/main/windows</directory>
- <outputDirectory>modules</outputDirectory>
- <includes>
- <include>*.psm1</include>
- </includes>
- </fileSet>
- </fileSets>
-</assembly>
diff --git a/ambari-metrics-assembly/src/main/assembly/monitor-windows.xml b/ambari-metrics-assembly/src/main/assembly/monitor-windows.xml
deleted file mode 100644
index d015d31..0000000
--- a/ambari-metrics-assembly/src/main/assembly/monitor-windows.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<!--
- 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.
--->
-<assembly>
- <id>windows-dist</id>
- <formats>
- <format>dir</format>
- <format>zip</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <fileSets>
- <fileSet>
- <directory>${monitor.dir}/src/main/python</directory>
- <outputDirectory>/sbin</outputDirectory>
- <includes>
- <include>*.py</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>${project.basedir}/../../ambari-common/src/main/python/ambari_commons</directory>
- <outputDirectory>/sbin/ambari_commons</outputDirectory>
- <includes>
- <include>*.py</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>${project.basedir}/../../ambari-common/src/main/python/ambari_commons/resources</directory>
- <outputDirectory>/sbin/ambari_commons/resources</outputDirectory>
- <includes>
- <include>*.json</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>${monitor.dir}/src/main/python/core</directory>
- <outputDirectory>/sbin/core</outputDirectory>
- <includes>
- <include>*.py</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>${monitor.dir}/target/psutil_build/lib.win-amd64-${python.build.version}</directory>
- <outputDirectory>/sbin</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>${monitor.dir}/conf/windows</directory>
- <outputDirectory>conf</outputDirectory>
- <includes>
- <include>metric_groups.conf</include>
- <include>metric_monitor.ini</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>${aggregator.dir}/conf/windows</directory>
- <outputDirectory>conf</outputDirectory>
- <includes>
- <include>log4j.properties</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>${monitor.dir}/conf/windows</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>ambari-metrics-monitor.cmd</include>
- </includes>
- </fileSet>
- </fileSets>
- <dependencySets>
- <dependencySet>
- <useProjectArtifact>false</useProjectArtifact>
- <excludes>
- <exclude>*</exclude>
- </excludes>
- </dependencySet>
- </dependencySets>
-</assembly>
diff --git a/ambari-metrics-assembly/src/main/assembly/sink-windows-choco.xml b/ambari-metrics-assembly/src/main/assembly/sink-windows-choco.xml
deleted file mode 100644
index b7dcb0f..0000000
--- a/ambari-metrics-assembly/src/main/assembly/sink-windows-choco.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0"?>
-<!--
- 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.
--->
-<assembly>
- <id>choco</id>
- <formats>
- <format>dir</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <files>
- <file>
- <source>${project.build.directory}/ambari-metrics-hadoop-sink-${artifact.version}.zip</source>
- <outputDirectory>content</outputDirectory>
- </file>
- <file>
- <source>${basedir}/src/main/package/choco/sink/ambari-metrics-hadoop-sink.nuspec</source>
- </file>
- <file>
- <source>${basedir}/src/main/package/choco/sink/chocolateyinstall.ps1</source>
- <outputDirectory>tools</outputDirectory>
- </file>
- <file>
- <source>${basedir}/src/main/package/choco/sink/chocolateyuninstall.ps1</source>
- <outputDirectory>tools</outputDirectory>
- </file>
- </files>
- <fileSets>
- <fileSet>
- <directory>${basedir}/../../ambari-common/src/main/windows</directory>
- <outputDirectory>modules</outputDirectory>
- <includes>
- <include>*.psm1</include>
- </includes>
- </fileSet>
- </fileSets>
-</assembly>
diff --git a/ambari-metrics-assembly/src/main/assembly/sink-windows.xml b/ambari-metrics-assembly/src/main/assembly/sink-windows.xml
deleted file mode 100644
index e82d2d4..0000000
--- a/ambari-metrics-assembly/src/main/assembly/sink-windows.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
- ~ 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.
- -->
-
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1 http://maven.apache.org/xsd/assembly-1.1.1.xsd">
- <id>hadoop-sink</id>
- <formats>
- <format>dir</format>
- <format>zip</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <fileSets>
- <fileSet>
- <directory>${hadoop-sink.dir}/src/main/conf</directory>
- <outputDirectory>hadoop-sink/conf</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>${flume-sink.dir}/src/main/conf</directory>
- <outputDirectory>hadoop-sink/conf</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>${storm-sink.dir}/src/main/conf</directory>
- <outputDirectory>hadoop-sink/conf</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>${kafka-sink.dir}/target/lib</directory>
- <outputDirectory>hadoop-sink/lib</outputDirectory>
- </fileSet>
- </fileSets>
-
- <files>
- <file>
- <source>${hadoop-sink.dir}/target/ambari-metrics-hadoop-sink-with-common-${project.version}.jar</source>
- <outputDirectory>hadoop-sink</outputDirectory>
- </file>
- <file>
- <source>${flume-sink.dir}/target/ambari-metrics-flume-sink-with-common-${project.version}.jar</source>
- <outputDirectory>hadoop-sink</outputDirectory>
- </file>
- <file>
- <source>${storm-sink.dir}/target/ambari-metrics-storm-sink-with-common-${project.version}.jar</source>
- <outputDirectory>hadoop-sink</outputDirectory>
- </file>
- <file>
- <source>${kafka-sink.dir}/target/ambari-metrics-kafka-sink-with-common-${project.version}.jar</source>
- <outputDirectory>hadoop-sink</outputDirectory>
- </file>
- </files>
-
-
-
-
-</assembly>
diff --git a/ambari-metrics-host-monitoring/conf/windows/ambari-metrics-monitor.cmd b/ambari-metrics-host-monitoring/conf/windows/ambari-metrics-monitor.cmd
deleted file mode 100644
index 115b6a6..0000000
--- a/ambari-metrics-host-monitoring/conf/windows/ambari-metrics-monitor.cmd
+++ /dev/null
@@ -1,17 +0,0 @@
-@rem Licensed to the Apache Software Foundation (ASF) under one or more
-@rem contributor license agreements. See the NOTICE file distributed with
-@rem this work for additional information regarding copyright ownership.
-@rem The ASF licenses this file to You under the Apache License, Version 2.0
-@rem (the "License"); you may not use this file except in compliance with
-@rem the License. You may obtain a copy of the License at
-@rem
-@rem http://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-
-@echo off
-python.exe -u %~dp0\sbin\amhm_service.py %* 2>&1
diff --git a/ambari-metrics-host-monitoring/conf/windows/metric_groups.conf b/ambari-metrics-host-monitoring/conf/windows/metric_groups.conf
deleted file mode 100644
index 6d5a62f..0000000
--- a/ambari-metrics-host-monitoring/conf/windows/metric_groups.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "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-host-monitoring/conf/windows/metric_monitor.ini b/ambari-metrics-host-monitoring/conf/windows/metric_monitor.ini
deleted file mode 100644
index 77c9ce1..0000000
--- a/ambari-metrics-host-monitoring/conf/windows/metric_monitor.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-;
-; 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_servers = localhost
-enable_time_threshold = false
-enable_value_threshold = false
-
-[emitter]
-send_interval = 60
-
-[collector]
-collector_sleep_interval = 5
-max_queue_size = 5000
-failover_strategy = round-robin
-failover_strategy_blacklisted_interval_seconds = 600
-port = 6188
diff --git a/ambari-metrics-host-monitoring/pom.xml b/ambari-metrics-host-monitoring/pom.xml
index e8f8556..e362281 100644
--- a/ambari-metrics-host-monitoring/pom.xml
+++ b/ambari-metrics-host-monitoring/pom.xml
@@ -35,6 +35,14 @@
</resmonitor.install.dir>
<final.name>${project.artifactId}-${project.version}</final.name>
</properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.ambari</groupId>
+ <artifactId>ambari-python</artifactId>
+ <version>2.7.1.1</version>
+ <type>tar.gz</type>
+ </dependency>
+ </dependencies>
<build>
<plugins>
<plugin>
@@ -153,55 +161,6 @@
</build>
<profiles>
<profile>
- <id>windows</id>
- <activation>
- <os>
- <family>win</family>
- </os>
- </activation>
- <properties>
- <envClassifier>win</envClassifier>
- <dirsep>\</dirsep>
- <pathsep>;</pathsep>
- <executable.python>python</executable.python>
- <executable.shell>cmd</executable.shell>
- <fileextension.shell>cmd</fileextension.shell>
- <fileextension.dot.shell-default>.cmd</fileextension.dot.shell-default>
- <assemblydescriptor>src/main/assemblies/amhm-windows.xml</assemblydescriptor>
- <packagingFormat>jar</packagingFormat>
- </properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.7</version>
- <executions>
- <execution>
- <id>psutils-compile</id>
- <phase>process-test-classes</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <target name="psutils-compile">
- <exec dir="${basedir}/src/main/python/psutil" executable="${executable.python}" failonerror="true">
- <arg value="setup.py" />
- <arg value="build" />
- <arg value="--build-temp" />
- <arg value="${basedir}\target\psutil_build_temp" />
- <arg value="--build-base" />
- <arg value="${basedir}/target/psutil_build" />
- </exec>
- </target>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
<id>linux</id>
<activation>
<os>
@@ -212,7 +171,7 @@
<envClassifier>linux</envClassifier>
<dirsep>/</dirsep>
<pathsep>:</pathsep>
- <executable.python>${project.basedir}/../../ambari-common/src/main/unix/ambari-python-wrap</executable.python>
+ <executable.python>${project.basedir}/src/main/unix/ambari-python-wrap</executable.python>
<executable.shell>sh</executable.shell>
<fileextension.shell>sh</fileextension.shell>
<fileextension.dot.shell-default></fileextension.dot.shell-default>
@@ -223,6 +182,25 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.5.1</version>
+ <executions>
+ <execution>
+ <id>unpack-ambari-common</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>unpack-dependencies</goal>
+ </goals>
+ <configuration>
+ <includeTypes>tar.gz</includeTypes>
+ <includeArtifactIds>ambari-python</includeArtifactIds>
+ <outputDirectory>target/ambari-python</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.7</version>
<executions>
diff --git a/ambari-metrics-host-monitoring/src/main/python/amhm_service.py b/ambari-metrics-host-monitoring/src/main/python/amhm_service.py
deleted file mode 100644
index 91ec81b..0000000
--- a/ambari-metrics-host-monitoring/src/main/python/amhm_service.py
+++ /dev/null
@@ -1,189 +0,0 @@
-#!/usr/bin/env python
-
-'''
-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.
-'''
-
-import optparse
-import os
-import sys
-
-from ambari_commons.ambari_service import AmbariService
-from ambari_commons.exceptions import FatalException, NonFatalException
-from ambari_commons.logging_utils import print_warning_msg, print_error_msg
-from ambari_commons.os_windows import SvcStatusCallback
-from core.config_reader import SERVICE_USERNAME_KEY, SERVICE_PASSWORD_KEY, \
- SETUP_ACTION, START_ACTION, STOP_ACTION, RESTART_ACTION, STATUS_ACTION
-from core.stop_handler import bind_signal_handlers, StopHandler
-from main import server_process_main, main_config
-
-
-#
-# Windows-specific service implementation. This class will be instantiated directly by pythonservice.exe.
-#
-class AMHostMonitoringService(AmbariService):
- AmbariService._svc_name_ = "AmbariMetricsHostMonitoring"
- AmbariService._svc_display_name_ = "Ambari Metrics Host Monitoring"
- AmbariService._svc_description_ = "Ambari Metrics Host Monitoring Service"
-
- # Adds the necessary script dir to the Python's modules path.
- # Modify this as the deployed product's dir structure changes.
- def _adjustPythonPath(self, current_dir):
- python_path = os.path.join(current_dir, "sbin")
- sys.path.insert(0, python_path)
- pass
-
- def SvcDoRun(self):
- scmStatus = SvcStatusCallback(self)
-
- self.redirect_output_streams()
-
- stopHandler = StopHandler(AMHostMonitoringService._heventSvcStop)
- bind_signal_handlers(stopHandler)
-
- AMHostMonitoringService.set_ctrl_c_handler(ctrlHandler)
-
- server_process_main(stopHandler, scmStatus)
- pass
-
- def _InitOptionsParser(self):
- return init_options_parser()
-
- def redirect_output_streams(self):
- self._RedirectOutputStreamsToFile(main_config.ams_monitor_out_file())
- pass
-
-
-def ctrlHandler(ctrlType):
- AMHostMonitoringService.DefCtrlCHandler()
- return True
-
-
-def svcsetup():
- AMHostMonitoringService.set_ctrl_c_handler(ctrlHandler)
- # we don't save password between 'setup' runs, so we can't run Install every time. We run 'setup' only if user and
- # password provided or if service not installed
- if (SERVICE_USERNAME_KEY in os.environ and SERVICE_PASSWORD_KEY in os.environ):
- AMHostMonitoringService.Install(username=os.environ[SERVICE_USERNAME_KEY], password=os.environ[SERVICE_PASSWORD_KEY])
- elif AMHostMonitoringService.QueryStatus() == "not installed":
- AMHostMonitoringService.Install()
- pass
-
-
-#
-# Starts the Ambari Metrics Collector. The server can start as a service or standalone process.
-# args:
-# options.is_process = True - start the server as a process. For now, there is no restrictions for the number of
-# server instances that can run like this.
-# options.is_process = False - start the server in normal mode, as a Windows service. If the Ambari Metrics Collector
-# is not registered as a service, the function fails. By default, only one instance of the service can
-# possibly run.
-#
-def start(options):
- AMHostMonitoringService.set_ctrl_c_handler(ctrlHandler)
-
- if options.is_process:
- #Run as a normal process. Invoke the ServiceMain directly.
- stopHandler = StopHandler(AMHostMonitoringService._heventSvcStop)
- bind_signal_handlers(stopHandler)
- server_process_main(stopHandler)
- else:
- AMHostMonitoringService.Start()
-
-#
-# Stops the Ambari Metrics Collector. Ineffective when the server is started as a standalone process.
-#
-def stop():
- AMHostMonitoringService.Stop()
-
-#
-# Prints the Ambari Metrics Collector service status.
-#
-def svcstatus(options):
- options.exit_message = None
-
- statusStr = AMHostMonitoringService.QueryStatus()
- print "Ambari Metrics Collector is " + statusStr
-
-
-def init_options_parser():
- parser = optparse.OptionParser(usage="usage: %prog action [options]", )
- parser.add_option('-d', '--debug', action="store_true", dest='debug', default=False,
- help="Start Ambari Metrics Host Monitoring in debug mode")
- parser.add_option('-p', '--process', action="store_true", dest='is_process', default=False,
- help="Start Ambari Metrics Host Monitoring as a normal process, not as a service")
-
- # --help reserved for help
- return parser
-
-def win_main():
- parser = init_options_parser()
- (options, args) = parser.parse_args()
-
- options.warnings = []
- options.exit_message = None
-
- if options.debug:
- sys.frozen = 'windows_exe' # Fake py2exe so we can debug
-
- if len(args) == 0:
- print parser.print_help()
- parser.error("No action entered")
-
- action = args[0]
-
- try:
- if action == SETUP_ACTION:
- svcsetup()
- elif action == START_ACTION:
- start(options)
- elif action == STOP_ACTION:
- stop()
- elif action == RESTART_ACTION:
- stop()
- start(options)
- elif action == STATUS_ACTION:
- svcstatus(options)
- else:
- parser.error("Invalid action")
-
- if options.warnings:
- for warning in options.warnings:
- print_warning_msg(warning)
- pass
- options.exit_message = "Ambari Metrics Host Monitoring '%s' completed with warnings." % action
- pass
- except FatalException as e:
- if e.reason is not None:
- print_error_msg("Exiting with exit code {0}. \nREASON: {1}".format(e.code, e.reason))
- sys.exit(e.code)
- except NonFatalException as e:
- options.exit_message = "Ambari Metrics Host Monitoring '%s' completed with warnings." % action
- if e.reason is not None:
- print_warning_msg(e.reason)
-
- if options.exit_message is not None:
- print options.exit_message
-
- sys.exit(0)
-
-if __name__ == "__main__":
- try:
- win_main()
- except (KeyboardInterrupt, EOFError):
- print("\nAborting ... Keyboard Interrupt.")
- sys.exit(1)
diff --git a/ambari-metrics-host-monitoring/src/main/python/core/config_reader.py b/ambari-metrics-host-monitoring/src/main/python/core/config_reader.py
index 940d11c..94291cc 100644
--- a/ambari-metrics-host-monitoring/src/main/python/core/config_reader.py
+++ b/ambari-metrics-host-monitoring/src/main/python/core/config_reader.py
@@ -39,24 +39,6 @@
def get_ca_certs_file_path(self):
pass
-@OsFamilyImpl(os_family=OSConst.WINSRV_FAMILY)
-class ConfigDefaultsWindows(ConfigDefaults):
- def __init__(self):
- self._CONFIG_DIR = "conf"
- self._CONFIG_FILE_PATH = "conf\\metric_monitor.ini"
- self._METRIC_FILE_PATH = "conf\\metric_groups.conf"
- self._METRIC_FILE_PATH = "conf\\ca.pem"
- pass
-
- def get_config_dir(self):
- return self._CONFIG_DIR
- def get_config_file_path(self):
- return self._CONFIG_FILE_PATH
- def get_metric_file_path(self):
- return self._METRIC_FILE_PATH
- def get_ca_certs_file_path(self):
- return self._CA_CERTS_FILE_PATH
-
@OsFamilyImpl(os_family=OsFamilyImpl.DEFAULT)
class ConfigDefaultsLinux(ConfigDefaults):
def __init__(self):
diff --git a/ambari-metrics-host-monitoring/src/main/python/core/stop_handler.py b/ambari-metrics-host-monitoring/src/main/python/core/stop_handler.py
index 330e018..8effc63 100644
--- a/ambari-metrics-host-monitoring/src/main/python/core/stop_handler.py
+++ b/ambari-metrics-host-monitoring/src/main/python/core/stop_handler.py
@@ -43,46 +43,6 @@
#
-# Windows implementation
-#
-@OsFamilyImpl(os_family=OSConst.WINSRV_FAMILY)
-class StopHandlerWindows(StopHandler):
- def __init__(self, stopEvent=None):
- import win32event
- # Event used to gracefully stop the process
- if stopEvent is None:
- # Allow standalone testing
- self._heventStop = win32event.CreateEvent(None, 0, 0, None)
- else:
- # Allow one unique event per process
- self._heventStop = stopEvent
-
- def set_stop(self):
- import win32event
- win32event.SetEvent(self._heventStop)
-
- def wait(self, timeout=None):
- '''
- :param timeout: Time to wait, in seconds.
- :return: 0 == stop event signaled, -1 = timeout
- '''
- import win32event
-
- if timeout is None:
- timeout = win32event.INFINITE
- else:
- timeout = timeout * 1000
-
- result = win32event.WaitForSingleObject(self._heventStop, timeout)
- if(win32event.WAIT_OBJECT_0 != result and win32event.WAIT_TIMEOUT != result):
- raise FatalException(-1, "Error waiting for stop event: " + str(result))
- if (win32event.WAIT_TIMEOUT == result):
- return -1
- logger.debug("Stop event received")
- return result # 0 -> stop
-
-
-#
# Linux implementation
#
def signal_handler(signum, frame):
diff --git a/ambari-metrics-host-monitoring/src/main/unix/ambari-python-wrap b/ambari-metrics-host-monitoring/src/main/unix/ambari-python-wrap
new file mode 100755
index 0000000..466bd00
--- /dev/null
+++ b/ambari-metrics-host-monitoring/src/main/unix/ambari-python-wrap
@@ -0,0 +1,42 @@
+#!/usr/bin/env bash
+# Copyright 2011 The Apache Software Foundation
+#
+# 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.
+
+export PYTHONPATH=/usr/lib/python2.6/site-packages:/usr/lib/python2.6/site-packages/ambari_commons:$PYTHONPATH
+
+# checking for default Python 2
+if [ -a /usr/bin/python2 ] && [ -z "$PYTHON" ]; then
+ PYTHON=/usr/bin/python2
+fi
+
+if [ -a /usr/bin/python2.7 ] && [ -z "$PYTHON" ]; then
+ PYTHON=/usr/bin/python2.7
+fi
+
+if [ -a /usr/bin/python2.6 ] && [ -z "$PYTHON" ]; then
+ PYTHON=/usr/bin/python2.6
+fi
+
+# if no preferable python versions found, try to use system one. Hoping it's Python 2
+if [[ -z "$PYTHON" ]]; then
+ PYTHON=/usr/bin/python
+fi
+
+# execute script
+$PYTHON "$@"
+#!/usr/bin/env bash
\ No newline at end of file
diff --git a/ambari-metrics-host-monitoring/src/test/python/core/TestEmitter.py b/ambari-metrics-host-monitoring/src/test/python/core/TestEmitter.py
index 8b3eb66..95fb068 100644
--- a/ambari-metrics-host-monitoring/src/test/python/core/TestEmitter.py
+++ b/ambari-metrics-host-monitoring/src/test/python/core/TestEmitter.py
@@ -23,16 +23,12 @@
import time
from unittest import TestCase
-from only_for_platform import get_platform, PLATFORM_WINDOWS
from mock.mock import patch, MagicMock
from security import CachedHTTPConnection
from blacklisted_set import BlacklistedSet
from spnego_kerberos_auth import SPNEGOKerberosAuth
-if get_platform() != PLATFORM_WINDOWS:
- os_distro_value = ('Suse','11','Final')
-else:
- os_distro_value = ('win2012serverr2','6.3','WindowsServer')
+os_distro_value = ('Suse','11','Final')
with patch("platform.linux_distribution", return_value = os_distro_value):
from ambari_commons import OSCheck
diff --git a/ambari-metrics-host-monitoring/src/test/python/unitTests.py b/ambari-metrics-host-monitoring/src/test/python/unitTests.py
index 4ffaec8..77557db 100644
--- a/ambari-metrics-host-monitoring/src/test/python/unitTests.py
+++ b/ambari-metrics-host-monitoring/src/test/python/unitTests.py
@@ -78,12 +78,8 @@
pwd = os.path.abspath(os.path.dirname(__file__))
project_folder = get_parent_path(pwd,'ambari-metrics-host-monitoring')
- ambari_common_folder = os.path.join(project_folder,"../../ambari-common")
- sys.path.append(ambari_common_folder + "/src/main/python")
- sys.path.append(ambari_common_folder + "/src/main/python/ambari_jinja2")
- sys.path.append(ambari_common_folder + "/src/main/python")
- sys.path.append(ambari_common_folder + "/src/test/python")
- sys.path.append(project_folder + "/src/test/python")
+ sys.path.append(project_folder + "/target/ambari-python/site-packages")
+ sys.path.append(project_folder + "/target/ambari-python/site-packages/ambari_jinja2")
sys.path.append(project_folder + "/src/main/python")
sys.path.append(project_folder + "/src/main/python/core")
sys.path.append(project_folder + "/src/main/resources/scripts")
diff --git a/ambari-metrics-timelineservice/conf/windows/ambari-metrics-collector.cmd b/ambari-metrics-timelineservice/conf/windows/ambari-metrics-collector.cmd
deleted file mode 100644
index 2cfff6f..0000000
--- a/ambari-metrics-timelineservice/conf/windows/ambari-metrics-collector.cmd
+++ /dev/null
@@ -1,17 +0,0 @@
-@rem Licensed to the Apache Software Foundation (ASF) under one or more
-@rem contributor license agreements. See the NOTICE file distributed with
-@rem this work for additional information regarding copyright ownership.
-@rem The ASF licenses this file to You under the Apache License, Version 2.0
-@rem (the "License"); you may not use this file except in compliance with
-@rem the License. You may obtain a copy of the License at
-@rem
-@rem http://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-
-@echo off
-python.exe -u %~dp0\sbin\main.py %* 2>&1
diff --git a/ambari-metrics-timelineservice/conf/windows/ams-env.cmd b/ambari-metrics-timelineservice/conf/windows/ams-env.cmd
deleted file mode 100644
index af99fc4..0000000
--- a/ambari-metrics-timelineservice/conf/windows/ams-env.cmd
+++ /dev/null
@@ -1,16 +0,0 @@
-@rem Licensed to the Apache Software Foundation (ASF) under one or more
-@rem contributor license agreements. See the NOTICE file distributed with
-@rem this work for additional information regarding copyright ownership.
-@rem The ASF licenses this file to You under the Apache License, Version 2.0
-@rem (the "License"); you may not use this file except in compliance with
-@rem the License. You may obtain a copy of the License at
-@rem
-@rem http://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-
-@rem Set environment variables here.
diff --git a/ambari-metrics-timelineservice/conf/windows/ams-site.xml b/ambari-metrics-timelineservice/conf/windows/ams-site.xml
deleted file mode 100644
index 41c3220..0000000
--- a/ambari-metrics-timelineservice/conf/windows/ams-site.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
- ~ 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.
- -->
-
-<configuration>
-
- <!-- Site specific AMBARI_METRICS configuration properties -->
-
-</configuration>
diff --git a/ambari-metrics-timelineservice/conf/windows/ams.properties b/ambari-metrics-timelineservice/conf/windows/ams.properties
deleted file mode 100644
index 3df60b0..0000000
--- a/ambari-metrics-timelineservice/conf/windows/ams.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# 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.
-#
diff --git a/ambari-metrics-timelineservice/conf/windows/amshbase_metrics_whitelist b/ambari-metrics-timelineservice/conf/windows/amshbase_metrics_whitelist
deleted file mode 100644
index 01072e9..0000000
--- a/ambari-metrics-timelineservice/conf/windows/amshbase_metrics_whitelist
+++ /dev/null
@@ -1,162 +0,0 @@
-jvm.Master.JvmMetrics.ThreadsBlocked
-jvm.Master.JvmMetrics.ThreadsNew
-jvm.Master.JvmMetrics.ThreadsRunnable
-jvm.Master.JvmMetrics.ThreadsTerminated
-jvm.Master.JvmMetrics.ThreadsTimedWaiting
-jvm.Master.JvmMetrics.ThreadsWaiting
-jvm.RegionServer.JvmMetrics.GcCount
-jvm.RegionServer.JvmMetrics.GcCountConcurrentMarkSweep
-jvm.RegionServer.JvmMetrics.GcCountParNew
-jvm.RegionServer.JvmMetrics.GcTimeMillis
-jvm.RegionServer.JvmMetrics.GcTimeMillisConcurrentMarkSweep
-jvm.RegionServer.JvmMetrics.GcTimeMillisParNew
-jvm.RegionServer.JvmMetrics.MemHeapCommittedM
-jvm.RegionServer.JvmMetrics.MemHeapMaxM
-jvm.RegionServer.JvmMetrics.MemHeapUsedM
-jvm.RegionServer.JvmMetrics.MemNonHeapCommittedM
-jvm.RegionServer.JvmMetrics.MemNonHeapMaxM
-jvm.RegionServer.JvmMetrics.MemNonHeapUsedM
-jvm.RegionServer.JvmMetrics.ThreadsBlocked
-jvm.RegionServer.JvmMetrics.ThreadsNew
-jvm.RegionServer.JvmMetrics.ThreadsRunnable
-jvm.RegionServer.JvmMetrics.ThreadsTerminated
-jvm.RegionServer.JvmMetrics.ThreadsTimedWaiting
-jvm.RegionServer.JvmMetrics.ThreadsWaiting
-master.AssignmentManager.ritCount
-master.AssignmentManager.ritCountOverThreshold
-master.AssignmentManager.ritOldestAge
-master.Master.TotalCallTime_num_ops
-master.Master.exceptions
-master.Server.averageLoad
-master.Server.numDeadRegionServers
-master.Server.numRegionServers
-regionserver.RegionServer.ProcessCallTime_75th_percentile
-regionserver.RegionServer.ProcessCallTime_95th_percentile
-regionserver.RegionServer.ProcessCallTime_99th_percentile
-regionserver.RegionServer.ProcessCallTime_max
-regionserver.RegionServer.ProcessCallTime_mean
-regionserver.RegionServer.ProcessCallTime_median
-regionserver.RegionServer.QueueCallTime_75th_percentile
-regionserver.RegionServer.QueueCallTime_95th_percentile
-regionserver.RegionServer.QueueCallTime_99th_percentile
-regionserver.RegionServer.QueueCallTime_max
-regionserver.RegionServer.QueueCallTime_mean
-regionserver.RegionServer.QueueCallTime_median
-regionserver.RegionServer.TotalCallTime_num_ops
-regionserver.RegionServer.authenticationFailures
-regionserver.RegionServer.authenticationSuccesses
-regionserver.RegionServer.authorizationFailures
-regionserver.RegionServer.authorizationSuccesses
-regionserver.RegionServer.exceptions
-regionserver.RegionServer.numActiveHandler
-regionserver.RegionServer.numCallsInGeneralQueue
-regionserver.RegionServer.numCallsInPriorityQueue
-regionserver.RegionServer.numCallsInReplicationQueue
-regionserver.RegionServer.numOpenConnections
-regionserver.RegionServer.queueSize
-regionserver.RegionServer.receivedBytes
-regionserver.RegionServer.sentBytes
-regionserver.Server.Append_75th_percentile
-regionserver.Server.Append_95th_percentile
-regionserver.Server.Append_99th_percentile
-regionserver.Server.Append_max
-regionserver.Server.Append_mean
-regionserver.Server.Append_median
-regionserver.Server.Append_min
-regionserver.Server.Append_num_ops
-regionserver.Server.Delete_75th_percentile
-regionserver.Server.Delete_95th_percentile
-regionserver.Server.Delete_99th_percentile
-regionserver.Server.Delete_max
-regionserver.Server.Delete_mean
-regionserver.Server.Delete_median
-regionserver.Server.Delete_min
-regionserver.Server.Delete_num_ops
-regionserver.Server.Get_75th_percentile
-regionserver.Server.Get_95th_percentile
-regionserver.Server.Get_99th_percentile
-regionserver.Server.Get_max
-regionserver.Server.Get_mean
-regionserver.Server.Get_median
-regionserver.Server.Get_min
-regionserver.Server.Get_num_ops
-regionserver.Server.Increment_75th_percentile
-regionserver.Server.Increment_95th_percentile
-regionserver.Server.Increment_99th_percentile
-regionserver.Server.Increment_max
-regionserver.Server.Increment_mean
-regionserver.Server.Increment_median
-regionserver.Server.Increment_min
-regionserver.Server.Increment_num_ops
-regionserver.Server.Mutate_75th_percentile
-regionserver.Server.Mutate_95th_percentile
-regionserver.Server.Mutate_99th_percentile
-regionserver.Server.Mutate_max
-regionserver.Server.Mutate_mean
-regionserver.Server.Mutate_median
-regionserver.Server.Mutate_min
-regionserver.Server.Mutate_num_ops
-regionserver.Server.Replay_75th_percentile
-regionserver.Server.Replay_95th_percentile
-regionserver.Server.Replay_99th_percentile
-regionserver.Server.Replay_max
-regionserver.Server.Replay_mean
-regionserver.Server.Replay_median
-regionserver.Server.Replay_min
-regionserver.Server.Replay_num_ops
-regionserver.Server.ScanNext_num_ops
-regionserver.Server.ScanTime_75th_percentile
-regionserver.Server.ScanTime_95th_percentile
-regionserver.Server.ScanTime_99th_percentile
-regionserver.Server.ScanTime_max
-regionserver.Server.ScanTime_mean
-regionserver.Server.ScanTime_median
-regionserver.Server.blockCacheCount
-regionserver.Server.blockCacheCountHitPercent
-regionserver.Server.blockCacheEvictionCount
-regionserver.Server.blockCacheExpressHitPercent
-regionserver.Server.blockCacheFreeSize
-regionserver.Server.blockCacheHitCount
-regionserver.Server.blockCacheMissCount
-regionserver.Server.blockCacheSize
-regionserver.Server.compactionQueueLength
-regionserver.Server.flushQueueLength
-regionserver.Server.hlogFileCount
-regionserver.Server.hlogFileSize
-regionserver.Server.memStoreSize
-regionserver.Server.percentFilesLocal
-regionserver.Server.readRequestCount
-regionserver.Server.regionCount
-regionserver.Server.slowDeleteCount
-regionserver.Server.slowGetCount
-regionserver.Server.slowPutCount
-regionserver.Server.splitQueueLength
-regionserver.Server.staticBloomSize
-regionserver.Server.staticIndexSize
-regionserver.Server.storeCount
-regionserver.Server.storeFileCount
-regionserver.Server.storeFileIndexSize
-regionserver.Server.storeFileSize
-regionserver.Server.totalRequestCount
-regionserver.Server.writeRequestCount
-regionserver.WAL.AppendSize_75th_percentile
-regionserver.WAL.AppendSize_95th_percentile
-regionserver.WAL.AppendSize_99th_percentile
-regionserver.WAL.AppendSize_max
-regionserver.WAL.AppendSize_mean
-regionserver.WAL.AppendSize_median
-regionserver.WAL.AppendTime_75th_percentile
-regionserver.WAL.AppendTime_95th_percentile
-regionserver.WAL.AppendTime_99th_percentile
-regionserver.WAL.AppendTime_max
-regionserver.WAL.AppendTime_mean
-regionserver.WAL.AppendTime_median
-regionserver.WAL.SyncTime_75th_percentile
-regionserver.WAL.SyncTime_95th_percentile
-regionserver.WAL.SyncTime_99th_percentile
-regionserver.WAL.SyncTime_max
-regionserver.WAL.SyncTime_mean
-regionserver.WAL.SyncTime_median
-regionserver.WAL.SyncTime_num_ops
-regionserver.WAL.appendCount
-regionserver.WAL.slowAppendCount
\ No newline at end of file
diff --git a/ambari-metrics-timelineservice/conf/windows/log4j.properties b/ambari-metrics-timelineservice/conf/windows/log4j.properties
deleted file mode 100644
index d354a27..0000000
--- a/ambari-metrics-timelineservice/conf/windows/log4j.properties
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# 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.
-#
-
-# Define some default values that can be overridden by system properties
-# Root logger option
-log4j.rootLogger=INFO,file
-
-# Direct log messages to a log file
-log4j.appender.file=org.apache.log4j.RollingFileAppender
-log4j.appender.file.File=\\var\\log\\ambari-metrics-collector\\ambari-metrics-collector.log
-log4j.appender.file.MaxFileSize=80MB
-log4j.appender.file.MaxBackupIndex=60
-log4j.appender.file.layout=org.apache.log4j.PatternLayout
-log4j.appender.file.layout.ConversionPattern=%d{ABSOLUTE} %5p [%t] %c{1}:%L - %m%n
diff --git a/ambari-metrics-timelineservice/conf/windows/metrics_whitelist b/ambari-metrics-timelineservice/conf/windows/metrics_whitelist
deleted file mode 100644
index fd03d6e..0000000
--- a/ambari-metrics-timelineservice/conf/windows/metrics_whitelist
+++ /dev/null
@@ -1,654 +0,0 @@
-AMBARI_METRICS.SmokeTest.FakeMetric
-ActiveThreads
-BytesQueued
-BytesReceivedLast5Minutes
-BytesSentLast5Minutes
-ChannelSize
-Counter.%.CacheMisses
-Counter.CacheHits
-Counter.CacheMisses
-Counter.ReadAllQuery
-Counter.ReadAllQuery.%
-Counter.ReadAllQuery.HostRoleCommandEntity
-DataModifyQuery
-DirectReadQuery
-DoesExistQuery
-EventPutSuccessCount
-EventTakeSuccessCount
-FSDatasetState.org.apache.hadoop.hdfs.server.datanode.fsdataset.impl.FsDatasetImpl.Capacity
-FSDatasetState.org.apache.hadoop.hdfs.server.datanode.fsdataset.impl.FsDatasetImpl.DfsUsed
-FSDatasetState.org.apache.hadoop.hdfs.server.datanode.fsdataset.impl.FsDatasetImpl.NumFailedVolumes
-FlowFilesQueued
-FlowFilesReceivedLast5Minutes
-FlowFilesSentLast5Minutes
-Free Slots
-InsertObjectQuery
-ReadAllQuery
-ReadAllQuery.HostRoleCommandEntity
-ReadObjectQuery
-Supervisors
-TimelineMetricStoreWatcher.FakeMetric
-Timer.ObjectBuilding
-Timer.QueryPreparation
-Timer.ReadAllQuery
-Timer.ReadAllQuery.%
-Timer.ReadAllQuery.HostRoleCommandEntity
-Timer.RowFetch
-Timer.SqlGeneration
-Timer.SqlPrepare
-Timer.StatementExecute
-Topologies
-Total Executors
-Total Slots
-Total Tasks
-Used Slots
-bytes_in
-bytes_out
-cache.CacheMetrics.CacheCapacityRemaining
-cache.CacheMetrics.CacheCapacityRemainingPercentage
-cache.CacheMetrics.CacheCapacityTotal
-cache.CacheMetrics.CacheCapacityUsed
-cache.CacheMetrics.CacheHitRatio
-cache.CacheMetrics.CacheReadRequests
-cpu_idle
-cpu_intr
-cpu_nice
-cpu_num
-cpu_sintr
-cpu_steal
-cpu_system
-cpu_user
-cpu_wio
-default.General.active_calls_api_hs2_operation_INITIALIZED
-default.General.active_calls_api_hs2_operation_PENDING
-default.General.active_calls_api_hs2_operation_RUNNING
-default.General.api_create_table_count
-default.General.api_get_all_databases_75thpercentile
-default.General.api_get_all_databases_999thpercentile
-default.General.api_get_partitions_by_names_75thpercentile
-default.General.api_get_partitions_by_names_999thpercentile
-default.General.api_hs2_operation_INITIALIZED_count
-default.General.create_total_count_partitions
-default.General.hs2_completed_operation_CLOSED
-default.General.hs2_completed_operation_ERROR
-default.General.hs2_completed_operation_FINISHED
-default.General.init_total_count_dbs
-default.General.init_total_count_partitions
-default.General.init_total_count_tables
-default.General.jvm.pause.extraSleepTime
-default.General.memory.heap.committed
-default.General.memory.heap.max
-default.General.memory.heap.used
-default.General.memory.non-heap.committed
-default.General.memory.non-heap.max
-default.General.memory.non-heap.used
-dfs.FSNamesystem.CapacityTotalGB
-dfs.FSNamesystem.CapacityUsedGB
-dfs.FSNamesystem.ExpiredHeartbeats
-dfs.FSNamesystem.LastCheckpointTime
-dfs.FSNamesystem.LastWrittenTransactionId
-dfs.FSNamesystem.LockQueueLength
-dfs.FSNamesystem.MillisSinceLastLoadedEdits
-dfs.FSNamesystem.MissingReplOneBlocks
-dfs.FSNamesystem.NumFilesUnderConstruction
-dfs.FSNamesystem.PendingDataNodeMessageCount
-dfs.FSNamesystem.PostponedMisreplicatedBlocks
-dfs.FSNamesystem.Snapshots
-dfs.FSNamesystem.SnapshottableDirectories
-dfs.FSNamesystem.StaleDataNodes
-dfs.FSNamesystem.TotalFiles
-dfs.FSNamesystem.TotalLoad
-dfs.FSNamesystem.TransactionsSinceLastCheckpoint
-dfs.FSNamesystem.TransactionsSinceLastLogRoll
-dfs.FSNamesystem.UnderReplicatedBlocks
-dfs.NNTopUserOpCounts.windowMs=1500000.op=%.TotalCount
-dfs.NNTopUserOpCounts.windowMs=1500000.op=*.TotalCount
-dfs.NNTopUserOpCounts.windowMs=1500000.op=*.user=%.count
-dfs.NNTopUserOpCounts.windowMs=1500000.op=__%.user=%
-dfs.NNTopUserOpCounts.windowMs=300000.op=%.TotalCount
-dfs.NNTopUserOpCounts.windowMs=300000.op=*.TotalCount
-dfs.NNTopUserOpCounts.windowMs=300000.op=*.user=%.count
-dfs.NNTopUserOpCounts.windowMs=300000.op=__%.user=%
-dfs.NNTopUserOpCounts.windowMs=60000.op=%.TotalCount
-dfs.NNTopUserOpCounts.windowMs=60000.op=*.TotalCount
-dfs.NNTopUserOpCounts.windowMs=60000.op=*.user=%.count
-dfs.NNTopUserOpCounts.windowMs=60000.op=__%.user=%
-dfs.datanode.BlocksRead
-dfs.datanode.BlocksWritten
-dfs.datanode.DatanodeNetworkErrors
-dfs.datanode.FsyncNanosAvgTime
-dfs.datanode.FsyncNanosNumOps
-dfs.datanode.PacketAckRoundTripTimeNanosAvgTime
-dfs.datanode.PacketAckRoundTripTimeNanosNumOps
-dfs.datanode.SendDataPacketBlockedOnNetworkNanosAvgTime
-dfs.datanode.SendDataPacketBlockedOnNetworkNanosNumOps
-dfs.datanode.SendDataPacketTransferNanosAvgTime
-dfs.datanode.SendDataPacketTransferNanosNumOps
-dfs.namenode.TotalFileOps
-disk_free
-disk_total
-disk_used
-druid/broker.*.%.query/time
-druid/broker.heap.jvm/mem/max
-druid/broker.heap.jvm/mem/used
-druid/broker.jvm/gc/time
-druid/coordinator.heap.jvm/mem/max
-druid/coordinator.heap.jvm/mem/used
-druid/coordinator.jvm/gc/time
-druid/historical.*.%.query/segment/time
-druid/historical.*.%.query/time
-druid/historical.*.%.query/wait/time
-druid/historical.heap.jvm/mem/max
-druid/historical.heap.jvm/mem/used
-druid/historical.jvm/gc/time
-druid/historical.segment/scan/pending
-druid/middlemanager.*.%.query/segment/time
-druid/middlemanager.*.%.query/time
-druid/middlemanager.*.%.query/wait/time
-druid/middlemanager.*.ingest/events/processed
-druid/middlemanager.*.ingest/events/thrownAway
-druid/middlemanager.*.ingest/events/unparseable
-druid/middlemanager.*.ingest/persists/count
-druid/middlemanager.*.ingest/persists/time
-druid/middlemanager.*.ingest/rows/output
-druid/middlemanager.heap.jvm/mem/max
-druid/middlemanager.heap.jvm/mem/used
-druid/middlemanager.jvm/gc/time
-druid/middlemanager.segment/scan/pending
-druid/overlord.*.segment/added/bytes
-druid/overlord.heap.jvm/mem/max
-druid/overlord.heap.jvm/mem/used
-druid/overlord.jvm/gc/time
-executors.ExecutorMetrics.ExecutorAvailableFreeSlots
-executors.ExecutorMetrics.ExecutorAvailableFreeSlotsPercent
-executors.ExecutorMetrics.ExecutorCacheMemoryPerInstance
-executors.ExecutorMetrics.ExecutorJvmMaxMemory
-executors.ExecutorMetrics.ExecutorMaxFreeSlots
-executors.ExecutorMetrics.ExecutorMaxPreemptionTimeLost
-executors.ExecutorMetrics.ExecutorMaxPreemptionTimeLost_300s50thPercentileLatency
-executors.ExecutorMetrics.ExecutorMaxPreemptionTimeLost_300s90thPercentileLatency
-executors.ExecutorMetrics.ExecutorMaxPreemptionTimeLost_300s95thPercentileLatency
-executors.ExecutorMetrics.ExecutorMaxPreemptionTimeLost_300s99thPercentileLatency
-executors.ExecutorMetrics.ExecutorMaxPreemptionTimeToKill
-executors.ExecutorMetrics.ExecutorMaxPreemptionTimeToKill_300s50thPercentileLatency
-executors.ExecutorMetrics.ExecutorMaxPreemptionTimeToKill_300s90thPercentileLatency
-executors.ExecutorMetrics.ExecutorMaxPreemptionTimeToKill_300s95thPercentileLatency
-executors.ExecutorMetrics.ExecutorMaxPreemptionTimeToKill_300s99thPercentileLatency
-executors.ExecutorMetrics.ExecutorMemoryPerInstance
-executors.ExecutorMetrics.ExecutorNumExecutorsPerInstance
-executors.ExecutorMetrics.ExecutorNumQueuedRequests
-executors.ExecutorMetrics.ExecutorTotalEvictedFromWaitQueue
-executors.ExecutorMetrics.ExecutorTotalFailed
-executors.ExecutorMetrics.ExecutorTotalKilled
-executors.ExecutorMetrics.ExecutorTotalRejectedRequests
-executors.ExecutorMetrics.ExecutorTotalRequestsHandled
-executors.ExecutorMetrics.ExecutorTotalSuccess
-filter.error.grok
-filter.error.keyvalue
-input.files.count
-input.files.read_bytes
-input.files.read_lines
-io.IOMetrics.MaxDecodingTime
-io.IOMetrics.PercentileDecodingTime_30s50thPercentileLatency
-io.IOMetrics.PercentileDecodingTime_30s90thPercentileLatency
-io.IOMetrics.PercentileDecodingTime_30s99thPercentileLatency
-ipc.client.org.apache.hadoop.ipc.DecayRpcScheduler.Caller(*).Priority
-ipc.client.org.apache.hadoop.ipc.DecayRpcScheduler.Caller(*).Volume
-jvm.JvmMetrics.GcCount
-jvm.JvmMetrics.GcCountConcurrentMarkSweep
-jvm.JvmMetrics.GcCountParNew
-jvm.JvmMetrics.GcNumWarnThresholdExceeded
-jvm.JvmMetrics.GcTimeMillis
-jvm.JvmMetrics.GcTimeMillisConcurrentMarkSweep
-jvm.JvmMetrics.GcTimeMillisParNew
-jvm.JvmMetrics.GcTotalExtraSleepTime
-jvm.JvmMetrics.LogError
-jvm.JvmMetrics.LogFatal
-jvm.JvmMetrics.MemHeapCommittedM
-jvm.JvmMetrics.MemHeapMaxM
-jvm.JvmMetrics.MemHeapUsedM
-jvm.JvmMetrics.MemNonHeapCommittedM
-jvm.JvmMetrics.MemNonHeapMaxM
-jvm.JvmMetrics.MemNonHeapUsedM
-jvm.JvmMetrics.ThreadsBlocked
-jvm.JvmMetrics.ThreadsNew
-jvm.JvmMetrics.ThreadsRunnable
-jvm.JvmMetrics.ThreadsTerminated
-jvm.JvmMetrics.ThreadsTimedWaiting
-jvm.JvmMetrics.ThreadsWaiting
-jvm.LlapDaemonJVMMetrics.LlapDaemonDirectBufferMemoryUsed
-jvm.LlapDaemonJVMMetrics.LlapDaemonDirectBufferTotalCapacity
-jvm.LlapDaemonJVMMetrics.LlapDaemonMappedBufferMemoryUsed
-jvm.LlapDaemonJVMMetrics.LlapDaemonMappedBufferTotalCapacity
-jvm.Master.JvmMetrics.ThreadsBlocked
-jvm.Master.JvmMetrics.ThreadsNew
-jvm.Master.JvmMetrics.ThreadsRunnable
-jvm.Master.JvmMetrics.ThreadsTerminated
-jvm.Master.JvmMetrics.ThreadsTimedWaiting
-jvm.Master.JvmMetrics.ThreadsWaiting
-jvm.RegionServer.JvmMetrics.GcCount
-jvm.RegionServer.JvmMetrics.GcCountConcurrentMarkSweep
-jvm.RegionServer.JvmMetrics.GcCountParNew
-jvm.RegionServer.JvmMetrics.GcTimeMillis
-jvm.RegionServer.JvmMetrics.GcTimeMillisConcurrentMarkSweep
-jvm.RegionServer.JvmMetrics.GcTimeMillisParNew
-jvm.RegionServer.JvmMetrics.MemHeapCommittedM
-jvm.RegionServer.JvmMetrics.MemHeapMaxM
-jvm.RegionServer.JvmMetrics.MemHeapUsedM
-jvm.RegionServer.JvmMetrics.MemNonHeapCommittedM
-jvm.RegionServer.JvmMetrics.MemNonHeapMaxM
-jvm.RegionServer.JvmMetrics.MemNonHeapUsedM
-jvm.RegionServer.JvmMetrics.ThreadsBlocked
-jvm.RegionServer.JvmMetrics.ThreadsNew
-jvm.RegionServer.JvmMetrics.ThreadsRunnable
-jvm.RegionServer.JvmMetrics.ThreadsTerminated
-jvm.RegionServer.JvmMetrics.ThreadsTimedWaiting
-jvm.RegionServer.JvmMetrics.ThreadsWaiting
-jvm.daemon_thread_count
-jvm.file_descriptor_usage
-jvm.gc.ConcurrentMarkSweep.count
-jvm.gc.ConcurrentMarkSweep.time
-jvm.gc.ParNew.count
-jvm.gc.ParNew.time
-jvm.heap_usage
-jvm.memory.heap.committed
-jvm.memory.heap.max
-jvm.memory.heap.used
-jvm.memory.non-heap.committed
-jvm.memory.non-heap.max
-jvm.memory.non-heap.used
-jvm.thread_count
-jvm.threads.blocked.count
-jvm.threads.count
-jvm.threads.daemon.count
-jvm.threads.deadlock.count
-jvm.threads.runnable.count
-jvm.uptime
-kafka.controller.ControllerStats.LeaderElectionRateAndTimeMs.1MinuteRate
-kafka.controller.ControllerStats.LeaderElectionRateAndTimeMs.count
-kafka.controller.ControllerStats.UncleanLeaderElectionsPerSec.1MinuteRate
-kafka.controller.ControllerStats.UncleanLeaderElectionsPerSec.count
-kafka.controller.KafkaController.ActiveControllerCount
-kafka.controller.KafkaController.OfflinePartitionsCount
-kafka.log.LogFlushStats.LogFlushRateAndTimeMs.1MinuteRate
-kafka.network.RequestMetrics.RequestsPerSec.request.FetchConsumer.count
-kafka.network.RequestMetrics.RequestsPerSec.request.Produce.count
-kafka.network.RequestMetrics.TotalTimeMs.request.FetchConsumer.99percentile
-kafka.network.RequestMetrics.TotalTimeMs.request.FetchConsumer.max
-kafka.network.RequestMetrics.TotalTimeMs.request.FetchConsumer.mean
-kafka.network.RequestMetrics.TotalTimeMs.request.FetchConsumer.min
-kafka.network.RequestMetrics.TotalTimeMs.request.FetchFollower.99percentile
-kafka.network.RequestMetrics.TotalTimeMs.request.FetchFollower.max
-kafka.network.RequestMetrics.TotalTimeMs.request.FetchFollower.mean
-kafka.network.RequestMetrics.TotalTimeMs.request.FetchFollower.min
-kafka.network.RequestMetrics.TotalTimeMs.request.Produce.99percentile
-kafka.network.RequestMetrics.TotalTimeMs.request.Produce.max
-kafka.network.RequestMetrics.TotalTimeMs.request.Produce.mean
-kafka.network.RequestMetrics.TotalTimeMs.request.Produce.min
-kafka.server.BrokerTopicMetrics.BytesInPerSec.1MinuteRate
-kafka.server.BrokerTopicMetrics.BytesInPerSec.count
-kafka.server.BrokerTopicMetrics.BytesInPerSec.topic.*.count
-kafka.server.BrokerTopicMetrics.BytesOutPerSec.1MinuteRate
-kafka.server.BrokerTopicMetrics.BytesOutPerSec.count
-kafka.server.BrokerTopicMetrics.BytesOutPerSec.topic.*.count
-kafka.server.BrokerTopicMetrics.MessagesInPerSec.1MinuteRate
-kafka.server.BrokerTopicMetrics.MessagesInPerSec.count
-kafka.server.BrokerTopicMetrics.MessagesInPerSec.topic.*.count
-kafka.server.BrokerTopicMetrics.TotalProduceRequestsPerSec.topic.*.count
-kafka.server.FetcherLagMetrics.ConsumerLag.clientId.ReplicaFetcherThread-0-1001.partition.0.topic.*
-kafka.server.ReplicaFetcherManager.MaxLag.clientId.Replica
-kafka.server.ReplicaManager.IsrExpandsPerSec.count
-kafka.server.ReplicaManager.IsrShrinksPerSec.count
-kafka.server.ReplicaManager.LeaderCount
-kafka.server.ReplicaManager.PartitionCount
-kafka.server.ReplicaManager.UnderReplicatedPartitions
-load_fifteen
-load_five
-load_one
-master.AssignmentManager.ritCount
-master.AssignmentManager.ritCountOverThreshold
-master.AssignmentManager.ritOldestAge
-master.Master.QueueCallTime_median
-master.Master.TotalCallTime_num_ops
-master.Master.exceptions
-master.Server.averageLoad
-master.Server.numDeadRegionServers
-master.Server.numRegionServers
-mem_buffered
-mem_cached
-mem_free
-mem_shared
-mem_total
-mem_used
-output.solr.write_bytes
-output.solr.write_logs
-pkts_in
-pkts_out
-proc_run
-proc_total
-read_bps
-read_bytes
-read_count
-read_time
-regionserver.IO.FsPReadTime_75th_percentile
-regionserver.IO.FsPReadTime_95th_percentile
-regionserver.IO.FsPReadTime_99th_percentile
-regionserver.IO.FsPReadTime_max
-regionserver.IO.FsPReadTime_mean
-regionserver.IO.FsPReadTime_median
-regionserver.IO.FsReadTime_75th_percentile
-regionserver.IO.FsReadTime_95th_percentile
-regionserver.IO.FsReadTime_99th_percentile
-regionserver.IO.FsReadTime_max
-regionserver.IO.FsReadTime_mean
-regionserver.IO.FsWriteTime_75th_percentile
-regionserver.IO.FsWriteTime_95th_percentile
-regionserver.IO.FsWriteTime_99th_percentile
-regionserver.IO.FsWriteTime_max
-regionserver.IO.FsWriteTime_mean
-regionserver.IO.FsWriteTime_median
-regionserver.IO.fsChecksumFailureCount
-regionserver.RegionServer.ProcessCallTime_75th_percentile
-regionserver.RegionServer.ProcessCallTime_95th_percentile
-regionserver.RegionServer.ProcessCallTime_99th_percentile
-regionserver.RegionServer.ProcessCallTime_max
-regionserver.RegionServer.ProcessCallTime_mean
-regionserver.RegionServer.ProcessCallTime_median
-regionserver.RegionServer.QueueCallTime_75th_percentile
-regionserver.RegionServer.QueueCallTime_95th_percentile
-regionserver.RegionServer.QueueCallTime_99th_percentile
-regionserver.RegionServer.QueueCallTime_max
-regionserver.RegionServer.QueueCallTime_mean
-regionserver.RegionServer.QueueCallTime_median
-regionserver.RegionServer.TotalCallTime_num_ops
-regionserver.RegionServer.authenticationFailures
-regionserver.RegionServer.authenticationSuccesses
-regionserver.RegionServer.authorizationFailures
-regionserver.RegionServer.authorizationSuccesses
-regionserver.RegionServer.exceptions
-regionserver.RegionServer.numActiveHandler
-regionserver.RegionServer.numCallsInGeneralQueue
-regionserver.RegionServer.numCallsInPriorityQueue
-regionserver.RegionServer.numCallsInReplicationQueue
-regionserver.RegionServer.numOpenConnections
-regionserver.RegionServer.queueSize
-regionserver.RegionServer.receivedBytes
-regionserver.RegionServer.sentBytes
-regionserver.Server.Append_75th_percentile
-regionserver.Server.Append_95th_percentile
-regionserver.Server.Append_99th_percentile
-regionserver.Server.Append_max
-regionserver.Server.Append_mean
-regionserver.Server.Append_median
-regionserver.Server.Append_min
-regionserver.Server.Append_num_ops
-regionserver.Server.Delete_75th_percentile
-regionserver.Server.Delete_95th_percentile
-regionserver.Server.Delete_99th_percentile
-regionserver.Server.Delete_max
-regionserver.Server.Delete_mean
-regionserver.Server.Delete_median
-regionserver.Server.Delete_min
-regionserver.Server.Delete_num_ops
-regionserver.Server.Get_75th_percentile
-regionserver.Server.Get_95th_percentile
-regionserver.Server.Get_99th_percentile
-regionserver.Server.Get_max
-regionserver.Server.Get_mean
-regionserver.Server.Get_median
-regionserver.Server.Get_min
-regionserver.Server.Get_num_ops
-regionserver.Server.Increment_75th_percentile
-regionserver.Server.Increment_95th_percentile
-regionserver.Server.Increment_99th_percentile
-regionserver.Server.Increment_max
-regionserver.Server.Increment_mean
-regionserver.Server.Increment_median
-regionserver.Server.Increment_min
-regionserver.Server.Increment_num_ops
-regionserver.Server.Mutate_75th_percentile
-regionserver.Server.Mutate_95th_percentile
-regionserver.Server.Mutate_99th_percentile
-regionserver.Server.Mutate_max
-regionserver.Server.Mutate_mean
-regionserver.Server.Mutate_median
-regionserver.Server.Mutate_min
-regionserver.Server.Mutate_num_ops
-regionserver.Server.Replay_75th_percentile
-regionserver.Server.Replay_95th_percentile
-regionserver.Server.Replay_99th_percentile
-regionserver.Server.Replay_max
-regionserver.Server.Replay_mean
-regionserver.Server.Replay_median
-regionserver.Server.Replay_min
-regionserver.Server.Replay_num_ops
-regionserver.Server.ScanNext_95th_percentile
-regionserver.Server.ScanNext_num_ops
-regionserver.Server.ScanTime_75th_percentile
-regionserver.Server.ScanTime_95th_percentile
-regionserver.Server.ScanTime_99th_percentile
-regionserver.Server.ScanTime_max
-regionserver.Server.ScanTime_mean
-regionserver.Server.ScanTime_median
-regionserver.Server.blockCacheCount
-regionserver.Server.blockCacheCountHitPercent
-regionserver.Server.blockCacheEvictionCount
-regionserver.Server.blockCacheExpressHitPercent
-regionserver.Server.blockCacheFreeSize
-regionserver.Server.blockCacheHitCount
-regionserver.Server.blockCacheMissCount
-regionserver.Server.blockCacheSize
-regionserver.Server.blockCountHitPercent
-regionserver.Server.compactionQueueLength
-regionserver.Server.flushQueueLength
-regionserver.Server.hlogFileCount
-regionserver.Server.hlogFileSize
-regionserver.Server.memStoreSize
-regionserver.Server.percentFilesLocal
-regionserver.Server.readRequestCount
-regionserver.Server.regionCount
-regionserver.Server.slowDeleteCount
-regionserver.Server.slowGetCount
-regionserver.Server.slowPutCount
-regionserver.Server.splitQueueLength
-regionserver.Server.staticBloomSize
-regionserver.Server.staticIndexSize
-regionserver.Server.storeCount
-regionserver.Server.storeFileCount
-regionserver.Server.storeFileIndexSize
-regionserver.Server.storeFileSize
-regionserver.Server.totalRequestCount
-regionserver.Server.updatesBlockedTime
-regionserver.Server.writeRequestCount
-regionserver.Tables.*_metric_averageRegionSize
-regionserver.Tables.*_metric_avgStoreFileAge
-regionserver.Tables.*_metric_flushMemstoreSize_95th_percentile
-regionserver.Tables.*_metric_flushMemstoreSize_max
-regionserver.Tables.*_metric_flushMemstoreSize_mean
-regionserver.Tables.*_metric_flushMemstoreSize_median
-regionserver.Tables.*_metric_flushOutputSize_95th_percentile
-regionserver.Tables.*_metric_flushOutputSize_max
-regionserver.Tables.*_metric_flushOutputSize_mean
-regionserver.Tables.*_metric_flushOutputSize_median
-regionserver.Tables.*_metric_flushTime_95th_percentile
-regionserver.Tables.*_metric_flushTime_max
-regionserver.Tables.*_metric_flushTime_mean
-regionserver.Tables.*_metric_flushTime_median
-regionserver.Tables.*_metric_flushTime_num_ops
-regionserver.Tables.*_metric_flushedMemstoreBytes
-regionserver.Tables.*_metric_flushedOutputBytes
-regionserver.Tables.*_metric_maxStoreFileAge
-regionserver.Tables.*_metric_memStoreSize
-regionserver.Tables.*_metric_minStoreFileAge
-regionserver.Tables.*_metric_numReferenceFiles
-regionserver.Tables.*_metric_readRequestCount
-regionserver.Tables.*_metric_regionCount
-regionserver.Tables.*_metric_storeCount
-regionserver.Tables.*_metric_storeFileCount
-regionserver.Tables.*_metric_storeFileSize
-regionserver.Tables.*_metric_tableSize
-regionserver.Tables.*_metric_totalRequestCount
-regionserver.Tables.*_metric_writeRequestCount
-regionserver.Users.*_metric_append_num_ops
-regionserver.Users.*_metric_delete_num_ops
-regionserver.Users.*_metric_get_num_ops
-regionserver.Users.*_metric_increment_num_ops
-regionserver.Users.*_metric_mutate_num_ops
-regionserver.Users.*_metric_scanTime_num_ops
-regionserver.WAL.AppendSize_75th_percentile
-regionserver.WAL.AppendSize_95th_percentile
-regionserver.WAL.AppendSize_99th_percentile
-regionserver.WAL.AppendSize_max
-regionserver.WAL.AppendSize_mean
-regionserver.WAL.AppendSize_median
-regionserver.WAL.AppendTime_75th_percentile
-regionserver.WAL.AppendTime_95th_percentile
-regionserver.WAL.AppendTime_99th_percentile
-regionserver.WAL.AppendTime_max
-regionserver.WAL.AppendTime_mean
-regionserver.WAL.AppendTime_median
-regionserver.WAL.SyncTime_75th_percentile
-regionserver.WAL.SyncTime_95th_percentile
-regionserver.WAL.SyncTime_99th_percentile
-regionserver.WAL.SyncTime_max
-regionserver.WAL.SyncTime_mean
-regionserver.WAL.SyncTime_median
-regionserver.WAL.SyncTime_num_ops
-regionserver.WAL.appendCount
-regionserver.WAL.slowAppendCount
-rpc.rpc.CallQueueLength
-rpc.rpc.NumOpenConnections
-rpc.rpc.RpcAuthenticationFailures
-rpc.rpc.RpcAuthorizationFailures
-rpc.rpc.RpcProcessingTimeAvgTime
-rpc.rpc.RpcQueueTimeAvgTime
-rpc.rpc.RpcSlowCalls
-rpc.rpc.client.CallQueueLength
-rpc.rpc.client.NumOpenConnections
-rpc.rpc.client.RpcClientBackoff
-rpc.rpc.client.RpcProcessingTimeAvgTime
-rpc.rpc.client.RpcProcessingTimeNumOps
-rpc.rpc.client.RpcQueueTimeAvgTime
-rpc.rpc.client.RpcQueueTimeNumOps
-rpc.rpc.client.RpcSlowCalls
-rpc.rpc.datanode.CallQueueLength
-rpc.rpc.datanode.RpcProcessingTimeAvgTime
-rpc.rpc.datanode.RpcProcessingTimeNumOps
-rpc.rpc.datanode.RpcQueueTimeAvgTime
-rpc.rpc.datanode.RpcQueueTimeNumOps
-rpc.rpc.datanode.RpcSlowCalls
-rpcdetailed.rpcdetailed.client.AddBlockAvgTime
-rpcdetailed.rpcdetailed.client.AddBlockNumOps
-solr.admin.info.jvm.memory.used
-solr.admin.info.system.processCpuLoad
-solr.admin.mbeans.cache.documentCache.hitratio
-solr.admin.mbeans.cache.documentCache.size
-solr.admin.mbeans.cache.documentCache.warmupTime
-solr.admin.mbeans.cache.filterCache.hitratio
-solr.admin.mbeans.cache.filterCache.size
-solr.admin.mbeans.cache.filterCache.warmupTime
-solr.admin.mbeans.cache.queryResultCache.hitratio
-solr.admin.mbeans.cache.queryResultCache.size
-solr.admin.mbeans.cache.queryResultCache.warmupTime
-solr.admin.mbeans.queryHandler.browse.avgTimePerRequest
-solr.admin.mbeans.queryHandler.browse.requests
-solr.admin.mbeans.queryHandler.export.avgTimePerRequest
-solr.admin.mbeans.queryHandler.export.requests
-solr.admin.mbeans.queryHandler.get.avgTimePerRequest
-solr.admin.mbeans.queryHandler.get.requests
-solr.admin.mbeans.queryHandler.query.avgTimePerRequest
-solr.admin.mbeans.queryHandler.query.requests
-solr.admin.mbeans.queryHandler.select.15minRateReqsPerSecond
-solr.admin.mbeans.queryHandler.select.5minRateReqsPerSecond
-solr.admin.mbeans.queryHandler.select.75thPcRequestTime
-solr.admin.mbeans.queryHandler.select.95thPcRequestTime
-solr.admin.mbeans.queryHandler.select.999thPcRequestTime
-solr.admin.mbeans.queryHandler.select.99thPcRequestTime
-solr.admin.mbeans.queryHandler.select.avgRequestsPerSecond
-solr.admin.mbeans.queryHandler.select.avgTimePerRequest
-solr.admin.mbeans.queryHandler.select.medianRequestTime
-solr.admin.mbeans.queryHandler.select.requests
-solr.admin.mbeans.updateHandler.adds
-solr.admin.mbeans.updateHandler.deletesById
-solr.admin.mbeans.updateHandler.deletesByQuery
-solr.admin.mbeans.updateHandler.docsPending
-solr.admin.mbeans.updateHandler.errors
-swap_free
-swap_total
-topology.*.%.--ack-count.%
-topology.*.%.--complete-latency.%
-topology.*.%.--emit-count.%
-topology.*.%.--execute-count.%
-topology.*.%.--fail-count.%
-topology.*.%.--receive.population
-topology.*.%.--sendqueue.population
-topology.*.*.%.--ack-count.%
-topology.*.*.%.--complete-latency.%
-topology.*.*.%.--emit-count.%
-topology.*.*.%.--execute-count.%
-topology.*.*.%.--fail-count.%
-topology.*.*.%.--process-latency.%
-topology.*.*.%.--receive.population
-topology.*.*.%.--sendqueue.population
-topology.*.--system.%.%.-1.GC/PSMarkSweep.count
-topology.*.--system.%.%.-1.GC/PSMarkSweep.timeMs
-topology.*.--system.%.%.-1.GC/PSScavenge.count
-topology.*.--system.%.%.-1.GC/PSScavenge.timeMs
-topology.*.--system.%.%.-1.memory/heap.usedBytes
-topology.*.--system.%.%.-1.memory/nonHeap.usedBytes
-topology.*.kafka-topic.*.*.latestCompletedOffset
-topology.*.kafka-topic.*.*.latestTimeOffset
-write_bps
-write_bytes
-write_count
-write_time
-yarn.ClusterMetrics.AMLaunchDelayAvgTime
-yarn.ClusterMetrics.AMRegisterDelayAvgTime
-yarn.ClusterMetrics.NumActiveNMs
-yarn.ClusterMetrics.NumLostNMs
-yarn.ClusterMetrics.NumUnhealthyNMs
-yarn.NodeManagerMetrics.AllocatedContainers
-yarn.NodeManagerMetrics.AllocatedGB
-yarn.NodeManagerMetrics.AllocatedVCores
-yarn.NodeManagerMetrics.AvailableGB
-yarn.NodeManagerMetrics.BadLocalDirs
-yarn.NodeManagerMetrics.BadLogDirs
-yarn.NodeManagerMetrics.ContainerLaunchDurationAvgTime
-yarn.NodeManagerMetrics.ContainersCompleted
-yarn.NodeManagerMetrics.ContainersFailed
-yarn.NodeManagerMetrics.ContainersIniting
-yarn.NodeManagerMetrics.ContainersKilled
-yarn.NodeManagerMetrics.ContainersLaunched
-yarn.NodeManagerMetrics.ContainersRunning
-yarn.NodeManagerMetrics.GoodLocalDirsDiskUtilizationPerc
-yarn.NodeManagerMetrics.GoodLogDirsDiskUtilizationPerc
-yarn.QueueMetrics.Queue=root.AMResourceLimitMB
-yarn.QueueMetrics.Queue=root.AggregateContainersAllocated
-yarn.QueueMetrics.Queue=root.AggregateNodeLocalContainersAllocated
-yarn.QueueMetrics.Queue=root.AggregateOffSwitchContainersAllocated
-yarn.QueueMetrics.Queue=root.AggregateRackLocalContainersAllocated
-yarn.QueueMetrics.Queue=root.AllocatedContainers
-yarn.QueueMetrics.Queue=root.AllocatedMB
-yarn.QueueMetrics.Queue=root.AllocatedVCores
-yarn.QueueMetrics.Queue=root.AppAttemptFirstContainerAllocationDelayAvgTime
-yarn.QueueMetrics.Queue=root.AppsCompleted
-yarn.QueueMetrics.Queue=root.AppsFailed
-yarn.QueueMetrics.Queue=root.AppsKilled
-yarn.QueueMetrics.Queue=root.AppsPending
-yarn.QueueMetrics.Queue=root.AppsRunning
-yarn.QueueMetrics.Queue=root.AppsSubmitted
-yarn.QueueMetrics.Queue=root.AvailableMB
-yarn.QueueMetrics.Queue=root.AvailableVCores
-yarn.QueueMetrics.Queue=root.PendingContainers
-yarn.QueueMetrics.Queue=root.PendingMB
-yarn.QueueMetrics.Queue=root.UsedAMResourceMB
-yarn.QueueMetrics.Queue=root.default.ReservedContainers
-yarn.QueueMetrics.Queue=root.default.ReservedMB
-yarn.QueueMetrics.Queue=root.running_0
-yarn.QueueMetrics.Queue=root.running_1440
-yarn.QueueMetrics.Queue=root.running_300
-yarn.QueueMetrics.Queue=root.running_60
-yarn.TimelineDataManagerMetrics.GetEntitiesTimeAvgTime
-yarn.TimelineDataManagerMetrics.GetEntitiesTotal
-yarn.TimelineDataManagerMetrics.PostEntitiesTimeAvgTime
-yarn.TimelineDataManagerMetrics.PostEntitiesTotal
\ No newline at end of file
diff --git a/ambari-metrics-timelineservice/pom.xml b/ambari-metrics-timelineservice/pom.xml
index 7451d5e..d185811 100644
--- a/ambari-metrics-timelineservice/pom.xml
+++ b/ambari-metrics-timelineservice/pom.xml
@@ -259,8 +259,6 @@
<excludes>
<exclude>conf/unix/metrics_whitelist</exclude>
<exclude>conf/unix/amshbase_metrics_whitelist</exclude>
- <exclude>conf/windows/metrics_whitelist</exclude>
- <exclude>conf/windows/amshbase_metrics_whitelist</exclude>
</excludes>
</configuration>
<executions>
@@ -801,12 +799,6 @@
<!-- Dependency in order to annotate unit tests with a category. -->
<dependency>
- <groupId>org.apache.ambari</groupId>
- <artifactId>ambari-utility</artifactId>
- <version>1.0.0.0-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-core</artifactId>
<version>2.1.0</version>
@@ -909,54 +901,6 @@
</build>
</profile>
<profile>
- <id>windows</id>
- <activation>
- <os>
- <family>win</family>
- </os>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.7</version>
- <executions>
- <execution>
- <id>hbase_download</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <target name="Download HBase">
- <mkdir dir="${project.build.directory}/embedded"/>
- <get
- src="${hbase.winpkg.zip}"
- dest="${project.build.directory}/embedded/hbase.zip"
- usetimestamp="true"
- />
- <unzip
- src="${project.build.directory}/embedded/hbase.zip"
- dest="${project.build.directory}/embedded/hbase.temp"
- />
- <unzip
- src="${project.build.directory}/embedded/hbase.temp/resources/${hbase.winpkg.folder}.zip"
- dest="${project.build.directory}/embedded"
- />
- <copy
- file="${project.build.directory}/embedded/hbase.temp/resources/servicehost.exe"
- tofile="${project.build.directory}/embedded/${hbase.winpkg.folder}/bin/ams_hbase_master.exe"
- />
- </target>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
<id>sim</id>
<build>
diff --git a/pom.xml b/pom.xml
index 7b5f02f..a655f9e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,6 @@
<version>2.0.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
- <module>../ambari-utility</module>
<module>ambari-metrics-common</module>
<module>ambari-metrics-hadoop-sink</module>
<module>ambari-metrics-flume-sink</module>
@@ -185,7 +184,7 @@
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<descriptors>
- <descriptor>../ambari-project/src/main/assemblies/empty.xml</descriptor>
+ <descriptor>src/main/assemblies/empty.xml</descriptor>
</descriptors>
</configuration>
<executions>
@@ -289,6 +288,19 @@
<exclude>**/*.nuspec</exclude>
<exclude>**/*.json</exclude>
<exclude>**/out</exclude>
+ <exclude>**/*.md</exclude>
+ <exclude>**/.idea/</exclude>
+ <exclude>**/.classpath/</exclude>
+ <exclude>**/.project/</exclude>
+ <exclude>**/.settings/</exclude>
+ <exclude>.git/</exclude>
+ <exclude>ambari-metrics-grafana/conf/unix/ams-grafana.ini</exclude>
+ <exclude>target/**</exclude>
+ <exclude>ambari-metrics-host-monitoring/src/main/python/psutil/**</exclude>
+ <exclude>target/rpm/ambari-metrics/SPECS/ambari-metrics.spec</exclude>
+ <exclude>ambari-metrics-timelineservice/src/test/resources/lib/org/apache/phoenix/phoenix-core-tests/4.2.0/phoenix-core-tests-4.2.0.pom</exclude>
+ <exclude>ambari-metrics-timelineservice/src/test/resources/lib/org/apache/phoenix/phoenix-core-tests/maven-metadata-local.xml</exclude>
+ <exclude>*/target/**</exclude>
</excludes>
</configuration>
<executions>
@@ -303,31 +315,8 @@
</plugins>
</build>
- <dependencies>
- <!-- Dependency in order to annotate unit tests with a category. -->
- <dependency>
- <groupId>org.apache.ambari</groupId>
- <artifactId>ambari-utility</artifactId>
- <version>1.0.0.0-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
<profiles>
<profile>
- <id>FastTests</id>
- <properties>
- <testcase.groups>category.FastTest</testcase.groups>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.apache.ambari</groupId>
- <artifactId>ambari-utility</artifactId>
- <version>1.0.0.0-SNAPSHOT</version>
- </dependency>
- </dependencies>
- </profile>
- <profile>
<id>sign-artifacts</id>
<activation>
<property>
diff --git a/src/main/assemblies/empty.xml b/src/main/assemblies/empty.xml
new file mode 100644
index 0000000..a8c65b6
--- /dev/null
+++ b/src/main/assemblies/empty.xml
@@ -0,0 +1,21 @@
+<!--
+ 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.
+-->
+<assembly>
+ <id>empty</id>
+ <formats/>
+</assembly>
