AMBARI-3725 - Check for overlaps in metrics between JMX and Ganglia try to get all point in time metrics from JMX.

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

@@ -6222,1067 +6222,7 @@
         "temporal":true
       }
     },
-
-    "RESOURCEMANAGER":{
-      "metrics/boottime":{
-        "metric":"boottime",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/cpu/cpu_aidle":{
-        "metric":"cpu_aidle",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/cpu/cpu_idle":{
-        "metric":"cpu_idle",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/cpu/cpu_nice":{
-        "metric":"cpu_nice",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/cpu/cpu_num":{
-        "metric":"cpu_num",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/cpu/cpu_speed":{
-        "metric":"cpu_speed",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/cpu/cpu_system":{
-        "metric":"cpu_system",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/cpu/cpu_user":{
-        "metric":"cpu_user",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/cpu/cpu_wio":{
-        "metric":"cpu_wio",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/disk/disk_free":{
-        "metric":"disk_free",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/disk/disk_total":{
-        "metric":"disk_total",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/disk/part_max_used":{
-        "metric":"part_max_used",
-        "pointInTime":true,
-        "temporal":true
-      },
-
-      "ServiceComponentInfo/rm_metrics/yarn/Queue/running_0":{
-        "metric":"yarn.Queue.running_0",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "ServiceComponentInfo/rm_metrics/yarn/Queue/running_60":{
-        "metric":"yarn.QueueMetrics.running_60",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "ServiceComponentInfo/rm_metrics/yarn/Queue/running_300":{
-        "metric":"yarn.QueueMetrics.running_300",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "ServiceComponentInfo/rm_metrics/yarn/Queue/running_1440":{
-        "metric":"yarn.QueueMetrics.running_1440",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "ServiceComponentInfo/rm_metrics/yarn/Queue/AppsSubmitted":{
-        "metric":"yarn.QueueMetrics.AppsSubmitted",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "ServiceComponentInfo/rm_metrics/yarn/Queue/AppsRunning":{
-        "metric":"yarn.QueueMetrics.AppsRunning",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "ServiceComponentInfo/rm_metrics/yarn/Queue/AppsPending":{
-        "metric":"yarn.QueueMetrics.AppsPending",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "ServiceComponentInfo/rm_metrics/yarn/Queue/AppsCompleted":{
-        "metric":"yarn.QueueMetrics.AppsCompleted",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "ServiceComponentInfo/rm_metrics/yarn/Queue/AppsKilled":{
-        "metric":"yarn.QueueMetrics.AppsKilled",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "ServiceComponentInfo/rm_metrics/yarn/Queue/AppsFailed":{
-        "metric":"yarn.QueueMetrics.AppsFailed",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "ServiceComponentInfo/rm_metrics/yarn/Queue/AllocatedMB":{
-        "metric":"yarn.QueueMetrics.AllocatedMB",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "ServiceComponentInfo/rm_metrics/yarn/Queue/AllocatedContainers":{
-        "metric":"yarn.QueueMetrics.AllocatedContainers",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "ServiceComponentInfo/rm_metrics/yarn/Queue/AggregateContainersAllocated":{
-        "metric":"yarn.QueueMetrics.AggregateContainersAllocated",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "ServiceComponentInfo/rm_metrics/yarn/Queue/AggregateContainersReleased":{
-        "metric":"yarn.QueueMetrics.AggregateContainersReleased",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "ServiceComponentInfo/rm_metrics/yarn/Queue/AvailableMB":{
-        "metric":"yarn.QueueMetrics.AvailableMB",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "ServiceComponentInfo/rm_metrics/yarn/Queue/PendingMB":{
-        "metric":"yarn.QueueMetrics.PendingMB",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "ServiceComponentInfo/rm_metrics/yarn/Queue/PendingContainers":{
-        "metric":"yarn.QueueMetrics.PendingContainers",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "ServiceComponentInfo/rm_metrics/yarn/Queue/ReservedMB":{
-        "metric":"yarn.QueueMetrics.ReservedMB",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "ServiceComponentInfo/rm_metrics/yarn/Queue/ReservedContainers":{
-        "metric":"yarn.QueueMetrics.ReservedContainers",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "ServiceComponentInfo/rm_metrics/yarn/Queue/ActiveUsers":{
-        "metric":"yarn.QueueMetrics.ActiveUsers",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "ServiceComponentInfo/rm_metrics/yarn/Queue/ActiveApplications":{
-        "metric":"yarn.QueueMetrics.ActiveApplications",
-        "pointInTime":true,
-        "temporal":true
-      },
-
-      "metrics/ugi/LoginSuccessNumOps":{
-        "metric":"ugi.ugi.LoginSuccessNumOps",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/ugi/LoginSuccessAvgTime":{
-        "metric":"ugi.ugi.LoginSuccessAvgTime",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/ugi/LoginFailureNumOps":{
-        "metric":"ugi.ugi.LoginFailureNumOps",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/ugi/LoginFailureAvgTime":{
-        "metric":"ugi.ugi.LoginFailureAvgTime",
-        "pointInTime":false,
-        "temporal":true
-      },
-
-      "metrics/rpc/ReceivedBytes":{
-        "metric":"rpc.metrics.ReceivedBytes",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/rpc/SentBytes":{
-        "metric":"rpc.metrics.SentBytes",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/rpc/RpcQueueTimeNumOps":{
-        "metric":"rpc.metrics.RpcQueueTimeNumOps",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/rpc/RpcQueueTimeAvgTime":{
-        "metric":"rpc.metrics.RpcQueueTimeAvgTime",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/rpc/RpcProcessingTimeNumOps":{
-        "metric":"rpc.metrics.RpcProcessingTimeNumOps",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/rpc/RpcProcessingTimeAvgTime":{
-        "metric":"rpc.metrics.RpcProcessingTimeAvgTime",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/rpc/RpcAuthenticationFailures":{
-        "metric":"rpc.metrics.RpcAuthenticationFailures",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/rpc/RpcAuthenticationSuccesses":{
-        "metric":"rpc.metrics.RpcAuthenticationSuccesses",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/rpc/RpcAuthorizationFailures":{
-        "metric":"rpc.metrics.RpcAuthorizationFailures",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/rpc/RpcAuthorizationSuccesses":{
-        "metric":"rpc.metrics.RpcAuthorizationSuccesses",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/rpc/NumOpenConnections":{
-        "metric":"rpc.metrics.NumOpenConnections",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/rpc/CallQueueLength":{
-        "metric":"rpc.metrics.CallQueueLength",
-        "pointInTime":false,
-        "temporal":true
-      },
-
-      "metrics/memory/mem_buffers":{
-        "metric":"mem_buffers",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/memory/mem_cached":{
-        "metric":"mem_cached",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/memory/mem_free":{
-        "metric":"mem_free",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/memory/mem_shared":{
-        "metric":"mem_shared",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/memory/mem_total":{
-        "metric":"mem_total",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/memory/swap_free":{
-        "metric":"swap_free",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/memory/swap_total":{
-        "metric":"swap_total",
-        "pointInTime":true,
-        "temporal":true
-      },
-
-      "metrics/network/bytes_in":{
-        "metric":"bytes_in",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/network/bytes_out":{
-        "metric":"bytes_out",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/network/pkts_in":{
-        "metric":"pkts_in",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/network/pkts_out":{
-        "metric":"pkts_out",
-        "pointInTime":true,
-        "temporal":true
-      },
-
-      "metrics/process/proc_run":{
-        "metric":"proc_run",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/process/proc_total":{
-        "metric":"proc_total",
-        "pointInTime":true,
-        "temporal":true
-      },
-
-      "metrics/jvm/MemNonHeapUsedM":{
-        "metric":"jvm.metrics.MemNonHeapUsedM",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/jvm/MemNonHeapCommittedM":{
-        "metric":"jvm.metrics.MemNonHeapCommittedM",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/jvm/MemHeapUsedM":{
-        "metric":"jvm.metrics.MemHeapUsedM",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/jvm/MemHeapCommittedM":{
-        "metric":"jvm.metrics.MemHeapCommittedM",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/jvm/GcCount":{
-        "metric":"jvm.metrics.GcCount",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/jvm/GcTimeMillis":{
-        "metric":"jvm.metrics.GcTimeMillis",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/jvm/LogFatal":{
-        "metric":"jvm.metrics.LogFatal",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/jvm/LogError":{
-        "metric":"jvm.metrics.LogError",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/jvm/LogWarn":{
-        "metric":"jvm.metrics.LogWarn",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/jvm/LogInfo":{
-        "metric":"jvm.metrics.LogInfo",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/jvm/ThreadsNew":{
-        "metric":"jvm.metrics.ThreadsNew",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/jvm/ThreadsRunnable":{
-        "metric":"jvm.metrics.ThreadsRunnable",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/jvm/ThreadsBlocked":{
-        "metric":"jvm.metrics.ThreadsBlocked",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/jvm/ThreadsWaiting":{
-        "metric":"jvm.metrics.ThreadsWaiting",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/jvm/ThreadsTimedWaiting":{
-        "metric":"jvm.metrics.ThreadsTimedWaiting",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/jvm/ThreadsTerminated":{
-        "metric":"jvm.metrics.ThreadsTerminated",
-        "pointInTime":false,
-        "temporal":true
-      }
-
-    },
-
-    "NODEMANAGER":{
-      "metrics/boottime":{
-        "metric":"boottime",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/cpu/cpu_aidle":{
-        "metric":"cpu_aidle",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/cpu/cpu_idle":{
-        "metric":"cpu_idle",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/cpu/cpu_nice":{
-        "metric":"cpu_nice",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/cpu/cpu_num":{
-        "metric":"cpu_num",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/cpu/cpu_speed":{
-        "metric":"cpu_speed",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/cpu/cpu_system":{
-        "metric":"cpu_system",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/cpu/cpu_user":{
-        "metric":"cpu_user",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/cpu/cpu_wio":{
-        "metric":"cpu_wio",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/disk/disk_free":{
-        "metric":"disk_free",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/disk/disk_total":{
-        "metric":"disk_total",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/disk/part_max_used":{
-        "metric":"part_max_used",
-        "pointInTime":true,
-        "temporal":true
-      },
-
-      "metrics/memory/mem_buffers":{
-        "metric":"mem_buffers",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/memory/mem_cached":{
-        "metric":"mem_cached",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/memory/mem_free":{
-        "metric":"mem_free",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/memory/mem_shared":{
-        "metric":"mem_shared",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/memory/mem_total":{
-        "metric":"mem_total",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/memory/swap_free":{
-        "metric":"swap_free",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/memory/swap_total":{
-        "metric":"swap_total",
-        "pointInTime":true,
-        "temporal":true
-      },
-
-      "metrics/network/bytes_in":{
-        "metric":"bytes_in",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/network/bytes_out":{
-        "metric":"bytes_out",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/network/pkts_in":{
-        "metric":"pkts_in",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/network/pkts_out":{
-        "metric":"pkts_out",
-        "pointInTime":true,
-        "temporal":true
-      },
-
-      "metrics/process/proc_run":{
-        "metric":"proc_run",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/process/proc_total":{
-        "metric":"proc_total",
-        "pointInTime":true,
-        "temporal":true
-      },
-
-      "metrics/mapred/ShuffleOutputBytes":{
-        "metric":"mapred.ShuffleOutputBytes",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/mapred/ShuffleOutputsFailed":{
-        "metric":"mapred.ShuffleOutputsFailed",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/mapred/ShuffleOutputsOK":{
-        "metric":"mapred.ShuffleOutputsOK",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/mapred/ShuffleConnections":{
-        "metric":"mapred.ShuffleConnections",
-        "pointInTime":true,
-        "temporal":true
-      },
-
-      "metrics/yarn/ContainersLaunched":{
-        "metric":"yarn.ContainersLaunched",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/yarn/ContainersCompleted":{
-        "metric":"yarn.ContainersCompleted",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/yarn/ContainersFailed":{
-        "metric":"yarn.ContainersFailed",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/yarn/ContainersKilled":{
-        "metric":"yarn.ContainersKilled",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/yarn/ContainersIniting":{
-        "metric":"yarn.ContainersIniting",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/yarn/ContainersRunning":{
-        "metric":"yarn.ContainersRunning",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/yarn/AllocatedGB":{
-        "metric":"yarn.AllocatedGB",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/yarn/AllocatedContainers":{
-        "metric":"yarn.AllocatedContainers",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/yarn/AvailableGB":{
-        "metric":"yarn.AvailableGB",
-        "pointInTime":true,
-        "temporal":true
-      },
-
-      "metrics/jvm/MemNonHeapUsedM":{
-        "metric":"jvm.metrics.MemNonHeapUsedM",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/jvm/MemNonHeapCommittedM":{
-        "metric":"jvm.metrics.MemNonHeapCommittedM",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/jvm/MemHeapUsedM":{
-        "metric":"jvm.metrics.MemHeapUsedM",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/jvm/MemHeapCommittedM":{
-        "metric":"jvm.metrics.MemHeapCommittedM",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/jvm/GcCount":{
-        "metric":"jvm.metrics.GcCount",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/jvm/GcTimeMillis":{
-        "metric":"jvm.metrics.GcTimeMillis",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/jvm/LogFatal":{
-        "metric":"jvm.metrics.LogFatal",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/jvm/LogError":{
-        "metric":"jvm.metrics.LogError",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/jvm/LogWarn":{
-        "metric":"jvm.metrics.LogWarn",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/jvm/LogInfo":{
-        "metric":"jvm.metrics.LogInfo",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/jvm/ThreadsNew":{
-        "metric":"jvm.metrics.ThreadsNew",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/jvm/ThreadsRunnable":{
-        "metric":"jvm.metrics.ThreadsRunnable",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/jvm/ThreadsBlocked":{
-        "metric":"jvm.metrics.ThreadsBlocked",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/jvm/ThreadsWaiting":{
-        "metric":"jvm.metrics.ThreadsWaiting",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/jvm/ThreadsTimedWaiting":{
-        "metric":"jvm.metrics.ThreadsTimedWaiting",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/jvm/ThreadsTerminated":{
-        "metric":"jvm.metrics.ThreadsTerminated",
-        "pointInTime":false,
-        "temporal":true
-      },
-
-      "metrics/rpc/ReceivedBytes":{
-        "metric":"rpc.metrics.ReceivedBytes",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/rpc/SentBytes":{
-        "metric":"rpc.metrics.SentBytes",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/rpc/RpcQueueTimeNumOps":{
-        "metric":"rpc.metrics.RpcQueueTimeNumOps",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/rpc/RpcQueueTimeAvgTime":{
-        "metric":"rpc.metrics.RpcQueueTimeAvgTime",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/rpc/RpcProcessingTimeNumOps":{
-        "metric":"rpc.metrics.RpcProcessingTimeNumOps",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/rpc/RpcProcessingTimeAvgTime":{
-        "metric":"rpc.metrics.RpcProcessingTimeAvgTime",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/rpc/RpcAuthenticationFailures":{
-        "metric":"rpc.metrics.RpcAuthenticationFailures",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/rpc/RpcAuthenticationSuccesses":{
-        "metric":"rpc.metrics.RpcAuthenticationSuccesses",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/rpc/RpcAuthorizationFailures":{
-        "metric":"rpc.metrics.RpcAuthorizationFailures",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/rpc/RpcAuthorizationSuccesses":{
-        "metric":"rpc.metrics.RpcAuthorizationSuccesses",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/rpc/NumOpenConnections":{
-        "metric":"rpc.metrics.NumOpenConnections",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/rpc/CallQueueLength":{
-        "metric":"rpc.metrics.CallQueueLength",
-        "pointInTime":false,
-        "temporal":true
-      },
-
-      "metrics/ugi/LoginSuccessNumOps":{
-        "metric":"ugi.ugi.LoginSuccessNumOps",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/ugi/LoginSuccessAvgTime":{
-        "metric":"ugi.ugi.LoginSuccessAvgTime",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/ugi/LoginFailureNumOps":{
-        "metric":"ugi.ugi.LoginFailureNumOps",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/ugi/LoginFailureAvgTime":{
-        "metric":"ugi.ugi.LoginFailureAvgTime",
-        "pointInTime":false,
-        "temporal":true
-      }
-
-    },
-
-    "HISTORYSERVER":{
-      "metrics/boottime":{
-        "metric":"boottime",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/cpu/cpu_aidle":{
-        "metric":"cpu_aidle",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/cpu/cpu_idle":{
-        "metric":"cpu_idle",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/cpu/cpu_nice":{
-        "metric":"cpu_nice",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/cpu/cpu_num":{
-        "metric":"cpu_num",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/cpu/cpu_speed":{
-        "metric":"cpu_speed",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/cpu/cpu_system":{
-        "metric":"cpu_system",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/cpu/cpu_user":{
-        "metric":"cpu_user",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/cpu/cpu_wio":{
-        "metric":"cpu_wio",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/disk/disk_free":{
-        "metric":"disk_free",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/disk/disk_total":{
-        "metric":"disk_total",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/disk/part_max_used":{
-        "metric":"part_max_used",
-        "pointInTime":true,
-        "temporal":true
-      },
-
-      "metrics/memory/mem_buffers":{
-        "metric":"mem_buffers",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/memory/mem_cached":{
-        "metric":"mem_cached",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/memory/mem_free":{
-        "metric":"mem_free",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/memory/mem_shared":{
-        "metric":"mem_shared",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/memory/mem_total":{
-        "metric":"mem_total",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/memory/swap_free":{
-        "metric":"swap_free",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/memory/swap_total":{
-        "metric":"swap_total",
-        "pointInTime":true,
-        "temporal":true
-      },
-
-      "metrics/network/bytes_in":{
-        "metric":"bytes_in",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/network/bytes_out":{
-        "metric":"bytes_out",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/network/pkts_in":{
-        "metric":"pkts_in",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/network/pkts_out":{
-        "metric":"pkts_out",
-        "pointInTime":true,
-        "temporal":true
-      },
-
-      "metrics/process/proc_run":{
-        "metric":"proc_run",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/process/proc_total":{
-        "metric":"proc_total",
-        "pointInTime":true,
-        "temporal":true
-      },
-
-      "metrics/jvm/MemNonHeapUsedM":{
-        "metric":"jvm.metrics.MemNonHeapUsedM",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/jvm/MemNonHeapCommittedM":{
-        "metric":"jvm.metrics.MemNonHeapCommittedM",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/jvm/MemHeapUsedM":{
-        "metric":"jvm.metrics.MemHeapUsedM",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/jvm/MemHeapCommittedM":{
-        "metric":"jvm.metrics.MemHeapCommittedM",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/jvm/GcCount":{
-        "metric":"jvm.metrics.GcCount",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/jvm/GcTimeMillis":{
-        "metric":"jvm.metrics.GcTimeMillis",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/jvm/LogFatal":{
-        "metric":"jvm.metrics.LogFatal",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/jvm/LogError":{
-        "metric":"jvm.metrics.LogError",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/jvm/LogWarn":{
-        "metric":"jvm.metrics.LogWarn",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/jvm/LogInfo":{
-        "metric":"jvm.metrics.LogInfo",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/jvm/ThreadsNew":{
-        "metric":"jvm.metrics.ThreadsNew",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/jvm/ThreadsRunnable":{
-        "metric":"jvm.metrics.ThreadsRunnable",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/jvm/ThreadsBlocked":{
-        "metric":"jvm.metrics.ThreadsBlocked",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/jvm/ThreadsWaiting":{
-        "metric":"jvm.metrics.ThreadsWaiting",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/jvm/ThreadsTimedWaiting":{
-        "metric":"jvm.metrics.ThreadsTimedWaiting",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/jvm/ThreadsTerminated":{
-        "metric":"jvm.metrics.ThreadsTerminated",
-        "pointInTime":false,
-        "temporal":true
-      },
-
-      "metrics/rpc/ReceivedBytes":{
-        "metric":"rpc.metrics.ReceivedBytes",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/rpc/SentBytes":{
-        "metric":"rpc.metrics.SentBytes",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/rpc/RpcQueueTimeNumOps":{
-        "metric":"rpc.metrics.RpcQueueTimeNumOps",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/rpc/RpcQueueTimeAvgTime":{
-        "metric":"rpc.metrics.RpcQueueTimeAvgTime",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/rpc/RpcProcessingTimeNumOps":{
-        "metric":"rpc.metrics.RpcProcessingTimeNumOps",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/rpc/RpcProcessingTimeAvgTime":{
-        "metric":"rpc.metrics.RpcProcessingTimeAvgTime",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/rpc/RpcAuthenticationFailures":{
-        "metric":"rpc.metrics.RpcAuthenticationFailures",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/rpc/RpcAuthenticationSuccesses":{
-        "metric":"rpc.metrics.RpcAuthenticationSuccesses",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/rpc/RpcAuthorizationFailures":{
-        "metric":"rpc.metrics.RpcAuthorizationFailures",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/rpc/RpcAuthorizationSuccesses":{
-        "metric":"rpc.metrics.RpcAuthorizationSuccesses",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/rpc/NumOpenConnections":{
-        "metric":"rpc.metrics.NumOpenConnections",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/rpc/CallQueueLength":{
-        "metric":"rpc.metrics.CallQueueLength",
-        "pointInTime":false,
-        "temporal":true
-      },
-
-      "metrics/ugi/LoginSuccessNumOps":{
-        "metric":"ugi.ugi.LoginSuccessNumOps",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/ugi/LoginSuccessAvgTime":{
-        "metric":"ugi.ugi.LoginSuccessAvgTime",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/ugi/LoginFailureNumOps":{
-        "metric":"ugi.ugi.LoginFailureNumOps",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/ugi/LoginFailureAvgTime":{
-        "metric":"ugi.ugi.LoginFailureAvgTime",
-        "pointInTime":false,
-        "temporal":true
-      }
-
-    },
-
     "HBASE_MASTER":{
-
       "metrics/boottime":{
         "metric":"boottime",
         "pointInTime":true,

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

@@ -195,6 +195,11 @@
         "pointInTime" : true,
         "temporal" : false
       },
+      "metrics/jvm/memMaxM":{
+        "metric" : "Hadoop:service=ResourceManager,name=JvmMetrics.MemMaxM",
+        "pointInTime" : true,
+        "temporal" : false
+      },
       "metrics/jvm/threadsBlocked":{
         "metric" : "Hadoop:service=ResourceManager,name=JvmMetrics.ThreadsBlocked",
         "pointInTime" : true,
@@ -230,6 +235,66 @@
         "pointInTime" : true,
         "temporal" : false
       },
+      "metrics/rpc/NumOpenConnections":{
+        "metric" : "Hadoop:service=ResourceManager,name=RpcActivity.NumOpenConnections",
+        "pointInTime" : true,
+        "temporal" : false
+      },
+      "metrics/rpc/ReceivedBytes":{
+        "metric" : "Hadoop:service=ResourceManager,name=RpcActivity.ReceivedBytes",
+        "pointInTime" : true,
+        "temporal" : false
+      },
+      "metrics/rpc/RpcProcessingTime_avg_time":{
+        "metric" : "Hadoop:service=ResourceManager,name=RpcActivity.RpcProcessingTimeAvgTime",
+        "pointInTime" : true,
+        "temporal" : false
+      },
+      "metrics/rpc/RpcProcessingTime_num_ops":{
+        "metric" : "Hadoop:service=ResourceManager,name=RpcActivity.RpcProcessingTimeNumOps",
+        "pointInTime" : true,
+        "temporal" : false
+      },
+      "metrics/rpc/RpcQueueTime_avg_time":{
+        "metric" : "Hadoop:service=ResourceManager,name=RpcActivity.RpcQueueTimeAvgTime",
+        "pointInTime" : true,
+        "temporal" : false
+      },
+      "metrics/rpc/RpcQueueTime_num_ops":{
+        "metric" : "Hadoop:service=ResourceManager,name=RpcActivity.RpcQueueTimeNumOps",
+        "pointInTime" : true,
+        "temporal" : false
+      },
+      "metrics/rpc/SentBytes":{
+        "metric" : "Hadoop:service=ResourceManager,name=RpcActivity.SentBytes",
+        "pointInTime" : true,
+        "temporal" : false
+      },
+      "metrics/rpc/callQueueLen":{
+        "metric" : "Hadoop:service=ResourceManager,name=RpcActivity.CallQueueLength",
+        "pointInTime" : true,
+        "temporal" : false
+      },
+      "metrics/rpc/rpcAuthenticationFailures":{
+        "metric" : "Hadoop:service=ResourceManager,name=RpcActivity.RpcAuthenticationFailures",
+        "pointInTime" : true,
+        "temporal" : false
+      },
+      "metrics/rpc/rpcAuthenticationSuccesses":{
+        "metric" : "Hadoop:service=ResourceManager,name=RpcActivity.RpcAuthenticationSuccesses",
+        "pointInTime" : true,
+        "temporal" : false
+      },
+      "metrics/rpc/rpcAuthorizationFailures":{
+        "metric" : "Hadoop:service=ResourceManager,name=RpcActivity.RpcAuthorizationFailures",
+        "pointInTime" : true,
+        "temporal" : false
+      },
+      "metrics/rpc/rpcAuthorizationSuccesses":{
+        "metric" : "Hadoop:service=ResourceManager,name=RpcActivity.RpcAuthorizationSuccesses",
+        "pointInTime" : true,
+        "temporal" : false
+      },
       "ServiceComponentInfo/rm_metrics/cluster/activeNMcount":{
         "metric" : "Hadoop:service=ResourceManager,name=ClusterMetrics.NumActiveNMs",
         "pointInTime" : true,
@@ -260,7 +325,32 @@
         "pointInTime" : true,
         "temporal" : false
        },
-       "metrics/yarn/ClusterMetrics/NumActiveNMs":{
+      "metrics/ugi/loginFailure_avg_time":{
+        "metric":"Hadoop:service=ResourceManager,name=UgiMetrics.LoginFailureAvgTime",
+        "pointInTime":true,
+        "temporal":false
+      },
+      "metrics/ugi/loginFailure_num_ops":{
+        "metric":"Hadoop:service=ResourceManager,name=UgiMetrics.LoginFailureNumOps",
+        "pointInTime":true,
+        "temporal":false
+      },
+      "metrics/ugi/loginSuccess_avg_time":{
+        "metric":"Hadoop:service=ResourceManager,name=UgiMetrics.LoginSuccessAvgTime",
+        "pointInTime":true,
+        "temporal":false
+      },
+      "metrics/ugi/loginSuccess_num_ops":{
+        "metric":"Hadoop:service=ResourceManager,name=UgiMetrics.LoginSuccessNumOps",
+        "pointInTime":true,
+        "temporal":false
+      },
+      "metrics/runtime/StartTime":{
+        "metric" : "java.lang:type=Runtime.StartTime",
+        "pointInTime" : true,
+        "temporal" : false
+      },
+      "metrics/yarn/ClusterMetrics/NumActiveNMs":{
         "metric" : "Hadoop:service=ResourceManager,name=ClusterMetrics.NumActiveNMs",
         "pointInTime":true,
         "temporal":false
@@ -1052,6 +1142,26 @@
         "pointInTime" : true,
         "temporal" : false
       },
+      "metrics/rpcdetailed/addBlock_avg_time":{
+        "metric" : "Hadoop:service=NameNode,name=RpcDetailedActivity.AddBlockAvgTime",
+        "pointInTime" : true,
+        "temporal" : false
+      },
+      "metrics/rpcdetailed/addBlock_num_ops":{
+        "metric" : "Hadoop:service=NameNode,name=RpcDetailedActivity.AddBlockNumOps",
+        "pointInTime" : true,
+        "temporal" : false
+      },
+      "metrics/rpcdetailed/blockReceived_avg_time":{
+        "metric" : "Hadoop:service=NameNode,name=RpcDetailedActivity.BlockReceivedAndDeletedAvgTime",
+        "pointInTime" : true,
+        "temporal" : false
+      },
+      "metrics/rpcdetailed/blockReceived_num_ops":{
+        "metric" : "Hadoop:service=NameNode,name=RpcDetailedActivity.BlockReceivedAndDeletedNumOps",
+        "pointInTime" : true,
+        "temporal" : false
+      },
       "metrics/rpcdetailed/blockReport_avg_time":{
         "metric" : "Hadoop:service=NameNode,name=RpcDetailedActivity.BlockReportAvgTime",
         "pointInTime" : true,
@@ -1062,6 +1172,46 @@
         "pointInTime" : true,
         "temporal" : false
       },
+      "metrics/rpcdetailed/complete_avg_time":{
+        "metric" : "Hadoop:service=NameNode,name=RpcDetailedActivity.CompleteAvgTime",
+        "pointInTime" : true,
+        "temporal" : false
+      },
+      "metrics/rpcdetailed/complete_num_ops":{
+        "metric" : "Hadoop:service=NameNode,name=RpcDetailedActivity.CompleteNumOps",
+        "pointInTime" : true,
+        "temporal" : false
+      },
+      "metrics/rpcdetailed/create_avg_time":{
+        "metric" : "Hadoop:service=NameNode,name=RpcDetailedActivity.CreateAvgTime",
+        "pointInTime" : true,
+        "temporal" : false
+      },
+      "metrics/rpcdetailed/create_num_ops":{
+        "metric" : "Hadoop:service=NameNode,name=RpcDetailedActivity.CreateNumOps",
+        "pointInTime" : true,
+        "temporal" : false
+      },
+      "metrics/rpcdetailed/fsync_avg_time":{
+        "metric" : "Hadoop:service=NameNode,name=RpcDetailedActivity.FsyncAvgTime",
+        "pointInTime" : true,
+        "temporal" : false
+      },
+      "metrics/rpcdetailed/fsync_num_ops":{
+        "metric" : "Hadoop:service=NameNode,name=RpcDetailedActivity.FsyncNumOps",
+        "pointInTime" : true,
+        "temporal" : false
+      },
+      "metrics/rpcdetailed/getBlockLocations_avg_time":{
+        "metric" : "Hadoop:service=NameNode,name=RpcDetailedActivity.GetBlockLocationsAvgTime",
+        "pointInTime" : true,
+        "temporal" : false
+      },
+      "metrics/rpcdetailed/getBlockLocations_num_ops":{
+        "metric" : "Hadoop:service=NameNode,name=RpcDetailedActivity.GetBlockLocationsNumOps",
+        "pointInTime" : true,
+        "temporal" : false
+      },
       "metrics/rpcdetailed/getEditLogSize_avg_time":{
         "metric" : "Hadoop:service=NameNode,name=RpcDetailedActivity.GetEditLogManifestAvgTime",
         "pointInTime" : true,
@@ -1537,6 +1687,86 @@
         "metric" : "Hadoop:service=NodeManager,name=JvmMetrics.ThreadsWaiting",
         "pointInTime" : true,
         "temporal" : false
+      },
+      "metrics/rpc/NumOpenConnections":{
+        "metric" : "Hadoop:service=NodeManager,name=RpcActivity.NumOpenConnections",
+        "pointInTime" : true,
+        "temporal" : false
+      },
+      "metrics/rpc/ReceivedBytes":{
+        "metric" : "Hadoop:service=NodeManager,name=RpcActivity.ReceivedBytes",
+        "pointInTime" : true,
+        "temporal" : false
+      },
+      "metrics/rpc/RpcProcessingTime_avg_time":{
+        "metric" : "Hadoop:service=NodeManager,name=RpcActivity.RpcProcessingTimeAvgTime",
+        "pointInTime" : true,
+        "temporal" : false
+      },
+      "metrics/rpc/RpcProcessingTime_num_ops":{
+        "metric" : "Hadoop:service=NodeManager,name=RpcActivity.RpcProcessingTimeNumOps",
+        "pointInTime" : true,
+        "temporal" : false
+      },
+      "metrics/rpc/RpcQueueTime_avg_time":{
+        "metric" : "Hadoop:service=NodeManager,name=RpcActivity.RpcQueueTimeAvgTime",
+        "pointInTime" : true,
+        "temporal" : false
+      },
+      "metrics/rpc/RpcQueueTime_num_ops":{
+        "metric" : "Hadoop:service=NodeManager,name=RpcActivity.RpcQueueTimeNumOps",
+        "pointInTime" : true,
+        "temporal" : false
+      },
+      "metrics/rpc/SentBytes":{
+        "metric" : "Hadoop:service=NodeManager,name=RpcActivity.SentBytes",
+        "pointInTime" : true,
+        "temporal" : false
+      },
+      "metrics/rpc/callQueueLen":{
+        "metric" : "Hadoop:service=NodeManager,name=RpcActivity.CallQueueLength",
+        "pointInTime" : true,
+        "temporal" : false
+      },
+      "metrics/rpc/rpcAuthenticationFailures":{
+        "metric" : "Hadoop:service=NodeManager,name=RpcActivity.RpcAuthenticationFailures",
+        "pointInTime" : true,
+        "temporal" : false
+      },
+      "metrics/rpc/rpcAuthenticationSuccesses":{
+        "metric" : "Hadoop:service=NodeManager,name=RpcActivity.RpcAuthenticationSuccesses",
+        "pointInTime" : true,
+        "temporal" : false
+      },
+      "metrics/rpc/rpcAuthorizationFailures":{
+        "metric" : "Hadoop:service=NodeManager,name=RpcActivity.RpcAuthorizationFailures",
+        "pointInTime" : true,
+        "temporal" : false
+      },
+      "metrics/rpc/rpcAuthorizationSuccesses":{
+        "metric" : "Hadoop:service=NodeManager,name=RpcActivity.RpcAuthorizationSuccesses",
+        "pointInTime" : true,
+        "temporal" : false
+      },
+      "metrics/ugi/loginFailure_avg_time":{
+        "metric":"Hadoop:service=NodeManager,name=UgiMetrics.LoginFailureAvgTime",
+        "pointInTime":true,
+        "temporal":false
+      },
+      "metrics/ugi/loginFailure_num_ops":{
+        "metric":"Hadoop:service=NodeManager,name=UgiMetrics.LoginFailureNumOps",
+        "pointInTime":true,
+        "temporal":false
+      },
+      "metrics/ugi/loginSuccess_avg_time":{
+        "metric":"Hadoop:service=NodeManager,name=UgiMetrics.LoginSuccessAvgTime",
+        "pointInTime":true,
+        "temporal":false
+      },
+      "metrics/ugi/loginSuccess_num_ops":{
+        "metric":"Hadoop:service=NodeManager,name=UgiMetrics.LoginSuccessNumOps",
+        "pointInTime":true,
+        "temporal":false
       }
     },
     "HISTORYSERVER":{
@@ -1925,6 +2155,11 @@
         "pointInTime" : true,
         "temporal" : false
       },
+      "metrics/jvm/memMaxM":{
+        "metric" : "Hadoop:service=ResourceManager,name=JvmMetrics.MemMaxM",
+        "pointInTime" : true,
+        "temporal" : false
+      },
       "metrics/jvm/threadsBlocked":{
         "metric" : "Hadoop:service=ResourceManager,name=JvmMetrics.ThreadsBlocked",
         "pointInTime" : true,
@@ -1955,6 +2190,86 @@
         "pointInTime" : true,
         "temporal" : false
       },
+      "metrics/rpc/NumOpenConnections":{
+        "metric" : "Hadoop:service=ResourceManager,name=RpcActivity.NumOpenConnections",
+        "pointInTime" : true,
+        "temporal" : false
+      },
+      "metrics/rpc/ReceivedBytes":{
+        "metric" : "Hadoop:service=ResourceManager,name=RpcActivity.ReceivedBytes",
+        "pointInTime" : true,
+        "temporal" : false
+      },
+      "metrics/rpc/RpcProcessingTime_avg_time":{
+        "metric" : "Hadoop:service=ResourceManager,name=RpcActivity.RpcProcessingTimeAvgTime",
+        "pointInTime" : true,
+        "temporal" : false
+      },
+      "metrics/rpc/RpcProcessingTime_num_ops":{
+        "metric" : "Hadoop:service=ResourceManager,name=RpcActivity.RpcProcessingTimeNumOps",
+        "pointInTime" : true,
+        "temporal" : false
+      },
+      "metrics/rpc/RpcQueueTime_avg_time":{
+        "metric" : "Hadoop:service=ResourceManager,name=RpcActivity.RpcQueueTimeAvgTime",
+        "pointInTime" : true,
+        "temporal" : false
+      },
+      "metrics/rpc/RpcQueueTime_num_ops":{
+        "metric" : "Hadoop:service=ResourceManager,name=RpcActivity.RpcQueueTimeNumOps",
+        "pointInTime" : true,
+        "temporal" : false
+      },
+      "metrics/rpc/SentBytes":{
+        "metric" : "Hadoop:service=ResourceManager,name=RpcActivity.SentBytes",
+        "pointInTime" : true,
+        "temporal" : false
+      },
+      "metrics/rpc/callQueueLen":{
+        "metric" : "Hadoop:service=ResourceManager,name=RpcActivity.CallQueueLength",
+        "pointInTime" : true,
+        "temporal" : false
+      },
+      "metrics/rpc/rpcAuthenticationFailures":{
+        "metric" : "Hadoop:service=ResourceManager,name=RpcActivity.RpcAuthenticationFailures",
+        "pointInTime" : true,
+        "temporal" : false
+      },
+      "metrics/rpc/rpcAuthenticationSuccesses":{
+        "metric" : "Hadoop:service=ResourceManager,name=RpcActivity.RpcAuthenticationSuccesses",
+        "pointInTime" : true,
+        "temporal" : false
+      },
+      "metrics/rpc/rpcAuthorizationFailures":{
+        "metric" : "Hadoop:service=ResourceManager,name=RpcActivity.RpcAuthorizationFailures",
+        "pointInTime" : true,
+        "temporal" : false
+      },
+      "metrics/rpc/rpcAuthorizationSuccesses":{
+        "metric" : "Hadoop:service=ResourceManager,name=RpcActivity.RpcAuthorizationSuccesses",
+        "pointInTime" : true,
+        "temporal" : false
+      },
+      "metrics/ugi/loginFailure_avg_time":{
+        "metric":"Hadoop:service=ResourceManager,name=UgiMetrics.LoginFailureAvgTime",
+        "pointInTime":true,
+        "temporal":false
+      },
+      "metrics/ugi/loginFailure_num_ops":{
+        "metric":"Hadoop:service=ResourceManager,name=UgiMetrics.LoginFailureNumOps",
+        "pointInTime":true,
+        "temporal":false
+      },
+      "metrics/ugi/loginSuccess_avg_time":{
+        "metric":"Hadoop:service=ResourceManager,name=UgiMetrics.LoginSuccessAvgTime",
+        "pointInTime":true,
+        "temporal":false
+      },
+      "metrics/ugi/loginSuccess_num_ops":{
+        "metric":"Hadoop:service=ResourceManager,name=UgiMetrics.LoginSuccessNumOps",
+        "pointInTime":true,
+        "temporal":false
+      },
       "metrics/yarn/ClusterMetrics/NumActiveNMs":{
         "metric" : "Hadoop:service=ResourceManager,name=ClusterMetrics.NumActiveNMs",
         "pointInTime":true,
@@ -2107,22 +2422,22 @@
         "pointInTime" : true,
         "temporal" : false
       },
-      "metrics/jvm/heapMemoryMax":{
+      "metrics/jvm/HeapMemoryMax":{
         "metric" : "java.lang:type=Memory.HeapMemoryUsage[max]",
         "pointInTime" : true,
         "temporal" : false
       },
-      "metrics/jvm/heapMemoryUsed":{
+      "metrics/jvm/HeapMemoryUsed":{
         "metric" : "java.lang:type=Memory.HeapMemoryUsage[used]",
         "pointInTime" : true,
         "temporal" : false
       },
-      "metrics/jvm/nonHeapMemoryMax":{
+      "metrics/jvm/NonHeapMemoryMax":{
         "metric" : "java.lang:type=Memory.NonHeapMemoryUsage[max]",
         "pointInTime" : true,
         "temporal" : false
       },
-      "metrics/jvm/nonHeapMemoryUsed":{
+      "metrics/jvm/NonHeapMemoryUsed":{
         "metric" : "java.lang:type=Memory.NonHeapMemoryUsage[used]",
         "pointInTime" : true,
         "temporal" : false
@@ -2167,6 +2482,11 @@
         "pointInTime" : true,
         "temporal" : false
       },
+      "metrics/jvm/memMaxM":{
+        "metric" : "Hadoop:service=JournalNode,name=JvmMetrics.MemMaxM",
+        "pointInTime" : true,
+        "temporal" : false
+      },
       "metrics/jvm/memNonHeapCommittedM":{
         "metric" : "Hadoop:service=JournalNode,name=JvmMetrics.MemNonHeapCommittedM",
         "pointInTime" : true,
@@ -2207,37 +2527,37 @@
         "pointInTime" : true,
         "temporal" : false
       },
-      "metrics/rpc/numOpenConnections":{
+      "metrics/rpc/NumOpenConnections":{
         "metric" : "Hadoop:service=JournalNode,name=RpcActivity.NumOpenConnections",
         "pointInTime" : true,
         "temporal" : false
       },
-      "metrics/rpc/receivedBytes":{
+      "metrics/rpc/ReceivedBytes":{
         "metric" : "Hadoop:service=JournalNode,name=RpcActivity.ReceivedBytes",
         "pointInTime" : true,
         "temporal" : false
       },
-      "metrics/rpc/rpcProcessingTime_avg_time":{
+      "metrics/rpc/RpcProcessingTime_avg_time":{
         "metric" : "Hadoop:service=JournalNode,name=RpcActivity.RpcProcessingTimeAvgTime",
         "pointInTime" : true,
         "temporal" : false
       },
-      "metrics/rpc/rpcProcessingTime_num_ops":{
+      "metrics/rpc/RpcProcessingTime_num_ops":{
         "metric" : "Hadoop:service=JournalNode,name=RpcActivity.RpcProcessingTimeNumOps",
         "pointInTime" : true,
         "temporal" : false
       },
-      "metrics/rpc/rpcQueueTime_avg_time":{
+      "metrics/rpc/RpcQueueTime_avg_time":{
         "metric" : "Hadoop:service=JournalNode,name=RpcActivity.RpcQueueTimeAvgTime",
         "pointInTime" : true,
         "temporal" : false
       },
-      "metrics/rpc/rpcQueueTime_num_ops":{
+      "metrics/rpc/RpcQueueTime_num_ops":{
         "metric" : "Hadoop:service=JournalNode,name=RpcActivity.RpcQueueTimeNumOps",
         "pointInTime" : true,
         "temporal" : false
       },
-      "metrics/rpc/sentBytes":{
+      "metrics/rpc/SentBytes":{
         "metric" : "Hadoop:service=JournalNode,name=RpcActivity.SentBytes",
         "pointInTime" : true,
         "temporal" : false

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

@@ -877,22 +877,6 @@ public class GangliaPropertyProviderTest {
       {"metrics/disk", "disk_free", 92.428},
       {"metrics/disk", "disk_total", 101.515},
       {"metrics/disk", "part_max_used", 12.8},
-      {"metrics/jvm", "gcCount", 0.0},
-      {"metrics/jvm", "logError", 0.0},
-      {"metrics/jvm", "logFatal", 0.0},
-      {"metrics/jvm", "logInfo", 0.0},
-      {"metrics/jvm", "logWarn", 0.0},
-      {"metrics/jvm", "memMaxM", 910.25},
-      {"metrics/jvm", "memHeapCommittedM", 48.8125},
-      {"metrics/jvm", "memHeapUsedM", 9.5575423},
-      {"metrics/jvm", "memNonHeapCommittedM", 23.5625},
-      {"metrics/jvm", "memNonHeapUsedM", 22.78144},
-      {"metrics/jvm", "threadsBlocked", 0.0},
-      {"metrics/jvm", "threadsNew", 0.0},
-      {"metrics/jvm", "threadsRunnable", 6.0},
-      {"metrics/jvm", "threadsTerminated", 0.0},
-      {"metrics/jvm", "threadsTimedWaiting", 3.0},
-      {"metrics/jvm", "threadsWaiting", 9.0},
       {"metrics/load", "load_fifteen", 0.026},
       {"metrics/load", "load_five", 0.114},
       {"metrics/load", "load_one", 0.226},
@@ -909,38 +893,6 @@ public class GangliaPropertyProviderTest {
       {"metrics/network", "pkts_out", 35.4},
       {"metrics/process", "proc_run", 4.0},
       {"metrics/process", "proc_total", 657.0},
-      {"metrics/rpc", "numOpenConnections", 1.0},
-      {"metrics/rpc", "receivedBytes", 6.34666666667},
-      {"metrics/rpc", "rpcProcessingTime_avg_time", 2.0},
-      {"metrics/rpc", "rpcProcessingTime_num_ops", 0.0266666666667},
-      {"metrics/rpc", "rpcQueueTime_avg_time", 0.0},
-      {"metrics/rpc", "rpcQueueTime_num_ops", 0.0266666666667},
-      {"metrics/rpc", "sentBytes", 1.01333333333},
-      {"metrics/rpc", "callQueueLength", 0.0},
-      {"metrics/rpc", "rpcAuthenticationFailures", 0.0},
-      {"metrics/rpc", "rpcAuthenticationSuccesses", 0.0},
-      {"metrics/rpc", "rpcAuthorizationFailures", 0.0},
-      {"metrics/rpc", "rpcAuthorizationSuccesses", 0.0266666666667},
-      {"metrics/ugi", "loginFailure_avg_time", 0.0},
-      {"metrics/ugi", "loginFailure_num_ops", 0.0},
-      {"metrics/ugi", "loginSuccess_avg_time", 0.0},
-      {"metrics/ugi", "loginSuccess_num_ops", 0.0},
-      {"metrics/rpcdetailed", "acceptRecovery_avg_time", 0},
-      {"metrics/rpcdetailed", "acceptRecovery_num_ops", 0},
-      {"metrics/rpcdetailed", "finalizeLogSegment_avg_time", 0},
-      {"metrics/rpcdetailed", "finalizeLogSegment_num_ops", 0},
-      {"metrics/rpcdetailed", "getEditLogManifest_avg_time", 2.0},
-      {"metrics/rpcdetailed", "getEditLogManifest_num_ops", 0.0266666666667},
-      {"metrics/rpcdetailed", "getJournalState_avg_time", 0},
-      {"metrics/rpcdetailed", "getJournalState_num_ops", 0},
-      {"metrics/rpcdetailed", "journal_avg_time", 0},
-      {"metrics/rpcdetailed", "journal_num_ops", 0},
-      {"metrics/rpcdetailed", "newEpoch_avg_time", 0},
-      {"metrics/rpcdetailed", "newEpoch_num_ops", 0},
-      {"metrics/rpcdetailed", "prepareRecovery_avg_time", 0},
-      {"metrics/rpcdetailed", "prepareRecovery_num_ops", 0},
-      {"metrics/rpcdetailed", "startLogSegment_avg_time", 0},
-      {"metrics/rpcdetailed", "startLogSegment_num_ops", 0},
       {"metrics/dfs/journalNode", "batchesWritten", 0.0},
       {"metrics/dfs/journalNode", "batchesWrittenWhileLagging", 0.0},
       {"metrics/dfs/journalNode", "bytesWritten", 0.0},
@@ -979,6 +931,18 @@ public class GangliaPropertyProviderTest {
     Request request = PropertyHelper.getReadRequest(properties, temporalInfoMap);
 
     Assert.assertEquals(1, propertyProvider.populateResources(Collections.singleton(resource), request, null).size());
+
+    Map<String, Object> p = PropertyHelper.getProperties(resource);
+
+    for (String key : p.keySet()) {
+      if (!properties.contains(key)) {
+        System.out.printf(key);
+      }
+    }
+
+
+
+
     Assert.assertEquals(properties.size() + 2, PropertyHelper.getProperties(resource).size());
 
     int i = 0;

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

@@ -692,10 +692,10 @@ public class JMXPropertyProviderTest {
 
     // see test/resources/hdfs_journalnode_jmx.json for values
     Assert.assertEquals(1377795104272L, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/jvm", "startTime")));
-    Assert.assertEquals(954466304, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/jvm", "heapMemoryMax")));
-    Assert.assertEquals(14569736, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/jvm", "heapMemoryUsed")));
-    Assert.assertEquals(136314880, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/jvm", "nonHeapMemoryMax")));
-    Assert.assertEquals(24993392, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/jvm", "nonHeapMemoryUsed")));
+    Assert.assertEquals(954466304, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/jvm", "HeapMemoryMax")));
+    Assert.assertEquals(14569736, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/jvm", "HeapMemoryUsed")));
+    Assert.assertEquals(136314880, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/jvm", "NonHeapMemoryMax")));
+    Assert.assertEquals(24993392, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/jvm", "NonHeapMemoryUsed")));
     Assert.assertEquals(9100, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/jvm", "gcCount")));
     Assert.assertEquals(31641, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/jvm", "gcTimeMillis")));
     Assert.assertEquals(0, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/jvm", "logError")));
@@ -713,13 +713,13 @@ public class JMXPropertyProviderTest {
     Assert.assertEquals(3, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/jvm", "threadsTimedWaiting")));
     Assert.assertEquals(8, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/jvm", "threadsWaiting")));
 
-    Assert.assertEquals(1, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/rpc", "numOpenConnections")));
-    Assert.assertEquals(4928861, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/rpc", "receivedBytes")));
-    Assert.assertEquals(13.211112159230245, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/rpc", "rpcProcessingTime_avg_time")));
-    Assert.assertEquals(25067, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/rpc", "rpcProcessingTime_num_ops")));
-    Assert.assertEquals(0.19686821997924706, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/rpc", "rpcQueueTime_avg_time")));
-    Assert.assertEquals(25067, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/rpc", "rpcQueueTime_num_ops")));
-    Assert.assertEquals(6578899, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/rpc", "sentBytes")));
+    Assert.assertEquals(1, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/rpc", "NumOpenConnections")));
+    Assert.assertEquals(4928861, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/rpc", "ReceivedBytes")));
+    Assert.assertEquals(13.211112159230245, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/rpc", "RpcProcessingTime_avg_time")));
+    Assert.assertEquals(25067, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/rpc", "RpcProcessingTime_num_ops")));
+    Assert.assertEquals(0.19686821997924706, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/rpc", "RpcQueueTime_avg_time")));
+    Assert.assertEquals(25067, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/rpc", "RpcQueueTime_num_ops")));
+    Assert.assertEquals(6578899, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/rpc", "SentBytes")));
     Assert.assertEquals(0, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/rpc", "callQueueLen")));
     Assert.assertEquals(0, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/rpc", "rpcAuthenticationFailures")));
     Assert.assertEquals(0, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/rpc", "rpcAuthenticationSuccesses")));

ambari-server/src/test/java/org/apache/ambari/server/controller/utilities/PropertyHelperTest.java

@@ -23,9 +23,13 @@ import org.junit.Assert;
 import org.junit.Test;
 
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.TreeSet;
 
 
 /**
@@ -138,5 +142,277 @@ public class PropertyHelperTest {
 
     Assert.assertFalse(PropertyHelper.containsArguments("$X/foo/bar/$Y/baz/$Z"));
   }
+
+  @Test
+  /**
+   * Test to make sure that point in time metrics are not in both JMX and Ganglia.
+   * A metric marked as point in time should not be available from both JMX
+   * and Ganglia.  The preference is to get point in time metrics from JMX
+   * but they may come from Ganglia if not available from JMX.
+   *
+   * If there is a legitimate exception and the point in time metric should
+   * be available from both property providers then please add an exception to
+   * this test.
+   */
+  public void testDuplicatePointInTimeMetrics() {
+    for (PropertyHelper.MetricsVersion version : PropertyHelper.MetricsVersion.values()) {
+
+      TreeSet<String> set = new TreeSet<String>();
+
+      for (Resource.Type type : Resource.Type.values()) {
+
+        Map<String, Map<String, PropertyInfo>> gids =
+            PropertyHelper.getGangliaPropertyIds(type, version);
+
+        Map<String, Map<String, PropertyInfo>> jids =
+            PropertyHelper.getJMXPropertyIds(type, version);
+
+        if (gids != null && jids != null) {
+
+          gids = normalizeMetricNames(gids);
+          jids = normalizeMetricNames(jids);
+
+          for (Map.Entry<String, Map<String, PropertyInfo>> gComponentEntry : gids.entrySet()) {
+
+            String gComponent = gComponentEntry.getKey();
+
+            Set<Map.Entry<String, PropertyInfo>> gComponentEntries = gComponentEntry.getValue().entrySet();
+
+            for (Map.Entry<String, PropertyInfo> gMetricEntry : gComponentEntries) {
+
+              Map<String, PropertyInfo> jMetrics = jids.get(gComponent);
+
+              if (jMetrics != null) {
+                String gMetric = gMetricEntry.getKey();
+                PropertyInfo jProperty = jMetrics.get(gMetric);
+
+                if (jProperty != null) {
+                  PropertyInfo gProperty = gMetricEntry.getValue();
+                  if (gProperty.isPointInTime()) {
+                    String s = type + " : " + gComponent + " : " + gMetric + " : " + gProperty.getPropertyId();
+                    set.add(s);
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+      if (set.size() > 0) {
+        System.out.println("The following point in time metrics are defined for both JMX and Ganglia.");
+        System.out.println("The preference is to get point in time metrics from JMX only if possible.");
+        System.out.println("If the metric can be obtained from JMX then set \"pointInTime\" : false for ");
+        System.out.println("the metric in the Ganglia properties definition, otherwise remove the metric ");
+        System.out.println("from the JMX properties definition.\n");
+        System.out.println("Metric version :" + version + "\n");
+        for (String s : set) {
+          System.out.println(s);
+        }
+        Assert.fail("Found duplicate point in time metrics.");
+      }
+    }
+  }
+
+  @Test
+  /**
+   * Test to make sure that any metrics that are marked as temporal only in Ganglia are available
+   * as point in time from JMX.  If a metric can not be provided by JMX it may be marked
+   * as point in time from Ganglia.
+   *
+   * If there is a legitimate exception and the metric should be temporal only then please add an
+   * exception to this test.
+   */
+  public void testTemporalOnlyMetrics() {
+
+    for (PropertyHelper.MetricsVersion version : PropertyHelper.MetricsVersion.values()) {
+
+      TreeSet<String> set = new TreeSet<String>();
+
+      for (Resource.Type type : Resource.Type.values()) {
+
+        Map<String, Map<String, PropertyInfo>> gids =
+            PropertyHelper.getGangliaPropertyIds(type, version);
+
+        Map<String, Map<String, PropertyInfo>> jids =
+            PropertyHelper.getJMXPropertyIds(type, version);
+
+        if (gids != null && jids != null) {
+
+          gids = normalizeMetricNames(gids);
+          jids = normalizeMetricNames(jids);
+
+          for (Map.Entry<String, Map<String, PropertyInfo>> gComponentEntry : gids.entrySet()) {
+
+            String gComponent = gComponentEntry.getKey();
+
+            Set<Map.Entry<String, PropertyInfo>> gComponentEntries = gComponentEntry.getValue().entrySet();
+
+            for (Map.Entry<String, PropertyInfo> gMetricEntry : gComponentEntries) {
+
+              Map<String, PropertyInfo> jMetrics = jids.get(gComponent);
+
+              if (jMetrics != null) {
+
+                String gMetric = gMetricEntry.getKey();
+                PropertyInfo gProperty = gMetricEntry.getValue();
+
+                if (!gProperty.isPointInTime()) {
+
+                  PropertyInfo jProperty = jMetrics.get(gMetric);
+
+                  if (jProperty == null || !jProperty.isPointInTime()) {
+
+                    String s = type + " : " + gComponent + " : " + gMetric + " : " + gProperty.getPropertyId();
+
+                    set.add(s);
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+      if (set.size() > 0) {
+        System.out.println("The following metrics are marked as temporal only for Ganglia ");
+        System.out.println("but are not defined for JMX.");
+        System.out.println("The preference is to get point in time metrics from JMX if possible.");
+        System.out.println("If the metric can be obtained from JMX then add it to the JMX properties");
+        System.out.println("definition, otherwise set set \"pointInTime\" : true for the metric in ");
+        System.out.println("the Ganglia properties definition.\n");
+        System.out.println("Metric version :" + version + "\n");
+        for (String s : set) {
+          System.out.println(s);
+        }
+        Assert.fail("Found temporal only metrics.");
+      }
+    }
+  }
+
+  @Test
+  /**
+   * Test to make sure that no JMX metrics are marked as point in time.
+   */
+  public void testJMXTemporal() {
+
+    for (PropertyHelper.MetricsVersion version : PropertyHelper.MetricsVersion.values()) {
+
+      TreeSet<String> set = new TreeSet<String>();
+
+      for (Resource.Type type : Resource.Type.values()) {
+
+        Map<String, Map<String, PropertyInfo>> jids =
+            PropertyHelper.getJMXPropertyIds(type, version);
+
+        if (jids != null) {
+
+          for (Map.Entry<String, Map<String, PropertyInfo>> jComponentEntry : jids.entrySet()) {
+
+            String jComponent = jComponentEntry.getKey();
+
+            Set<Map.Entry<String, PropertyInfo>> jComponentEntries = jComponentEntry.getValue().entrySet();
+            for (Map.Entry<String, PropertyInfo> jMetricEntry : jComponentEntries) {
+
+              String jMetric = jMetricEntry.getKey();
+
+              PropertyInfo jProperty = jMetricEntry.getValue();
+
+              if (jProperty.isTemporal()) {
+                String s = type + " : " + jComponent + " : " + jMetric + " : " + jProperty.getPropertyId();
+
+                set.add(s);
+              }
+            }
+          }
+        }
+      }
+
+      if (set.size() > 0) {
+        System.out.println("The following metrics are marked as temporal JMX.");
+        System.out.println("JMX can provide point in time metrics only.\n");
+        System.out.println("Metric version :" + version + "\n");
+        for (String s : set) {
+          System.out.println(s);
+        }
+        Assert.fail("Found temporal JMX metrics.");
+      }
+    }
+  }
+
+  @Test
+  /**
+   * Test to look for changes in case of the metric names
+   * (e.g. metrics/rpc/RpcQueueTime_num_ops to metrics/rpc/rpcQueueTime_num_ops).
+   */
+  public void testMetricCaseChange() {
+    Map<String, Set<String>> metricSet = new HashMap<String, Set<String>>();
+    for (int i = 0; i < 2; ++i) {
+      for (PropertyHelper.MetricsVersion version : PropertyHelper.MetricsVersion.values()) {
+        for (Resource.Type type : Resource.Type.values()) {
+
+          Map<String, Map<String, PropertyInfo>> ids = i == 0 ?
+              PropertyHelper.getGangliaPropertyIds(type, version) :
+              PropertyHelper.getJMXPropertyIds(type, version);
+
+          if (ids != null) {
+
+            for (Map.Entry<String, Map<String, PropertyInfo>> gComponentEntry : ids.entrySet()) {
+              Set<Map.Entry<String, PropertyInfo>> gComponentEntries = gComponentEntry.getValue().entrySet();
+              for (Map.Entry<String, PropertyInfo> gMetricEntry : gComponentEntries) {
+
+                String gMetric = gMetricEntry.getKey();
+                String key = gMetric.toLowerCase();
+
+                Set<String> metrics = metricSet.get(key);
+                if (metrics == null) {
+                  metrics = new HashSet<String>();
+                  metricSet.put(key, metrics);
+                }
+                metrics.add(gMetric);
+              }
+            }
+          }
+        }
+      }
+    }
+
+    List<Set<String>> failureList = new LinkedList<Set<String>>();
+    for (Set<String> metrics : metricSet.values()) {
+      if (metrics.size() > 1) {
+        failureList.add(metrics);
+      }
+    }
+
+    if (failureList.size() > 1) {
+      System.out.println("The following metrics differ only by case.\n");
+      for (Set<String> metrics : failureList) {
+        System.out.println("  " + metrics);
+      }
+      Assert.fail("Found metric name case differences.");
+    }
+  }
+
+  // remove any replacement tokens (e.g. $1.replaceAll(\",q(\\d+)=\",\"/\").substring(1)) in the metric names
+  private static Map<String, Map<String, PropertyInfo>> normalizeMetricNames(Map<String, Map<String, PropertyInfo>> gids) {
+
+    Map<String, Map<String, PropertyInfo>> returnMap = new HashMap<String, Map<String, PropertyInfo>>();
+
+    for (Map.Entry<String, Map<String, PropertyInfo>> gComponentEntry : gids.entrySet()) {
+
+      String gComponent = gComponentEntry.getKey();
+      Map<String, PropertyInfo> newMap = new HashMap<String, PropertyInfo>();
+
+      Set<Map.Entry<String, PropertyInfo>> gComponentEntries = gComponentEntry.getValue().entrySet();
+
+      for (Map.Entry<String, PropertyInfo> gMetricEntry : gComponentEntries) {
+
+        String gMetric = gMetricEntry.getKey();
+        PropertyInfo propertyInfo = gMetricEntry.getValue();
+
+        newMap.put(gMetric.replaceAll("\\$\\d+(\\.\\S+\\(\\S+\\))*", "*"), propertyInfo);
+      }
+      returnMap.put(gComponent, newMap);
+    }
+    return returnMap;
+  }
 }