AMBARI-1442 - Host Component metrics always showing zero values

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/trunk@1447785 13f79535-47bb-0310-9956-ffa450edef68

ambari-server/src/main/resources/ganglia_properties.json

@@ -2281,22 +2281,22 @@
       },
       "metrics/ugi/loginFailure_avg_time":{
         "metric":"ugi.ugi.loginFailure_avg_time",
-        "pointInTime":true,
+        "pointInTime":false,
         "temporal":true
       },
       "metrics/ugi/loginFailure_num_ops":{
         "metric":"ugi.ugi.loginFailure_num_ops",
-        "pointInTime":true,
+        "pointInTime":false,
         "temporal":true
       },
       "metrics/ugi/loginSuccess_avg_time":{
         "metric":"ugi.ugi.loginSuccess_avg_time",
-        "pointInTime":true,
+        "pointInTime":false,
         "temporal":true
       },
       "metrics/ugi/loginSuccess_num_ops":{
         "metric":"ugi.ugi.loginSuccess_num_ops",
-        "pointInTime":true,
+        "pointInTime":false,
         "temporal":true
       }
     },
@@ -4094,7 +4094,7 @@
       },
       "metrics/mapred/Queue/jobs_completed":{
         "metric":"mapred.Queue.jobs_completed",
-        "pointInTime":true,
+        "pointInTime":false,
         "temporal":true
       },
       "metrics/mapred/Queue/jobs_failed":{
@@ -4114,12 +4114,12 @@
       },
       "metrics/mapred/Queue/jobs_running":{
         "metric":"mapred.Queue.jobs_running",
-        "pointInTime":true,
+        "pointInTime":false,
         "temporal":true
       },
       "metrics/mapred/Queue/jobs_submitted":{
         "metric":"mapred.Queue.jobs_submitted",
-        "pointInTime":true,
+        "pointInTime":false,
         "temporal":true
       },
       "metrics/mapred/Queue/maps_completed":{
@@ -4164,42 +4164,42 @@
       },
       "metrics/mapred/Queue/reserved_map_slots":{
         "metric":"mapred.Queue.reserved_map_slots",
-        "pointInTime":true,
+        "pointInTime":false,
         "temporal":true
       },
       "metrics/mapred/Queue/reserved_reduce_slots":{
         "metric":"mapred.Queue.reserved_reduce_slots",
-        "pointInTime":true,
+        "pointInTime":false,
         "temporal":true
       },
       "metrics/mapred/Queue/running_0":{
         "metric":"mapred.Queue.running_0",
-        "pointInTime":true,
+        "pointInTime":false,
         "temporal":true
       },
       "metrics/mapred/Queue/running_1440":{
         "metric":"mapred.Queue.running_1440",
-        "pointInTime":true,
+        "pointInTime":false,
         "temporal":true
       },
       "metrics/mapred/Queue/running_300":{
         "metric":"mapred.Queue.running_300",
-        "pointInTime":true,
+        "pointInTime":false,
         "temporal":true
       },
       "metrics/mapred/Queue/running_60":{
         "metric":"mapred.Queue.running_60",
-        "pointInTime":true,
+        "pointInTime":false,
         "temporal":true
       },
       "metrics/mapred/Queue/waiting_maps":{
         "metric":"mapred.Queue.waiting_maps",
-        "pointInTime":true,
+        "pointInTime":false,
         "temporal":true
       },
       "metrics/mapred/Queue/waiting_reduces":{
         "metric":"mapred.Queue.waiting_reduces",
-        "pointInTime":true,
+        "pointInTime":false,
         "temporal":true
       },
       "metrics/mapred/jobtracker/blacklisted_maps":{
@@ -4219,7 +4219,7 @@
       },
       "metrics/mapred/jobtracker/jobs_completed":{
         "metric":"mapred.jobtracker.jobs_completed",
-        "pointInTime":true,
+        "pointInTime":false,
         "temporal":true
       },
       "metrics/mapred/jobtracker/jobs_failed":{
@@ -4239,12 +4239,12 @@
       },
       "metrics/mapred/jobtracker/jobs_running":{
         "metric":"mapred.jobtracker.jobs_running",
-        "pointInTime":true,
+        "pointInTime":false,
         "temporal":true
       },
       "metrics/mapred/jobtracker/jobs_submitted":{
         "metric":"mapred.jobtracker.jobs_submitted",
-        "pointInTime":true,
+        "pointInTime":false,
         "temporal":true
       },
       "metrics/mapred/jobtracker/map_slots":{
@@ -4274,12 +4274,12 @@
       },
       "metrics/mapred/jobtracker/occupied_map_slots":{
         "metric":"mapred.jobtracker.occupied_map_slots",
-        "pointInTime":true,
+        "pointInTime":false,
         "temporal":true
       },
       "metrics/mapred/jobtracker/occupied_reduce_slots":{
         "metric":"mapred.jobtracker.occupied_reduce_slots",
-        "pointInTime":true,
+        "pointInTime":false,
         "temporal":true
       },
       "metrics/mapred/jobtracker/reduce_slots":{
@@ -4309,22 +4309,22 @@
       },
       "metrics/mapred/jobtracker/reserved_map_slots":{
         "metric":"mapred.jobtracker.reserved_map_slots",
-        "pointInTime":true,
+        "pointInTime":false,
         "temporal":true
       },
       "metrics/mapred/jobtracker/reserved_reduce_slots":{
         "metric":"mapred.jobtracker.reserved_reduce_slots",
-        "pointInTime":true,
+        "pointInTime":false,
         "temporal":true
       },
       "metrics/mapred/jobtracker/running_maps":{
         "metric":"mapred.jobtracker.running_maps",
-        "pointInTime":true,
+        "pointInTime":false,
         "temporal":true
       },
       "metrics/mapred/jobtracker/running_reduces":{
         "metric":"mapred.jobtracker.running_reduces",
-        "pointInTime":true,
+        "pointInTime":false,
         "temporal":true
       },
       "metrics/mapred/jobtracker/trackers":{
@@ -4349,12 +4349,12 @@
       },
       "metrics/mapred/jobtracker/waiting_maps":{
         "metric":"mapred.jobtracker.waiting_maps",
-        "pointInTime":true,
+        "pointInTime":false,
         "temporal":true
       },
       "metrics/mapred/jobtracker/waiting_reduces":{
         "metric":"mapred.jobtracker.waiting_reduces",
-        "pointInTime":true,
+        "pointInTime":false,
         "temporal":true
       },
       "metrics/memory/mem_buffers":{
@@ -4644,22 +4644,22 @@
       },
       "metrics/ugi/loginFailure_avg_time":{
         "metric":"ugi.ugi.loginFailure_avg_time",
-        "pointInTime":true,
+        "pointInTime":false,
         "temporal":true
       },
       "metrics/ugi/loginFailure_num_ops":{
         "metric":"ugi.ugi.loginFailure_num_ops",
-        "pointInTime":true,
+        "pointInTime":false,
         "temporal":true
       },
       "metrics/ugi/loginSuccess_avg_time":{
         "metric":"ugi.ugi.loginSuccess_avg_time",
-        "pointInTime":true,
+        "pointInTime":false,
         "temporal":true
       },
       "metrics/ugi/loginSuccess_num_ops":{
         "metric":"ugi.ugi.loginSuccess_num_ops",
-        "pointInTime":true,
+        "pointInTime":false,
         "temporal":true
       }
     },
@@ -6477,12 +6477,12 @@
       },
       "metrics/rpc/NumOpenConnections":{
         "metric":"rpc.rpc.NumOpenConnections",
-        "pointInTime":true,
+        "pointInTime":false,
         "temporal":true
       },
       "metrics/rpc/ReceivedBytes":{
         "metric":"rpc.rpc.ReceivedBytes",
-        "pointInTime":true,
+        "pointInTime":false,
         "temporal":true
       },
       "metrics/rpc/RpcProcessingTime_avg_time":{
@@ -6517,7 +6517,7 @@
       },
       "metrics/rpc/SentBytes":{
         "metric":"rpc.rpc.SentBytes",
-        "pointInTime":true,
+        "pointInTime":false,
         "temporal":true
       },
       "metrics/rpc/addColumn/aboveOneSec/_avg_time":{
@@ -6612,7 +6612,7 @@
       },
       "metrics/rpc/callQueueLen":{
         "metric":"rpc.rpc.callQueueLen",
-        "pointInTime":true,
+        "pointInTime":false,
         "temporal":true
       },
       "metrics/rpc/checkAndDelete_avg_time":{
@@ -7237,22 +7237,22 @@
       },
       "metrics/rpc/rpcAuthenticationFailures":{
         "metric":"rpc.rpc.rpcAuthenticationFailures",
-        "pointInTime":true,
+        "pointInTime":false,
         "temporal":true
       },
       "metrics/rpc/rpcAuthenticationSuccesses":{
         "metric":"rpc.rpc.rpcAuthenticationSuccesses",
-        "pointInTime":true,
+        "pointInTime":false,
         "temporal":true
       },
       "metrics/rpc/rpcAuthorizationFailures":{
         "metric":"rpc.rpc.rpcAuthorizationFailures",
-        "pointInTime":true,
+        "pointInTime":false,
         "temporal":true
       },
       "metrics/rpc/rpcAuthorizationSuccesses":{
         "metric":"rpc.rpc.rpcAuthorizationSuccesses",
-        "pointInTime":true,
+        "pointInTime":false,
         "temporal":true
       },
       "metrics/rpc/shutdown/aboveOneSec/_avg_time":{
@@ -11463,22 +11463,22 @@
       },
       "metrics/ugi/loginFailure_avg_time":{
         "metric":"ugi.ugi.loginFailure_avg_time",
-        "pointInTime":true,
+        "pointInTime":false,
         "temporal":true
       },
       "metrics/ugi/loginFailure_num_ops":{
         "metric":"ugi.ugi.loginFailure_num_ops",
-        "pointInTime":true,
+        "pointInTime":false,
         "temporal":true
       },
       "metrics/ugi/loginSuccess_avg_time":{
         "metric":"ugi.ugi.loginSuccess_avg_time",
-        "pointInTime":true,
+        "pointInTime":false,
         "temporal":true
       },
       "metrics/ugi/loginSuccess_num_ops":{
         "metric":"ugi.ugi.loginSuccess_num_ops",
-        "pointInTime":true,
+        "pointInTime":false,
         "temporal":true
       }
     },
@@ -13007,22 +13007,22 @@
       },
       "metrics/ugi/loginFailure_avg_time":{
         "metric":"ugi.ugi.loginFailure_avg_time",
-        "pointInTime":true,
+        "pointInTime":false,
         "temporal":true
       },
       "metrics/ugi/loginFailure_num_ops":{
         "metric":"ugi.ugi.loginFailure_num_ops",
-        "pointInTime":true,
+        "pointInTime":false,
         "temporal":true
       },
       "metrics/ugi/loginSuccess_avg_time":{
         "metric":"ugi.ugi.loginSuccess_avg_time",
-        "pointInTime":true,
+        "pointInTime":false,
         "temporal":true
       },
       "metrics/ugi/loginSuccess_num_ops":{
         "metric":"ugi.ugi.loginSuccess_num_ops",
-        "pointInTime":true,
+        "pointInTime":false,
         "temporal":true
       }
     },
@@ -13186,7 +13186,7 @@
       },
       "metrics/mapred/Queue/jobs_completed":{
         "metric":"mapred.Queue.jobs_completed",
-        "pointInTime":true,
+        "pointInTime":false,
         "temporal":true
       },
       "metrics/mapred/Queue/jobs_failed":{
@@ -13206,12 +13206,12 @@
       },
       "metrics/mapred/Queue/jobs_running":{
         "metric":"mapred.Queue.jobs_running",
-        "pointInTime":true,
+        "pointInTime":false,
         "temporal":true
       },
       "metrics/mapred/Queue/jobs_submitted":{
         "metric":"mapred.Queue.jobs_submitted",
-        "pointInTime":true,
+        "pointInTime":false,
         "temporal":true
       },
       "metrics/mapred/Queue/maps_completed":{
@@ -13256,42 +13256,42 @@
       },
       "metrics/mapred/Queue/reserved_map_slots":{
         "metric":"mapred.Queue.reserved_map_slots",
-        "pointInTime":true,
+        "pointInTime":false,
         "temporal":true
       },
       "metrics/mapred/Queue/reserved_reduce_slots":{
         "metric":"mapred.Queue.reserved_reduce_slots",
-        "pointInTime":true,
+        "pointInTime":false,
         "temporal":true
       },
       "metrics/mapred/Queue/running_0":{
         "metric":"mapred.Queue.running_0",
-        "pointInTime":true,
+        "pointInTime":false,
         "temporal":true
       },
       "metrics/mapred/Queue/running_1440":{
         "metric":"mapred.Queue.running_1440",
-        "pointInTime":true,
+        "pointInTime":false,
         "temporal":true
       },
       "metrics/mapred/Queue/running_300":{
         "metric":"mapred.Queue.running_300",
-        "pointInTime":true,
+        "pointInTime":false,
         "temporal":true
       },
       "metrics/mapred/Queue/running_60":{
         "metric":"mapred.Queue.running_60",
-        "pointInTime":true,
+        "pointInTime":false,
         "temporal":true
       },
       "metrics/mapred/Queue/waiting_maps":{
         "metric":"mapred.Queue.waiting_maps",
-        "pointInTime":true,
+        "pointInTime":false,
         "temporal":true
       },
       "metrics/mapred/Queue/waiting_reduces":{
         "metric":"mapred.Queue.waiting_reduces",
-        "pointInTime":true,
+        "pointInTime":false,
         "temporal":true
       },
       "metrics/mapred/jobtracker/blacklisted_maps":{
@@ -13311,7 +13311,7 @@
       },
       "metrics/mapred/jobtracker/jobs_completed":{
         "metric":"mapred.jobtracker.jobs_completed",
-        "pointInTime":true,
+        "pointInTime":false,
         "temporal":true
       },
       "metrics/mapred/jobtracker/jobs_failed":{
@@ -13331,12 +13331,12 @@
       },
       "metrics/mapred/jobtracker/jobs_running":{
         "metric":"mapred.jobtracker.jobs_running",
-        "pointInTime":true,
+        "pointInTime":false,
         "temporal":true
       },
       "metrics/mapred/jobtracker/jobs_submitted":{
         "metric":"mapred.jobtracker.jobs_submitted",
-        "pointInTime":true,
+        "pointInTime":false,
         "temporal":true
       },
       "metrics/mapred/jobtracker/map_slots":{
@@ -13366,12 +13366,12 @@
       },
       "metrics/mapred/jobtracker/occupied_map_slots":{
         "metric":"mapred.jobtracker.occupied_map_slots",
-        "pointInTime":true,
+        "pointInTime":false,
         "temporal":true
       },
       "metrics/mapred/jobtracker/occupied_reduce_slots":{
         "metric":"mapred.jobtracker.occupied_reduce_slots",
-        "pointInTime":true,
+        "pointInTime":false,
         "temporal":true
       },
       "metrics/mapred/jobtracker/reduce_slots":{
@@ -13401,22 +13401,22 @@
       },
       "metrics/mapred/jobtracker/reserved_map_slots":{
         "metric":"mapred.jobtracker.reserved_map_slots",
-        "pointInTime":true,
+        "pointInTime":false,
         "temporal":true
       },
       "metrics/mapred/jobtracker/reserved_reduce_slots":{
         "metric":"mapred.jobtracker.reserved_reduce_slots",
-        "pointInTime":true,
+        "pointInTime":false,
         "temporal":true
       },
       "metrics/mapred/jobtracker/running_maps":{
         "metric":"mapred.jobtracker.running_maps",
-        "pointInTime":true,
+        "pointInTime":false,
         "temporal":true
       },
       "metrics/mapred/jobtracker/running_reduces":{
         "metric":"mapred.jobtracker.running_reduces",
-        "pointInTime":true,
+        "pointInTime":false,
         "temporal":true
       },
       "metrics/mapred/jobtracker/trackers":{
@@ -13441,12 +13441,12 @@
       },
       "metrics/mapred/jobtracker/waiting_maps":{
         "metric":"mapred.jobtracker.waiting_maps",
-        "pointInTime":true,
+        "pointInTime":false,
         "temporal":true
       },
       "metrics/mapred/jobtracker/waiting_reduces":{
         "metric":"mapred.jobtracker.waiting_reduces",
-        "pointInTime":true,
+        "pointInTime":false,
         "temporal":true
       },
       "metrics/memory/mem_buffers":{
@@ -13736,22 +13736,22 @@
       },
       "metrics/ugi/loginFailure_avg_time":{
         "metric":"ugi.ugi.loginFailure_avg_time",
-        "pointInTime":true,
+        "pointInTime":false,
         "temporal":true
       },
       "metrics/ugi/loginFailure_num_ops":{
         "metric":"ugi.ugi.loginFailure_num_ops",
-        "pointInTime":true,
+        "pointInTime":false,
         "temporal":true
       },
       "metrics/ugi/loginSuccess_avg_time":{
         "metric":"ugi.ugi.loginSuccess_avg_time",
-        "pointInTime":true,
+        "pointInTime":false,
         "temporal":true
       },
       "metrics/ugi/loginSuccess_num_ops":{
         "metric":"ugi.ugi.loginSuccess_num_ops",
-        "pointInTime":true,
+        "pointInTime":false,
         "temporal":true
       }
     },
@@ -13920,47 +13920,47 @@
       },
       "metrics/mapred/shuffleOutput/shuffle_exceptions_caught":{
         "metric":"mapred.shuffleOutput.shuffle_exceptions_caught",
-        "pointInTime":true,
+        "pointInTime":false,
         "temporal":true
       },
       "metrics/mapred/shuffleOutput/shuffle_failed_outputs":{
         "metric":"mapred.shuffleOutput.shuffle_failed_outputs",
-        "pointInTime":true,
+        "pointInTime":false,
         "temporal":true
       },
       "metrics/mapred/shuffleOutput/shuffle_handler_busy_percent":{
         "metric":"mapred.shuffleOutput.shuffle_handler_busy_percent",
-        "pointInTime":true,
+        "pointInTime":false,
         "temporal":true
       },
       "metrics/mapred/shuffleOutput/shuffle_output_bytes":{
         "metric":"mapred.shuffleOutput.shuffle_output_bytes",
-        "pointInTime":true,
+        "pointInTime":false,
         "temporal":true
       },
       "metrics/mapred/shuffleOutput/shuffle_success_outputs":{
         "metric":"mapred.shuffleOutput.shuffle_success_outputs",
-        "pointInTime":true,
+        "pointInTime":false,
         "temporal":true
       },
       "metrics/mapred/tasktracker/mapTaskSlots":{
         "metric":"mapred.tasktracker.mapTaskSlots",
-        "pointInTime":true,
+        "pointInTime":false,
         "temporal":true
       },
       "metrics/mapred/tasktracker/maps_running":{
         "metric":"mapred.tasktracker.maps_running",
-        "pointInTime":true,
+        "pointInTime":false,
         "temporal":true
       },
       "metrics/mapred/tasktracker/reduceTaskSlots":{
         "metric":"mapred.tasktracker.reduceTaskSlots",
-        "pointInTime":true,
+        "pointInTime":false,
         "temporal":true
       },
       "metrics/mapred/tasktracker/reduces_running":{
         "metric":"mapred.tasktracker.reduces_running",
-        "pointInTime":true,
+        "pointInTime":false,
         "temporal":true
       },
       "metrics/memory/mem_buffers":{
@@ -15190,22 +15190,22 @@
       },
       "metrics/ugi/loginFailure_avg_time":{
         "metric":"ugi.ugi.loginFailure_avg_time",
-        "pointInTime":true,
+        "pointInTime":false,
         "temporal":true
       },
       "metrics/ugi/loginFailure_num_ops":{
         "metric":"ugi.ugi.loginFailure_num_ops",
-        "pointInTime":true,
+        "pointInTime":false,
         "temporal":true
       },
       "metrics/ugi/loginSuccess_avg_time":{
         "metric":"ugi.ugi.loginSuccess_avg_time",
-        "pointInTime":true,
+        "pointInTime":false,
         "temporal":true
       },
       "metrics/ugi/loginSuccess_num_ops":{
         "metric":"ugi.ugi.loginSuccess_num_ops",
-        "pointInTime":true,
+        "pointInTime":false,
         "temporal":true
       }
     },
@@ -15464,12 +15464,12 @@
       },
       "metrics/rpc/NumOpenConnections":{
         "metric":"rpc.rpc.NumOpenConnections",
-        "pointInTime":true,
+        "pointInTime":false,
         "temporal":true
       },
       "metrics/rpc/ReceivedBytes":{
         "metric":"rpc.rpc.ReceivedBytes",
-        "pointInTime":true,
+        "pointInTime":false,
         "temporal":true
       },
       "metrics/rpc/RpcProcessingTime_avg_time":{
@@ -15504,7 +15504,7 @@
       },
       "metrics/rpc/SentBytes":{
         "metric":"rpc.rpc.SentBytes",
-        "pointInTime":true,
+        "pointInTime":false,
         "temporal":true
       },
       "metrics/rpc/addColumn/aboveOneSec/_avg_time":{
@@ -15599,7 +15599,7 @@
       },
       "metrics/rpc/callQueueLen":{
         "metric":"rpc.rpc.callQueueLen",
-        "pointInTime":true,
+        "pointInTime":false,
         "temporal":true
       },
       "metrics/rpc/checkAndDelete_avg_time":{
@@ -16224,22 +16224,22 @@
       },
       "metrics/rpc/rpcAuthenticationFailures":{
         "metric":"rpc.rpc.rpcAuthenticationFailures",
-        "pointInTime":true,
+        "pointInTime":false,
         "temporal":true
       },
       "metrics/rpc/rpcAuthenticationSuccesses":{
         "metric":"rpc.rpc.rpcAuthenticationSuccesses",
-        "pointInTime":true,
+        "pointInTime":false,
         "temporal":true
       },
       "metrics/rpc/rpcAuthorizationFailures":{
         "metric":"rpc.rpc.rpcAuthorizationFailures",
-        "pointInTime":true,
+        "pointInTime":false,
         "temporal":true
       },
       "metrics/rpc/rpcAuthorizationSuccesses":{
         "metric":"rpc.rpc.rpcAuthorizationSuccesses",
-        "pointInTime":true,
+        "pointInTime":false,
         "temporal":true
       },
       "metrics/rpc/shutdown/aboveOneSec/_avg_time":{
@@ -19432,12 +19432,12 @@
       },
       "metrics/rpc/rpcAuthenticationFailures":{
         "metric":"rpc.rpc.rpcAuthenticationFailures",
-        "pointInTime":true,
+        "pointInTime":false,
         "temporal":true
       },
       "metrics/rpc/rpcAuthenticationSuccesses":{
         "metric":"rpc.rpc.rpcAuthenticationSuccesses",
-        "pointInTime":true,
+        "pointInTime":false,
         "temporal":true
       },
       "metrics/rpc/rpcAuthorizationFailures":{
@@ -19562,4 +19562,4 @@
       }
     }
   }
-}
+}

ambari-server/src/test/java/org/apache/ambari/server/controller/ganglia/GangliaPropertyProviderTest.java

@@ -86,22 +86,32 @@ public class GangliaPropertyProviderTest {
     //http://ec2-174-129-152-147.compute-1.amazonaws.com/cgi-bin/rrd.py?c=HDPSlaves&m=jvm.metrics.gcCount,mapred.shuffleOutput.shuffle_exceptions_caught,mapred.shuffleOutput.shuffle_failed_outputs,mapred.shuffleOutput.shuffle_output_bytes,mapred.shuffleOutput.shuffle_success_outputs&s=10&e=20&r=1&h=ip-10-85-111-149.ec2.internal
 
     Set<String> properties = new HashSet<String>();
-    properties.add(PropertyHelper.getPropertyId("metrics/mapred/shuffleOutput", "shuffle_exceptions_caught"));
-    properties.add(PropertyHelper.getPropertyId("metrics/mapred/shuffleOutput", "shuffle_failed_outputs"));
-    properties.add(PropertyHelper.getPropertyId("metrics/mapred/shuffleOutput", "shuffle_output_bytes"));
-    properties.add(PropertyHelper.getPropertyId("metrics/mapred/shuffleOutput", "shuffle_success_outputs"));
+    String shuffle_exceptions_caught = PropertyHelper.getPropertyId("metrics/mapred/shuffleOutput", "shuffle_exceptions_caught");
+    String shuffle_failed_outputs    = PropertyHelper.getPropertyId("metrics/mapred/shuffleOutput", "shuffle_failed_outputs");
+    String shuffle_output_bytes      = PropertyHelper.getPropertyId("metrics/mapred/shuffleOutput", "shuffle_output_bytes");
+    String shuffle_success_outputs   = PropertyHelper.getPropertyId("metrics/mapred/shuffleOutput", "shuffle_success_outputs");
+
+    properties.add(shuffle_exceptions_caught);
+    properties.add(shuffle_failed_outputs);
+    properties.add(shuffle_output_bytes);
+    properties.add(shuffle_success_outputs);
     request = PropertyHelper.getReadRequest(properties, temporalInfoMap);
 
+    temporalInfoMap.put(shuffle_exceptions_caught, new TemporalInfoImpl(10L, 20L, 1L));
+    temporalInfoMap.put(shuffle_failed_outputs, new TemporalInfoImpl(10L, 20L, 1L));
+    temporalInfoMap.put(shuffle_output_bytes, new TemporalInfoImpl(10L, 20L, 1L));
+    temporalInfoMap.put(shuffle_success_outputs, new TemporalInfoImpl(10L, 20L, 1L));
+
     Assert.assertEquals(1, propertyProvider.populateResources(Collections.singleton(resource), request, null).size());
 
-    Assert.assertEquals("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=mapred.shuffleOutput.shuffle_output_bytes,mapred.shuffleOutput.shuffle_success_outputs,mapred.shuffleOutput.shuffle_failed_outputs,mapred.shuffleOutput.shuffle_exceptions_caught&e=now&pt=true",
+    Assert.assertEquals("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=mapred.shuffleOutput.shuffle_output_bytes,mapred.shuffleOutput.shuffle_success_outputs,mapred.shuffleOutput.shuffle_failed_outputs,mapred.shuffleOutput.shuffle_exceptions_caught&s=10&e=20&r=1",
         streamProvider.getLastSpec());
 
     Assert.assertEquals(6, PropertyHelper.getProperties(resource).size());
-    Assert.assertNotNull(resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/mapred/shuffleOutput", "shuffle_exceptions_caught")));
-    Assert.assertNotNull(resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/mapred/shuffleOutput", "shuffle_failed_outputs")));
-    Assert.assertNotNull(resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/mapred/shuffleOutput", "shuffle_output_bytes")));
-    Assert.assertNotNull(resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/mapred/shuffleOutput", "shuffle_success_outputs")));
+    Assert.assertNotNull(resource.getPropertyValue(shuffle_exceptions_caught));
+    Assert.assertNotNull(resource.getPropertyValue(shuffle_failed_outputs));
+    Assert.assertNotNull(resource.getPropertyValue(shuffle_output_bytes));
+    Assert.assertNotNull(resource.getPropertyValue(shuffle_success_outputs));
   }
 
 

ambari-server/src/test/java/org/apache/ambari/server/controller/jmx/JMXPropertyProviderTest.java

@@ -18,24 +18,17 @@
 
 package org.apache.ambari.server.controller.jmx;
 
-import com.google.inject.Guice;
-import com.google.inject.Injector;
-import org.apache.ambari.server.AmbariException;
-import org.apache.ambari.server.api.services.AmbariMetaInfo;
-import org.apache.ambari.server.controller.*;
-import org.apache.ambari.server.controller.internal.AbstractProviderModule;
-import org.apache.ambari.server.controller.internal.DefaultProviderModule;
 import org.apache.ambari.server.controller.internal.ResourceImpl;
-import org.apache.ambari.server.controller.spi.*;
-import org.apache.ambari.server.controller.utilities.PredicateBuilder;
+import org.apache.ambari.server.controller.spi.Request;
+import org.apache.ambari.server.controller.spi.Resource;
+import org.apache.ambari.server.controller.spi.SystemException;
 import org.apache.ambari.server.controller.utilities.PropertyHelper;
-import org.apache.ambari.server.orm.GuiceJpaInitializer;
-import org.apache.ambari.server.orm.InMemoryDefaultTestModule;
-import org.apache.ambari.server.state.*;
 import org.junit.Assert;
-import org.junit.Before;
 import org.junit.Test;
-import java.util.*;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
 
 
 /**
@@ -111,6 +104,9 @@ public class JMXPropertyProviderTest {
     properties.add(PropertyHelper.getPropertyId("metrics/jvm", "HeapMemoryUsed"));
     properties.add(PropertyHelper.getPropertyId("metrics/jvm", "NonHeapMemoryMax"));
     properties.add(PropertyHelper.getPropertyId("metrics/jvm", "NonHeapMemoryUsed"));
+    properties.add(PropertyHelper.getPropertyId("metrics/mapred/jobtracker", "jobs_submitted"));
+    properties.add(PropertyHelper.getPropertyId("metrics/mapred/jobtracker", "jobs_completed"));
+
     request = PropertyHelper.getReadRequest(properties);
 
     propertyProvider.populateResources(Collections.singleton(resource), request, null);
@@ -118,12 +114,14 @@ public class JMXPropertyProviderTest {
     Assert.assertEquals(propertyProvider.getSpec("domu-12-31-39-14-ee-b3.compute-1.internal:50030"), streamProvider.getLastSpec());
 
     // see test/resources/mapreduce_jobtracker_jmx.json for values
-    Assert.assertEquals(7, PropertyHelper.getProperties(resource).size());
+    Assert.assertEquals(9, PropertyHelper.getProperties(resource).size());
     Assert.assertEquals(59, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/jvm", "threadsWaiting")));
     Assert.assertEquals(1052770304, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/jvm", "HeapMemoryMax")));
     Assert.assertEquals(43580400, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/jvm", "HeapMemoryUsed")));
     Assert.assertEquals(136314880, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/jvm", "NonHeapMemoryMax")));
     Assert.assertEquals(29602888, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/jvm", "NonHeapMemoryUsed")));
+    Assert.assertEquals(1, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/mapred/jobtracker", "jobs_submitted")));
+    Assert.assertEquals(1, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/mapred/jobtracker", "jobs_completed")));
 
     Assert.assertNull(resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/jvm", "gcCount")));
 
@@ -139,17 +137,26 @@ public class JMXPropertyProviderTest {
     properties.add(PropertyHelper.getPropertyId("metrics/jvm", "HeapMemoryUsed"));
     properties.add(PropertyHelper.getPropertyId("metrics/jvm", "NonHeapMemoryMax"));
     properties.add(PropertyHelper.getPropertyId("metrics/jvm", "NonHeapMemoryUsed"));
+    properties.add(PropertyHelper.getPropertyId("metrics/mapred/shuffleOutput", "shuffle_exceptions_caught"));
+    properties.add(PropertyHelper.getPropertyId("metrics/mapred/shuffleOutput", "shuffle_failed_outputs"));
+    properties.add(PropertyHelper.getPropertyId("metrics/mapred/shuffleOutput", "shuffle_output_bytes"));
+    properties.add(PropertyHelper.getPropertyId("metrics/mapred/shuffleOutput", "shuffle_success_outputs"));
+
     request = PropertyHelper.getReadRequest(properties);
 
     propertyProvider.populateResources(Collections.singleton(resource), request, null);
 
     Assert.assertEquals(propertyProvider.getSpec("domu-12-31-39-14-ee-b3.compute-1.internal:50060"), streamProvider.getLastSpec());
 
-    Assert.assertEquals(6, PropertyHelper.getProperties(resource).size());
+    Assert.assertEquals(10, PropertyHelper.getProperties(resource).size());
     Assert.assertEquals(954466304, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/jvm", "HeapMemoryMax")));
     Assert.assertEquals(18330984, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/jvm", "HeapMemoryUsed")));
     Assert.assertEquals(136314880, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/jvm", "NonHeapMemoryMax")));
     Assert.assertEquals(24235104, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/jvm", "NonHeapMemoryUsed")));
+    Assert.assertEquals(0, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/mapred/shuffleOutput", "shuffle_exceptions_caught")));
+    Assert.assertEquals(0, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/mapred/shuffleOutput", "shuffle_failed_outputs")));
+    Assert.assertEquals(1841, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/mapred/shuffleOutput", "shuffle_output_bytes")));
+    Assert.assertEquals(1, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/mapred/shuffleOutput", "shuffle_success_outputs")));
 
     Assert.assertNull(resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/jvm", "gcCount")));