AMBARI-3113. Add Ganglia/JMX monitoring for Journal Node component (Maksim Kononenko via dlysnichenko)
Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/013a75a9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/013a75a9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/013a75a9 Branch: refs/heads/trunk Commit: 013a75a98f5d073f0faf54408163faeafe2800f4 Parents: def7e8c Author: Lisnichenko Dmitro <[email protected]> Authored: Thu Sep 5 20:18:31 2013 +0300 Committer: Lisnichenko Dmitro <[email protected]> Committed: Thu Sep 5 20:18:31 2013 +0300 ---------------------------------------------------------------------- .../hadoop-metrics2.properties-GANGLIA.erb | 1 + .../templates/hadoop-metrics2.properties.erb | 1 + .../ganglia/GangliaPropertyProvider.java | 1 + .../controller/jmx/JMXPropertyProvider.java | 1 + .../main/resources/ganglia_properties_2.json | 2242 +++++++++++++----- .../src/main/resources/jmx_properties_2.json | 402 ++++ .../ganglia/GangliaPropertyProviderTest.java | 145 ++ .../controller/jmx/JMXPropertyProviderTest.java | 119 + .../controller/jmx/TestStreamProvider.java | 1 + .../test/resources/hdfs_journalnode_jmx.json | 832 +++++++ .../test/resources/journalnode_ganglia_data.txt | 949 ++++++++ 11 files changed, 4090 insertions(+), 604 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/013a75a9/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 693fe92..3d76650 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 @@ -37,5 +37,6 @@ reducetask.sink.ganglia.servers=<%=scope.function_hdp_host("ganglia_server_host" resourcemanager.sink.ganglia.servers=<%=scope.function_hdp_host("ganglia_server_host")%>:8664 nodemanager.sink.ganglia.servers=<%=scope.function_hdp_host("ganglia_server_host")%>:8660 historyserver.sink.ganglia.servers=<%=scope.function_hdp_host("ganglia_server_host")%>:8666 +journalnode.sink.ganglia.servers=<%=scope.function_hdp_host("ganglia_server_host")%>:8660 resourcemanager.sink.ganglia.tagsForPrefix.yarn=Queue http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/013a75a9/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 693fe92..3d76650 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 @@ -37,5 +37,6 @@ reducetask.sink.ganglia.servers=<%=scope.function_hdp_host("ganglia_server_host" resourcemanager.sink.ganglia.servers=<%=scope.function_hdp_host("ganglia_server_host")%>:8664 nodemanager.sink.ganglia.servers=<%=scope.function_hdp_host("ganglia_server_host")%>:8660 historyserver.sink.ganglia.servers=<%=scope.function_hdp_host("ganglia_server_host")%>:8666 +journalnode.sink.ganglia.servers=<%=scope.function_hdp_host("ganglia_server_host")%>:8660 resourcemanager.sink.ganglia.tagsForPrefix.yarn=Queue http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/013a75a9/ambari-server/src/main/java/org/apache/ambari/server/controller/ganglia/GangliaPropertyProvider.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/ganglia/GangliaPropertyProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/ganglia/GangliaPropertyProvider.java index 1482330..49d9e38 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/ganglia/GangliaPropertyProvider.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/ganglia/GangliaPropertyProvider.java @@ -67,6 +67,7 @@ public abstract class GangliaPropertyProvider extends AbstractPropertyProvider { GANGLIA_CLUSTER_NAME_MAP.put("HBASE_CLIENT", "HDPSlaves"); GANGLIA_CLUSTER_NAME_MAP.put("HBASE_REGIONSERVER", "HDPSlaves"); GANGLIA_CLUSTER_NAME_MAP.put("FLUME_SERVER", "HDPSlaves"); + GANGLIA_CLUSTER_NAME_MAP.put("JOURNALNODE", "HDPSlaves"); } protected final static Logger LOG = http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/013a75a9/ambari-server/src/main/java/org/apache/ambari/server/controller/jmx/JMXPropertyProvider.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/jmx/JMXPropertyProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/jmx/JMXPropertyProvider.java index 2138cb0..d27eebd 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/jmx/JMXPropertyProvider.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/jmx/JMXPropertyProvider.java @@ -101,6 +101,7 @@ public class JMXPropertyProvider extends AbstractPropertyProvider { DEFAULT_JMX_PORTS.put("RESOURCEMANAGER", "8088"); DEFAULT_JMX_PORTS.put("HISTORYSERVER", "19888"); DEFAULT_JMX_PORTS.put("NODEMANAGER", "8042"); + DEFAULT_JMX_PORTS.put("JOURNALNODE", "8480"); ObjectMapper objectMapper = new ObjectMapper(); objectMapper.configure(DeserializationConfig.Feature.USE_ANNOTATIONS, false);
