You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by av...@apache.org on 2016/03/25 00:13:00 UTC

ambari git commit: AMBARI-15571 : Disable YARN Container metrics from AMS (avijayan)

Repository: ambari
Updated Branches:
  refs/heads/trunk 7cbf3f4b4 -> 1ee8e88a0


AMBARI-15571 : Disable YARN Container metrics from AMS (avijayan)


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

Branch: refs/heads/trunk
Commit: 1ee8e88a028d6b1e14f3377ed5a6f0a5f60da9cb
Parents: 7cbf3f4
Author: Aravindan Vijayan <av...@hortonworks.com>
Authored: Thu Mar 24 16:12:17 2016 -0700
Committer: Aravindan Vijayan <av...@hortonworks.com>
Committed: Thu Mar 24 16:12:27 2016 -0700

----------------------------------------------------------------------
 .../HDFS/2.1.0.2.0/package/alerts/alert_metrics_deviation.py     | 2 +-
 .../hooks/before-START/templates/hadoop-metrics2.properties.j2   | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/1ee8e88a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/alerts/alert_metrics_deviation.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/alerts/alert_metrics_deviation.py b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/alerts/alert_metrics_deviation.py
index 3c9c5c5..741c201 100644
--- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/alerts/alert_metrics_deviation.py
+++ b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/alerts/alert_metrics_deviation.py
@@ -316,7 +316,7 @@ def execute(configurations={}, parameters={}, host_name=None):
   metrics = [metric for metric in metrics if metric > (minimum_value_threshold * 1000)]
 
   if len(metrics) < 2:
-    return (RESULT_STATE_OK, ['No datapoints found above the minimum threshold of {0}'.format(minimum_value_threshold)])
+    return (RESULT_STATE_OK, ['No datapoints found above the minimum threshold of {0} seconds'.format(minimum_value_threshold)])
 
   mean = calculate_mean(metrics)
   stddev = calulate_sample_std_deviation(metrics)

http://git-wip-us.apache.org/repos/asf/ambari/blob/1ee8e88a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/templates/hadoop-metrics2.properties.j2
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/templates/hadoop-metrics2.properties.j2 b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/templates/hadoop-metrics2.properties.j2
index fcd9b23..6f32000 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/templates/hadoop-metrics2.properties.j2
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/templates/hadoop-metrics2.properties.j2
@@ -101,4 +101,8 @@ namenode.sink.timeline.metric.rpc.datanode.port={{nn_rpc_dn_port}}
 namenode.sink.timeline.metric.rpc.healthcheck.port={{nn_rpc_healthcheck_port}}
 {% endif %}
 
+# Switch off container metrics
+*.source.filter.class=org.apache.hadoop.metrics2.filter.GlobFilter
+nodemanager.*.source.filter.exclude=*ContainerResource*
+
 {% endif %}