You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sw...@apache.org on 2015/01/15 23:42:29 UTC

ambari git commit: AMBARI-9161. Disable per Region metrics for the Metrics System. (swagle)

Repository: ambari
Updated Branches:
  refs/heads/trunk 265f13f46 -> a10d56f0b


AMBARI-9161. Disable per Region metrics for the Metrics System. (swagle)


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

Branch: refs/heads/trunk
Commit: a10d56f0b2a14b11d97e835ed81bedc4b361eb17
Parents: 265f13f
Author: Siddharth Wagle <sw...@hortonworks.com>
Authored: Thu Jan 15 14:14:21 2015 -0800
Committer: Siddharth Wagle <sw...@hortonworks.com>
Committed: Thu Jan 15 14:14:21 2015 -0800

----------------------------------------------------------------------
 .../common-services/AMS/0.1.0/configuration/ams-hbase-env.xml    | 4 ----
 .../0.1.0/package/templates/hadoop-metrics2-hbase.properties.j2  | 4 ++++
 2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/a10d56f0/ambari-server/src/main/resources/common-services/AMS/0.1.0/configuration/ams-hbase-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMS/0.1.0/configuration/ams-hbase-env.xml b/ambari-server/src/main/resources/common-services/AMS/0.1.0/configuration/ams-hbase-env.xml
index f18a0df..d42596a 100644
--- a/ambari-server/src/main/resources/common-services/AMS/0.1.0/configuration/ams-hbase-env.xml
+++ b/ambari-server/src/main/resources/common-services/AMS/0.1.0/configuration/ams-hbase-env.xml
@@ -74,10 +74,6 @@ export HBASE_CONF_DIR=${HBASE_CONF_DIR:-{{hbase_conf_dir}}}
 # Extra Java CLASSPATH elements. Optional.
 export HBASE_CLASSPATH=${HBASE_CLASSPATH}
 
-if [ -f "/usr/lib/ambari-metrics-hadoop-sink/ambari-metrics-hadoop-sink.jar" ]; then
-  export HBASE_CLASSPATH=${HBASE_CLASSPATH}:/usr/lib/ambari-metrics-hadoop-sink/ambari-metrics-hadoop-sink.jar
-fi
-
 # The maximum amount of heap to use, in MB. Default is 1000.
 export HBASE_HEAPSIZE={{hbase_heapsize}}
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/a10d56f0/ambari-server/src/main/resources/common-services/AMS/0.1.0/package/templates/hadoop-metrics2-hbase.properties.j2
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMS/0.1.0/package/templates/hadoop-metrics2-hbase.properties.j2 b/ambari-server/src/main/resources/common-services/AMS/0.1.0/package/templates/hadoop-metrics2-hbase.properties.j2
index 13b0948..91fe843 100644
--- a/ambari-server/src/main/resources/common-services/AMS/0.1.0/package/templates/hadoop-metrics2-hbase.properties.j2
+++ b/ambari-server/src/main/resources/common-services/AMS/0.1.0/package/templates/hadoop-metrics2-hbase.properties.j2
@@ -55,3 +55,7 @@ hbase.sink.timeline.class=org.apache.hadoop.metrics2.sink.timeline.HadoopTimelin
 hbase.sink.timeline.period=10
 hbase.sink.timeline.collector={{ams_collector_host_single}}:{{metric_collector_port}}
 hbase.sink.timeline.serviceName-prefix=ams
+
+# Switch off metrics generation on a per region basis
+*.source.filter.class=org.apache.hadoop.metrics2.filter.GlobFilter
+hbase.*.source.filter.exclude=*Regions*
\ No newline at end of file