Repository: ambari Updated Branches: refs/heads/trunk 5ad79b964 -> 9906552a2
AMBARI-9278. Allow hostname customization for metric monitor. Sink configs. (swagle) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9906552a Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9906552a Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9906552a Branch: refs/heads/trunk Commit: 9906552a2a622b06fb188ba3f138085c81a14c16 Parents: 5ad79b9 Author: Siddharth Wagle <swa...@hortonworks.com> Authored: Thu Jan 22 20:58:14 2015 -0800 Committer: Siddharth Wagle <swa...@hortonworks.com> Committed: Thu Jan 22 20:58:20 2015 -0800 ---------------------------------------------------------------------- .../AMS/0.1.0/package/templates/hadoop-metrics2-hbase.properties.j2 | 1 + .../templates/hadoop-metrics2-hbase.properties-GANGLIA-MASTER.j2 | 1 + .../templates/hadoop-metrics2-hbase.properties-GANGLIA-RS.j2 | 1 + .../hooks/before-START/templates/hadoop-metrics2.properties.j2 | 1 + 4 files changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/9906552a/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 91fe843..4472abc 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 @@ -51,6 +51,7 @@ rpc.period=10 rpc.collector={{ams_collector_host_single}}:{{metric_collector_port}} *.timeline.plugin.urls=file:///usr/lib/ambari-metrics-hadoop-sink/ambari-metrics-hadoop-sink.jar +*.sink.timeline.slave.host.name={{hostname}} hbase.sink.timeline.class=org.apache.hadoop.metrics2.sink.timeline.HadoopTimelineMetricsSink hbase.sink.timeline.period=10 hbase.sink.timeline.collector={{ams_collector_host_single}}:{{metric_collector_port}} http://git-wip-us.apache.org/repos/asf/ambari/blob/9906552a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/templates/hadoop-metrics2-hbase.properties-GANGLIA-MASTER.j2 ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/templates/hadoop-metrics2-hbase.properties-GANGLIA-MASTER.j2 b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/templates/hadoop-metrics2-hbase.properties-GANGLIA-MASTER.j2 index f8a82d9..50234f9 100644 --- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/templates/hadoop-metrics2-hbase.properties-GANGLIA-MASTER.j2 +++ b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/templates/hadoop-metrics2-hbase.properties-GANGLIA-MASTER.j2 @@ -50,6 +50,7 @@ hbase.extendedperiod = 3600 {% if has_metric_collector %} *.timeline.plugin.urls=file:///usr/lib/ambari-metrics-hadoop-sink/ambari-metrics-hadoop-sink.jar +*.sink.timeline.slave.host.name={{hostname}} hbase.class=org.apache.hadoop.metrics2.sink.timeline.HadoopTimelineMetricsSink hbase.period=10 hbase.collector={{metric_collector_host}}:{{metric_collector_port}} http://git-wip-us.apache.org/repos/asf/ambari/blob/9906552a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/templates/hadoop-metrics2-hbase.properties-GANGLIA-RS.j2 ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/templates/hadoop-metrics2-hbase.properties-GANGLIA-RS.j2 b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/templates/hadoop-metrics2-hbase.properties-GANGLIA-RS.j2 index 9586e1a..462bef4 100644 --- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/templates/hadoop-metrics2-hbase.properties-GANGLIA-RS.j2 +++ b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/templates/hadoop-metrics2-hbase.properties-GANGLIA-RS.j2 @@ -49,6 +49,7 @@ hbase.extendedperiod = 3600 {% if has_metric_collector %} *.timeline.plugin.urls=file:///usr/lib/ambari-metrics-hadoop-sink/ambari-metrics-hadoop-sink.jar +*.sink.timeline.slave.host.name={{hostname}} hbase.class=org.apache.hadoop.metrics2.sink.timeline.HadoopTimelineMetricsSink hbase.period=10 hbase.collector={{metric_collector_host}}:{{metric_collector_port}} http://git-wip-us.apache.org/repos/asf/ambari/blob/9906552a/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 2ce70ba..f75947e 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 @@ -70,6 +70,7 @@ resourcemanager.sink.ganglia.tagsForPrefix.yarn=Queue *.sink.timeline.plugin.urls=file:///usr/lib/ambari-metrics-hadoop-sink/ambari-metrics-hadoop-sink.jar *.sink.timeline.class=org.apache.hadoop.metrics2.sink.timeline.HadoopTimelineMetricsSink *.sink.timeline.period=10 +*.sink.timeline.slave.host.name = {{hostname}} datanode.sink.timeline.collector={{metric_collector_host}}:{{metric_collector_port}} namenode.sink.timeline.collector={{metric_collector_host}}:{{metric_collector_port}}