Updated Branches: refs/heads/trunk d98cfd9ca -> 9ef4a4137
AMBARI-3210. Exception in each log of monitorable component if ganglia is not installed( odiachenko) Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/9ef4a413 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/9ef4a413 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/9ef4a413 Branch: refs/heads/trunk Commit: 9ef4a41378f9b80caa8321479706ad8a7a50d517 Parents: d98cfd9 Author: Oleksandr Diachenko <[email protected]> Authored: Mon Sep 16 18:54:40 2013 +0300 Committer: Oleksandr Diachenko <[email protected]> Committed: Mon Sep 16 18:55:24 2013 +0300 ---------------------------------------------------------------------- .../hdp-hadoop/templates/hadoop-metrics2.properties-GANGLIA.erb | 3 +++ .../modules/hdp-hadoop/templates/hadoop-metrics2.properties.erb | 3 +++ 2 files changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/9ef4a413/ambari-agent/src/main/puppet/modules/hdp-hadoop/templates/hadoop-metrics2.properties-GANGLIA.erb ---------------------------------------------------------------------- diff --git a/ambari-agent/src/main/puppet/modules/hdp-hadoop/templates/hadoop-metrics2.properties-GANGLIA.erb b/ambari-agent/src/main/puppet/modules/hdp-hadoop/templates/hadoop-metrics2.properties-GANGLIA.erb index 3d76650..65d9767 100644 --- a/ambari-agent/src/main/puppet/modules/hdp-hadoop/templates/hadoop-metrics2.properties-GANGLIA.erb +++ b/ambari-agent/src/main/puppet/modules/hdp-hadoop/templates/hadoop-metrics2.properties-GANGLIA.erb @@ -16,6 +16,7 @@ # syntax: [prefix].[source|sink|jmx].[instance].[options] # See package.html for org.apache.hadoop.metrics2 for details +<%if not scope.function_hdp_is_empty(ganglia_server_host)%> *.period=60 *.sink.ganglia.class=org.apache.hadoop.metrics2.sink.ganglia.GangliaSink31 @@ -40,3 +41,5 @@ historyserver.sink.ganglia.servers=<%=scope.function_hdp_host("ganglia_server_ho journalnode.sink.ganglia.servers=<%=scope.function_hdp_host("ganglia_server_host")%>:8660 resourcemanager.sink.ganglia.tagsForPrefix.yarn=Queue + +<% end %> http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/9ef4a413/ambari-agent/src/main/puppet/modules/hdp-hadoop/templates/hadoop-metrics2.properties.erb ---------------------------------------------------------------------- diff --git a/ambari-agent/src/main/puppet/modules/hdp-hadoop/templates/hadoop-metrics2.properties.erb b/ambari-agent/src/main/puppet/modules/hdp-hadoop/templates/hadoop-metrics2.properties.erb index 3d76650..65d9767 100644 --- a/ambari-agent/src/main/puppet/modules/hdp-hadoop/templates/hadoop-metrics2.properties.erb +++ b/ambari-agent/src/main/puppet/modules/hdp-hadoop/templates/hadoop-metrics2.properties.erb @@ -16,6 +16,7 @@ # syntax: [prefix].[source|sink|jmx].[instance].[options] # See package.html for org.apache.hadoop.metrics2 for details +<%if not scope.function_hdp_is_empty(ganglia_server_host)%> *.period=60 *.sink.ganglia.class=org.apache.hadoop.metrics2.sink.ganglia.GangliaSink31 @@ -40,3 +41,5 @@ historyserver.sink.ganglia.servers=<%=scope.function_hdp_host("ganglia_server_ho journalnode.sink.ganglia.servers=<%=scope.function_hdp_host("ganglia_server_host")%>:8660 resourcemanager.sink.ganglia.tagsForPrefix.yarn=Queue + +<% end %>
