You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ma...@apache.org on 2012/11/07 09:13:24 UTC

svn commit: r1406489 [11/19] - in /incubator/ambari/branches/AMBARI-666: ./ ambari-agent/ ambari-agent/conf/ ambari-agent/conf/unix/ ambari-agent/src/main/puppet/manifestloader/ ambari-agent/src/main/puppet/modules/configgenerator/manifests/ ambari-age...

Modified: incubator/ambari/branches/AMBARI-666/ambari-server/src/main/resources/ganglia_properties.json
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-server/src/main/resources/ganglia_properties.json?rev=1406489&r1=1406488&r2=1406489&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-server/src/main/resources/ganglia_properties.json (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-server/src/main/resources/ganglia_properties.json Wed Nov  7 08:13:12 2012
@@ -1,4 +1,36 @@
 {
+  "Host":{
+    "*" :{
+      "metrics/boottime" :                                      {"metric" : "boottime",                                        "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/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/load/load_fifteen" :                             {"metric" : "load_fifteen",                                    "pointInTime" : true,   "temporal" : true},
+      "metrics/load/load_five" :                                {"metric" : "load_five",                                       "pointInTime" : true,   "temporal" : true},
+      "metrics/load/load_one" :                                 {"metric" : "load_one",                                        "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/processes/proc_run" :                            {"metric" : "proc_run",                                        "pointInTime" : true,   "temporal" : true},
+      "metrics/processes/proc_total" :                          {"metric" : "proc_total",                                      "pointInTime" : true,   "temporal" : true}
+    }
+  },
   "Component":{
     "NAMENODE" :{
       "metrics/dfs/namenode/blockReport_avg_time" :             {"metric" : "dfs.namenode.blockReport_avg_time",                "pointInTime" : true,   "temporal" : true},
@@ -97,38 +129,94 @@
       "metrics/hbase/master/splitTime_num_ops" :                {"metric" : "hbase.master.splitTime_num_ops",                   "pointInTime" : true,   "temporal" : true}
     },
     "HBASE_CLIENT" :{
+    },
+    "HBASE_REGIONSERVER" :{
+      "metrics/hbase/regionserver/blockCacheCount" :                          {"metric" : "hbase.regionserver.blockCacheCount",                         "pointInTime" : true,   "temporal" : true},
+      "metrics/hbase/regionserver/blockCacheEvictedCount" :                   {"metric" : "hbase.regionserver.blockCacheEvictedCount",                  "pointInTime" : true,   "temporal" : true},
+      "metrics/hbase/regionserver/blockCacheFree" :                           {"metric" : "hbase.regionserver.blockCacheFree",                          "pointInTime" : true,   "temporal" : true},
+      "metrics/hbase/regionserver/blockCacheHitCachingRatio" :                {"metric" : "hbase.regionserver.blockCacheHitCachingRatio",               "pointInTime" : true,   "temporal" : true},
+      "metrics/hbase/regionserver/blockCacheHitCount" :                       {"metric" : "hbase.regionserver.blockCacheHitCount",                      "pointInTime" : true,   "temporal" : true},
+      "metrics/hbase/regionserver/blockCacheHitRatio" :                       {"metric" : "hbase.regionserver.blockCacheHitRatio",                      "pointInTime" : true,   "temporal" : true},
+      "metrics/hbase/regionserver/blockCacheMissCount" :                      {"metric" : "hbase.regionserver.blockCacheMissCount",                     "pointInTime" : true,   "temporal" : true},
+      "metrics/hbase/regionserver/blockCacheSize" :                           {"metric" : "hbase.regionserver.blockCacheSize",                          "pointInTime" : true,   "temporal" : true},
+      "metrics/hbase/regionserver/compactionQueueSize" :                      {"metric" : "hbase.regionserver.compactionQueueSize",                     "pointInTime" : true,   "temporal" : true},
+      "metrics/hbase/regionserver/compactionSize_avg_time" :                  {"metric" : "hbase.regionserver.compactionSize_avg_time",                 "pointInTime" : true,   "temporal" : true},
+      "metrics/hbase/regionserver/compactionSize_num_ops" :                   {"metric" : "hbase.regionserver.compactionSize_num_ops",                  "pointInTime" : true,   "temporal" : true},
+      "metrics/hbase/regionserver/compactionTime_avg_time" :                  {"metric" : "hbase.regionserver.compactionTime_avg_time",                 "pointInTime" : true,   "temporal" : true},
+      "metrics/hbase/regionserver/compactionTime_num_ops" :                   {"metric" : "hbase.regionserver.compactionTime_num_ops",                  "pointInTime" : true,   "temporal" : true},
+      "metrics/hbase/regionserver/deleteRequestLatency_75th_percentile" :     {"metric" : "hbase.regionserver.deleteRequestLatency_75th_percentile",    "pointInTime" : true,   "temporal" : true},
+      "metrics/hbase/regionserver/deleteRequestLatency_95th_percentile" :     {"metric" : "hbase.regionserver.deleteRequestLatency_95th_percentile",    "pointInTime" : true,   "temporal" : true},
+      "metrics/hbase/regionserver/deleteRequestLatency_99th_percentile" :     {"metric" : "hbase.regionserver.deleteRequestLatency_99th_percentile",    "pointInTime" : true,   "temporal" : true},
+      "metrics/hbase/regionserver/deleteRequestLatency_max" :                 {"metric" : "hbase.regionserver.deleteRequestLatency_max",                "pointInTime" : true,   "temporal" : true},
+      "metrics/hbase/regionserver/deleteRequestLatency_mean" :                {"metric" : "hbase.regionserver.deleteRequestLatency_mean",               "pointInTime" : true,   "temporal" : true},
+      "metrics/hbase/regionserver/deleteRequestLatency_median" :              {"metric" : "hbase.regionserver.deleteRequestLatency_median",             "pointInTime" : true,   "temporal" : true},
+      "metrics/hbase/regionserver/deleteRequestLatency_min" :                 {"metric" : "hbase.regionserver.deleteRequestLatency_min",                "pointInTime" : true,   "temporal" : true},
+      "metrics/hbase/regionserver/deleteRequestLatency_num_ops" :             {"metric" : "hbase.regionserver.deleteRequestLatency_num_ops",            "pointInTime" : true,   "temporal" : true},
+      "metrics/hbase/regionserver/deleteRequestLatency_std_dev" :             {"metric" : "hbase.regionserver.deleteRequestLatency_std_dev",            "pointInTime" : true,   "temporal" : true},
+      "metrics/hbase/regionserver/flushQueueSize" :                           {"metric" : "hbase.regionserver.flushQueueSize",                          "pointInTime" : true,   "temporal" : true},
+      "metrics/hbase/regionserver/flushSize_avg_time" :                       {"metric" : "hbase.regionserver.flushSize_avg_time",                      "pointInTime" : true,   "temporal" : true},
+      "metrics/hbase/regionserver/flushSize_num_ops" :                        {"metric" : "hbase.regionserver.flushSize_num_ops",                       "pointInTime" : true,   "temporal" : true},
+      "metrics/hbase/regionserver/flushTime_avg_time" :                       {"metric" : "hbase.regionserver.flushTime_avg_time",                      "pointInTime" : true,   "temporal" : true},
+      "metrics/hbase/regionserver/flushTime_num_ops" :                        {"metric" : "hbase.regionserver.flushTime_num_ops",                       "pointInTime" : true,   "temporal" : true},
+      "metrics/hbase/regionserver/fsReadLatencyHistogram_75th_percentile" :   {"metric" : "hbase.regionserver.fsReadLatencyHistogram_75th_percentile",  "pointInTime" : true,   "temporal" : true},
+      "metrics/hbase/regionserver/fsReadLatencyHistogram_95th_percentile" :   {"metric" : "hbase.regionserver.fsReadLatencyHistogram_95th_percentile",  "pointInTime" : true,   "temporal" : true},
+      "metrics/hbase/regionserver/fsReadLatencyHistogram_99th_percentile" :   {"metric" : "hbase.regionserver.fsReadLatencyHistogram_99th_percentile",  "pointInTime" : true,   "temporal" : true},
+      "metrics/hbase/regionserver/fsReadLatencyHistogram_max" :               {"metric" : "hbase.regionserver.fsReadLatencyHistogram_max",              "pointInTime" : true,   "temporal" : true},
+      "metrics/hbase/regionserver/fsReadLatencyHistogram_mean" :              {"metric" : "hbase.regionserver.fsReadLatencyHistogram_mean",             "pointInTime" : true,   "temporal" : true},
+      "metrics/hbase/regionserver/fsReadLatencyHistogram_median" :            {"metric" : "hbase.regionserver.fsReadLatencyHistogram_median",           "pointInTime" : true,   "temporal" : true},
+      "metrics/hbase/regionserver/fsReadLatencyHistogram_min" :               {"metric" : "hbase.regionserver.fsReadLatencyHistogram_min",              "pointInTime" : true,   "temporal" : true},
+      "metrics/hbase/regionserver/fsReadLatencyHistogram_num_ops" :           {"metric" : "hbase.regionserver.fsReadLatencyHistogram_num_ops",          "pointInTime" : true,   "temporal" : true},
+      "metrics/hbase/regionserver/fsReadLatencyHistogram_std_dev" :           {"metric" : "hbase.regionserver.fsReadLatencyHistogram_std_dev",          "pointInTime" : true,   "temporal" : true},
+      "metrics/hbase/regionserver/fsReadLatency_avg_time" :                   {"metric" : "hbase.regionserver.fsReadLatency_avg_time",                  "pointInTime" : true,   "temporal" : true},
+      "metrics/hbase/regionserver/fsReadLatency_num_ops" :                    {"metric" : "hbase.regionserver.fsReadLatency_num_ops",                   "pointInTime" : true,   "temporal" : true},
+      "metrics/hbase/regionserver/fsSyncLatency_avg_time" :                   {"metric" : "hbase.regionserver.fsSyncLatency_avg_time",                  "pointInTime" : true,   "temporal" : true},
+      "metrics/hbase/regionserver/fsSyncLatency_num_ops" :                    {"metric" : "hbase.regionserver.fsSyncLatency_num_ops",                   "pointInTime" : true,   "temporal" : true},
+      "metrics/hbase/regionserver/fsWriteLatencyHistogram_75th_percentile" :  {"metric" : "hbase.regionserver.fsWriteLatencyHistogram_75th_percentile", "pointInTime" : true,   "temporal" : true},
+      "metrics/hbase/regionserver/fsWriteLatencyHistogram_95th_percentile" :  {"metric" : "hbase.regionserver.fsWriteLatencyHistogram_95th_percentile", "pointInTime" : true,   "temporal" : true},
+      "metrics/hbase/regionserver/fsWriteLatencyHistogram_99th_percentile" :  {"metric" : "hbase.regionserver.fsWriteLatencyHistogram_99th_percentile", "pointInTime" : true,   "temporal" : true},
+      "metrics/hbase/regionserver/fsWriteLatencyHistogram_max" :              {"metric" : "hbase.regionserver.fsWriteLatencyHistogram_max",             "pointInTime" : true,   "temporal" : true},
+      "metrics/hbase/regionserver/fsWriteLatencyHistogram_mean" :             {"metric" : "hbase.regionserver.fsWriteLatencyHistogram_mean",            "pointInTime" : true,   "temporal" : true},
+      "metrics/hbase/regionserver/fsWriteLatencyHistogram_median" :           {"metric" : "hbase.regionserver.fsWriteLatencyHistogram_median",          "pointInTime" : true,   "temporal" : true},
+      "metrics/hbase/regionserver/fsWriteLatencyHistogram_min" :              {"metric" : "hbase.regionserver.fsWriteLatencyHistogram_min",             "pointInTime" : true,   "temporal" : true},
+      "metrics/hbase/regionserver/fsWriteLatencyHistogram_num_ops" :          {"metric" : "hbase.regionserver.fsWriteLatencyHistogram_num_ops",         "pointInTime" : true,   "temporal" : true},
+      "metrics/hbase/regionserver/fsWriteLatencyHistogram_std_dev" :          {"metric" : "hbase.regionserver.fsWriteLatencyHistogram_std_dev",         "pointInTime" : true,   "temporal" : true},
+      "metrics/hbase/regionserver/fsWriteLatency_avg_time" :                  {"metric" : "hbase.regionserver.fsWriteLatency_avg_time",                 "pointInTime" : true,   "temporal" : true},
+      "metrics/hbase/regionserver/fsWriteLatency_num_ops" :                   {"metric" : "hbase.regionserver.fsWriteLatency_num_ops",                  "pointInTime" : true,   "temporal" : true},
+      "metrics/hbase/regionserver/getRequestLatency_75th_percentile" :        {"metric" : "hbase.regionserver.getRequestLatency_75th_percentile",       "pointInTime" : true,   "temporal" : true},
+      "metrics/hbase/regionserver/getRequestLatency_95th_percentile" :        {"metric" : "hbase.regionserver.getRequestLatency_95th_percentile",       "pointInTime" : true,   "temporal" : true},
+      "metrics/hbase/regionserver/getRequestLatency_99th_percentile" :        {"metric" : "hbase.regionserver.getRequestLatency_99th_percentile",       "pointInTime" : true,   "temporal" : true},
+      "metrics/hbase/regionserver/getRequestLatency_max" :                    {"metric" : "hbase.regionserver.getRequestLatency_max",                   "pointInTime" : true,   "temporal" : true},
+      "metrics/hbase/regionserver/getRequestLatency_mean" :                   {"metric" : "hbase.regionserver.getRequestLatency_mean",                  "pointInTime" : true,   "temporal" : true},
+      "metrics/hbase/regionserver/getRequestLatency_median" :                 {"metric" : "hbase.regionserver.getRequestLatency_median",                "pointInTime" : true,   "temporal" : true},
+      "metrics/hbase/regionserver/getRequestLatency_min" :                    {"metric" : "hbase.regionserver.getRequestLatency_min",                   "pointInTime" : true,   "temporal" : true},
+      "metrics/hbase/regionserver/getRequestLatency_num_ops" :                {"metric" : "hbase.regionserver.getRequestLatency_num_ops",               "pointInTime" : true,   "temporal" : true},
+      "metrics/hbase/regionserver/getRequestLatency_std_dev" :                {"metric" : "hbase.regionserver.getRequestLatency_std_dev",               "pointInTime" : true,   "temporal" : true},
+      "metrics/hbase/regionserver/hdfsBlocksLocalityIndex" :                  {"metric" : "hbase.regionserver.hdfsBlocksLocalityIndex",                 "pointInTime" : true,   "temporal" : true},
+      "metrics/hbase/regionserver/hlogFileCount" :                            {"metric" : "hbase.regionserver.hlogFileCount",                           "pointInTime" : true,   "temporal" : true},
+      "metrics/hbase/regionserver/memstoreSizeMB" :                           {"metric" : "hbase.regionserver.memstoreSizeMB",                          "pointInTime" : true,   "temporal" : true},
+      "metrics/hbase/regionserver/putRequestLatency_75th_percentile" :        {"metric" : "hbase.regionserver.putRequestLatency_75th_percentile",       "pointInTime" : true,   "temporal" : true},
+      "metrics/hbase/regionserver/putRequestLatency_95th_percentile" :        {"metric" : "hbase.regionserver.putRequestLatency_95th_percentile",       "pointInTime" : true,   "temporal" : true},
+      "metrics/hbase/regionserver/putRequestLatency_99th_percentile" :        {"metric" : "hbase.regionserver.putRequestLatency_99th_percentile",       "pointInTime" : true,   "temporal" : true},
+      "metrics/hbase/regionserver/putRequestLatency_max" :                    {"metric" : "hbase.regionserver.putRequestLatency_max",                   "pointInTime" : true,   "temporal" : true},
+      "metrics/hbase/regionserver/putRequestLatency_mean" :                   {"metric" : "hbase.regionserver.putRequestLatency_mean",                  "pointInTime" : true,   "temporal" : true},
+      "metrics/hbase/regionserver/putRequestLatency_median" :                 {"metric" : "hbase.regionserver.putRequestLatency_median",                "pointInTime" : true,   "temporal" : true},
+      "metrics/hbase/regionserver/putRequestLatency_min" :                    {"metric" : "hbase.regionserver.putRequestLatency_min",                   "pointInTime" : true,   "temporal" : true},
+      "metrics/hbase/regionserver/putRequestLatency_num_ops" :                {"metric" : "hbase.regionserver.putRequestLatency_num_ops",               "pointInTime" : true,   "temporal" : true},
+      "metrics/hbase/regionserver/putRequestLatency_std_dev" :                {"metric" : "hbase.regionserver.putRequestLatency_std_dev",               "pointInTime" : true,   "temporal" : true},
+      "metrics/hbase/regionserver/readRequestsCount" :                        {"metric" : "hbase.regionserver.readRequestsCount",                       "pointInTime" : true,   "temporal" : true},
+      "metrics/hbase/regionserver/regions" :                                  {"metric" : "hbase.regionserver.regions",                                 "pointInTime" : true,   "temporal" : true},
+      "metrics/hbase/regionserver/requests" :                                 {"metric" : "hbase.regionserver.requests",                                "pointInTime" : true,   "temporal" : true},
+      "metrics/hbase/regionserver/rootIndexSizeKB" :                          {"metric" : "hbase.regionserver.rootIndexSizeKB",                         "pointInTime" : true,   "temporal" : true},
+      "metrics/hbase/regionserver/storefileIndexSizeMB" :                     {"metric" : "hbase.regionserver.storefileIndexSizeMB",                    "pointInTime" : true,   "temporal" : true},
+      "metrics/hbase/regionserver/storefiles" :                               {"metric" : "hbase.regionserver.storefiles",                              "pointInTime" : true,   "temporal" : true},
+      "metrics/hbase/regionserver/stores" :                                   {"metric" : "hbase.regionserver.stores",                                  "pointInTime" : true,   "temporal" : true},
+      "metrics/hbase/regionserver/totalStaticBloomSizeKB" :                   {"metric" : "hbase.regionserver.totalStaticBloomSizeKB",                  "pointInTime" : true,   "temporal" : true},
+      "metrics/hbase/regionserver/totalStaticIndexSizeKB" :                   {"metric" : "hbase.regionserver.totalStaticIndexSizeKB",                  "pointInTime" : true,   "temporal" : true},
+      "metrics/hbase/regionserver/writeRequestsCount" :                       {"metric" : "hbase.regionserver.writeRequestsCount",                      "pointInTime" : true,   "temporal" : true}
     }
   },
   "HostComponent":{
     "NAMENODE" :{
-      "metrics/boottime" :                                      {"metric" : "boottime",                                        "pointInTime" : false,   "temporal" : true},
-      "metrics/bytes_in" :                                      {"metric" : "bytes_in",                                        "pointInTime" : false,   "temporal" : true},
-      "metrics/bytes_out" :                                     {"metric" : "bytes_out",                                       "pointInTime" : false,   "temporal" : true},
-      "metrics/cpu_aidle" :                                     {"metric" : "cpu_aidle",                                       "pointInTime" : false,   "temporal" : true},
-      "metrics/cpu_idle" :                                      {"metric" : "cpu_idle",                                        "pointInTime" : false,   "temporal" : true},
-      "metrics/cpu_nice" :                                      {"metric" : "cpu_nice",                                        "pointInTime" : false,   "temporal" : true},
-      "metrics/cpu_num" :                                       {"metric" : "cpu_num",                                         "pointInTime" : false,   "temporal" : true},
-      "metrics/cpu_speed" :                                     {"metric" : "cpu_speed",                                       "pointInTime" : false,   "temporal" : true},
-      "metrics/cpu_system" :                                    {"metric" : "cpu_system",                                      "pointInTime" : false,   "temporal" : true},
-      "metrics/cpu_user" :                                      {"metric" : "cpu_user",                                        "pointInTime" : false,   "temporal" : true},
-      "metrics/cpu_wio" :                                       {"metric" : "cpu_wio",                                         "pointInTime" : false,   "temporal" : true},
-      "metrics/disk_free" :                                     {"metric" : "disk_free",                                       "pointInTime" : false,   "temporal" : true},
-      "metrics/disk_total" :                                    {"metric" : "disk_total",                                      "pointInTime" : false,   "temporal" : true},
-      "metrics/load_fifteen" :                                  {"metric" : "load_fifteen",                                    "pointInTime" : false,   "temporal" : true},
-      "metrics/load_five" :                                     {"metric" : "load_five",                                       "pointInTime" : false,   "temporal" : true},
-      "metrics/load_one" :                                      {"metric" : "load_one",                                        "pointInTime" : false,   "temporal" : true},
-      "metrics/mem_buffers" :                                   {"metric" : "mem_buffers",                                     "pointInTime" : false,   "temporal" : true},
-      "metrics/mem_cached" :                                    {"metric" : "mem_cached",                                      "pointInTime" : false,   "temporal" : true},
-      "metrics/mem_free" :                                      {"metric" : "mem_free",                                        "pointInTime" : false,   "temporal" : true},
-      "metrics/mem_shared" :                                    {"metric" : "mem_shared",                                      "pointInTime" : false,   "temporal" : true},
-      "metrics/mem_total" :                                     {"metric" : "mem_total",                                       "pointInTime" : false,   "temporal" : true},
-      "metrics/part_max_used" :                                 {"metric" : "part_max_used",                                   "pointInTime" : false,   "temporal" : true},
-      "metrics/pkts_in" :                                       {"metric" : "pkts_in",                                         "pointInTime" : false,   "temporal" : true},
-      "metrics/pkts_out" :                                      {"metric" : "pkts_out",                                        "pointInTime" : false,   "temporal" : true},
-      "metrics/proc_run" :                                      {"metric" : "proc_run",                                        "pointInTime" : false,   "temporal" : true},
-      "metrics/proc_total" :                                    {"metric" : "proc_total",                                      "pointInTime" : false,   "temporal" : true},
-      "metrics/swap_free" :                                     {"metric" : "swap_free",                                       "pointInTime" : false,   "temporal" : true},
-      "metrics/swap_total" :                                    {"metric" : "swap_total",                                      "pointInTime" : false,   "temporal" : true},
       "metrics/dfs/FSNamesystem/BlockCapacity" :                {"metric" : "dfs.FSNamesystem.BlockCapacity",                  "pointInTime" : false,   "temporal" : true},
       "metrics/dfs/FSNamesystem/BlocksTotal" :                  {"metric" : "dfs.FSNamesystem.BlocksTotal",                    "pointInTime" : false,   "temporal" : true},
       "metrics/dfs/FSNamesystem/CapacityRemainingGB" :          {"metric" : "dfs.FSNamesystem.CapacityRemainingGB",            "pointInTime" : false,   "temporal" : true},
@@ -235,34 +323,6 @@
       "metrics/rpcdetailed/sendHeartbeat_num_ops" :             {"metric" : "rpcdetailed.rpcdetailed.sendHeartbeat_num_ops",   "pointInTime" : false,   "temporal" : true}
     },
     "DATANODE" :{
-      "metrics/boottime" :                                      {"metric" : "boottime",                                        "pointInTime" : false,   "temporal" : true},
-      "metrics/bytes_in" :                                      {"metric" : "bytes_in",                                        "pointInTime" : false,   "temporal" : true},
-      "metrics/bytes_out" :                                     {"metric" : "bytes_out",                                       "pointInTime" : false,   "temporal" : true},
-      "metrics/cpu_aidle" :                                     {"metric" : "cpu_aidle",                                       "pointInTime" : false,   "temporal" : true},
-      "metrics/cpu_idle" :                                      {"metric" : "cpu_idle",                                        "pointInTime" : false,   "temporal" : true},
-      "metrics/cpu_nice" :                                      {"metric" : "cpu_nice",                                        "pointInTime" : false,   "temporal" : true},
-      "metrics/cpu_num" :                                       {"metric" : "cpu_num",                                         "pointInTime" : false,   "temporal" : true},
-      "metrics/cpu_speed" :                                     {"metric" : "cpu_speed",                                       "pointInTime" : false,   "temporal" : true},
-      "metrics/cpu_system" :                                    {"metric" : "cpu_system",                                      "pointInTime" : false,   "temporal" : true},
-      "metrics/cpu_user" :                                      {"metric" : "cpu_user",                                        "pointInTime" : false,   "temporal" : true},
-      "metrics/cpu_wio" :                                       {"metric" : "cpu_wio",                                         "pointInTime" : false,   "temporal" : true},
-      "metrics/disk_free" :                                     {"metric" : "disk_free",                                       "pointInTime" : false,   "temporal" : true},
-      "metrics/disk_total" :                                    {"metric" : "disk_total",                                      "pointInTime" : false,   "temporal" : true},
-      "metrics/load_fifteen" :                                  {"metric" : "load_fifteen",                                    "pointInTime" : false,   "temporal" : true},
-      "metrics/load_five" :                                     {"metric" : "load_five",                                       "pointInTime" : false,   "temporal" : true},
-      "metrics/load_one" :                                      {"metric" : "load_one",                                        "pointInTime" : false,   "temporal" : true},
-      "metrics/mem_buffers" :                                   {"metric" : "mem_buffers",                                     "pointInTime" : false,   "temporal" : true},
-      "metrics/mem_cached" :                                    {"metric" : "mem_cached",                                      "pointInTime" : false,   "temporal" : true},
-      "metrics/mem_free" :                                      {"metric" : "mem_free",                                        "pointInTime" : false,   "temporal" : true},
-      "metrics/mem_shared" :                                    {"metric" : "mem_shared",                                      "pointInTime" : false,   "temporal" : true},
-      "metrics/mem_total" :                                     {"metric" : "mem_total",                                       "pointInTime" : false,   "temporal" : true},
-      "metrics/part_max_used" :                                 {"metric" : "part_max_used",                                   "pointInTime" : false,   "temporal" : true},
-      "metrics/pkts_in" :                                       {"metric" : "pkts_in",                                         "pointInTime" : false,   "temporal" : true},
-      "metrics/pkts_out" :                                      {"metric" : "pkts_out",                                        "pointInTime" : false,   "temporal" : true},
-      "metrics/proc_run" :                                      {"metric" : "proc_run",                                        "pointInTime" : false,   "temporal" : true},
-      "metrics/proc_total" :                                    {"metric" : "proc_total",                                      "pointInTime" : false,   "temporal" : true},
-      "metrics/swap_free" :                                     {"metric" : "swap_free",                                       "pointInTime" : false,   "temporal" : true},
-      "metrics/swap_total" :                                    {"metric" : "swap_total",                                      "pointInTime" : false,   "temporal" : true},
       "metrics/dfs/datanode/bytes_written" :                    {"metric" : "dfs.datanode.bytes_written",                      "pointInTime" : false,   "temporal" : true},
       "metrics/dfs/datanode/readBlockOp_num_ops" :              {"metric" : "dfs.datanode.readBlockOp_num_ops",                "pointInTime" : false,   "temporal" : true},
       "metrics/dfs/datanode/writes_from_local_client" :         {"metric" : "dfs.datanode.writes_from_local_client",           "pointInTime" : false,   "temporal" : true},
@@ -328,34 +388,6 @@
       "metrics/rpc/rpcAuthorizationSuccesses" :                 {"metric" : "rpc.rpc.rpcAuthorizationSuccesses",               "pointInTime" : false,   "temporal" : true}
     },
     "JOBTRACKER" :{
-      "metrics/boottime" :                                      {"metric" : "boottime",                                        "pointInTime" : false,   "temporal" : true},
-      "metrics/bytes_in" :                                      {"metric" : "bytes_in",                                        "pointInTime" : false,   "temporal" : true},
-      "metrics/bytes_out" :                                     {"metric" : "bytes_out",                                       "pointInTime" : false,   "temporal" : true},
-      "metrics/cpu_aidle" :                                     {"metric" : "cpu_aidle",                                       "pointInTime" : false,   "temporal" : true},
-      "metrics/cpu_idle" :                                      {"metric" : "cpu_idle",                                        "pointInTime" : false,   "temporal" : true},
-      "metrics/cpu_nice" :                                      {"metric" : "cpu_nice",                                        "pointInTime" : false,   "temporal" : true},
-      "metrics/cpu_num" :                                       {"metric" : "cpu_num",                                         "pointInTime" : false,   "temporal" : true},
-      "metrics/cpu_speed" :                                     {"metric" : "cpu_speed",                                       "pointInTime" : false,   "temporal" : true},
-      "metrics/cpu_system" :                                    {"metric" : "cpu_system",                                      "pointInTime" : false,   "temporal" : true},
-      "metrics/cpu_user" :                                      {"metric" : "cpu_user",                                        "pointInTime" : false,   "temporal" : true},
-      "metrics/cpu_wio" :                                       {"metric" : "cpu_wio",                                         "pointInTime" : false,   "temporal" : true},
-      "metrics/disk_free" :                                     {"metric" : "disk_free",                                       "pointInTime" : false,   "temporal" : true},
-      "metrics/disk_total" :                                    {"metric" : "disk_total",                                      "pointInTime" : false,   "temporal" : true},
-      "metrics/load_fifteen" :                                  {"metric" : "load_fifteen",                                    "pointInTime" : false,   "temporal" : true},
-      "metrics/load_five" :                                     {"metric" : "load_five",                                       "pointInTime" : false,   "temporal" : true},
-      "metrics/load_one" :                                      {"metric" : "load_one",                                        "pointInTime" : false,   "temporal" : true},
-      "metrics/mem_buffers" :                                   {"metric" : "mem_buffers",                                     "pointInTime" : false,   "temporal" : true},
-      "metrics/mem_cached" :                                    {"metric" : "mem_cached",                                      "pointInTime" : false,   "temporal" : true},
-      "metrics/mem_free" :                                      {"metric" : "mem_free",                                        "pointInTime" : false,   "temporal" : true},
-      "metrics/mem_shared" :                                    {"metric" : "mem_shared",                                      "pointInTime" : false,   "temporal" : true},
-      "metrics/mem_total" :                                     {"metric" : "mem_total",                                       "pointInTime" : false,   "temporal" : true},
-      "metrics/part_max_used" :                                 {"metric" : "part_max_used",                                   "pointInTime" : false,   "temporal" : true},
-      "metrics/pkts_in" :                                       {"metric" : "pkts_in",                                         "pointInTime" : false,   "temporal" : true},
-      "metrics/pkts_out" :                                      {"metric" : "pkts_out",                                        "pointInTime" : false,   "temporal" : true},
-      "metrics/proc_run" :                                      {"metric" : "proc_run",                                        "pointInTime" : false,   "temporal" : true},
-      "metrics/proc_total" :                                    {"metric" : "proc_total",                                      "pointInTime" : false,   "temporal" : true},
-      "metrics/swap_free" :                                     {"metric" : "swap_free",                                       "pointInTime" : false,   "temporal" : true},
-      "metrics/swap_total" :                                    {"metric" : "swap_total",                                      "pointInTime" : false,   "temporal" : true},
       "metrics/mapred/Queue/running_0" :                        {"metric" : "mapred.Queue.running_0",                          "pointInTime" : false,   "temporal" : true},
       "metrics/mapred/Queue/running_1440" :                     {"metric" : "mapred.Queue.running_1440",                       "pointInTime" : false,   "temporal" : true},
       "metrics/mapred/Queue/running_300" :                      {"metric" : "mapred.Queue.running_300",                        "pointInTime" : false,   "temporal" : true},
@@ -446,34 +478,6 @@
       "metrics/rpcdetailed/sendHeartbeat_num_ops" :             {"metric" : "rpcdetailed.rpcdetailed.sendHeartbeat_num_ops",   "pointInTime" : false,   "temporal" : true}
     },
     "TASKTRACKER" :{
-      "metrics/boottime" :                                      {"metric" : "boottime",                                        "pointInTime" : false,   "temporal" : true},
-      "metrics/bytes_in" :                                      {"metric" : "bytes_in",                                        "pointInTime" : false,   "temporal" : true},
-      "metrics/bytes_out" :                                     {"metric" : "bytes_out",                                       "pointInTime" : false,   "temporal" : true},
-      "metrics/cpu_aidle" :                                     {"metric" : "cpu_aidle",                                       "pointInTime" : false,   "temporal" : true},
-      "metrics/cpu_idle" :                                      {"metric" : "cpu_idle",                                        "pointInTime" : false,   "temporal" : true},
-      "metrics/cpu_nice" :                                      {"metric" : "cpu_nice",                                        "pointInTime" : false,   "temporal" : true},
-      "metrics/cpu_num" :                                       {"metric" : "cpu_num",                                         "pointInTime" : false,   "temporal" : true},
-      "metrics/cpu_speed" :                                     {"metric" : "cpu_speed",                                       "pointInTime" : false,   "temporal" : true},
-      "metrics/cpu_system" :                                    {"metric" : "cpu_system",                                      "pointInTime" : false,   "temporal" : true},
-      "metrics/cpu_user" :                                      {"metric" : "cpu_user",                                        "pointInTime" : false,   "temporal" : true},
-      "metrics/cpu_wio" :                                       {"metric" : "cpu_wio",                                         "pointInTime" : false,   "temporal" : true},
-      "metrics/disk_free" :                                     {"metric" : "disk_free",                                       "pointInTime" : false,   "temporal" : true},
-      "metrics/disk_total" :                                    {"metric" : "disk_total",                                      "pointInTime" : false,   "temporal" : true},
-      "metrics/load_fifteen" :                                  {"metric" : "load_fifteen",                                    "pointInTime" : false,   "temporal" : true},
-      "metrics/load_five" :                                     {"metric" : "load_five",                                       "pointInTime" : false,   "temporal" : true},
-      "metrics/load_one" :                                      {"metric" : "load_one",                                        "pointInTime" : false,   "temporal" : true},
-      "metrics/mem_buffers" :                                   {"metric" : "mem_buffers",                                     "pointInTime" : false,   "temporal" : true},
-      "metrics/mem_cached" :                                    {"metric" : "mem_cached",                                      "pointInTime" : false,   "temporal" : true},
-      "metrics/mem_free" :                                      {"metric" : "mem_free",                                        "pointInTime" : false,   "temporal" : true},
-      "metrics/mem_shared" :                                    {"metric" : "mem_shared",                                      "pointInTime" : false,   "temporal" : true},
-      "metrics/mem_total" :                                     {"metric" : "mem_total",                                       "pointInTime" : false,   "temporal" : true},
-      "metrics/part_max_used" :                                 {"metric" : "part_max_used",                                   "pointInTime" : false,   "temporal" : true},
-      "metrics/pkts_in" :                                       {"metric" : "pkts_in",                                         "pointInTime" : false,   "temporal" : true},
-      "metrics/pkts_out" :                                      {"metric" : "pkts_out",                                        "pointInTime" : false,   "temporal" : true},
-      "metrics/proc_run" :                                      {"metric" : "proc_run",                                        "pointInTime" : false,   "temporal" : true},
-      "metrics/proc_total" :                                    {"metric" : "proc_total",                                      "pointInTime" : false,   "temporal" : true},
-      "metrics/swap_free" :                                     {"metric" : "swap_free",                                       "pointInTime" : false,   "temporal" : true},
-      "metrics/swap_total" :                                    {"metric" : "swap_total",                                      "pointInTime" : false,   "temporal" : true},
       "metrics/mapred/tasktracker/mapTaskSlots" :               {"metric" : "mapred.tasktracker.mapTaskSlots",                 "pointInTime" : false,   "temporal" : true},
       "metrics/mapred/tasktracker/maps_running" :               {"metric" : "mapred.tasktracker.maps_running",                 "pointInTime" : false,   "temporal" : true},
       "metrics/mapred/tasktracker/reduceTaskSlots" :            {"metric" : "mapred.tasktracker.reduceTaskSlots",              "pointInTime" : false,   "temporal" : true},
@@ -527,34 +531,6 @@
       "metrics/rpc/rpcAuthorizationSuccesses" :                 {"metric" : "rpc.rpc.rpcAuthorizationSuccesses",               "pointInTime" : false,   "temporal" : true}
     },
     "HBASE_MASTER" :{
-      "metrics/boottime" :                                      {"metric" : "boottime",                                        "pointInTime" : false,   "temporal" : true},
-      "metrics/bytes_in" :                                      {"metric" : "bytes_in",                                        "pointInTime" : false,   "temporal" : true},
-      "metrics/bytes_out" :                                     {"metric" : "bytes_out",                                       "pointInTime" : false,   "temporal" : true},
-      "metrics/cpu_aidle" :                                     {"metric" : "cpu_aidle",                                       "pointInTime" : false,   "temporal" : true},
-      "metrics/cpu_idle" :                                      {"metric" : "cpu_idle",                                        "pointInTime" : false,   "temporal" : true},
-      "metrics/cpu_nice" :                                      {"metric" : "cpu_nice",                                        "pointInTime" : false,   "temporal" : true},
-      "metrics/cpu_num" :                                       {"metric" : "cpu_num",                                         "pointInTime" : false,   "temporal" : true},
-      "metrics/cpu_speed" :                                     {"metric" : "cpu_speed",                                       "pointInTime" : false,   "temporal" : true},
-      "metrics/cpu_system" :                                    {"metric" : "cpu_system",                                      "pointInTime" : false,   "temporal" : true},
-      "metrics/cpu_user" :                                      {"metric" : "cpu_user",                                        "pointInTime" : false,   "temporal" : true},
-      "metrics/cpu_wio" :                                       {"metric" : "cpu_wio",                                         "pointInTime" : false,   "temporal" : true},
-      "metrics/disk_free" :                                     {"metric" : "disk_free",                                       "pointInTime" : false,   "temporal" : true},
-      "metrics/disk_total" :                                    {"metric" : "disk_total",                                      "pointInTime" : false,   "temporal" : true},
-      "metrics/load_fifteen" :                                  {"metric" : "load_fifteen",                                    "pointInTime" : false,   "temporal" : true},
-      "metrics/load_five" :                                     {"metric" : "load_five",                                       "pointInTime" : false,   "temporal" : true},
-      "metrics/load_one" :                                      {"metric" : "load_one",                                        "pointInTime" : false,   "temporal" : true},
-      "metrics/mem_buffers" :                                   {"metric" : "mem_buffers",                                     "pointInTime" : false,   "temporal" : true},
-      "metrics/mem_cached" :                                    {"metric" : "mem_cached",                                      "pointInTime" : false,   "temporal" : true},
-      "metrics/mem_free" :                                      {"metric" : "mem_free",                                        "pointInTime" : false,   "temporal" : true},
-      "metrics/mem_shared" :                                    {"metric" : "mem_shared",                                      "pointInTime" : false,   "temporal" : true},
-      "metrics/mem_total" :                                     {"metric" : "mem_total",                                       "pointInTime" : false,   "temporal" : true},
-      "metrics/part_max_used" :                                 {"metric" : "part_max_used",                                   "pointInTime" : false,   "temporal" : true},
-      "metrics/pkts_in" :                                       {"metric" : "pkts_in",                                         "pointInTime" : false,   "temporal" : true},
-      "metrics/pkts_out" :                                      {"metric" : "pkts_out",                                        "pointInTime" : false,   "temporal" : true},
-      "metrics/proc_run" :                                      {"metric" : "proc_run",                                        "pointInTime" : false,   "temporal" : true},
-      "metrics/proc_total" :                                    {"metric" : "proc_total",                                      "pointInTime" : false,   "temporal" : true},
-      "metrics/swap_free" :                                     {"metric" : "swap_free",                                       "pointInTime" : false,   "temporal" : true},
-      "metrics/swap_total" :                                    {"metric" : "swap_total",                                      "pointInTime" : false,   "temporal" : true},
       "metrics/dfs/FSNamesystem/BlockCapacity" :                {"metric" : "dfs.FSNamesystem.BlockCapacity",                  "pointInTime" : false,   "temporal" : true},
       "metrics/dfs/FSNamesystem/BlocksTotal" :                  {"metric" : "dfs.FSNamesystem.BlocksTotal",                    "pointInTime" : false,   "temporal" : true},
       "metrics/dfs/FSNamesystem/CapacityRemainingGB" :          {"metric" : "dfs.FSNamesystem.CapacityRemainingGB",            "pointInTime" : false,   "temporal" : true},
@@ -648,34 +624,55 @@
       "metrics/rpcdetailed/sendHeartbeat_num_ops" :             {"metric" : "rpcdetailed.rpcdetailed.sendHeartbeat_num_ops",   "pointInTime" : false,   "temporal" : true}
     },
     "HBASE_CLIENT" :{
-      "metrics/boottime" :                                      {"metric" : "boottime",                                        "pointInTime" : false,   "temporal" : true},
-      "metrics/bytes_in" :                                      {"metric" : "bytes_in",                                        "pointInTime" : false,   "temporal" : true},
-      "metrics/bytes_out" :                                     {"metric" : "bytes_out",                                       "pointInTime" : false,   "temporal" : true},
-      "metrics/cpu_aidle" :                                     {"metric" : "cpu_aidle",                                       "pointInTime" : false,   "temporal" : true},
-      "metrics/cpu_idle" :                                      {"metric" : "cpu_idle",                                        "pointInTime" : false,   "temporal" : true},
-      "metrics/cpu_nice" :                                      {"metric" : "cpu_nice",                                        "pointInTime" : false,   "temporal" : true},
-      "metrics/cpu_num" :                                       {"metric" : "cpu_num",                                         "pointInTime" : false,   "temporal" : true},
-      "metrics/cpu_speed" :                                     {"metric" : "cpu_speed",                                       "pointInTime" : false,   "temporal" : true},
-      "metrics/cpu_system" :                                    {"metric" : "cpu_system",                                      "pointInTime" : false,   "temporal" : true},
-      "metrics/cpu_user" :                                      {"metric" : "cpu_user",                                        "pointInTime" : false,   "temporal" : true},
-      "metrics/cpu_wio" :                                       {"metric" : "cpu_wio",                                         "pointInTime" : false,   "temporal" : true},
-      "metrics/disk_free" :                                     {"metric" : "disk_free",                                       "pointInTime" : false,   "temporal" : true},
-      "metrics/disk_total" :                                    {"metric" : "disk_total",                                      "pointInTime" : false,   "temporal" : true},
-      "metrics/load_fifteen" :                                  {"metric" : "load_fifteen",                                    "pointInTime" : false,   "temporal" : true},
-      "metrics/load_five" :                                     {"metric" : "load_five",                                       "pointInTime" : false,   "temporal" : true},
-      "metrics/load_one" :                                      {"metric" : "load_one",                                        "pointInTime" : false,   "temporal" : true},
-      "metrics/mem_buffers" :                                   {"metric" : "mem_buffers",                                     "pointInTime" : false,   "temporal" : true},
-      "metrics/mem_cached" :                                    {"metric" : "mem_cached",                                      "pointInTime" : false,   "temporal" : true},
-      "metrics/mem_free" :                                      {"metric" : "mem_free",                                        "pointInTime" : false,   "temporal" : true},
-      "metrics/mem_shared" :                                    {"metric" : "mem_shared",                                      "pointInTime" : false,   "temporal" : true},
-      "metrics/mem_total" :                                     {"metric" : "mem_total",                                       "pointInTime" : false,   "temporal" : true},
-      "metrics/part_max_used" :                                 {"metric" : "part_max_used",                                   "pointInTime" : false,   "temporal" : true},
-      "metrics/pkts_in" :                                       {"metric" : "pkts_in",                                         "pointInTime" : false,   "temporal" : true},
-      "metrics/pkts_out" :                                      {"metric" : "pkts_out",                                        "pointInTime" : false,   "temporal" : true},
-      "metrics/proc_run" :                                      {"metric" : "proc_run",                                        "pointInTime" : false,   "temporal" : true},
-      "metrics/proc_total" :                                    {"metric" : "proc_total",                                      "pointInTime" : false,   "temporal" : true},
-      "metrics/swap_free" :                                     {"metric" : "swap_free",                                       "pointInTime" : false,   "temporal" : true},
-      "metrics/swap_total" :                                    {"metric" : "swap_total",                                      "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/logError" :                                  {"metric" : "jvm.metrics.logError",                            "pointInTime" : false,   "temporal" : true},
+      "metrics/jvm/logFatal" :                                  {"metric" : "jvm.metrics.logFatal",                            "pointInTime" : false,   "temporal" : true},
+      "metrics/jvm/logInfo" :                                   {"metric" : "jvm.metrics.logInfo",                             "pointInTime" : false,   "temporal" : true},
+      "metrics/jvm/logWarn" :                                   {"metric" : "jvm.metrics.logWarn",                             "pointInTime" : false,   "temporal" : true},
+      "metrics/jvm/memHeapCommittedM" :                         {"metric" : "jvm.metrics.memHeapCommittedM",                   "pointInTime" : false,   "temporal" : true},
+      "metrics/jvm/memHeapUsedM" :                              {"metric" : "jvm.metrics.memHeapUsedM",                        "pointInTime" : false,   "temporal" : true},
+      "metrics/jvm/memNonHeapCommittedM" :                      {"metric" : "jvm.metrics.memNonHeapCommittedM",                "pointInTime" : false,   "temporal" : true},
+      "metrics/jvm/memNonHeapUsedM" :                           {"metric" : "jvm.metrics.memNonHeapUsedM",                     "pointInTime" : false,   "temporal" : true},
+      "metrics/jvm/threadsBlocked" :                            {"metric" : "jvm.metrics.threadsBlocked",                      "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/threadsTerminated" :                         {"metric" : "jvm.metrics.threadsTerminated",                   "pointInTime" : false,   "temporal" : true},
+      "metrics/jvm/threadsTimedWaiting" :                       {"metric" : "jvm.metrics.threadsTimedWaiting",                 "pointInTime" : false,   "temporal" : true},
+      "metrics/jvm/threadsWaiting" :                            {"metric" : "jvm.metrics.threadsWaiting",                      "pointInTime" : false,   "temporal" : true},
+      "metrics/metricssystem/dropped_pub_all" :                 {"metric" : "metricssystem.MetricsSystem.dropped_pub_all",     "pointInTime" : false,   "temporal" : true},
+      "metrics/metricssystem/num_sinks" :                       {"metric" : "metricssystem.MetricsSystem.num_sinks",           "pointInTime" : false,   "temporal" : true},
+      "metrics/metricssystem/num_sources" :                     {"metric" : "metricssystem.MetricsSystem.num_sources",         "pointInTime" : false,   "temporal" : true},
+      "metrics/metricssystem/publish_avg_time" :                {"metric" : "metricssystem.MetricsSystem.publish_avg_time",    "pointInTime" : false,   "temporal" : true},
+      "metrics/metricssystem/publish_imax_time" :               {"metric" : "metricssystem.MetricsSystem.publish_imax_time",   "pointInTime" : false,   "temporal" : true},
+      "metrics/metricssystem/publish_imin_time" :               {"metric" : "metricssystem.MetricsSystem.publish_imin_time",   "pointInTime" : false,   "temporal" : true},
+      "metrics/metricssystem/publish_max_time" :                {"metric" : "metricssystem.MetricsSystem.publish_max_time",    "pointInTime" : false,   "temporal" : true},
+      "metrics/metricssystem/publish_min_time" :                {"metric" : "metricssystem.MetricsSystem.publish_min_time",    "pointInTime" : false,   "temporal" : true},
+      "metrics/metricssystem/publish_num_ops" :                 {"metric" : "metricssystem.MetricsSystem.publish_num_ops",     "pointInTime" : false,   "temporal" : true},
+      "metrics/metricssystem/publish_stdev_time" :              {"metric" : "metricssystem.MetricsSystem.publish_stdev_time",  "pointInTime" : false,   "temporal" : true},
+      "metrics/metricssystem/latency_avg_time" :                {"metric" : "metricssystem.MetricsSystem.sink.ganglia.latency_avg_time", "pointInTime" : false,   "temporal" : true},
+      "metrics/metricssystem/latency_num_ops" :                 {"metric" : "metricssystem.MetricsSystem.sink.ganglia.latency_num_ops", "pointInTime" : false,   "temporal" : true},
+      "metrics/metricssystem/snapshot_avg_time" :               {"metric" : "metricssystem.MetricsSystem.snapshot_avg_time",   "pointInTime" : false,   "temporal" : true},
+      "metrics/metricssystem/snapshot_imax_time" :              {"metric" : "metricssystem.MetricsSystem.snapshot_imax_time",  "pointInTime" : false,   "temporal" : true},
+      "metrics/metricssystem/snapshot_imin_time" :              {"metric" : "metricssystem.MetricsSystem.snapshot_imin_time",  "pointInTime" : false,   "temporal" : true},
+      "metrics/metricssystem/snapshot_max_time" :               {"metric" : "metricssystem.MetricsSystem.snapshot_max_time",   "pointInTime" : false,   "temporal" : true},
+      "metrics/metricssystem/snapshot_min_time" :               {"metric" : "metricssystem.MetricsSystem.snapshot_min_time",   "pointInTime" : false,   "temporal" : true},
+      "metrics/metricssystem/snapshot_num_ops" :                {"metric" : "metricssystem.MetricsSystem.snapshot_num_ops",    "pointInTime" : false,   "temporal" : true},
+      "metrics/metricssystem/snapshot_stdev_time" :             {"metric" : "metricssystem.MetricsSystem.snapshot_stdev_time", "pointInTime" : false,   "temporal" : true},
+      "metrics/rpc/NumOpenConnections" :                        {"metric" : "rpc.rpc.NumOpenConnections",                      "pointInTime" : false,   "temporal" : true},
+      "metrics/rpc/ReceivedBytes" :                             {"metric" : "rpc.rpc.ReceivedBytes",                           "pointInTime" : false,   "temporal" : true},
+      "metrics/rpc/RpcProcessingTime_avg_time" :                {"metric" : "rpc.rpc.RpcProcessingTime_avg_time",              "pointInTime" : false,   "temporal" : true},
+      "metrics/rpc/RpcProcessingTime_num_ops" :                 {"metric" : "rpc.rpc.RpcProcessingTime_num_ops",               "pointInTime" : false,   "temporal" : true},
+      "metrics/rpc/RpcQueueTime_avg_time" :                     {"metric" : "rpc.rpc.RpcQueueTime_avg_time",                   "pointInTime" : false,   "temporal" : true},
+      "metrics/rpc/RpcQueueTime_num_ops" :                      {"metric" : "rpc.rpc.RpcQueueTime_num_ops",                    "pointInTime" : false,   "temporal" : true},
+      "metrics/rpc/SentBytes" :                                 {"metric" : "rpc.rpc.SentBytes",                               "pointInTime" : false,   "temporal" : true},
+      "metrics/rpc/callQueueLen" :                              {"metric" : "rpc.rpc.callQueueLen",                            "pointInTime" : false,   "temporal" : true},
+      "metrics/rpc/rpcAuthenticationFailures" :                 {"metric" : "rpc.rpc.rpcAuthenticationFailures",               "pointInTime" : false,   "temporal" : true},
+      "metrics/rpc/rpcAuthenticationSuccesses" :                {"metric" : "rpc.rpc.rpcAuthenticationSuccesses",              "pointInTime" : false,   "temporal" : true},
+      "metrics/rpc/rpcAuthorizationFailures" :                  {"metric" : "rpc.rpc.rpcAuthorizationFailures",                "pointInTime" : false,   "temporal" : true},
+      "metrics/rpc/rpcAuthorizationSuccesses" :                 {"metric" : "rpc.rpc.rpcAuthorizationSuccesses",               "pointInTime" : false,   "temporal" : true}
+    },
+    "HBASE_REGIONSERVER" :{
       "metrics/jvm/gcCount" :                                   {"metric" : "jvm.metrics.gcCount",                             "pointInTime" : false,   "temporal" : true},
       "metrics/jvm/gcTimeMillis" :                              {"metric" : "jvm.metrics.gcTimeMillis",                        "pointInTime" : false,   "temporal" : true},
       "metrics/jvm/logError" :                                  {"metric" : "jvm.metrics.logError",                            "pointInTime" : false,   "temporal" : true},

Modified: incubator/ambari/branches/AMBARI-666/ambari-server/src/main/resources/jmx_properties.json
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-server/src/main/resources/jmx_properties.json?rev=1406489&r1=1406488&r2=1406489&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-server/src/main/resources/jmx_properties.json (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-server/src/main/resources/jmx_properties.json Wed Nov  7 08:13:12 2012
@@ -386,97 +386,6 @@
       "metrics/rpcdetailed/sendHeartbeat_num_ops" :             {"metric" : "rpcdetailed.sendHeartbeat_num_ops",               "pointInTime" : true,   "temporal" : false}
     },
     "HBASE_MASTER" :{
-      "metrics/dfs/FSNamesystem/BlockCapacity" :                {"metric" : "dfs.BlockCapacity",                               "pointInTime" : true,   "temporal" : false},
-      "metrics/dfs/FSNamesystem/BlocksTotal" :                  {"metric" : "dfs.BlocksTotal",                                 "pointInTime" : true,   "temporal" : false},
-      "metrics/dfs/FSNamesystem/CapacityRemainingGB" :          {"metric" : "dfs.CapacityRemainingGB",                         "pointInTime" : true,   "temporal" : false},
-      "metrics/dfs/FSNamesystem/CapacityTotalGB" :              {"metric" : "dfs.CapacityTotalGB",                             "pointInTime" : true,   "temporal" : false},
-      "metrics/dfs/FSNamesystem/CapacityUsedGB" :               {"metric" : "dfs.CapacityUsedGB",                              "pointInTime" : true,   "temporal" : false},
-      "metrics/dfs/FSNamesystem/CorruptBlocks" :                {"metric" : "dfs.CorruptBlocks",                               "pointInTime" : true,   "temporal" : false},
-      "metrics/dfs/FSNamesystem/ExcessBlocks" :                 {"metric" : "dfs.ExcessBlocks",                                "pointInTime" : true,   "temporal" : false},
-      "metrics/dfs/FSNamesystem/FilesTotal" :                   {"metric" : "dfs.FilesTotal",                                  "pointInTime" : true,   "temporal" : false},
-      "metrics/dfs/FSNamesystem/MissingBlocks" :                {"metric" : "dfs.MissingBlocks",                               "pointInTime" : true,   "temporal" : false},
-      "metrics/dfs/FSNamesystem/PendingDeletionBlocks" :        {"metric" : "dfs.PendingDeletionBlocks",                       "pointInTime" : true,   "temporal" : false},
-      "metrics/dfs/FSNamesystem/PendingReplicationBlocks" :     {"metric" : "dfs.PendingReplicationBlocks",                    "pointInTime" : true,   "temporal" : false},
-      "metrics/dfs/FSNamesystem/ScheduledReplicationBlocks" :   {"metric" : "dfs.ScheduledReplicationBlocks",                  "pointInTime" : true,   "temporal" : false},
-      "metrics/dfs/FSNamesystem/TotalLoad" :                    {"metric" : "dfs.TotalLoad",                                   "pointInTime" : true,   "temporal" : false},
-      "metrics/dfs/FSNamesystem/UnderReplicatedBlocks" :        {"metric" : "dfs.UnderReplicatedBlocks",                       "pointInTime" : true,   "temporal" : false},
-      "metrics/jvm/gcCount" :                                   {"metric" : "jvm.gcCount",                                     "pointInTime" : true,   "temporal" : false},
-      "metrics/jvm/gcTimeMillis" :                              {"metric" : "jvm.gcTimeMillis",                                "pointInTime" : true,   "temporal" : false},
-      "metrics/jvm/logError" :                                  {"metric" : "jvm.logError",                                    "pointInTime" : true,   "temporal" : false},
-      "metrics/jvm/logFatal" :                                  {"metric" : "jvm.logFatal",                                    "pointInTime" : true,   "temporal" : false},
-      "metrics/jvm/logInfo" :                                   {"metric" : "jvm.logInfo",                                     "pointInTime" : true,   "temporal" : false},
-      "metrics/jvm/logWarn" :                                   {"metric" : "jvm.logWarn",                                     "pointInTime" : true,   "temporal" : false},
-      "metrics/jvm/memHeapCommittedM" :                         {"metric" : "jvm.memHeapCommittedM",                           "pointInTime" : true,   "temporal" : false},
-      "metrics/jvm/memHeapUsedM" :                              {"metric" : "jvm.memHeapUsedM",                                "pointInTime" : true,   "temporal" : false},
-      "metrics/jvm/memNonHeapCommittedM" :                      {"metric" : "jvm.memNonHeapCommittedM",                        "pointInTime" : true,   "temporal" : false},
-      "metrics/jvm/memNonHeapUsedM" :                           {"metric" : "jvm.memNonHeapUsedM",                             "pointInTime" : true,   "temporal" : false},
-      "metrics/jvm/threadsBlocked" :                            {"metric" : "jvm.threadsBlocked",                              "pointInTime" : true,   "temporal" : false},
-      "metrics/jvm/threadsNew" :                                {"metric" : "jvm.threadsNew",                                  "pointInTime" : true,   "temporal" : false},
-      "metrics/jvm/threadsRunnable" :                           {"metric" : "jvm.threadsRunnable",                             "pointInTime" : true,   "temporal" : false},
-      "metrics/jvm/threadsTerminated" :                         {"metric" : "jvm.threadsTerminated",                           "pointInTime" : true,   "temporal" : false},
-      "metrics/jvm/threadsTimedWaiting" :                       {"metric" : "jvm.threadsTimedWaiting",                         "pointInTime" : true,   "temporal" : false},
-      "metrics/jvm/threadsWaiting" :                            {"metric" : "jvm.threadsWaiting",                              "pointInTime" : true,   "temporal" : false},
-      "metrics/metricssystem/dropped_pub_all" :                 {"metric" : "metricssystem.dropped_pub_all",                   "pointInTime" : true,   "temporal" : false},
-      "metrics/metricssystem/num_sinks" :                       {"metric" : "metricssystem.num_sinks",                         "pointInTime" : true,   "temporal" : false},
-      "metrics/metricssystem/num_sources" :                     {"metric" : "metricssystem.num_sources",                       "pointInTime" : true,   "temporal" : false},
-      "metrics/metricssystem/publish_avg_time" :                {"metric" : "metricssystem.publish_avg_time",                  "pointInTime" : true,   "temporal" : false},
-      "metrics/metricssystem/publish_imax_time" :               {"metric" : "metricssystem.publish_imax_time",                 "pointInTime" : true,   "temporal" : false},
-      "metrics/metricssystem/publish_imin_time" :               {"metric" : "metricssystem.publish_imin_time",                 "pointInTime" : true,   "temporal" : false},
-      "metrics/metricssystem/publish_max_time" :                {"metric" : "metricssystem.publish_max_time",                  "pointInTime" : true,   "temporal" : false},
-      "metrics/metricssystem/publish_min_time" :                {"metric" : "metricssystem.publish_min_time",                  "pointInTime" : true,   "temporal" : false},
-      "metrics/metricssystem/publish_num_ops" :                 {"metric" : "metricssystem.publish_num_ops",                   "pointInTime" : true,   "temporal" : false},
-      "metrics/metricssystem/publish_stdev_time" :              {"metric" : "metricssystem.publish_stdev_time",                "pointInTime" : true,   "temporal" : false},
-      "metrics/metricssystem/latency_avg_time" :                {"metric" : "metricssystem.sink.ganglia.latency_avg_time",     "pointInTime" : true,   "temporal" : false},
-      "metrics/metricssystem/latency_num_ops" :                 {"metric" : "metricssystem.sink.ganglia.latency_num_ops",      "pointInTime" : true,   "temporal" : false},
-      "metrics/metricssystem/snapshot_avg_time" :               {"metric" : "metricssystem.snapshot_avg_time",                 "pointInTime" : true,   "temporal" : false},
-      "metrics/metricssystem/snapshot_imax_time" :              {"metric" : "metricssystem.snapshot_imax_time",                "pointInTime" : true,   "temporal" : false},
-      "metrics/metricssystem/snapshot_imin_time" :              {"metric" : "metricssystem.snapshot_imin_time",                "pointInTime" : true,   "temporal" : false},
-      "metrics/metricssystem/snapshot_max_time" :               {"metric" : "metricssystem.snapshot_max_time",                 "pointInTime" : true,   "temporal" : false},
-      "metrics/metricssystem/snapshot_min_time" :               {"metric" : "metricssystem.snapshot_min_time",                 "pointInTime" : true,   "temporal" : false},
-      "metrics/metricssystem/snapshot_num_ops" :                {"metric" : "metricssystem.snapshot_num_ops",                  "pointInTime" : true,   "temporal" : false},
-      "metrics/metricssystem/snapshot_stdev_time" :             {"metric" : "metricssystem.snapshot_stdev_time",               "pointInTime" : true,   "temporal" : false},
-      "metrics/rpc/NumOpenConnections" :                        {"metric" : "rpc.NumOpenConnections",                          "pointInTime" : true,   "temporal" : false},
-      "metrics/rpc/ReceivedBytes" :                             {"metric" : "rpc.ReceivedBytes",                               "pointInTime" : true,   "temporal" : false},
-      "metrics/rpc/RpcProcessingTime_avg_time" :                {"metric" : "rpc.RpcProcessingTime_avg_time",                  "pointInTime" : true,   "temporal" : false},
-      "metrics/rpc/RpcProcessingTime_num_ops" :                 {"metric" : "rpc.RpcProcessingTime_num_ops",                   "pointInTime" : true,   "temporal" : false},
-      "metrics/rpc/RpcQueueTime_avg_time" :                     {"metric" : "rpc.RpcQueueTime_avg_time",                       "pointInTime" : true,   "temporal" : false},
-      "metrics/rpc/RpcQueueTime_num_ops" :                      {"metric" : "rpc.RpcQueueTime_num_ops",                        "pointInTime" : true,   "temporal" : false},
-      "metrics/rpc/SentBytes" :                                 {"metric" : "rpc.SentBytes",                                   "pointInTime" : true,   "temporal" : false},
-      "metrics/rpc/callQueueLen" :                              {"metric" : "rpc.callQueueLen",                                "pointInTime" : true,   "temporal" : false},
-      "metrics/rpc/rpcAuthenticationFailures" :                 {"metric" : "rpc.rpcAuthenticationFailures",                   "pointInTime" : true,   "temporal" : false},
-      "metrics/rpc/rpcAuthenticationSuccesses" :                {"metric" : "rpc.rpcAuthenticationSuccesses",                  "pointInTime" : true,   "temporal" : false},
-      "metrics/rpc/rpcAuthorizationFailures" :                  {"metric" : "rpc.rpcAuthorizationFailures",                    "pointInTime" : true,   "temporal" : false},
-      "metrics/rpc/rpcAuthorizationSuccesses" :                 {"metric" : "rpc.rpcAuthorizationSuccesses",                   "pointInTime" : true,   "temporal" : false},
-      "metrics/rpcdetailed/addBlock_avg_time" :                 {"metric" : "rpcdetailed.addBlock_avg_time",                   "pointInTime" : true,   "temporal" : false},
-      "metrics/rpcdetailed/addBlock_num_ops" :                  {"metric" : "rpcdetailed.addBlock_num_ops",                    "pointInTime" : true,   "temporal" : false},
-      "metrics/rpcdetailed/blockReceived_avg_time" :            {"metric" : "rpcdetailed.blockReceived_avg_time",              "pointInTime" : true,   "temporal" : false},
-      "metrics/rpcdetailed/blockReceived_num_ops" :             {"metric" : "rpcdetailed.blockReceived_num_ops",               "pointInTime" : true,   "temporal" : false},
-      "metrics/rpcdetailed/blockReport_avg_time" :              {"metric" : "rpcdetailed.blockReport_avg_time",                "pointInTime" : true,   "temporal" : false},
-      "metrics/rpcdetailed/blockReport_num_ops" :               {"metric" : "rpcdetailed.blockReport_num_ops",                 "pointInTime" : true,   "temporal" : false},
-      "metrics/rpcdetailed/complete_avg_time" :                 {"metric" : "rpcdetailed.complete_avg_time",                   "pointInTime" : true,   "temporal" : false},
-      "metrics/rpcdetailed/complete_num_ops" :                  {"metric" : "rpcdetailed.complete_num_ops",                    "pointInTime" : true,   "temporal" : false},
-      "metrics/rpcdetailed/create_avg_time" :                   {"metric" : "rpcdetailed.create_avg_time",                     "pointInTime" : true,   "temporal" : false},
-      "metrics/rpcdetailed/create_num_ops" :                    {"metric" : "rpcdetailed.create_num_ops",                      "pointInTime" : true,   "temporal" : false},
-      "metrics/rpcdetailed/fsync_avg_time" :                    {"metric" : "rpcdetailed.fsync_avg_time",                      "pointInTime" : true,   "temporal" : false},
-      "metrics/rpcdetailed/fsync_num_ops" :                     {"metric" : "rpcdetailed.fsync_num_ops",                       "pointInTime" : true,   "temporal" : false},
-      "metrics/rpcdetailed/getBlockLocations_avg_time" :        {"metric" : "rpcdetailed.getBlockLocations_avg_time",          "pointInTime" : true,   "temporal" : false},
-      "metrics/rpcdetailed/getBlockLocations_num_ops" :         {"metric" : "rpcdetailed.getBlockLocations_num_ops",           "pointInTime" : true,   "temporal" : false},
-      "metrics/rpcdetailed/getEditLogSize_avg_time" :           {"metric" : "rpcdetailed.getEditLogSize_avg_time",             "pointInTime" : true,   "temporal" : false},
-      "metrics/rpcdetailed/getEditLogSize_num_ops" :            {"metric" : "rpcdetailed.getEditLogSize_num_ops",              "pointInTime" : true,   "temporal" : false},
-      "metrics/rpcdetailed/getFileInfo_avg_time" :              {"metric" : "rpcdetailed.getFileInfo_avg_time",                "pointInTime" : true,   "temporal" : false},
-      "metrics/rpcdetailed/getFileInfo_num_ops" :               {"metric" : "rpcdetailed.getFileInfo_num_ops",                 "pointInTime" : true,   "temporal" : false},
-      "metrics/rpcdetailed/getListing_avg_time" :               {"metric" : "rpcdetailed.getListing_avg_time",                 "pointInTime" : true,   "temporal" : false},
-      "metrics/rpcdetailed/getListing_num_ops" :                {"metric" : "rpcdetailed.getListing_num_ops",                  "pointInTime" : true,   "temporal" : false},
-      "metrics/rpcdetailed/getProtocolVersion_avg_time" :       {"metric" : "rpcdetailed.getProtocolVersion_avg_time",         "pointInTime" : true,   "temporal" : false},
-      "metrics/rpcdetailed/getProtocolVersion_num_ops" :        {"metric" : "rpcdetailed.getProtocolVersion_num_ops",          "pointInTime" : true,   "temporal" : false},
-      "metrics/rpcdetailed/renewLease_avg_time" :               {"metric" : "rpcdetailed.renewLease_avg_time",                 "pointInTime" : true,   "temporal" : false},
-      "metrics/rpcdetailed/renewLease_num_ops" :                {"metric" : "rpcdetailed.renewLease_num_ops",                  "pointInTime" : true,   "temporal" : false},
-      "metrics/rpcdetailed/rollEditLog_avg_time" :              {"metric" : "rpcdetailed.rollEditLog_avg_time",                "pointInTime" : true,   "temporal" : false},
-      "metrics/rpcdetailed/rollEditLog_num_ops" :               {"metric" : "rpcdetailed.rollEditLog_num_ops",                 "pointInTime" : true,   "temporal" : false},
-      "metrics/rpcdetailed/rollFsImage_avg_time" :              {"metric" : "rpcdetailed.rollFsImage_avg_time",                "pointInTime" : true,   "temporal" : false},
-      "metrics/rpcdetailed/rollFsImage_num_ops" :               {"metric" : "rpcdetailed.rollFsImage_num_ops",                 "pointInTime" : true,   "temporal" : false},
-      "metrics/rpcdetailed/sendHeartbeat_avg_time" :            {"metric" : "rpcdetailed.sendHeartbeat_avg_time",              "pointInTime" : true,   "temporal" : false},
-      "metrics/rpcdetailed/sendHeartbeat_num_ops" :             {"metric" : "rpcdetailed.sendHeartbeat_num_ops",               "pointInTime" : true,   "temporal" : false}
     }
   }
 }

Modified: incubator/ambari/branches/AMBARI-666/ambari-server/src/main/resources/key_properties.json
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-server/src/main/resources/key_properties.json?rev=1406489&r1=1406488&r2=1406489&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-server/src/main/resources/key_properties.json (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-server/src/main/resources/key_properties.json Wed Nov  7 08:13:12 2012
@@ -75,5 +75,51 @@
       "category":"Config",
       "temporal":false
     }
+  },
+  "Action":{
+    "Cluster":{
+        "name":"cluster_name",
+        "category":"Actions",
+        "temporal":false
+      },
+    "Service":{
+      	"name":"service_name",
+      	"category":"Actions",
+      	"temporal":false
+     },
+    "Action":{
+        "name":"action_name",
+      	"category":"Actions",
+      	"temporal":false
+    }
+  },
+  "Request":{
+    "Cluster":{
+      "name":"cluster_name",
+      "category":"Requests",
+      "temporal":false
+    },
+    "Request":{
+      "name":"id",
+      "category":"Requests",
+      "temporal":false
+    }
+  },
+  "Task":{
+    "Cluster":{
+      "name":"cluster_name",
+      "category":"Tasks",
+      "temporal":false
+    },
+    "Request":{
+      "name":"request_id",
+      "category":"Tasks",
+      "temporal":false
+    },
+    "Task":{
+      "name":"id",
+      "category":"Tasks",
+      "temporal":false
+    }
   }
 }

Modified: incubator/ambari/branches/AMBARI-666/ambari-server/src/main/resources/properties.json
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-server/src/main/resources/properties.json?rev=1406489&r1=1406488&r2=1406489&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-server/src/main/resources/properties.json (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-server/src/main/resources/properties.json Wed Nov  7 08:13:12 2012
@@ -1,6 +1,11 @@
 {
   "Cluster":[
       {
+        "name":"cluster_id",
+        "category":"Clusters",
+        "temporal":false
+      },
+      {
         "name":"cluster_name",
         "category":"Clusters",
         "temporal":false
@@ -165,5 +170,101 @@
         "category":"Config",
         "temporal":false
       }
-    ]
+    ],
+  "Action":[
+      {
+        "name":"cluster_name",
+        "category":"Actions",
+        "temporal":false
+      },
+      {
+      	"name":"service_name",
+      	"category":"Actions",
+      	"temporal":false
+      },
+      {
+        "name":"action_name",
+        "category":"Actions",
+        "temporal":false
+      }
+  ],
+  "Request":[
+    {
+      "name":"id",
+      "category":"Requests",
+      "temporal":false
+    },
+    {
+      "name":"cluster_name",
+      "category":"Requests",
+      "temporal":false
+    }
+  ],
+  "Task":[
+    {
+      "name":"id",
+      "category":"Tasks",
+      "temporal":false
+    },
+    {
+      "name":"request_id",
+      "category":"Tasks",
+      "temporal":false
+    },
+    {
+      "name":"cluster_name",
+      "category":"Tasks",
+      "temporal":false
+    },
+    {
+      "name":"stage_id",
+      "category":"Tasks",
+      "temporal":false
+    },
+    {
+      "name":"host_name",
+      "category":"Tasks",
+      "temporal":false
+    },
+    {
+      "name":"role",
+      "category":"Tasks",
+      "temporal":false
+    },
+    {
+      "name":"command",
+      "category":"Tasks",
+      "temporal":false
+    },
+    {
+      "name":"status",
+      "category":"Tasks",
+      "temporal":false
+    },
+    {
+      "name":"exit_code",
+      "category":"Tasks",
+      "temporal":false
+    },
+    {
+      "name":"stderr",
+      "category":"Tasks",
+      "temporal":false
+    },
+    {
+      "name":"stdout",
+      "category":"Tasks",
+      "temporal":false
+    },
+    {
+      "name":"start_time",
+      "category":"Tasks",
+      "temporal":false
+    },
+    {
+      "name":"attempt_cnt",
+      "category":"Tasks",
+      "temporal":false
+    }
+  ]
 }

Modified: incubator/ambari/branches/AMBARI-666/ambari-server/src/main/resources/stacks/HDP/0.1/repos/repoinfo.xml
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-server/src/main/resources/stacks/HDP/0.1/repos/repoinfo.xml?rev=1406489&r1=1406488&r2=1406489&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-server/src/main/resources/stacks/HDP/0.1/repos/repoinfo.xml (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-server/src/main/resources/stacks/HDP/0.1/repos/repoinfo.xml Wed Nov  7 08:13:12 2012
@@ -1,12 +1,57 @@
-<?xml version="1.0"?>
-<reposinfo>
-    <repo>
-        <url>url</url>
-        <os>Centos 5</os>
-        <description>...</description>
-    </repo>
-    <repo>
-        <url>url</url>
-        <os>Centos 6</os>
-    </repo>
-</reposinfo>
\ No newline at end of file
+<?xml version="1.0"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+<reposinfo>
+  <os type="centos6">
+    <repo>
+      <baseurl>http://public-repo-1.hortonworks.com/HDP-1.1.1.16/repos/centos6</baseurl>
+      <repoid>HDP-1.1.1.16</repoid>
+      <reponame>HDP</reponame>
+    </repo>
+    <repo>
+      <baseurl>http://public-repo-1.hortonworks.com/HDP-UTILS-1.1.0.15/repos/centos6</baseurl>
+      <repoid>HDP-UTILS-1.1.0.15</repoid>
+      <reponame>HDP-UTILS</reponame>
+      <mirrorslist></mirrorslist>
+    </repo>
+    <repo>
+      <baseurl></baseurl>
+      <repoid>epel</repoid>
+      <reponame>epel</reponame>
+      <mirrorslist><![CDATA[https://mirrors.fedoraproject.org/metalink?repo=epel-6&arch=$basearch]]></mirrorslist>
+    </repo>
+  </os>
+  <os type="centos5">
+    <repo>
+      <baseurl>http://public-repo-1.hortonworks.com/HDP-1.1.1.16/repos/centos5</baseurl>
+      <repoid>HDP-1.1.1.16</repoid>
+      <reponame>HDP</reponame>
+    </repo>
+    <repo>
+      <baseurl>http://public-repo-1.hortonworks.com/HDP-UTILS-1.1.0.15/repos/centos5</baseurl>
+      <repoid>HDP-UTILS-1.1.0.15</repoid>
+      <reponame>HDP-UTILS</reponame>
+      <mirrorslist></mirrorslist>
+    </repo>
+    <repo>
+      <baseurl></baseurl>
+      <repoid>epel</repoid>
+      <reponame>epel</reponame>
+      <mirrorslist><![CDATA[https://mirrors.fedoraproject.org/metalink?repo=epel-5&arch=$basearch]]></mirrorslist>
+    </repo>
+  </os>
+</reposinfo>

Added: incubator/ambari/branches/AMBARI-666/ambari-server/src/main/resources/stacks/HDP/0.1/services/GANGLIA/metainfo.xml
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-server/src/main/resources/stacks/HDP/0.1/services/GANGLIA/metainfo.xml?rev=1406489&view=auto
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-server/src/main/resources/stacks/HDP/0.1/services/GANGLIA/metainfo.xml (added)
+++ incubator/ambari/branches/AMBARI-666/ambari-server/src/main/resources/stacks/HDP/0.1/services/GANGLIA/metainfo.xml Wed Nov  7 08:13:12 2012
@@ -0,0 +1,43 @@
+<?xml version="1.0"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+<metainfo>
+    <user>root</user>
+    <comment>This is comment for GANGLIA service</comment>
+    <version>1.0</version>
+
+
+    <components>
+        <component>
+            <name>GANGLIA_SERVER</name>
+            <category>MASTER</category>
+        </component>
+
+        <component>
+            <name>GANGLIA_MONITOR</name>
+            <category>SLAVE</category>
+        </component>
+
+        <component>
+            <name>MONITOR_WEBSERVER</name>
+            <category>MASTER</category>
+        </component>
+
+    </components>
+
+
+</metainfo>