Repository: ambari Updated Branches: refs/heads/branch-2.5 6e8d34587 -> 351c20c2d
Remove duplicate entry in ams-site.xml(avijayan) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/351c20c2 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/351c20c2 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/351c20c2 Branch: refs/heads/branch-2.5 Commit: 351c20c2d99250fe16e876c7d6c7a983497e3ad3 Parents: 6e8d345 Author: Aravindan Vijayan <[email protected]> Authored: Sat Nov 19 20:48:30 2016 -0800 Committer: Aravindan Vijayan <[email protected]> Committed: Sat Nov 19 20:48:38 2016 -0800 ---------------------------------------------------------------------- .../AMBARI_METRICS/0.1.0/configuration/ams-site.xml | 8 -------- .../before-START/templates/hadoop-metrics2.properties.j2 | 2 +- 2 files changed, 1 insertion(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/351c20c2/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-site.xml b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-site.xml index 9e0b1d0..b7008cf 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-site.xml +++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-site.xml @@ -716,12 +716,4 @@ </description> <on-ambari-upgrade add="true"/> </property> - <property> - <name>timeline.metrics.service.metadata.filters</name> - <value>ContainerResource</value> - <description> - Commas separated list of regular expressions that match metric names - which prevents certain metrics from ending up in metadata cache. - </description> - </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/351c20c2/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 f44ef0e..07cb93e 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 @@ -71,7 +71,7 @@ resourcemanager.sink.ganglia.tagsForPrefix.yarn=Queue *.sink.timeline.class=org.apache.hadoop.metrics2.sink.timeline.HadoopTimelineMetricsSink *.sink.timeline.period={{metrics_collection_period}} *.sink.timeline.sendInterval={{metrics_report_interval}}000 -*.sink.timeline.slave.host.name = {{hostname}} +*.sink.timeline.slave.host.name={{hostname}} *.sink.timeline.zookeeper.quorum={{zookeeper_quorum}} *.sink.timeline.protocol={{metric_collector_protocol}} *.sink.timeline.port={{metric_collector_port}}
