ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nc...@apache.org
Subject git commit: AMBARI-4183. Revisit Ganglia setup and make it easier to understand. Do not use HDPSlaves (ncole)
Date Thu, 02 Jan 2014 20:25:08 GMT
Updated Branches:
  refs/heads/trunk b15eca4a0 -> 1e0326ba4


AMBARI-4183. Revisit Ganglia setup and make it easier to understand.  Do not use HDPSlaves (ncole)


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

Branch: refs/heads/trunk
Commit: 1e0326ba460ec76c3756aabba5e97372bc17220d
Parents: b15eca4
Author: Nate Cole <ncole@hortonworks.com>
Authored: Thu Jan 2 13:45:03 2014 -0500
Committer: Nate Cole <ncole@hortonworks.com>
Committed: Thu Jan 2 15:24:56 2014 -0500

----------------------------------------------------------------------
 .../GangliaComponentPropertyProvider.java       |  15 +-
 .../GangliaHostComponentPropertyProvider.java   |  15 +-
 .../ganglia/GangliaHostPropertyProvider.java    |   5 +
 .../ganglia/GangliaPropertyProvider.java        |  26 +-
 .../templates/hadoop-metrics2.properties.j2     |   8 +-
 .../GANGLIA/package/scripts/ganglia_monitor.py  |  43 ++-
 .../GANGLIA/package/scripts/ganglia_server.py   |  32 +-
 .../services/GANGLIA/package/scripts/params.py  |  12 +-
 .../package/templates/gangliaClusters.conf.j2   |   8 +-
 .../templates/hadoop-metrics2.properties.j2     |   8 +-
 .../GANGLIA/package/scripts/ganglia_monitor.py  |  56 ++-
 .../GANGLIA/package/scripts/ganglia_server.py   |  48 ++-
 .../services/GANGLIA/package/scripts/params.py  |  18 +-
 .../package/templates/gangliaClusters.conf.j2   |  11 +-
 .../ganglia/GangliaPropertyProviderTest.java    |  28 +-
 .../StackDefinedPropertyProviderTest.java       |   1 +
 .../src/test/resources/flume_ganglia_data.txt   | 110 +++---
 .../test/resources/journalnode_ganglia_data.txt | 240 ++++++-------
 .../test/resources/temporal_ganglia_data.txt    |  10 +-
 .../test/resources/temporal_ganglia_data_1.txt  | 359 +++++++++++++++++++
 20 files changed, 803 insertions(+), 250 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/1e0326ba/ambari-server/src/main/java/org/apache/ambari/server/controller/ganglia/GangliaComponentPropertyProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/ganglia/GangliaComponentPropertyProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/ganglia/GangliaComponentPropertyProvider.java
index c9bdf6a..1e01aa0 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/ganglia/GangliaComponentPropertyProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/ganglia/GangliaComponentPropertyProvider.java
@@ -18,15 +18,16 @@
 
 package org.apache.ambari.server.controller.ganglia;
 
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
 import org.apache.ambari.server.configuration.ComponentSSLConfiguration;
 import org.apache.ambari.server.controller.internal.PropertyInfo;
 import org.apache.ambari.server.controller.spi.Resource;
 import org.apache.ambari.server.controller.utilities.StreamProvider;
 
-import java.util.Collections;
-import java.util.Map;
-import java.util.Set;
-
 /**
  * Ganglia property provider implementation for component resources.
  */
@@ -61,6 +62,10 @@ public class GangliaComponentPropertyProvider extends GangliaPropertyProvider {
 
   @Override
   protected Set<String> getGangliaClusterNames(Resource resource, String clusterName) {
-    return Collections.singleton(GANGLIA_CLUSTER_NAME_MAP.get(getComponentName(resource)));
+    String component = getComponentName(resource);
+    
+    return new HashSet<String>(GANGLIA_CLUSTER_NAME_MAP.containsKey(component) ?
+        GANGLIA_CLUSTER_NAME_MAP.get(component) :
+          Collections.<String>emptyList());    
   }
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/1e0326ba/ambari-server/src/main/java/org/apache/ambari/server/controller/ganglia/GangliaHostComponentPropertyProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/ganglia/GangliaHostComponentPropertyProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/ganglia/GangliaHostComponentPropertyProvider.java
index 5964e6c..9411cab 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/ganglia/GangliaHostComponentPropertyProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/ganglia/GangliaHostComponentPropertyProvider.java
@@ -18,15 +18,16 @@
 
 package org.apache.ambari.server.controller.ganglia;
 
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
 import org.apache.ambari.server.configuration.ComponentSSLConfiguration;
 import org.apache.ambari.server.controller.internal.PropertyInfo;
 import org.apache.ambari.server.controller.spi.Resource;
 import org.apache.ambari.server.controller.utilities.StreamProvider;
 
-import java.util.Collections;
-import java.util.Map;
-import java.util.Set;
-
 /**
  * Ganglia property provider implementation for host component resources.
  */
@@ -62,6 +63,10 @@ public class GangliaHostComponentPropertyProvider extends GangliaPropertyProvide
 
   @Override
   protected Set<String> getGangliaClusterNames(Resource resource, String clusterName) {
-    return Collections.singleton(GANGLIA_CLUSTER_NAME_MAP.get(getComponentName(resource)));
+    String component = getComponentName(resource);
+    
+    return new HashSet<String>(GANGLIA_CLUSTER_NAME_MAP.containsKey(component) ?
+        GANGLIA_CLUSTER_NAME_MAP.get(component) :
+          Collections.<String>emptyList());
   }
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/1e0326ba/ambari-server/src/main/java/org/apache/ambari/server/controller/ganglia/GangliaHostPropertyProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/ganglia/GangliaHostPropertyProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/ganglia/GangliaHostPropertyProvider.java
index 2c11d66..c87cd3a 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/ganglia/GangliaHostPropertyProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/ganglia/GangliaHostPropertyProvider.java
@@ -44,6 +44,11 @@ public class GangliaHostPropertyProvider extends GangliaPropertyProvider{
     GANGLIA_CLUSTER_NAMES.add("HDPResourceManager");
     GANGLIA_CLUSTER_NAMES.add("HDPHBaseMaster");
     GANGLIA_CLUSTER_NAMES.add("HDPHistoryServer");
+    GANGLIA_CLUSTER_NAMES.add("HDPNameNode");
+    GANGLIA_CLUSTER_NAMES.add("HDPTaskTracker");
+    GANGLIA_CLUSTER_NAMES.add("HDPHBaseRegionServer");
+    GANGLIA_CLUSTER_NAMES.add("HDPFlumeServer");
+    GANGLIA_CLUSTER_NAMES.add("HDPJournalNode");
   }
 
   // ----- Constructors ------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ambari/blob/1e0326ba/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 6bca2a9..1914875 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
@@ -54,21 +54,21 @@ public abstract class GangliaPropertyProvider extends AbstractPropertyProvider {
   /**
    * Map of Ganglia cluster names keyed by component type.
    */
-  public static final Map<String, String> GANGLIA_CLUSTER_NAME_MAP = new HashMap<String, String>();
+  static final Map<String, List<String>> GANGLIA_CLUSTER_NAME_MAP = new HashMap<String, List<String>>();
 
+  
   static {
-    GANGLIA_CLUSTER_NAME_MAP.put("NAMENODE",           "HDPNameNode");
-    GANGLIA_CLUSTER_NAME_MAP.put("DATANODE",           "HDPSlaves");
-    GANGLIA_CLUSTER_NAME_MAP.put("JOBTRACKER",         "HDPJobTracker");
-    GANGLIA_CLUSTER_NAME_MAP.put("TASKTRACKER",        "HDPSlaves");
-    GANGLIA_CLUSTER_NAME_MAP.put("RESOURCEMANAGER",    "HDPResourceManager");
-    GANGLIA_CLUSTER_NAME_MAP.put("NODEMANAGER",        "HDPSlaves");
-    GANGLIA_CLUSTER_NAME_MAP.put("HISTORYSERVER",      "HDPHistoryServer");
-    GANGLIA_CLUSTER_NAME_MAP.put("HBASE_MASTER",       "HDPHBaseMaster");
-    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");
+    GANGLIA_CLUSTER_NAME_MAP.put("NAMENODE",           Arrays.asList("HDPNameNode"));
+    GANGLIA_CLUSTER_NAME_MAP.put("DATANODE",           Arrays.asList("HDPDataNode", "HDPSlaves"));
+    GANGLIA_CLUSTER_NAME_MAP.put("JOBTRACKER",         Arrays.asList("HDPJobTracker"));
+    GANGLIA_CLUSTER_NAME_MAP.put("TASKTRACKER",        Arrays.asList("HDPTaskTracker", "HDPSlaves"));
+    GANGLIA_CLUSTER_NAME_MAP.put("RESOURCEMANAGER",    Arrays.asList("HDPResourceManager"));
+    GANGLIA_CLUSTER_NAME_MAP.put("NODEMANAGER",        Arrays.asList("HDPNodeManager", "HDPSlaves"));
+    GANGLIA_CLUSTER_NAME_MAP.put("HISTORYSERVER",      Arrays.asList("HDPHistoryServer"));
+    GANGLIA_CLUSTER_NAME_MAP.put("HBASE_MASTER",       Arrays.asList("HDPHBaseMaster"));
+    GANGLIA_CLUSTER_NAME_MAP.put("HBASE_REGIONSERVER", Arrays.asList("HDPHBaseRegionServer", "HDPSlaves"));
+    GANGLIA_CLUSTER_NAME_MAP.put("FLUME_SERVER",       Arrays.asList("HDPFlumeServer", "HDPSlaves"));
+    GANGLIA_CLUSTER_NAME_MAP.put("JOURNALNODE",        Arrays.asList("HDPJournalNode", "HDPSlaves"));
   }
 
   protected final static Logger LOG =

http://git-wip-us.apache.org/repos/asf/ambari/blob/1e0326ba/ambari-server/src/main/resources/stacks/HDP/1.3.4/hooks/before-START/templates/hadoop-metrics2.properties.j2
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.4/hooks/before-START/templates/hadoop-metrics2.properties.j2 b/ambari-server/src/main/resources/stacks/HDP/1.3.4/hooks/before-START/templates/hadoop-metrics2.properties.j2
index 990f42d..a6a66ef 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.4/hooks/before-START/templates/hadoop-metrics2.properties.j2
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.4/hooks/before-START/templates/hadoop-metrics2.properties.j2
@@ -30,15 +30,15 @@
 
 # Hook up to the server
 namenode.sink.ganglia.servers={{ganglia_server_host}}:8661
-datanode.sink.ganglia.servers={{ganglia_server_host}}:8660
+datanode.sink.ganglia.servers={{ganglia_server_host}}:8659
 jobtracker.sink.ganglia.servers={{ganglia_server_host}}:8662
-tasktracker.sink.ganglia.servers={{ganglia_server_host}}:8660
+tasktracker.sink.ganglia.servers={{ganglia_server_host}}:8658
 maptask.sink.ganglia.servers={{ganglia_server_host}}:8660
 reducetask.sink.ganglia.servers={{ganglia_server_host}}:8660
 resourcemanager.sink.ganglia.servers={{ganglia_server_host}}:8664
-nodemanager.sink.ganglia.servers={{ganglia_server_host}}:8660
+nodemanager.sink.ganglia.servers={{ganglia_server_host}}:8657
 historyserver.sink.ganglia.servers={{ganglia_server_host}}:8666
-journalnode.sink.ganglia.servers={{ganglia_server_host}}:8660
+journalnode.sink.ganglia.servers={{ganglia_server_host}}:8654
 
 resourcemanager.sink.ganglia.tagsForPrefix.yarn=Queue
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/1e0326ba/ambari-server/src/main/resources/stacks/HDP/1.3.4/services/GANGLIA/package/scripts/ganglia_monitor.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.4/services/GANGLIA/package/scripts/ganglia_monitor.py b/ambari-server/src/main/resources/stacks/HDP/1.3.4/services/GANGLIA/package/scripts/ganglia_monitor.py
index 3fa7f5e..bddecf6 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.4/services/GANGLIA/package/scripts/ganglia_monitor.py
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.4/services/GANGLIA/package/scripts/ganglia_monitor.py
@@ -75,42 +75,71 @@ class GangliaMonitor(Script):
                       role = "monitor",
                       owner = "root",
                       group = params.user_group)
+
     if params.is_jtnode_master:
       generate_daemon("gmond",
                       name = "HDPJobTracker",
                       role = "monitor",
                       owner = "root",
                       group = params.user_group)
+
     if params.is_rmnode_master:
       generate_daemon("gmond",
                       name = "HDPResourceManager",
                       role = "monitor",
                       owner = "root",
                       group = params.user_group)
+
     if params.is_hsnode_master:
       generate_daemon("gmond",
                       name = "HDPHistoryServer",
                       role = "monitor",
                       owner = "root",
                       group = params.user_group)
+
     if params.is_hbase_master:
       generate_daemon("gmond",
                       name = "HDPHBaseMaster",
                       role = "monitor",
                       owner = "root",
                       group = params.user_group)
-    not_any_master = params.is_namenode_master == False and \
-                     params.is_jtnode_master == False and \
-                     params.is_rmnode_master == False and \
-                     params.is_hsnode_master == False and \
-                     params.is_hbase_master == False
-    if params.is_slave or not_any_master:
+
+    if params.is_hsnode_master:
+      generate_daemon("gmond",
+                      name = "HDPHistoryServer",
+                      role = "monitor",
+                      owner = "root",
+                      group = params.user_group)
+
+    if params.is_slave:
+      generate_daemon("gmond",
+                      name = "HDPDataNode",
+                      role = "monitor",
+                      owner = "root",
+                      group = params.user_group)
+
+    if params.is_tasktracker:
+      generate_daemon("gmond",
+                      name = "HDPTaskTracker",
+                      role = "monitor",
+                      owner = "root",
+                      group = params.user_group)
+
+    if params.is_hbase_rs:
       generate_daemon("gmond",
-                      name = "HDPSlaves",
+                      name = "HDPHBaseRegionServer",
                       role = "monitor",
                       owner = "root",
                       group = params.user_group)
 
+    if params.is_flume:
+      generate_daemon("gmond",
+                      name = "HDPFlumeServer",
+                      role = "monitor",
+                      owner = "root",
+                      group = params.user_group)
+
+
     Directory(path.join(params.ganglia_dir, "conf.d"),
               owner="root",
               group=params.user_group

http://git-wip-us.apache.org/repos/asf/ambari/blob/1e0326ba/ambari-server/src/main/resources/stacks/HDP/1.3.4/services/GANGLIA/package/scripts/ganglia_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.4/services/GANGLIA/package/scripts/ganglia_server.py b/ambari-server/src/main/resources/stacks/HDP/1.3.4/services/GANGLIA/package/scripts/ganglia_server.py
index d8e3746..293b5c3 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.4/services/GANGLIA/package/scripts/ganglia_server.py
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.4/services/GANGLIA/package/scripts/ganglia_server.py
@@ -64,32 +64,58 @@ class GangliaServer(Script):
                       role = "server",
                       owner = "root",
                       group = params.user_group)
+
     if params.has_jobtracker:
       generate_daemon("gmond",
                       name = "HDPJobTracker",
                       role = "server",
                       owner = "root",
                       group = params.user_group)
+
     if params.has_hbase_masters:
       generate_daemon("gmond",
                       name = "HDPHBaseMaster",
                       role = "server",
                       owner = "root",
                       group = params.user_group)
+
     if params.has_resourcemanager:
       generate_daemon("gmond",
                       name = "HDPResourceManager",
                       role = "server",
                       owner = "root",
                       group = params.user_group)
-    if params.has_histroryserver:
+    if params.has_historyserver:
       generate_daemon("gmond",
                       name = "HDPHistoryServer",
                       role = "server",
                       owner = "root",
                       group = params.user_group)
-    generate_daemon("gmond",
-                      name = "HDPSlaves",
+
+    if params.has_slaves:
+      generate_daemon("gmond",
+                      name = "HDPDataNode",
+                      role = "server",
+                      owner = "root",
+                      group = params.user_group)
+
+    if params.has_tasktracker:
+      generate_daemon("gmond",
+                      name = "HDPTaskTracker",
+                      role = "server",
+                      owner = "root",
+                      group = params.user_group)
+
+    if params.has_hbase_rs:
+      generate_daemon("gmond",
+                      name = "HDPHBaseRegionServer",
+                      role = "server",
+                      owner = "root",
+                      group = params.user_group)
+
+    if params.has_flume:
+      generate_daemon("gmond",
+                      name = "HDPFlumeServer",
                       role = "server",
                       owner = "root",
                       group = params.user_group)

http://git-wip-us.apache.org/repos/asf/ambari/blob/1e0326ba/ambari-server/src/main/resources/stacks/HDP/1.3.4/services/GANGLIA/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.4/services/GANGLIA/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/1.3.4/services/GANGLIA/package/scripts/params.py
index 96ef072..3700d0a 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.4/services/GANGLIA/package/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.4/services/GANGLIA/package/scripts/params.py
@@ -42,7 +42,11 @@ jtnode_host = default("/clusterHostInfo/jtnode_host", [])
 rm_host = default("/clusterHostInfo/rm_host", [])
 hs_host = default("/clusterHostInfo/hs_host", [])
 hbase_master_hosts = default("/clusterHostInfo/hbase_master_hosts", [])
+# datanodes are marked as slave_hosts
 slave_hosts = default("/clusterHostInfo/slave_hosts", [])
+tt_hosts = default("/clusterHostInfo/mapred_tt_hosts", [])
+hbase_rs_hosts = default("/clusterHostInfo/hbase_rs_hosts", [])
+flume_hosts = default("/clusterHostInfo/flume_hosts", [])
 
 is_namenode_master = hostname in namenode_host
 is_jtnode_master = hostname in jtnode_host
@@ -50,13 +54,19 @@ is_rmnode_master = hostname in rm_host
 is_hsnode_master = hostname in hs_host
 is_hbase_master = hostname in hbase_master_hosts
 is_slave = hostname in slave_hosts
+is_tasktracker = hostname in tt_hosts
+is_hbase_rs = hostname in hbase_rs_hosts
+is_flume = hostname in flume_hosts
 
 has_namenodes = not len(namenode_host) == 0
 has_jobtracker = not len(jtnode_host) == 0
 has_resourcemanager = not len(rm_host) == 0
-has_histroryserver = not len(hs_host) == 0
+has_historyserver = not len(hs_host) == 0
 has_hbase_masters = not len(hbase_master_hosts) == 0
 has_slaves = not len(slave_hosts) == 0
+has_tasktracker = not len(tt_hosts) == 0
+has_hbase_rs = not len(hbase_rs_hosts) == 0
+has_flume = not len(flume_hosts) == 0
 
 if System.get_instance().platform == "suse":
   rrd_py_path = '/srv/www/cgi-bin'

http://git-wip-us.apache.org/repos/asf/ambari/blob/1e0326ba/ambari-server/src/main/resources/stacks/HDP/1.3.4/services/GANGLIA/package/templates/gangliaClusters.conf.j2
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.4/services/GANGLIA/package/templates/gangliaClusters.conf.j2 b/ambari-server/src/main/resources/stacks/HDP/1.3.4/services/GANGLIA/package/templates/gangliaClusters.conf.j2
index f9e708a..23588a5 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.4/services/GANGLIA/package/templates/gangliaClusters.conf.j2
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.4/services/GANGLIA/package/templates/gangliaClusters.conf.j2
@@ -20,7 +20,13 @@
 ### ClusterName           GmondMasterHost   GmondPort ###
 #########################################################
 
-    HDPSlaves       	{{ganglia_server_host}}  8660
+    HDPJournalNode      {{ganglia_server_host}}   8654
+    HDPFlumeServer      {{ganglia_server_host}}   8655
+    HDPHBaseRegionServer       	{{ganglia_server_host}}   8656
+    HDPNodeManager     	{{ganglia_server_host}}   8657
+    HDPTaskTracker     	{{ganglia_server_host}}   8658
+    HDPDataNode       	{{ganglia_server_host}}   8659
+    HDPSlaves       	{{ganglia_server_host}}   8660
     HDPNameNode         {{ganglia_server_host}}   8661
     HDPJobTracker     	{{ganglia_server_host}}  8662
     HDPHBaseMaster      {{ganglia_server_host}}   8663

http://git-wip-us.apache.org/repos/asf/ambari/blob/1e0326ba/ambari-server/src/main/resources/stacks/HDP/2.0.8/hooks/before-START/templates/hadoop-metrics2.properties.j2
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.8/hooks/before-START/templates/hadoop-metrics2.properties.j2 b/ambari-server/src/main/resources/stacks/HDP/2.0.8/hooks/before-START/templates/hadoop-metrics2.properties.j2
index 990f42d..a6a66ef 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.8/hooks/before-START/templates/hadoop-metrics2.properties.j2
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.8/hooks/before-START/templates/hadoop-metrics2.properties.j2
@@ -30,15 +30,15 @@
 
 # Hook up to the server
 namenode.sink.ganglia.servers={{ganglia_server_host}}:8661
-datanode.sink.ganglia.servers={{ganglia_server_host}}:8660
+datanode.sink.ganglia.servers={{ganglia_server_host}}:8659
 jobtracker.sink.ganglia.servers={{ganglia_server_host}}:8662
-tasktracker.sink.ganglia.servers={{ganglia_server_host}}:8660
+tasktracker.sink.ganglia.servers={{ganglia_server_host}}:8658
 maptask.sink.ganglia.servers={{ganglia_server_host}}:8660
 reducetask.sink.ganglia.servers={{ganglia_server_host}}:8660
 resourcemanager.sink.ganglia.servers={{ganglia_server_host}}:8664
-nodemanager.sink.ganglia.servers={{ganglia_server_host}}:8660
+nodemanager.sink.ganglia.servers={{ganglia_server_host}}:8657
 historyserver.sink.ganglia.servers={{ganglia_server_host}}:8666
-journalnode.sink.ganglia.servers={{ganglia_server_host}}:8660
+journalnode.sink.ganglia.servers={{ganglia_server_host}}:8654
 
 resourcemanager.sink.ganglia.tagsForPrefix.yarn=Queue
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/1e0326ba/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/GANGLIA/package/scripts/ganglia_monitor.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/GANGLIA/package/scripts/ganglia_monitor.py b/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/GANGLIA/package/scripts/ganglia_monitor.py
index 3fa7f5e..6ae004b 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/GANGLIA/package/scripts/ganglia_monitor.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/GANGLIA/package/scripts/ganglia_monitor.py
@@ -75,38 +75,80 @@ class GangliaMonitor(Script):
                       role = "monitor",
                       owner = "root",
                       group = params.user_group)
+
     if params.is_jtnode_master:
       generate_daemon("gmond",
                       name = "HDPJobTracker",
                       role = "monitor",
                       owner = "root",
                       group = params.user_group)
+
     if params.is_rmnode_master:
       generate_daemon("gmond",
                       name = "HDPResourceManager",
                       role = "monitor",
                       owner = "root",
                       group = params.user_group)
+
     if params.is_hsnode_master:
       generate_daemon("gmond",
                       name = "HDPHistoryServer",
                       role = "monitor",
                       owner = "root",
                       group = params.user_group)
+
     if params.is_hbase_master:
       generate_daemon("gmond",
                       name = "HDPHBaseMaster",
                       role = "monitor",
                       owner = "root",
                       group = params.user_group)
-    not_any_master = params.is_namenode_master == False and \
-                     params.is_jtnode_master == False and \
-                     params.is_rmnode_master == False and \
-                     params.is_hsnode_master == False and \
-                     params.is_hbase_master == False
-    if params.is_slave or not_any_master:
+
+    if params.is_nodemanager:
+      generate_daemon("gmond",
+                      name = "HDPNodeManager",
+                      role = "monitor",
+                      owner = "root",
+                      group = params.user_group)
+
+    if params.is_hsnode_master:
+      generate_daemon("gmond",
+                      name = "HDPHistoryServer",
+                      role = "monitor",
+                      owner = "root",
+                      group = params.user_group)
+
+    if params.is_slave:
+      generate_daemon("gmond",
+                      name = "HDPDataNode",
+                      role = "monitor",
+                      owner = "root",
+                      group = params.user_group)
+
+    if params.is_tasktracker:
+      generate_daemon("gmond",
+                      name = "HDPTaskTracker",
+                      role = "monitor",
+                      owner = "root",
+                      group = params.user_group)
+
+    if params.is_hbase_rs:
+      generate_daemon("gmond",
+                      name = "HDPHBaseRegionServer",
+                      role = "monitor",
+                      owner = "root",
+                      group = params.user_group)
+
+    if params.is_flume:
+      generate_daemon("gmond",
+                      name = "HDPFlumeServer",
+                      role = "monitor",
+                      owner = "root",
+                      group = params.user_group)
+
+    if params.is_jn_host:
       generate_daemon("gmond",
-                      name = "HDPSlaves",
+                      name = "HDPJournalNode",
                       role = "monitor",
                       owner = "root",
                       group = params.user_group)

http://git-wip-us.apache.org/repos/asf/ambari/blob/1e0326ba/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/GANGLIA/package/scripts/ganglia_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/GANGLIA/package/scripts/ganglia_server.py b/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/GANGLIA/package/scripts/ganglia_server.py
index d8e3746..9f4f705 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/GANGLIA/package/scripts/ganglia_server.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/GANGLIA/package/scripts/ganglia_server.py
@@ -64,35 +64,77 @@ class GangliaServer(Script):
                       role = "server",
                       owner = "root",
                       group = params.user_group)
+
     if params.has_jobtracker:
       generate_daemon("gmond",
                       name = "HDPJobTracker",
                       role = "server",
                       owner = "root",
                       group = params.user_group)
+
     if params.has_hbase_masters:
       generate_daemon("gmond",
                       name = "HDPHBaseMaster",
                       role = "server",
                       owner = "root",
                       group = params.user_group)
+
     if params.has_resourcemanager:
       generate_daemon("gmond",
                       name = "HDPResourceManager",
                       role = "server",
                       owner = "root",
                       group = params.user_group)
-    if params.has_histroryserver:
+
+    if params.has_nodemanager:
+      generate_daemon("gmond",
+                      name = "HDPNodeManager",
+                      role = "server",
+                      owner = "root",
+                      group = params.user_group)
+
+    if params.has_historyserver:
       generate_daemon("gmond",
                       name = "HDPHistoryServer",
                       role = "server",
                       owner = "root",
                       group = params.user_group)
-    generate_daemon("gmond",
-                      name = "HDPSlaves",
+
+    if params.has_slaves:
+      generate_daemon("gmond",
+                      name = "HDPDataNode",
+                      role = "server",
+                      owner = "root",
+                      group = params.user_group)
+
+    if params.has_tasktracker:
+      generate_daemon("gmond",
+                      name = "HDPTaskTracker",
+                      role = "server",
+                      owner = "root",
+                      group = params.user_group)
+
+    if params.has_hbase_rs:
+      generate_daemon("gmond",
+                      name = "HDPHBaseRegionServer",
+                      role = "server",
+                      owner = "root",
+                      group = params.user_group)
+
+    if params.has_flume:
+      generate_daemon("gmond",
+                      name = "HDPFlumeServer",
+                      role = "server",
+                      owner = "root",
+                      group = params.user_group)
+
+    if params.has_journalnode:
+      generate_daemon("gmond",
+                      name = "HDPJournalNode",
                       role = "server",
                       owner = "root",
                       group = params.user_group)
+
     generate_daemon("gmetad",
                     name = "gmetad",
                     role = "server",

http://git-wip-us.apache.org/repos/asf/ambari/blob/1e0326ba/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/GANGLIA/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/GANGLIA/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/GANGLIA/package/scripts/params.py
index 99245e3..32a7e4b 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/GANGLIA/package/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/GANGLIA/package/scripts/params.py
@@ -42,7 +42,13 @@ jtnode_host = default("/clusterHostInfo/jtnode_host", [])
 rm_host = default("/clusterHostInfo/rm_host", [])
 hs_host = default("/clusterHostInfo/hs_host", [])
 hbase_master_hosts = default("/clusterHostInfo/hbase_master_hosts", [])
+# datanodes are marked as slave_hosts
 slave_hosts = default("/clusterHostInfo/slave_hosts", [])
+tt_hosts = default("/clusterHostInfo/mapred_tt_hosts", [])
+nm_hosts = default("/clusterHostInfo/nm_hosts", [])
+hbase_rs_hosts = default("/clusterHostInfo/hbase_rs_hosts", [])
+flume_hosts = default("/clusterHostInfo/flume_hosts", [])
+jn_hosts = default("/clusterHostInfo/journalnode_hosts", [])
 
 is_namenode_master = hostname in namenode_host
 is_jtnode_master = hostname in jtnode_host
@@ -50,13 +56,23 @@ is_rmnode_master = hostname in rm_host
 is_hsnode_master = hostname in hs_host
 is_hbase_master = hostname in hbase_master_hosts
 is_slave = hostname in slave_hosts
+is_tasktracker = hostname in tt_hosts
+is_nodemanager = hostname in nm_hosts
+is_hbase_rs = hostname in hbase_rs_hosts
+is_flume = hostname in flume_hosts
+is_jn_host = hostname in jn_hosts
 
 has_namenodes = not len(namenode_host) == 0
 has_jobtracker = not len(jtnode_host) == 0
 has_resourcemanager = not len(rm_host) == 0
-has_histroryserver = not len(hs_host) == 0
+has_historyserver = not len(hs_host) == 0
 has_hbase_masters = not len(hbase_master_hosts) == 0
 has_slaves = not len(slave_hosts) == 0
+has_tasktracker = not len(tt_hosts) == 0
+has_nodemanager = not len(nm_hosts) == 0
+has_hbase_rs = not len(hbase_rs_hosts) == 0
+has_flume = not len(flume_hosts) == 0
+has_journalnode = not len(jn_hosts) == 0
 
 if System.get_instance().platform == "suse":
   rrd_py_path = '/srv/www/cgi-bin'

http://git-wip-us.apache.org/repos/asf/ambari/blob/1e0326ba/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/GANGLIA/package/templates/gangliaClusters.conf.j2
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/GANGLIA/package/templates/gangliaClusters.conf.j2 b/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/GANGLIA/package/templates/gangliaClusters.conf.j2
index f9e708a..f3bb355 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/GANGLIA/package/templates/gangliaClusters.conf.j2
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/GANGLIA/package/templates/gangliaClusters.conf.j2
@@ -20,9 +20,16 @@
 ### ClusterName           GmondMasterHost   GmondPort ###
 #########################################################
 
-    HDPSlaves       	{{ganglia_server_host}}  8660
+    HDPJournalNode      {{ganglia_server_host}}   8654
+    HDPFlumeServer      {{ganglia_server_host}}   8655
+    HDPHBaseRegionServer       	{{ganglia_server_host}}   8656
+    HDPNodeManager     	{{ganglia_server_host}}   8657
+    HDPTaskTracker     	{{ganglia_server_host}}   8658
+    HDPDataNode       	{{ganglia_server_host}}   8659
+    HDPSlaves       	{{ganglia_server_host}}   8660
     HDPNameNode         {{ganglia_server_host}}   8661
-    HDPJobTracker     	{{ganglia_server_host}}  8662
+    HDPJobTracker     	{{ganglia_server_host}}   8662
     HDPHBaseMaster      {{ganglia_server_host}}   8663
     HDPResourceManager  {{ganglia_server_host}}   8664
     HDPHistoryServer    {{ganglia_server_host}}   8666
+

http://git-wip-us.apache.org/repos/asf/ambari/blob/1e0326ba/ambari-server/src/test/java/org/apache/ambari/server/controller/ganglia/GangliaPropertyProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/ganglia/GangliaPropertyProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/ganglia/GangliaPropertyProviderTest.java
index ac2cb2f..f981e98 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/ganglia/GangliaPropertyProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/ganglia/GangliaPropertyProviderTest.java
@@ -28,6 +28,7 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.Set;
 
 import org.apache.ambari.server.configuration.ComponentSSLConfiguration;
@@ -125,7 +126,7 @@ public class GangliaPropertyProviderTest {
 
 
     String expected = (configuration.isGangliaSSL() ? "https" : "http") +
-        "://domU-12-31-39-0E-34-E1.compute-1.internal/cgi-bin/rrd.py?c=HDPSlaves&h=domU-12-31-39-0E-34-E1.compute-1.internal&m=jvm.metrics.gcCount&s=10&e=20&r=1";
+        "://domU-12-31-39-0E-34-E1.compute-1.internal/cgi-bin/rrd.py?c=HDPDataNode%2CHDPSlaves&h=domU-12-31-39-0E-34-E1.compute-1.internal&m=jvm.metrics.gcCount&s=10&e=20&r=1";
     Assert.assertEquals(expected, streamProvider.getLastSpec());
 
     Assert.assertEquals(3, PropertyHelper.getProperties(resource).size());
@@ -175,7 +176,7 @@ public class GangliaPropertyProviderTest {
     expectedUri.setScheme((configuration.isGangliaSSL() ? "https" : "http"));
     expectedUri.setHost("domU-12-31-39-0E-34-E1.compute-1.internal");
     expectedUri.setPath("/cgi-bin/rrd.py");
-    expectedUri.setParameter("c", "HDPSlaves");
+    expectedUri.setParameter("c", "HDPTaskTracker,HDPSlaves");
     expectedUri.setParameter("h", "domU-12-31-39-0E-34-E1.compute-1.internal");
     expectedUri.setParameter("m", metricsList);
     expectedUri.setParameter("s", "10");
@@ -191,7 +192,6 @@ public class GangliaPropertyProviderTest {
     
     Assert.assertTrue(isUrlParamsEquals(actualUri, expectedUri));
 
-
     Assert.assertEquals(6, PropertyHelper.getProperties(resource).size());
 
     Assert.assertNotNull(resource.getPropertyValue(shuffle_exceptions_caught));
@@ -253,7 +253,7 @@ public class GangliaPropertyProviderTest {
 
   @Test
   public void testPopulateManyResources() throws Exception {
-    TestStreamProvider streamProvider  = new TestStreamProvider("temporal_ganglia_data.txt");
+    TestStreamProvider streamProvider  = new TestStreamProvider("temporal_ganglia_data_1.txt");
     TestGangliaHostProvider hostProvider = new TestGangliaHostProvider();
 
     GangliaPropertyProvider propertyProvider = new GangliaHostPropertyProvider(
@@ -292,7 +292,7 @@ public class GangliaPropertyProviderTest {
     uriBuilder.setScheme((configuration.isGangliaSSL() ? "https" : "http"));
     uriBuilder.setHost("domU-12-31-39-0E-34-E1.compute-1.internal");
     uriBuilder.setPath("/cgi-bin/rrd.py");
-    uriBuilder.setParameter("c", "HDPJobTracker,HDPHBaseMaster,HDPResourceManager,HDPSlaves,HDPHistoryServer,HDPNameNode");
+    uriBuilder.setParameter("c", "HDPJobTracker,HDPHBaseMaster,HDPResourceManager,HDPFlumeServer,HDPSlaves,HDPHistoryServer,HDPJournalNode,HDPTaskTracker,HDPHBaseRegionServer,HDPNameNode");
     uriBuilder.setParameter("h", "domU-12-31-39-0E-34-E3.compute-1.internal,domU-12-31-39-0E-34-E1.compute-1.internal,domU-12-31-39-0E-34-E2.compute-1.internal");
     uriBuilder.setParameter("m", "jvm.metrics.gcCount");
     uriBuilder.setParameter("s", "10");
@@ -301,7 +301,6 @@ public class GangliaPropertyProviderTest {
 
     String expected = uriBuilder.toString();
     
-    
     Assert.assertEquals(expected, streamProvider.getLastSpec());
 
     for (Resource res : resources) {
@@ -352,7 +351,7 @@ public class GangliaPropertyProviderTest {
     expectedUri.setScheme((configuration.isGangliaSSL() ? "https" : "http"));
     expectedUri.setHost("domU-12-31-39-0E-34-E1.compute-1.internal");
     expectedUri.setPath("/cgi-bin/rrd.py");
-    expectedUri.setParameter("c", "HDPJobTracker,HDPHBaseMaster,HDPResourceManager,HDPSlaves,HDPHistoryServer,HDPNameNode");
+    expectedUri.setParameter("c", "HDPJobTracker,HDPHBaseMaster,HDPResourceManager,HDPFlumeServer,HDPSlaves,HDPHistoryServer,HDPJournalNode,HDPTaskTracker,HDPHBaseRegionServer,HDPNameNode");
    
     expectedUri.setParameter("h", hostsList.toString());
     expectedUri.setParameter("m", "jvm.metrics.gcCount");
@@ -408,7 +407,7 @@ public class GangliaPropertyProviderTest {
     expectedUri.setScheme((configuration.isGangliaSSL() ? "https" : "http"));
     expectedUri.setHost("domU-12-31-39-0E-34-E1.compute-1.internal");
     expectedUri.setPath("/cgi-bin/rrd.py");
-    expectedUri.setParameter("c", "HDPSlaves");
+    expectedUri.setParameter("c", "HDPFlumeServer,HDPSlaves");
     expectedUri.setParameter("h", "ip-10-39-113-33.ec2.internal");
     expectedUri.setParameter("m", metricsList);
     expectedUri.setParameter("s", "10");
@@ -471,7 +470,7 @@ public class GangliaPropertyProviderTest {
     expectedUri.setScheme((configuration.isGangliaSSL() ? "https" : "http"));
     expectedUri.setHost("domU-12-31-39-0E-34-E1.compute-1.internal");
     expectedUri.setPath("/cgi-bin/rrd.py");
-    expectedUri.setParameter("c", "HDPSlaves");
+    expectedUri.setParameter("c", "HDPFlumeServer,HDPSlaves");
     expectedUri.setParameter("h", "ip-10-39-113-33.ec2.internal");
     expectedUri.setParameter("m", metricsList);
     expectedUri.setParameter("e", "now");
@@ -516,7 +515,8 @@ public class GangliaPropertyProviderTest {
     Assert.assertEquals(1, propertyProvider.populateResources(Collections.singleton(resource), request, null).size());
 
     String expected = (configuration.isGangliaSSL() ? "https" : "http") +
-        "://domU-12-31-39-0E-34-E1.compute-1.internal/cgi-bin/rrd.py?c=HDPSlaves&h=ip-10-39-113-33.ec2.internal&m=";
+        "://domU-12-31-39-0E-34-E1.compute-1.internal/cgi-bin/rrd.py?c=HDPFlumeServer%2CHDPSlaves&h=ip-10-39-113-33.ec2.internal&m=";
+    
     Assert.assertTrue(streamProvider.getLastSpec().startsWith(expected));
 
     Assert.assertEquals(33, PropertyHelper.getProperties(resource).size());
@@ -562,7 +562,7 @@ public class GangliaPropertyProviderTest {
     expectedUri.setScheme((configuration.isGangliaSSL() ? "https" : "http"));
     expectedUri.setHost("domU-12-31-39-0E-34-E1.compute-1.internal");
     expectedUri.setPath("/cgi-bin/rrd.py");
-    expectedUri.setParameter("c", "HDPSlaves");
+    expectedUri.setParameter("c", "HDPFlumeServer,HDPSlaves");
     expectedUri.setParameter("h", "ip-10-39-113-33.ec2.internal");
     expectedUri.setParameter("m", metricsList);
     expectedUri.setParameter("s", "10");
@@ -620,7 +620,7 @@ public class GangliaPropertyProviderTest {
     expectedUri.setScheme((configuration.isGangliaSSL() ? "https" : "http"));
     expectedUri.setHost("domU-12-31-39-0E-34-E1.compute-1.internal");
     expectedUri.setPath("/cgi-bin/rrd.py");
-    expectedUri.setParameter("c", "HDPSlaves");
+    expectedUri.setParameter("c", "HDPFlumeServer,HDPSlaves");
     expectedUri.setParameter("h", "ip-10-39-113-33.ec2.internal");
     expectedUri.setParameter("m", metricsList);
     expectedUri.setParameter("s", "10");
@@ -679,7 +679,7 @@ public class GangliaPropertyProviderTest {
     expectedUri.setScheme((configuration.isGangliaSSL() ? "https" : "http"));
     expectedUri.setHost("domU-12-31-39-0E-34-E1.compute-1.internal");
     expectedUri.setPath("/cgi-bin/rrd.py");
-    expectedUri.setParameter("c", "HDPSlaves");
+    expectedUri.setParameter("c", "HDPFlumeServer,HDPSlaves");
     expectedUri.setParameter("h", "ip-10-39-113-33.ec2.internal");
     expectedUri.setParameter("m", metricsList);
     expectedUri.setParameter("s", "10");
@@ -738,7 +738,7 @@ public class GangliaPropertyProviderTest {
     expectedUri.setScheme((configuration.isGangliaSSL() ? "https" : "http"));
     expectedUri.setHost("domU-12-31-39-0E-34-E1.compute-1.internal");
     expectedUri.setPath("/cgi-bin/rrd.py");
-    expectedUri.setParameter("c", "HDPSlaves");
+    expectedUri.setParameter("c", "HDPFlumeServer,HDPSlaves");
     expectedUri.setParameter("h", "ip-10-39-113-33.ec2.internal");
     expectedUri.setParameter("m", metricsList);
     expectedUri.setParameter("s", "10");

http://git-wip-us.apache.org/repos/asf/ambari/blob/1e0326ba/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackDefinedPropertyProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackDefinedPropertyProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackDefinedPropertyProviderTest.java
index 607fc6f..6ce0022 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackDefinedPropertyProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackDefinedPropertyProviderTest.java
@@ -26,6 +26,7 @@ import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.Map.Entry;
 
 import org.apache.ambari.server.controller.ganglia.GangliaHostComponentPropertyProvider;
 import org.apache.ambari.server.controller.ganglia.GangliaPropertyProvider;

http://git-wip-us.apache.org/repos/asf/ambari/blob/1e0326ba/ambari-server/src/test/resources/flume_ganglia_data.txt
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/flume_ganglia_data.txt b/ambari-server/src/test/resources/flume_ganglia_data.txt
index c4abb30..b44b029 100644
--- a/ambari-server/src/test/resources/flume_ganglia_data.txt
+++ b/ambari-server/src/test/resources/flume_ganglia_data.txt
@@ -161997,7 +161997,7 @@ load_five
 0.00308333333333
 [~EOM]
 sum
-HDPSlaves
+HDPFlumeServer
 ip-10-39-113-33.ec2.internal
 cpu_idle
 1371116160
@@ -162140,7 +162140,7 @@ cpu_idle
 98.6988888889
 [~EOM]
 sum
-HDPSlaves
+HDPFlumeServer
 ip-10-39-113-33.ec2.internal
 flume.CHANNEL.c1.ChannelCapacity
 1371116160
@@ -162262,7 +162262,7 @@ flume.CHANNEL.c1.ChannelCapacity
 10000.0
 [~EOM]
 sum
-HDPSlaves
+HDPFlumeServer
 ip-10-39-113-33.ec2.internal
 flume.CHANNEL.c1.StartTime
 1371116160
@@ -162384,7 +162384,7 @@ flume.CHANNEL.c1.StartTime
 1.37117557853e+12
 [~EOM]
 sum
-HDPSlaves
+HDPFlumeServer
 ip-10-39-113-33.ec2.internal
 flume.CHANNEL.c1.EventTakeAttemptCount
 1371116160
@@ -162506,7 +162506,7 @@ flume.CHANNEL.c1.EventTakeAttemptCount
 2778.0
 [~EOM]
 sum
-HDPSlaves
+HDPFlumeServer
 ip-10-39-113-33.ec2.internal
 cpu_speed
 1371116160
@@ -162646,7 +162646,7 @@ cpu_speed
 2266.0
 [~EOM]
 sum
-HDPSlaves
+HDPFlumeServer
 ip-10-39-113-33.ec2.internal
 cpu_wio
 1371116160
@@ -162789,7 +162789,7 @@ cpu_wio
 0.0777777777778
 [~EOM]
 sum
-HDPSlaves
+HDPFlumeServer
 ip-10-39-113-33.ec2.internal
 proc_run
 1371116160
@@ -162932,7 +162932,7 @@ proc_run
 1.13611111111
 [~EOM]
 sum
-HDPSlaves
+HDPFlumeServer
 ip-10-39-113-33.ec2.internal
 flume.SINK.sink1.ConnectionCreatedCount
 1371116160
@@ -163054,7 +163054,7 @@ flume.SINK.sink1.ConnectionCreatedCount
 265.0
 [~EOM]
 sum
-HDPSlaves
+HDPFlumeServer
 ip-10-39-113-33.ec2.internal
 load_one
 1371116160
@@ -163197,7 +163197,7 @@ load_one
 0.00616666666667
 [~EOM]
 sum
-HDPSlaves
+HDPFlumeServer
 ip-10-39-113-33.ec2.internal
 cpu_num
 1371116160
@@ -163337,7 +163337,7 @@ cpu_num
 2.0
 [~EOM]
 sum
-HDPSlaves
+HDPFlumeServer
 ip-10-39-113-33.ec2.internal
 flume.SINK.sink1.BatchCompleteCount
 1371116160
@@ -163459,7 +163459,7 @@ flume.SINK.sink1.BatchCompleteCount
 0.0
 [~EOM]
 sum
-HDPSlaves
+HDPFlumeServer
 ip-10-39-113-33.ec2.internal
 bytes_in
 1371116160
@@ -163602,7 +163602,7 @@ bytes_in
 2497.8
 [~EOM]
 sum
-HDPSlaves
+HDPFlumeServer
 ip-10-39-113-33.ec2.internal
 flume.SINK.sink1.EventDrainSuccessCount
 1371116160
@@ -163724,7 +163724,7 @@ flume.SINK.sink1.EventDrainSuccessCount
 1940.0
 [~EOM]
 sum
-HDPSlaves
+HDPFlumeServer
 ip-10-39-113-33.ec2.internal
 swap_total
 1371116160
@@ -163864,7 +163864,7 @@ swap_total
 0.0
 [~EOM]
 sum
-HDPSlaves
+HDPFlumeServer
 ip-10-39-113-33.ec2.internal
 flume.SINK.sink1.StartTime
 1371116160
@@ -163986,7 +163986,7 @@ flume.SINK.sink1.StartTime
 1.37117557853e+12
 [~EOM]
 sum
-HDPSlaves
+HDPFlumeServer
 ip-10-39-113-33.ec2.internal
 cpu_aidle
 1371116160
@@ -164129,7 +164129,7 @@ cpu_aidle
 0.0
 [~EOM]
 sum
-HDPSlaves
+HDPFlumeServer
 ip-10-39-113-33.ec2.internal
 cpu_user
 1371116160
@@ -164272,7 +164272,7 @@ cpu_user
 0.721111111111
 [~EOM]
 sum
-HDPSlaves
+HDPFlumeServer
 ip-10-39-113-33.ec2.internal
 flume.CHANNEL.c1.EventTakeSuccessCount
 1371116160
@@ -164394,7 +164394,7 @@ flume.CHANNEL.c1.EventTakeSuccessCount
 1940.0
 [~EOM]
 sum
-HDPSlaves
+HDPFlumeServer
 ip-10-39-113-33.ec2.internal
 flume.SINK.sink1.EventDrainAttemptCount
 1371116160
@@ -164659,7 +164659,7 @@ bytes_out
 6786.544
 [~EOM]
 sum
-HDPSlaves
+HDPFlumeServer
 ip-10-39-113-33.ec2.internal
 disk_total
 1371116160
@@ -164802,7 +164802,7 @@ disk_total
 893.765
 [~EOM]
 sum
-HDPSlaves
+HDPFlumeServer
 ip-10-39-113-33.ec2.internal
 flume.CHANNEL.c1.EventPutAttemptCount
 1371116160
@@ -164924,7 +164924,7 @@ flume.CHANNEL.c1.EventPutAttemptCount
 1960.0
 [~EOM]
 sum
-HDPSlaves
+HDPFlumeServer
 ip-10-39-113-33.ec2.internal
 cpu_nice
 1371116160
@@ -165067,7 +165067,7 @@ cpu_nice
 0.0
 [~EOM]
 sum
-HDPSlaves
+HDPFlumeServer
 ip-10-39-113-33.ec2.internal
 flume.CHANNEL.c1.StopTime
 1371116160
@@ -165332,7 +165332,7 @@ pkts_out
 34.58
 [~EOM]
 sum
-HDPSlaves
+HDPFlumeServer
 ip-10-39-113-33.ec2.internal
 flume.SINK.sink1.ConnectionFailedCount
 1371116160
@@ -165454,7 +165454,7 @@ flume.SINK.sink1.ConnectionFailedCount
 0.0
 [~EOM]
 sum
-HDPSlaves
+HDPFlumeServer
 ip-10-39-113-33.ec2.internal
 cpu_system
 1371116160
@@ -165597,7 +165597,7 @@ cpu_system
 0.525
 [~EOM]
 sum
-HDPSlaves
+HDPFlumeServer
 ip-10-39-113-33.ec2.internal
 part_max_used
 1371116160
@@ -165740,7 +165740,7 @@ part_max_used
 64.8
 [~EOM]
 sum
-HDPSlaves
+HDPFlumeServer
 ip-10-39-113-33.ec2.internal
 flume.CHANNEL.c1.ChannelFillPercentage
 1371116160
@@ -165862,7 +165862,7 @@ flume.CHANNEL.c1.ChannelFillPercentage
 0.2
 [~EOM]
 sum
-HDPSlaves
+HDPFlumeServer
 ip-10-39-113-33.ec2.internal
 flume.CHANNEL.c1.ChannelSize
 1371116160
@@ -165984,7 +165984,7 @@ flume.CHANNEL.c1.ChannelSize
 20.0
 [~EOM]
 sum
-HDPSlaves
+HDPFlumeServer
 ip-10-39-113-33.ec2.internal
 disk_free
 1371116160
@@ -166270,7 +166270,7 @@ load_fifteen
 0.0
 [~EOM]
 sum
-HDPSlaves
+HDPFlumeServer
 ip-10-39-113-33.ec2.internal
 flume.CHANNEL.c1.EventPutSuccessCount
 1371116160
@@ -166535,7 +166535,7 @@ mem_total
 7646152.0
 [~EOM]
 sum
-HDPSlaves
+HDPFlumeServer
 ip-10-39-113-33.ec2.internal
 flume.SINK.sink1.BatchUnderflowCount
 1371116160
@@ -166657,7 +166657,7 @@ flume.SINK.sink1.BatchUnderflowCount
 97.0
 [~EOM]
 sum
-HDPSlaves
+HDPFlumeServer
 ip-10-39-113-33.ec2.internal
 flume.SINK.sink1.ConnectionClosedCount
 1371116160
@@ -166779,7 +166779,7 @@ flume.SINK.sink1.ConnectionClosedCount
 264.0
 [~EOM]
 sum
-HDPSlaves
+HDPFlumeServer
 ip-10-39-113-33.ec2.internal
 flume.SINK.sink1.StopTime
 1371116160
@@ -167473,7 +167473,7 @@ mem_shared
 0.0
 [~EOM]
 sum
-HDPSlaves
+HDPFlumeServer
 ip-10-39-113-33.ec2.internal
 boottime
 1371116160
@@ -167756,7 +167756,7 @@ swap_free
 0.0
 [~EOM]
 sum
-HDPSlaves
+HDPFlumeServer
 ip-10-39-113-33.ec2.internal
 flume.SINK.sink1.BatchEmptyCount
 1371116160
@@ -169732,7 +169732,7 @@ cpu_idle
 283.961388889
 [~EOM]
 sum
-HDPSlaves
+HDPFlumeServer
 __SummaryInfo__
 flume.CHANNEL.c1.ChannelCapacity
 1371116160
@@ -173836,7 +173836,7 @@ rpc.metrics.stopMaster_avg_time
 0.0
 [~EOM]
 sum
-HDPSlaves
+HDPFlumeServer
 __SummaryInfo__
 flume.CHANNEL.c1.StartTime
 1371116160
@@ -176234,7 +176234,7 @@ rpc.metrics.replicateLogEntries_num_ops
 0.0
 [~EOM]
 sum
-HDPSlaves
+HDPFlumeServer
 __SummaryInfo__
 flume.CHANNEL.c1.EventTakeAttemptCount
 1371116160
@@ -183896,7 +183896,7 @@ rpc.metrics.getRegionInfo.aboveOneSec._num_ops
 0.0
 [~EOM]
 sum
-HDPSlaves
+HDPFlumeServer
 __SummaryInfo__
 flume.SINK.sink1.ConnectionCreatedCount
 1371116160
@@ -192695,7 +192695,7 @@ hbase.regionserver.compactionSize_avg_time
 0.0
 [~EOM]
 sum
-HDPSlaves
+HDPFlumeServer
 __SummaryInfo__
 flume.SINK.sink1.BatchCompleteCount
 1371116160
@@ -202205,7 +202205,7 @@ rpc.metrics.abort_avg_time
 0.0
 [~EOM]
 sum
-HDPSlaves
+HDPFlumeServer
 __SummaryInfo__
 flume.SINK.sink1.EventDrainSuccessCount
 1371116160
@@ -203890,7 +203890,7 @@ rpc.metrics.isRestoreSnapshotDone_num_ops
 0.0
 [~EOM]
 sum
-HDPSlaves
+HDPFlumeServer
 __SummaryInfo__
 flume.SINK.sink1.StartTime
 1371116160
@@ -208427,7 +208427,7 @@ cpu_user
 10.2077777778
 [~EOM]
 sum
-HDPSlaves
+HDPFlumeServer
 __SummaryInfo__
 flume.CHANNEL.c1.EventTakeSuccessCount
 1371116160
@@ -210967,7 +210967,7 @@ hbase.RegionServerDynamicStatistics.tbl..META..cf.info.memstoreSizeMB
 0.0
 [~EOM]
 sum
-HDPSlaves
+HDPFlumeServer
 __SummaryInfo__
 flume.SINK.sink1.EventDrainAttemptCount
 1371116160
@@ -217492,7 +217492,7 @@ rpc.metrics.checkAndPut_avg_time
 0.0
 [~EOM]
 sum
-HDPSlaves
+HDPFlumeServer
 __SummaryInfo__
 flume.CHANNEL.c1.EventPutAttemptCount
 1371116160
@@ -218898,7 +218898,7 @@ metricssystem.MetricsSystem.publish_min_time
 0.0
 [~EOM]
 sum
-HDPSlaves
+HDPFlumeServer
 __SummaryInfo__
 flume.CHANNEL.c1.StopTime
 1371116160
@@ -222584,7 +222584,7 @@ hbase.regionserver.updatesBlockedSecondsHighWater_mean
 0.0
 [~EOM]
 sum
-HDPSlaves
+HDPFlumeServer
 __SummaryInfo__
 flume.SINK.sink1.ConnectionFailedCount
 1371116160
@@ -225974,7 +225974,7 @@ hbase.RegionServerDynamicStatistics.storeFileSizeMB.max
 0.0
 [~EOM]
 sum
-HDPSlaves
+HDPFlumeServer
 __SummaryInfo__
 flume.CHANNEL.c1.ChannelFillPercentage
 1371116160
@@ -227236,7 +227236,7 @@ rpc.metrics.increment.aboveOneSec._num_ops
 0.0
 [~EOM]
 sum
-HDPSlaves
+HDPFlumeServer
 __SummaryInfo__
 flume.CHANNEL.c1.ChannelSize
 1371116160
@@ -234620,7 +234620,7 @@ hbase.regionserver.updatesBlockedSeconds_75th_percentile
 0.0
 [~EOM]
 sum
-HDPSlaves
+HDPFlumeServer
 __SummaryInfo__
 flume.CHANNEL.c1.EventPutSuccessCount
 1371116160
@@ -235027,7 +235027,7 @@ mem_total
 22938456.0
 [~EOM]
 sum
-HDPSlaves
+HDPFlumeServer
 __SummaryInfo__
 flume.SINK.sink1.BatchUnderflowCount
 1371116160
@@ -236288,7 +236288,7 @@ ugi.ugi.loginFailure_num_ops
 0.0
 [~EOM]
 sum
-HDPSlaves
+HDPFlumeServer
 __SummaryInfo__
 flume.SINK.sink1.ConnectionClosedCount
 1371116160
@@ -236979,7 +236979,7 @@ jvm.metrics.maxMemoryM
 1004.0
 [~EOM]
 sum
-HDPSlaves
+HDPFlumeServer
 __SummaryInfo__
 flume.SINK.sink1.StopTime
 1371116160
@@ -250617,7 +250617,7 @@ hbase.regionserver.fsPreadLatency_avg_time
 0.0
 [~EOM]
 sum
-HDPSlaves
+HDPFlumeServer
 __SummaryInfo__
 flume.SINK.sink1.BatchEmptyCount
 1371116160
@@ -256149,7 +256149,7 @@ bytes_out
 637.831
 [~EOM]
 sum
-HDPSlaves
+HDPFlumeServer
 ip-10-40-205-86.ec2.internal
 disk_total
 1371116160

http://git-wip-us.apache.org/repos/asf/ambari/blob/1e0326ba/ambari-server/src/test/resources/journalnode_ganglia_data.txt
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/journalnode_ganglia_data.txt b/ambari-server/src/test/resources/journalnode_ganglia_data.txt
index 503560b..ac52002 100644
--- a/ambari-server/src/test/resources/journalnode_ganglia_data.txt
+++ b/ambari-server/src/test/resources/journalnode_ganglia_data.txt
@@ -1,6 +1,6 @@
 1378331362.0
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 rpc.rpc.NumOpenConnections
 1378216155
@@ -8,7 +8,7 @@ rpc.rpc.NumOpenConnections
 1.0
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 metricssystem.MetricsSystem.NumAllSinks
 1378216155
@@ -16,7 +16,7 @@ metricssystem.MetricsSystem.NumAllSinks
 0.0
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 part_max_used
 1378216155
@@ -24,21 +24,21 @@ part_max_used
 12.8
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 rpcdetailed.rpcdetailed.NewEpochAvgTime
 1378216155
 15
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 rpcdetailed.rpcdetailed.FinalizeLogSegmentNumOps
 1378216155
 15
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 dfs.JournalNode.Syncs60s90thPercentileLatencyMicros
 1378216155
@@ -46,7 +46,7 @@ dfs.JournalNode.Syncs60s90thPercentileLatencyMicros
 0.0
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 ugi.UgiMetrics.LoginFailureAvgTime
 1378216155
@@ -54,7 +54,7 @@ ugi.UgiMetrics.LoginFailureAvgTime
 0.0
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 dfs.JournalNode.Syncs60s95thPercentileLatencyMicros
 1378216155
@@ -62,7 +62,7 @@ dfs.JournalNode.Syncs60s95thPercentileLatencyMicros
 0.0
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 metricssystem.MetricsSystem.Sink_gangliaDropped
 1378216155
@@ -70,7 +70,7 @@ metricssystem.MetricsSystem.Sink_gangliaDropped
 0.0
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 ugi.UgiMetrics.LoginSuccessNumOps
 1378216155
@@ -78,7 +78,7 @@ ugi.UgiMetrics.LoginSuccessNumOps
 0.0
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 jvm.JvmMetrics.GcTimeMillisPS Scavenge
 1378216155
@@ -86,7 +86,7 @@ jvm.JvmMetrics.GcTimeMillisPS Scavenge
 0.0
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 dfs.JournalNode.Syncs300sNumOps
 1378216155
@@ -94,7 +94,7 @@ dfs.JournalNode.Syncs300sNumOps
 0.0
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 metricssystem.MetricsSystem.SnapshotAvgTime
 1378216155
@@ -102,7 +102,7 @@ metricssystem.MetricsSystem.SnapshotAvgTime
 0.266666666667
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 rpcdetailed.rpcdetailed.GetEditLogManifestAvgTime
 1378216155
@@ -110,7 +110,7 @@ rpcdetailed.rpcdetailed.GetEditLogManifestAvgTime
 2.0
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 dfs.JournalNode.Syncs300s95thPercentileLatencyMicros
 1378216155
@@ -118,21 +118,21 @@ dfs.JournalNode.Syncs300s95thPercentileLatencyMicros
 0.0
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 rpcdetailed.rpcdetailed.JournalAvgTime
 1378216155
 15
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 rpcdetailed.rpcdetailed.StartLogSegmentNumOps
 1378216155
 15
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 rpc.rpc.RpcQueueTimeNumOps
 1378216155
@@ -140,7 +140,7 @@ rpc.rpc.RpcQueueTimeNumOps
 0.0266666666667
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 jvm.JvmMetrics.GcCountPS MarkSweep
 1378216155
@@ -148,7 +148,7 @@ jvm.JvmMetrics.GcCountPS MarkSweep
 0.0
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 dfs.JournalNode.Syncs60sNumOps
 1378216155
@@ -156,7 +156,7 @@ dfs.JournalNode.Syncs60sNumOps
 0.0
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 dfs.JournalNode.BatchesWritten
 1378216155
@@ -164,14 +164,14 @@ dfs.JournalNode.BatchesWritten
 0.0
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 rpcdetailed.rpcdetailed.PrepareRecoveryAvgTime
 1378216155
 15
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 dfs.JournalNode.LastWriterEpoch
 1378216155
@@ -179,7 +179,7 @@ dfs.JournalNode.LastWriterEpoch
 5.0
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 jvm.JvmMetrics.MemNonHeapCommittedM
 1378216155
@@ -187,7 +187,7 @@ jvm.JvmMetrics.MemNonHeapCommittedM
 23.5625
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 load_five
 1378216155
@@ -195,7 +195,7 @@ load_five
 0.114
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 dfs.JournalNode.Syncs300s75thPercentileLatencyMicros
 1378216155
@@ -203,7 +203,7 @@ dfs.JournalNode.Syncs300s75thPercentileLatencyMicros
 0.0
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 jvm.JvmMetrics.LogInfo
 1378216155
@@ -211,7 +211,7 @@ jvm.JvmMetrics.LogInfo
 0.0
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 metricssystem.MetricsSystem.DroppedPubAll
 1378216155
@@ -219,14 +219,14 @@ metricssystem.MetricsSystem.DroppedPubAll
 0.0
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 rpcdetailed.rpcdetailed.FinalizeLogSegmentAvgTime
 1378216155
 15
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 jvm.JvmMetrics.ThreadsTerminated
 1378216155
@@ -234,7 +234,7 @@ jvm.JvmMetrics.ThreadsTerminated
 0.0
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 rpc.rpc.CallQueueLength
 1378216155
@@ -242,7 +242,7 @@ rpc.rpc.CallQueueLength
 0.0
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 dfs.JournalNode.Syncs3600s99thPercentileLatencyMicros
 1378216155
@@ -250,7 +250,7 @@ dfs.JournalNode.Syncs3600s99thPercentileLatencyMicros
 0.0
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 jvm.JvmMetrics.MemHeapUsedM
 1378216155
@@ -258,7 +258,7 @@ jvm.JvmMetrics.MemHeapUsedM
 9.5575423
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 dfs.JournalNode.Syncs3600s50thPercentileLatencyMicros
 1378216155
@@ -266,7 +266,7 @@ dfs.JournalNode.Syncs3600s50thPercentileLatencyMicros
 0.0
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 load_one
 1378216155
@@ -274,7 +274,7 @@ load_one
 0.226
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 metricssystem.MetricsSystem.NumActiveSources
 1378216155
@@ -282,7 +282,7 @@ metricssystem.MetricsSystem.NumActiveSources
 5.0
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 metricssystem.MetricsSystem.PublishNumOps
 1378216155
@@ -290,7 +290,7 @@ metricssystem.MetricsSystem.PublishNumOps
 0.112380952381
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 jvm.JvmMetrics.ThreadsWaiting
 1378216155
@@ -298,7 +298,7 @@ jvm.JvmMetrics.ThreadsWaiting
 9.0
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 rpc.rpc.RpcProcessingTimeNumOps
 1378216155
@@ -306,7 +306,7 @@ rpc.rpc.RpcProcessingTimeNumOps
 0.0266666666667
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 metricssystem.MetricsSystem.Sink_gangliaAvgTime
 1378216155
@@ -314,7 +314,7 @@ metricssystem.MetricsSystem.Sink_gangliaAvgTime
 25.4
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 swap_total
 1378216155
@@ -322,7 +322,7 @@ swap_total
 4128760.0
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 rpc.rpc.RpcAuthenticationSuccesses
 1378216155
@@ -330,7 +330,7 @@ rpc.rpc.RpcAuthenticationSuccesses
 0.0
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 cpu_user
 1378216155
@@ -338,14 +338,14 @@ cpu_user
 3.3
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 rpcdetailed.rpcdetailed.GetJournalStateNumOps
 1378216155
 15
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 dfs.JournalNode.Syncs300s90thPercentileLatencyMicros
 1378216155
@@ -353,7 +353,7 @@ dfs.JournalNode.Syncs300s90thPercentileLatencyMicros
 0.0
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 jvm.JvmMetrics.LogWarn
 1378216155
@@ -361,7 +361,7 @@ jvm.JvmMetrics.LogWarn
 0.0
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 metricssystem.MetricsSystem.SnapshotNumOps
 1378216155
@@ -369,7 +369,7 @@ metricssystem.MetricsSystem.SnapshotNumOps
 0.674285714286
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 rpc.rpc.RpcAuthenticationFailures
 1378216155
@@ -377,7 +377,7 @@ rpc.rpc.RpcAuthenticationFailures
 0.0
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 bytes_in
 1378216155
@@ -385,14 +385,14 @@ bytes_in
 22547.48
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 rpcdetailed.rpcdetailed.AcceptRecoveryAvgTime
 1378216155
 15
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 mem_free
 1378216155
@@ -400,7 +400,7 @@ mem_free
 1365496.0
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 mem_cached
 1378216155
@@ -408,7 +408,7 @@ mem_cached
 589576.0
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 mem_shared
 1378216155
@@ -416,7 +416,7 @@ mem_shared
 0.0
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 jvm.JvmMetrics.MemMaxM
 1378216155
@@ -424,7 +424,7 @@ jvm.JvmMetrics.MemMaxM
 910.25
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 dfs.JournalNode.Syncs300s50thPercentileLatencyMicros
 1378216155
@@ -432,7 +432,7 @@ dfs.JournalNode.Syncs300s50thPercentileLatencyMicros
 0.0
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 jvm.JvmMetrics.MemNonHeapUsedM
 1378216155
@@ -440,7 +440,7 @@ jvm.JvmMetrics.MemNonHeapUsedM
 22.78144
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 cpu_idle
 1378216155
@@ -448,7 +448,7 @@ cpu_idle
 88.2
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 dfs.JournalNode.LastPromisedEpoch
 1378216155
@@ -456,7 +456,7 @@ dfs.JournalNode.LastPromisedEpoch
 5.0
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 jvm.JvmMetrics.ThreadsBlocked
 1378216155
@@ -464,14 +464,14 @@ jvm.JvmMetrics.ThreadsBlocked
 0.0
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 rpcdetailed.rpcdetailed.AcceptRecoveryNumOps
 1378216155
 15
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 jvm.JvmMetrics.GcTimeMillis
 1378216155
@@ -479,14 +479,14 @@ jvm.JvmMetrics.GcTimeMillis
 0.0
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 rpcdetailed.rpcdetailed.PrepareRecoveryNumOps
 1378216155
 15
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 disk_total
 1378216155
@@ -494,7 +494,7 @@ disk_total
 101.515
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 rpc.rpc.RpcProcessingTimeAvgTime
 1378216155
@@ -502,7 +502,7 @@ rpc.rpc.RpcProcessingTimeAvgTime
 2.0
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 rpc.rpc.SentBytes
 1378216155
@@ -510,7 +510,7 @@ rpc.rpc.SentBytes
 1.01333333333
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 jvm.JvmMetrics.ThreadsNew
 1378216155
@@ -518,7 +518,7 @@ jvm.JvmMetrics.ThreadsNew
 0.0
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 load_fifteen
 1378216155
@@ -526,7 +526,7 @@ load_fifteen
 0.026
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 rpc.rpc.RpcQueueTimeAvgTime
 1378216155
@@ -534,7 +534,7 @@ rpc.rpc.RpcQueueTimeAvgTime
 0.0
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 jvm.JvmMetrics.GcCountPS Scavenge
 1378216155
@@ -542,7 +542,7 @@ jvm.JvmMetrics.GcCountPS Scavenge
 0.0
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 bytes_out
 1378216155
@@ -550,7 +550,7 @@ bytes_out
 5772.33
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 dfs.JournalNode.Syncs3600sNumOps
 1378216155
@@ -558,7 +558,7 @@ dfs.JournalNode.Syncs3600sNumOps
 0.0
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 jvm.JvmMetrics.ThreadsTimedWaiting
 1378216155
@@ -566,7 +566,7 @@ jvm.JvmMetrics.ThreadsTimedWaiting
 3.0
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 jvm.JvmMetrics.MemHeapCommittedM
 1378216155
@@ -574,7 +574,7 @@ jvm.JvmMetrics.MemHeapCommittedM
 48.8125
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 dfs.JournalNode.Syncs3600s95thPercentileLatencyMicros
 1378216155
@@ -582,14 +582,14 @@ dfs.JournalNode.Syncs3600s95thPercentileLatencyMicros
 0.0
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 rpcdetailed.rpcdetailed.StartLogSegmentAvgTime
 1378216155
 15
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 metricssystem.MetricsSystem.NumAllSources
 1378216155
@@ -597,7 +597,7 @@ metricssystem.MetricsSystem.NumAllSources
 5.0
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 dfs.JournalNode.Syncs3600s90thPercentileLatencyMicros
 1378216155
@@ -605,7 +605,7 @@ dfs.JournalNode.Syncs3600s90thPercentileLatencyMicros
 0.0
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 cpu_system
 1378216155
@@ -613,7 +613,7 @@ cpu_system
 8.4
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 pkts_in
 1378216155
@@ -621,7 +621,7 @@ pkts_in
 24.0
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 jvm.JvmMetrics.LogError
 1378216155
@@ -629,7 +629,7 @@ jvm.JvmMetrics.LogError
 0.0
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 dfs.JournalNode.Syncs3600s75thPercentileLatencyMicros
 1378216155
@@ -637,7 +637,7 @@ dfs.JournalNode.Syncs3600s75thPercentileLatencyMicros
 0.0
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 cpu_num
 1378216155
@@ -645,7 +645,7 @@ cpu_num
 2.0
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 disk_free
 1378216155
@@ -653,7 +653,7 @@ disk_free
 92.428
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 rpc.rpc.RpcAuthorizationSuccesses
 1378216155
@@ -661,7 +661,7 @@ rpc.rpc.RpcAuthorizationSuccesses
 0.0266666666667
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 cpu_nice
 1378216155
@@ -669,7 +669,7 @@ cpu_nice
 0.0
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 metricssystem.MetricsSystem.NumActiveSinks
 1378216155
@@ -677,7 +677,7 @@ metricssystem.MetricsSystem.NumActiveSinks
 1.0
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 mem_total
 1378216155
@@ -685,7 +685,7 @@ mem_total
 4055144.0
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 dfs.JournalNode.Syncs60s50thPercentileLatencyMicros
 1378216155
@@ -693,7 +693,7 @@ dfs.JournalNode.Syncs60s50thPercentileLatencyMicros
 0.0
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 dfs.JournalNode.CurrentLagTxns
 1378216155
@@ -701,7 +701,7 @@ dfs.JournalNode.CurrentLagTxns
 0.0
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 proc_total
 1378216155
@@ -709,14 +709,14 @@ proc_total
 657.0
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 rpcdetailed.rpcdetailed.NewEpochNumOps
 1378216155
 15
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 proc_run
 1378216155
@@ -724,7 +724,7 @@ proc_run
 4.0
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 metricssystem.MetricsSystem.Sink_gangliaNumOps
 1378216155
@@ -732,7 +732,7 @@ metricssystem.MetricsSystem.Sink_gangliaNumOps
 0.112380952381
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 swap_free
 1378216155
@@ -740,7 +740,7 @@ swap_free
 4128760.0
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 jvm.JvmMetrics.LogFatal
 1378216155
@@ -748,7 +748,7 @@ jvm.JvmMetrics.LogFatal
 0.0
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 pkts_out
 1378216155
@@ -756,7 +756,7 @@ pkts_out
 35.4
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 jvm.JvmMetrics.ThreadsRunnable
 1378216155
@@ -764,7 +764,7 @@ jvm.JvmMetrics.ThreadsRunnable
 6.0
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 cpu_wio
 1378216155
@@ -772,7 +772,7 @@ cpu_wio
 0.1
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 rpc.rpc.RpcAuthorizationFailures
 1378216155
@@ -780,7 +780,7 @@ rpc.rpc.RpcAuthorizationFailures
 0.0
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 dfs.JournalNode.BatchesWrittenWhileLagging
 1378216155
@@ -788,7 +788,7 @@ dfs.JournalNode.BatchesWrittenWhileLagging
 0.0
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 ugi.UgiMetrics.LoginFailureNumOps
 1378216155
@@ -796,7 +796,7 @@ ugi.UgiMetrics.LoginFailureNumOps
 0.0
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 dfs.JournalNode.TxnsWritten
 1378216155
@@ -804,7 +804,7 @@ dfs.JournalNode.TxnsWritten
 0.0
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 jvm.JvmMetrics.GcTimeMillisPS MarkSweep
 1378216155
@@ -812,7 +812,7 @@ jvm.JvmMetrics.GcTimeMillisPS MarkSweep
 0.0
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 dfs.JournalNode.BytesWritten
 1378216155
@@ -820,7 +820,7 @@ dfs.JournalNode.BytesWritten
 0.0
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 dfs.JournalNode.LastWrittenTxId
 1378216155
@@ -828,7 +828,7 @@ dfs.JournalNode.LastWrittenTxId
 613.0
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 metricssystem.MetricsSystem.Sink_gangliaQsize
 1378216155
@@ -836,7 +836,7 @@ metricssystem.MetricsSystem.Sink_gangliaQsize
 0.0
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 mem_buffers
 1378216155
@@ -844,7 +844,7 @@ mem_buffers
 129384.0
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 boottime
 1378216155
@@ -852,7 +852,7 @@ boottime
 1378290058.0
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 dfs.JournalNode.Syncs60s75thPercentileLatencyMicros
 1378216155
@@ -860,7 +860,7 @@ dfs.JournalNode.Syncs60s75thPercentileLatencyMicros
 0.0
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 ugi.UgiMetrics.LoginSuccessAvgTime
 1378216155
@@ -868,7 +868,7 @@ ugi.UgiMetrics.LoginSuccessAvgTime
 0.0
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 cpu_speed
 1378216155
@@ -876,7 +876,7 @@ cpu_speed
 3583.0
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 metricssystem.MetricsSystem.PublishAvgTime
 1378216155
@@ -884,7 +884,7 @@ metricssystem.MetricsSystem.PublishAvgTime
 0.0
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 rpc.rpc.ReceivedBytes
 1378216155
@@ -892,7 +892,7 @@ rpc.rpc.ReceivedBytes
 6.34666666667
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 cpu_aidle
 1378216155
@@ -900,7 +900,7 @@ cpu_aidle
 0.0
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 dfs.JournalNode.Syncs60s99thPercentileLatencyMicros
 1378216155
@@ -908,14 +908,14 @@ dfs.JournalNode.Syncs60s99thPercentileLatencyMicros
 0.0
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 rpcdetailed.rpcdetailed.JournalNumOps
 1378216155
 15
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 dfs.JournalNode.Syncs300s99thPercentileLatencyMicros
 1378216155
@@ -923,7 +923,7 @@ dfs.JournalNode.Syncs300s99thPercentileLatencyMicros
 0.0
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 rpcdetailed.rpcdetailed.GetEditLogManifestNumOps
 1378216155
@@ -931,14 +931,14 @@ rpcdetailed.rpcdetailed.GetEditLogManifestNumOps
 0.0266666666667
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 rpcdetailed.rpcdetailed.GetJournalStateAvgTime
 1378216155
 15
 [~EOM]
 sum
-HDPSlaves
+HDPJournalNode
 ip-10-39-113-33.ec2.internal
 jvm.JvmMetrics.GcCount
 1378216155

http://git-wip-us.apache.org/repos/asf/ambari/blob/1e0326ba/ambari-server/src/test/resources/temporal_ganglia_data.txt
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/temporal_ganglia_data.txt b/ambari-server/src/test/resources/temporal_ganglia_data.txt
index 29ada6f..c377505 100644
--- a/ambari-server/src/test/resources/temporal_ganglia_data.txt
+++ b/ambari-server/src/test/resources/temporal_ganglia_data.txt
@@ -1,6 +1,6 @@
 1358487599.0
 sum
-HDPSlaves
+HDPTaskTracker
 domU-12-31-39-0E-34-E1.compute-1.internal
 mapred.shuffleOutput.shuffle_exceptions_caught
 1358434800
@@ -13,7 +13,7 @@ mapred.shuffleOutput.shuffle_exceptions_caught
 [~r]86
 [~EOM]
 sum
-HDPSlaves
+HDPDataNode
 domU-12-31-39-0E-34-E1.compute-1.internal
 jvm.metrics.gcCount
 1358434800
@@ -325,7 +325,7 @@ jvm.metrics.gcCount
 115576389.233
 [~EOM]
 sum
-HDPSlaves
+HDPTaskTracker
 domU-12-31-39-0E-34-E1.compute-1.internal
 mapred.shuffleOutput.shuffle_output_bytes
 1358434800
@@ -334,7 +334,7 @@ mapred.shuffleOutput.shuffle_output_bytes
 [~r]106
 [~EOM]
 sum
-HDPSlaves
+HDPTaskTracker
 domU-12-31-39-0E-34-E1.compute-1.internal
 mapred.shuffleOutput.shuffle_failed_outputs
 1358434800
@@ -347,7 +347,7 @@ mapred.shuffleOutput.shuffle_failed_outputs
 [~r]50
 [~EOM]
 sum
-HDPSlaves
+HDPTaskTracker
 domU-12-31-39-0E-34-E1.compute-1.internal
 mapred.shuffleOutput.shuffle_success_outputs
 1358434800

http://git-wip-us.apache.org/repos/asf/ambari/blob/1e0326ba/ambari-server/src/test/resources/temporal_ganglia_data_1.txt
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/temporal_ganglia_data_1.txt b/ambari-server/src/test/resources/temporal_ganglia_data_1.txt
new file mode 100644
index 0000000..b57f272
--- /dev/null
+++ b/ambari-server/src/test/resources/temporal_ganglia_data_1.txt
@@ -0,0 +1,359 @@
+1358487599.0
+sum
+HDPTaskTracker
+domU-12-31-39-0E-34-E1.compute-1.internal
+mapred.shuffleOutput.shuffle_exceptions_caught
+1358434800
+360
+0.0
+[~r]10
+7.0
+[~r]10
+0.0
+[~r]86
+[~EOM]
+sum
+HDPJournalNode
+domU-12-31-39-0E-34-E1.compute-1.internal
+jvm.metrics.gcCount
+1358434800
+360
+83513252.9778
+119191023.641
+94591541.6419
+122656559.37
+142370213.761
+107374182.528
+131235111.95
+130489436.186
+143115866.264
+132030498.116
+131235096.191
+145722098.374
+128678583.679
+131235111.822
+69196695.2917
+133621204.781
+95443717.7111
+115895949.467
+134643809.447
+135211933.4
+142370212.222
+128053678.05
+141574824.397
+97034446.3556
+92035020.3
+39200091.525
+129644383.156
+143960940.847
+132030476.178
+127826414.616
+59879570.0701
+142370213.906
+147142389.835
+143165576.536
+134963382.052
+143165576.534
+141141658.42
+141461233.555
+119304637.975
+119304655.727
+[~n]
+[~r]10
+146347025.188
+143392823.479
+131007864.879
+139984129.803
+131235108.855
+107374174.855
+95443717.671
+131235111.822
+143165576.538
+83513263.8167
+111350993.135
+118509282.802
+142370212.222
+120100011.423
+93852989.0687
+23065591.0807
+118509256.794
+142370212.222
+120100011.461
+143165576.518
+143165576.532
+71582797.8174
+146148183.173
+116322039.185
+131235103.56
+131235123.489
+95443706.0444
+71582788.25
+139984127.162
+134416571.797
+143165577.856
+107374182.454
+143165564.577
+119304647.097
+128053662.656
+84990350.0306
+117827550.129
+132030467.969
+143960940.848
+93852997.3374
+142938330.213
+109192149.075
+120895375.756
+138691664.073
+135709034.825
+146148182.177
+94847194.4554
+128849018.873
+107374182.416
+71582801.1622
+134416556.176
+128053654.561
+83513252.9926
+63380593.77
+115576389.233
+[~EOM]
+sum
+HDPSlaves
+domU-12-31-39-0E-34-E2.compute-1.internal
+jvm.metrics.gcCount
+1358434800
+360
+83513252.9778
+119191023.641
+94591541.6419
+122656559.37
+142370213.761
+107374182.528
+131235111.95
+130489436.186
+143115866.264
+132030498.116
+131235096.191
+145722098.374
+128678583.679
+131235111.822
+69196695.2917
+133621204.781
+95443717.7111
+115895949.467
+134643809.447
+135211933.4
+142370212.222
+128053678.05
+141574824.397
+97034446.3556
+92035020.3
+39200091.525
+129644383.156
+[~n]
+[~r]10
+143960940.847
+132030476.178
+127826414.616
+59879570.0701
+142370213.906
+147142389.835
+143165576.536
+134963382.052
+143165576.534
+141141658.42
+141461233.555
+119304637.975
+119304655.727
+146347025.188
+143392823.479
+131007864.879
+139984129.803
+131235108.855
+107374174.855
+95443717.671
+131235111.822
+143165576.538
+83513263.8167
+111350993.135
+118509282.802
+142370212.222
+120100011.423
+93852989.0687
+23065591.0807
+118509256.794
+142370212.222
+120100011.461
+143165576.518
+143165576.532
+71582797.8174
+146148183.173
+116322039.185
+131235103.56
+131235123.489
+95443706.0444
+71582788.25
+139984127.162
+134416571.797
+143165577.856
+107374182.454
+143165564.577
+119304647.097
+128053662.656
+84990350.0306
+117827550.129
+132030467.969
+143960940.848
+93852997.3374
+142938330.213
+109192149.075
+120895375.756
+138691664.073
+135709034.825
+146148182.177
+94847194.4554
+128849018.873
+107374182.416
+71582801.1622
+134416556.176
+128053654.561
+83513252.9926
+63380593.77
+115576389.233
+[~EOM]
+sum
+HDPNameNode
+domU-12-31-39-0E-34-E3.compute-1.internal
+jvm.metrics.gcCount
+1358434800
+360
+83513252.9778
+119191023.641
+94591541.6419
+122656559.37
+142370213.761
+107374182.528
+131235111.95
+130489436.186
+143115866.264
+132030498.116
+131235096.191
+145722098.374
+128678583.679
+131235111.822
+69196695.2917
+133621204.781
+95443717.7111
+115895949.467
+134643809.447
+135211933.4
+142370212.222
+128053678.05
+141574824.397
+97034446.3556
+92035020.3
+39200091.525
+129644383.156
+143960940.847
+132030476.178
+127826414.616
+59879570.0701
+142370213.906
+147142389.835
+[~n]
+[~r]10
+143165576.536
+134963382.052
+143165576.534
+141141658.42
+141461233.555
+119304637.975
+119304655.727
+146347025.188
+143392823.479
+131007864.879
+139984129.803
+131235108.855
+107374174.855
+95443717.671
+131235111.822
+143165576.538
+83513263.8167
+111350993.135
+118509282.802
+142370212.222
+120100011.423
+93852989.0687
+23065591.0807
+118509256.794
+142370212.222
+120100011.461
+143165576.518
+143165576.532
+71582797.8174
+146148183.173
+116322039.185
+131235103.56
+131235123.489
+95443706.0444
+71582788.25
+139984127.162
+134416571.797
+143165577.856
+107374182.454
+143165564.577
+119304647.097
+128053662.656
+84990350.0306
+117827550.129
+132030467.969
+143960940.848
+93852997.3374
+142938330.213
+109192149.075
+120895375.756
+138691664.073
+135709034.825
+146148182.177
+94847194.4554
+128849018.873
+107374182.416
+71582801.1622
+134416556.176
+128053654.561
+83513252.9926
+63380593.77
+115576389.233
+[~EOM]
+sum
+HDPTaskTracker
+domU-12-31-39-0E-34-E1.compute-1.internal
+mapred.shuffleOutput.shuffle_output_bytes
+1358434800
+360
+0.0
+[~r]106
+[~EOM]
+sum
+HDPTaskTracker
+domU-12-31-39-0E-34-E1.compute-1.internal
+mapred.shuffleOutput.shuffle_failed_outputs
+1358434800
+360
+0.0
+[~r]56
+[~n]
+[~r]10
+0.0
+[~r]50
+[~EOM]
+sum
+HDPTaskTracker
+domU-12-31-39-0E-34-E1.compute-1.internal
+mapred.shuffleOutput.shuffle_success_outputs
+1358434800
+360
+0.0
+[~r]242
+[~EOM]
+[~EOF]
+1358487599.0
\ No newline at end of file


Mime
View raw message