ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mpapirkovs...@apache.org
Subject ambari git commit: AMBARI-9052. AMS start work fails on Ubuntu. (mpapirkovskyy)
Date Thu, 08 Jan 2015 23:05:13 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk b0a237978 -> 5350550c5


AMBARI-9052. AMS start work fails on Ubuntu. (mpapirkovskyy)


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

Branch: refs/heads/trunk
Commit: 5350550c5eeed21e354c1ad82dc87bb2d7594ffb
Parents: b0a2379
Author: Myroslav Papirkovskyy <mpapyrkovskyy@hortonworks.com>
Authored: Fri Jan 9 00:58:35 2015 +0200
Committer: Myroslav Papirkovskyy <mpapyrkovskyy@hortonworks.com>
Committed: Fri Jan 9 01:04:01 2015 +0200

----------------------------------------------------------------------
 ambari-metrics/ambari-metrics-assembly/pom.xml   | 19 ++++++++++++++++++-
 .../src/main/assembly/monitor.xml                |  7 +++++++
 .../conf/unix/metric_groups.conf                 |  4 ++--
 .../conf/unix/metric_monitor.ini                 |  6 +++---
 4 files changed, 30 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/5350550c/ambari-metrics/ambari-metrics-assembly/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-metrics/ambari-metrics-assembly/pom.xml b/ambari-metrics/ambari-metrics-assembly/pom.xml
index c85e5c5..1e1ca8c 100644
--- a/ambari-metrics/ambari-metrics-assembly/pom.xml
+++ b/ambari-metrics/ambari-metrics-assembly/pom.xml
@@ -247,6 +247,16 @@
                       </sources>
                     </mapping>
                     <mapping>
+                      <directory>${resmonitor.install.dir}/ambari_commons</directory>
+                      <sources>
+                        <source>
+                          <location>
+                            ${project.basedir}/../../ambari-common/src/main/python/ambari_commons
+                          </location>
+                        </source>
+                      </sources>
+                    </mapping>
+                    <mapping>
                       <directory>/etc/ambari-metrics-monitor/conf</directory>
                       <configuration>true</configuration>
                     </mapping>
@@ -515,7 +525,6 @@
             <version>1.0.1</version>
             <executions>
               <execution>
-                <!-- unbinds rpm creation from maven lifecycle -->
                 <phase>package</phase>
                 <goals>
                   <goal>jdeb</goal>
@@ -565,6 +574,14 @@
                   </mapper>
                 </data>
                 <data>
+                  <type>directory</type>
+                  <src>${project.basedir}/../../ambari-common/src/main/python/ambari_commons</src>
+                  <mapper>
+                    <type>perm</type>
+                    <prefix>${resmonitor.install.dir}/ambari_commons</prefix>
+                  </mapper>
+                </data>
+                <data>
                   <type>template</type>
                   <paths>
                     <path>/var/run/ambari-metrics-monitor</path>

http://git-wip-us.apache.org/repos/asf/ambari/blob/5350550c/ambari-metrics/ambari-metrics-assembly/src/main/assembly/monitor.xml
----------------------------------------------------------------------
diff --git a/ambari-metrics/ambari-metrics-assembly/src/main/assembly/monitor.xml b/ambari-metrics/ambari-metrics-assembly/src/main/assembly/monitor.xml
index 5944616..99a41c3 100644
--- a/ambari-metrics/ambari-metrics-assembly/src/main/assembly/monitor.xml
+++ b/ambari-metrics/ambari-metrics-assembly/src/main/assembly/monitor.xml
@@ -31,6 +31,13 @@
       <outputDirectory>site-packages/resource_monitoring</outputDirectory>
     </fileSet>
     <fileSet>
+      <directory>${project.basedir}/../../ambari-common/src/main/python/ambari_commons</directory>
+      <outputDirectory>site-packages/resource_monitoring/ambari_commons</outputDirectory>
+      <includes>
+        <include>**/*</include>
+      </includes>
+    </fileSet>
+    <fileSet>
       <directory>${monitor.dir}/conf/unix</directory>
       <outputDirectory>conf</outputDirectory>
       <includes>

http://git-wip-us.apache.org/repos/asf/ambari/blob/5350550c/ambari-metrics/ambari-metrics-host-monitoring/conf/unix/metric_groups.conf
----------------------------------------------------------------------
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
index aa03d19..616b36c 100644
--- a/ambari-metrics/ambari-metrics-host-monitoring/conf/unix/metric_groups.conf
+++ b/ambari-metrics/ambari-metrics-host-monitoring/conf/unix/metric_groups.conf
@@ -1,4 +1,4 @@
-{#
+#
 # 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
@@ -14,7 +14,7 @@
 # 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": {

http://git-wip-us.apache.org/repos/asf/ambari/blob/5350550c/ambari-metrics/ambari-metrics-host-monitoring/conf/unix/metric_monitor.ini
----------------------------------------------------------------------
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
index 5e672fc..2403a14 100644
--- a/ambari-metrics/ambari-metrics-host-monitoring/conf/unix/metric_monitor.ini
+++ b/ambari-metrics/ambari-metrics-host-monitoring/conf/unix/metric_monitor.ini
@@ -1,4 +1,4 @@
-{#
+#
 # 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
@@ -14,11 +14,11 @@
 # 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}}
+metrics_server = localhost:{{ams_collector_port}}
 enable_time_threshold = false
 enable_value_threshold = false
 


Mime
View raw message