You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sw...@apache.org on 2015/04/03 00:00:47 UTC
[2/7] ambari git commit: AMBARI-10290. Expose avaialble host metrics
across hostcomponents. Support HostComponent host metrics. (swagle)
http://git-wip-us.apache.org/repos/asf/ambari/blob/23faabc4/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/metrics.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/metrics.json b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/metrics.json
index 21db93b..08c2b50 100644
--- a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/metrics.json
+++ b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/metrics.json
@@ -3,109 +3,111 @@
"Component": [
{
"type": "org.apache.ambari.server.controller.metrics.RestMetricsPropertyProvider",
- "properties" : {
+ "properties": {
"default_port": "8745",
"port_config_type": "storm-site",
"port_property_name": "storm.port",
"protocol": "http"
},
- "metrics": {"default":{
- "metrics/api/cluster/summary/tasks.total":
- {
- "metric": "/api/cluster/summary##tasks.total",
- "pointInTime": true,
- "temporal": false
- },
- "metrics/api/cluster/summary/slots.total": {
- "metric": "/api/cluster/summary##slots.total",
- "pointInTime": true,
- "temporal": false
- },
- "metrics/api/cluster/summary/slots.free": {
- "metric": "/api/cluster/summary##slots.free",
- "pointInTime": true,
- "temporal": false
- },
- "metrics/api/cluster/summary/supervisors": {
- "metric": "/api/cluster/summary##supervisors",
- "pointInTime": true,
- "temporal": false
- },
- "metrics/api/cluster/summary/executors.total": {
- "metric": "/api/cluster/summary##executors.total",
- "pointInTime": true,
- "temporal": false
- },
- "metrics/api/cluster/summary/slots.used": {
- "metric": "/api/cluster/summary##slots.used",
- "pointInTime": true,
- "temporal": false
- },
- "metrics/api/cluster/summary/topologies": {
- "metric": "/api/cluster/summary##topologies",
- "pointInTime": true,
- "temporal": false
- },
- "metrics/api/cluster/summary/nimbus.uptime": {
- "metric": "/api/cluster/summary##nimbus.uptime",
- "pointInTime": true,
- "temporal": false
+ "metrics": {
+ "default": {
+ "metrics/api/cluster/summary/tasks.total": {
+ "metric": "/api/cluster/summary##tasks.total",
+ "pointInTime": true,
+ "temporal": false
+ },
+ "metrics/api/cluster/summary/slots.total": {
+ "metric": "/api/cluster/summary##slots.total",
+ "pointInTime": true,
+ "temporal": false
+ },
+ "metrics/api/cluster/summary/slots.free": {
+ "metric": "/api/cluster/summary##slots.free",
+ "pointInTime": true,
+ "temporal": false
+ },
+ "metrics/api/cluster/summary/supervisors": {
+ "metric": "/api/cluster/summary##supervisors",
+ "pointInTime": true,
+ "temporal": false
+ },
+ "metrics/api/cluster/summary/executors.total": {
+ "metric": "/api/cluster/summary##executors.total",
+ "pointInTime": true,
+ "temporal": false
+ },
+ "metrics/api/cluster/summary/slots.used": {
+ "metric": "/api/cluster/summary##slots.used",
+ "pointInTime": true,
+ "temporal": false
+ },
+ "metrics/api/cluster/summary/topologies": {
+ "metric": "/api/cluster/summary##topologies",
+ "pointInTime": true,
+ "temporal": false
+ },
+ "metrics/api/cluster/summary/nimbus.uptime": {
+ "metric": "/api/cluster/summary##nimbus.uptime",
+ "pointInTime": true,
+ "temporal": false
+ }
}
- }}
+ }
}
],
"HostComponent": [
{
"type": "org.apache.ambari.server.controller.metrics.RestMetricsPropertyProvider",
- "properties" : {
+ "properties": {
"default_port": "8745",
"port_config_type": "storm-site",
"port_property_name": "storm.port",
"protocol": "http"
},
- "metrics": {"default":{
- "metrics/api/cluster/summary/tasks.total":
- {
- "metric": "/api/cluster/summary##tasks.total",
- "pointInTime": true,
- "temporal": false
- },
- "metrics/api/cluster/summary/slots.total": {
- "metric": "/api/cluster/summary##slots.total",
- "pointInTime": true,
- "temporal": false
- },
- "metrics/api/cluster/summary/slots.free": {
- "metric": "/api/cluster/summary##slots.free",
- "pointInTime": true,
- "temporal": false
- },
- "metrics/api/cluster/summary/supervisors": {
- "metric": "/api/cluster/summary##supervisors",
- "pointInTime": true,
- "temporal": false
- },
- "metrics/api/cluster/summary/executors.total": {
- "metric": "/api/cluster/summary##executors.total",
- "pointInTime": true,
- "temporal": false
- },
- "metrics/api/cluster/summary/slots.used": {
- "metric": "/api/cluster/summary##slots.used",
- "pointInTime": true,
- "temporal": false
- },
- "metrics/api/cluster/summary/topologies": {
- "metric": "/api/cluster/summary##topologies",
- "pointInTime": true,
- "temporal": false
- },
- "metrics/api/cluster/summary/nimbus.uptime": {
- "metric": "/api/cluster/summary##nimbus.uptime",
- "pointInTime": true,
- "temporal": false
+ "metrics": {
+ "default": {
+ "metrics/api/cluster/summary/tasks.total": {
+ "metric": "/api/cluster/summary##tasks.total",
+ "pointInTime": true,
+ "temporal": false
+ },
+ "metrics/api/cluster/summary/slots.total": {
+ "metric": "/api/cluster/summary##slots.total",
+ "pointInTime": true,
+ "temporal": false
+ },
+ "metrics/api/cluster/summary/slots.free": {
+ "metric": "/api/cluster/summary##slots.free",
+ "pointInTime": true,
+ "temporal": false
+ },
+ "metrics/api/cluster/summary/supervisors": {
+ "metric": "/api/cluster/summary##supervisors",
+ "pointInTime": true,
+ "temporal": false
+ },
+ "metrics/api/cluster/summary/executors.total": {
+ "metric": "/api/cluster/summary##executors.total",
+ "pointInTime": true,
+ "temporal": false
+ },
+ "metrics/api/cluster/summary/slots.used": {
+ "metric": "/api/cluster/summary##slots.used",
+ "pointInTime": true,
+ "temporal": false
+ },
+ "metrics/api/cluster/summary/topologies": {
+ "metric": "/api/cluster/summary##topologies",
+ "pointInTime": true,
+ "temporal": false
+ },
+ "metrics/api/cluster/summary/nimbus.uptime": {
+ "metric": "/api/cluster/summary##nimbus.uptime",
+ "pointInTime": true,
+ "temporal": false
+ }
}
- }}
+ }
}
]
},
@@ -113,302 +115,320 @@
"Component": [
{
"type": "ganglia",
- "metrics": {"default":{
- "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/cpu/cpu_aidle": {
- "metric": "cpu_aidle",
- "pointInTime": true,
- "temporal": true
- },
- "metrics/load_fifteen": {
- "metric": "load_fifteen",
- "pointInTime": true,
- "temporal": true
- },
- "metrics/load_five": {
- "metric": "load_five",
- "pointInTime": true,
- "temporal": true
- },
- "metrics/load_one": {
- "metric": "load_one",
- "pointInTime": true,
- "temporal": true
- },
- "metrics/memory/mem_buffers": {
- "metric": "mem_buffers",
- "pointInTime": true,
- "temporal": true
- },
- "metrics/disk/part_max_used": {
- "metric": "part_max_used",
- "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/memory/swap_total": {
- "metric": "swap_total",
- "pointInTime": true,
- "temporal": true
- },
- "metrics/storm/nimbus/jvm/memory/heap/committed": {
- "metric": "Nimbus.JVM.Memory.Heap.committed",
- "pointInTime": true,
- "temporal": true
- },
- "metrics/storm/nimbus/jvm/memory/heap/init": {
- "metric": "Nimbus.JVM.Memory.Heap.init",
- "pointInTime": true,
- "temporal": true
- },
- "metrics/storm/nimbus/jvm/memory/heap/max": {
- "metric": "Nimbus.JVM.Memory.Heap.max",
- "pointInTime": true,
- "temporal": true
- },
- "metrics/storm/nimbus/jvm/memory/heap/used": {
- "metric": "Nimbus.JVM.Memory.Heap.used",
- "pointInTime": true,
- "temporal": true
- },
- "metrics/storm/nimbus/jvm/memory/nonheap/committed": {
- "metric": "Nimbus.JVM.Memory.NonHeap.committed",
- "pointInTime": true,
- "temporal": true
- },
- "metrics/storm/nimbus/jvm/memory/nonheap/init": {
- "metric": "Nimbus.JVM.Memory.NonHeap.init",
- "pointInTime": true,
- "temporal": true
- },
- "metrics/storm/nimbus/jvm/memory/nonheap/max": {
- "metric": "Nimbus.JVM.Memory.NonHeap.max",
- "pointInTime": true,
- "temporal": true
- },
- "metrics/storm/nimbus/jvm/memory/nonheap/used": {
- "metric": "Nimbus.JVM.Memory.NonHeap.used",
- "pointInTime": true,
- "temporal": true
- },
- "metrics/storm/nimbus/jvm/os/processcputime": {
- "metric": "Nimbus.JVM.OS.ProcessCpuTime",
- "pointInTime": true,
- "temporal": true
- },
- "metrics/storm/nimbus/jvm/threading/daemonthreadcount": {
- "metric": "Nimbus.JVM.Threading.DaemonThreadCount",
- "pointInTime": true,
- "temporal": true
- },
- "metrics/storm/nimbus/jvm/threading/threadcount": {
- "metric": "Nimbus.JVM.Threading.ThreadCount",
- "pointInTime": true,
- "temporal": true
- },
+ "metrics": {
+ "default": {
+ "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/cpu/cpu_aidle": {
+ "metric": "cpu_aidle",
+ "pointInTime": true,
+ "temporal": true
+ },
+ "metrics/load_fifteen": {
+ "metric": "load_fifteen",
+ "pointInTime": true,
+ "temporal": true
+ },
+ "metrics/load_five": {
+ "metric": "load_five",
+ "pointInTime": true,
+ "temporal": true
+ },
+ "metrics/load_one": {
+ "metric": "load_one",
+ "pointInTime": true,
+ "temporal": true
+ },
+ "metrics/memory/mem_buffers": {
+ "metric": "mem_buffers",
+ "pointInTime": true,
+ "temporal": true
+ },
+ "metrics/disk/part_max_used": {
+ "metric": "part_max_used",
+ "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/memory/swap_total": {
+ "metric": "swap_total",
+ "pointInTime": true,
+ "temporal": true
+ },
+ "metrics/storm/nimbus/jvm/memory/heap/committed": {
+ "metric": "Nimbus.JVM.Memory.Heap.committed",
+ "pointInTime": true,
+ "temporal": true
+ },
+ "metrics/storm/nimbus/jvm/memory/heap/init": {
+ "metric": "Nimbus.JVM.Memory.Heap.init",
+ "pointInTime": true,
+ "temporal": true
+ },
+ "metrics/storm/nimbus/jvm/memory/heap/max": {
+ "metric": "Nimbus.JVM.Memory.Heap.max",
+ "pointInTime": true,
+ "temporal": true
+ },
+ "metrics/storm/nimbus/jvm/memory/heap/used": {
+ "metric": "Nimbus.JVM.Memory.Heap.used",
+ "pointInTime": true,
+ "temporal": true
+ },
+ "metrics/storm/nimbus/jvm/memory/nonheap/committed": {
+ "metric": "Nimbus.JVM.Memory.NonHeap.committed",
+ "pointInTime": true,
+ "temporal": true
+ },
+ "metrics/storm/nimbus/jvm/memory/nonheap/init": {
+ "metric": "Nimbus.JVM.Memory.NonHeap.init",
+ "pointInTime": true,
+ "temporal": true
+ },
+ "metrics/storm/nimbus/jvm/memory/nonheap/max": {
+ "metric": "Nimbus.JVM.Memory.NonHeap.max",
+ "pointInTime": true,
+ "temporal": true
+ },
+ "metrics/storm/nimbus/jvm/memory/nonheap/used": {
+ "metric": "Nimbus.JVM.Memory.NonHeap.used",
+ "pointInTime": true,
+ "temporal": true
+ },
+ "metrics/storm/nimbus/jvm/os/processcputime": {
+ "metric": "Nimbus.JVM.OS.ProcessCpuTime",
+ "pointInTime": true,
+ "temporal": true
+ },
+ "metrics/storm/nimbus/jvm/threading/daemonthreadcount": {
+ "metric": "Nimbus.JVM.Threading.DaemonThreadCount",
+ "pointInTime": true,
+ "temporal": true
+ },
+ "metrics/storm/nimbus/jvm/threading/threadcount": {
+ "metric": "Nimbus.JVM.Threading.ThreadCount",
+ "pointInTime": true,
+ "temporal": true
+ },
- "metrics/storm/nimbus/freeslots": {
- "metric": "Free Slots",
- "pointInTime": true,
- "temporal": true
- },
- "metrics/storm/nimbus/supervisors": {
- "metric": "Supervisors",
- "pointInTime": true,
- "temporal": true
- },
- "metrics/storm/nimbus/topologies": {
- "metric": "Topologies",
- "pointInTime": true,
- "temporal": true
- },
- "metrics/storm/nimbus/totalexecutors": {
- "metric": "Total Executors",
- "pointInTime": true,
- "temporal": true
- },
- "metrics/storm/nimbus/totalslots": {
- "metric": "Total Slots",
- "pointInTime": true,
- "temporal": true
- },
- "metrics/storm/nimbus/totaltasks": {
- "metric": "Total Tasks",
- "pointInTime": true,
- "temporal": true
- },
- "metrics/storm/nimbus/usedslots": {
- "metric": "Used Slots",
- "pointInTime": true,
- "temporal": true
+ "metrics/storm/nimbus/freeslots": {
+ "metric": "Free Slots",
+ "pointInTime": true,
+ "temporal": true
+ },
+ "metrics/storm/nimbus/supervisors": {
+ "metric": "Supervisors",
+ "pointInTime": true,
+ "temporal": true
+ },
+ "metrics/storm/nimbus/topologies": {
+ "metric": "Topologies",
+ "pointInTime": true,
+ "temporal": true
+ },
+ "metrics/storm/nimbus/totalexecutors": {
+ "metric": "Total Executors",
+ "pointInTime": true,
+ "temporal": true
+ },
+ "metrics/storm/nimbus/totalslots": {
+ "metric": "Total Slots",
+ "pointInTime": true,
+ "temporal": true
+ },
+ "metrics/storm/nimbus/totaltasks": {
+ "metric": "Total Tasks",
+ "pointInTime": true,
+ "temporal": true
+ },
+ "metrics/storm/nimbus/usedslots": {
+ "metric": "Used Slots",
+ "pointInTime": true,
+ "temporal": true
+ }
}
- }}
+ }
}
],
"HostComponent": [
{
"type": "ganglia",
- "metrics": {"default":{
- "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/cpu/cpu_aidle": {
- "metric": "cpu_aidle",
- "pointInTime": true,
- "temporal": true
- },
- "metrics/load_fifteen": {
- "metric": "load_fifteen",
- "pointInTime": true,
- "temporal": true
- },
- "metrics/load_five": {
- "metric": "load_five",
- "pointInTime": true,
- "temporal": true
- },
- "metrics/load_one": {
- "metric": "load_one",
- "pointInTime": true,
- "temporal": true
- },
- "metrics/memory/mem_buffers": {
- "metric": "mem_buffers",
- "pointInTime": true,
- "temporal": true
- },
- "metrics/disk/part_max_used": {
- "metric": "part_max_used",
- "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/memory/swap_total": {
- "metric": "swap_total",
- "pointInTime": true,
- "temporal": true
- },
- "metrics/storm/nimbus/jvm/memory/heap/committed": {
- "metric": "Nimbus.JVM.Memory.Heap.committed",
- "pointInTime": true,
- "temporal": true
- },
- "metrics/storm/nimbus/jvm/memory/heap/init": {
- "metric": "Nimbus.JVM.Memory.Heap.init",
- "pointInTime": true,
- "temporal": true
- },
- "metrics/storm/nimbus/jvm/memory/heap/max": {
- "metric": "Nimbus.JVM.Memory.Heap.max",
- "pointInTime": true,
- "temporal": true
- },
- "metrics/storm/nimbus/jvm/memory/heap/used": {
- "metric": "Nimbus.JVM.Memory.Heap.used",
- "pointInTime": true,
- "temporal": true
- },
- "metrics/storm/nimbus/jvm/memory/nonheap/committed": {
- "metric": "Nimbus.JVM.Memory.NonHeap.committed",
- "pointInTime": true,
- "temporal": true
- },
- "metrics/storm/nimbus/jvm/memory/nonheap/init": {
- "metric": "Nimbus.JVM.Memory.NonHeap.init",
- "pointInTime": true,
- "temporal": true
- },
- "metrics/storm/nimbus/jvm/memory/nonheap/max": {
- "metric": "Nimbus.JVM.Memory.NonHeap.max",
- "pointInTime": true,
- "temporal": true
- },
- "metrics/storm/nimbus/jvm/memory/nonheap/used": {
- "metric": "Nimbus.JVM.Memory.NonHeap.used",
- "pointInTime": true,
- "temporal": true
- },
- "metrics/storm/nimbus/jvm/os/processcputime": {
- "metric": "Nimbus.JVM.OS.ProcessCpuTime",
- "pointInTime": true,
- "temporal": true
- },
- "metrics/storm/nimbus/jvm/threading/daemonthreadcount": {
- "metric": "Nimbus.JVM.Threading.DaemonThreadCount",
- "pointInTime": true,
- "temporal": true
- },
- "metrics/storm/nimbus/jvm/threading/threadcount": {
- "metric": "Nimbus.JVM.Threading.ThreadCount",
- "pointInTime": true,
- "temporal": true
- }
+ "metrics": {
+ "default": {
+ "metrics/boottime": {
+ "metric": "boottime",
+ "pointInTime": true,
+ "temporal": true,
+ "amsHostMetric": true
+ },
+ "metrics/network/bytes_in": {
+ "metric": "bytes_in",
+ "pointInTime": true,
+ "temporal": true,
+ "amsHostMetric": true
+ },
+ "metrics/network/bytes_out": {
+ "metric": "bytes_out",
+ "pointInTime": true,
+ "temporal": true,
+ "amsHostMetric": true
+ },
+ "metrics/cpu/cpu_aidle": {
+ "metric": "cpu_aidle",
+ "pointInTime": true,
+ "temporal": true,
+ "amsHostMetric": true
+ },
+ "metrics/load_fifteen": {
+ "metric": "load_fifteen",
+ "pointInTime": true,
+ "temporal": true,
+ "amsHostMetric": true
+ },
+ "metrics/load_five": {
+ "metric": "load_five",
+ "pointInTime": true,
+ "temporal": true,
+ "amsHostMetric": true
+ },
+ "metrics/load_one": {
+ "metric": "load_one",
+ "pointInTime": true,
+ "temporal": true,
+ "amsHostMetric": true
+ },
+ "metrics/memory/mem_buffers": {
+ "metric": "mem_buffers",
+ "pointInTime": true,
+ "temporal": true,
+ "amsHostMetric": true
+ },
+ "metrics/disk/part_max_used": {
+ "metric": "part_max_used",
+ "pointInTime": true,
+ "temporal": true,
+ "amsHostMetric": true
+ },
+ "metrics/network/pkts_in": {
+ "metric": "pkts_in",
+ "pointInTime": true,
+ "temporal": true,
+ "amsHostMetric": true
+ },
+ "metrics/network/pkts_out": {
+ "metric": "pkts_out",
+ "pointInTime": true,
+ "temporal": true,
+ "amsHostMetric": true
+ },
+ "metrics/process/proc_run": {
+ "metric": "proc_run",
+ "pointInTime": true,
+ "temporal": true,
+ "amsHostMetric": true
+ },
+ "metrics/process/proc_total": {
+ "metric": "proc_total",
+ "pointInTime": true,
+ "temporal": true,
+ "amsHostMetric": true
+ },
+ "metrics/memory/swap_total": {
+ "metric": "swap_total",
+ "pointInTime": true,
+ "temporal": true,
+ "amsHostMetric": true
+ },
+ "metrics/storm/nimbus/jvm/memory/heap/committed": {
+ "metric": "Nimbus.JVM.Memory.Heap.committed",
+ "pointInTime": true,
+ "temporal": true
+ },
+ "metrics/storm/nimbus/jvm/memory/heap/init": {
+ "metric": "Nimbus.JVM.Memory.Heap.init",
+ "pointInTime": true,
+ "temporal": true
+ },
+ "metrics/storm/nimbus/jvm/memory/heap/max": {
+ "metric": "Nimbus.JVM.Memory.Heap.max",
+ "pointInTime": true,
+ "temporal": true
+ },
+ "metrics/storm/nimbus/jvm/memory/heap/used": {
+ "metric": "Nimbus.JVM.Memory.Heap.used",
+ "pointInTime": true,
+ "temporal": true
+ },
+ "metrics/storm/nimbus/jvm/memory/nonheap/committed": {
+ "metric": "Nimbus.JVM.Memory.NonHeap.committed",
+ "pointInTime": true,
+ "temporal": true
+ },
+ "metrics/storm/nimbus/jvm/memory/nonheap/init": {
+ "metric": "Nimbus.JVM.Memory.NonHeap.init",
+ "pointInTime": true,
+ "temporal": true
+ },
+ "metrics/storm/nimbus/jvm/memory/nonheap/max": {
+ "metric": "Nimbus.JVM.Memory.NonHeap.max",
+ "pointInTime": true,
+ "temporal": true
+ },
+ "metrics/storm/nimbus/jvm/memory/nonheap/used": {
+ "metric": "Nimbus.JVM.Memory.NonHeap.used",
+ "pointInTime": true,
+ "temporal": true
+ },
+ "metrics/storm/nimbus/jvm/os/processcputime": {
+ "metric": "Nimbus.JVM.OS.ProcessCpuTime",
+ "pointInTime": true,
+ "temporal": true
+ },
+ "metrics/storm/nimbus/jvm/threading/daemonthreadcount": {
+ "metric": "Nimbus.JVM.Threading.DaemonThreadCount",
+ "pointInTime": true,
+ "temporal": true
+ },
+ "metrics/storm/nimbus/jvm/threading/threadcount": {
+ "metric": "Nimbus.JVM.Threading.ThreadCount",
+ "pointInTime": true,
+ "temporal": true
+ }
- }}
+ }
+ }
}
]
},
@@ -416,375 +436,393 @@
"Component": [
{
"type": "ganglia",
- "metrics": {"default":{
- "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/cpu/cpu_aidle": {
- "metric": "cpu_aidle",
- "pointInTime": true,
- "temporal": true
- },
- "metrics/load_fifteen": {
- "metric": "load_fifteen",
- "pointInTime": true,
- "temporal": true
- },
- "metrics/load_five": {
- "metric": "load_five",
- "pointInTime": true,
- "temporal": true
- },
- "metrics/load_one": {
- "metric": "load_one",
- "pointInTime": true,
- "temporal": true
- },
- "metrics/memory/mem_buffers": {
- "metric": "mem_buffers",
- "pointInTime": true,
- "temporal": true
- },
- "metrics/disk/part_max_used": {
- "metric": "part_max_used",
- "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/memory/swap_total": {
- "metric": "swap_total",
- "pointInTime": true,
- "temporal": true
- },
- "metrics/storm/supervisor/jvm/memory/heap/committed": {
- "metric": "Supervisor.JVM.Memory.Heap.committed",
- "pointInTime": true,
- "temporal": true
- },
- "metrics/storm/supervisor/jvm/memory/heap/init": {
- "metric": "Supervisor.JVM.Memory.Heap.init",
- "pointInTime": true,
- "temporal": true
- },
- "metrics/storm/supervisor/jvm/memory/heap/max": {
- "metric": "Supervisor.JVM.Memory.Heap.max",
- "pointInTime": true,
- "temporal": true
- },
- "metrics/storm/supervisor/jvm/memory/heap/used": {
- "metric": "Supervisor.JVM.Memory.Heap.used",
- "pointInTime": true,
- "temporal": true
- },
- "metrics/storm/supervisor/jvm/memory/nonheap/committed": {
- "metric": "Supervisor.JVM.Memory.NonHeap.committed",
- "pointInTime": true,
- "temporal": true
- },
- "metrics/storm/supervisor/jvm/memory/nonheap/init": {
- "metric": "Supervisor.JVM.Memory.NonHeap.init",
- "pointInTime": true,
- "temporal": true
- },
- "metrics/storm/supervisor/jvm/memory/nonheap/max": {
- "metric": "Supervisor.JVM.Memory.NonHeap.max",
- "pointInTime": true,
- "temporal": true
- },
- "metrics/storm/supervisor/jvm/memory/nonheap/used": {
- "metric": "Supervisor.JVM.Memory.NonHeap.used",
- "pointInTime": true,
- "temporal": true
- },
- "metrics/storm/supervisor/jvm/os/processcputime": {
- "metric": "Supervisor.JVM.OS.ProcessCpuTime",
- "pointInTime": true,
- "temporal": true
- },
- "metrics/storm/supervisor/jvm/threading/daemonthreadcount": {
- "metric": "Supervisor.JVM.Threading.DaemonThreadCount",
- "pointInTime": true,
- "temporal": true
- },
- "metrics/storm/supervisor/jvm/threading/threadcount": {
- "metric": "Supervisor.JVM.Threading.ThreadCount",
- "pointInTime": true,
- "temporal": true
- },
- "metrics/storm/worker/$1/jvm/memory/heap/committed": {
- "metric": "Worker.(.+).JVM.Memory.Heap.committed",
- "pointInTime": true,
- "temporal": true
- },
- "metrics/storm/worker/$1/jvm/memory/heap/init": {
- "metric": "Worker.(.+).JVM.Memory.Heap.init",
- "pointInTime": true,
- "temporal": true
- },
- "metrics/storm/worker/$1/jvm/memory/heap/max": {
- "metric": "Worker.(.+).JVM.Memory.Heap.max",
- "pointInTime": true,
- "temporal": true
- },
- "metrics/storm/worker/$1/jvm/memory/heap/used": {
- "metric": "Worker.(.+).JVM.Memory.Heap.used",
- "pointInTime": true,
- "temporal": true
- },
- "metrics/storm/worker/$1/jvm/memory/nonheap/committed": {
- "metric": "Worker.(.+).JVM.Memory.NonHeap.committed",
- "pointInTime": true,
- "temporal": true
- },
- "metrics/storm/worker/$1/jvm/memory/nonheap/init": {
- "metric": "Worker.(.+).JVM.Memory.NonHeap.init",
- "pointInTime": true,
- "temporal": true
- },
- "metrics/storm/worker/$1/jvm/memory/nonheap/max": {
- "metric": "Worker.(.+).JVM.Memory.NonHeap.max",
- "pointInTime": true,
- "temporal": true
- },
- "metrics/storm/worker/$1/jvm/memory/nonheap/used": {
- "metric": "Worker.(.+).JVM.Memory.NonHeap.used",
- "pointInTime": true,
- "temporal": true
- },
- "metrics/storm/worker/$1/jvm/os/processcputime": {
- "metric": "Worker.(.+).JVM.OS.ProcessCpuTime",
- "pointInTime": true,
- "temporal": true
- },
- "metrics/storm/worker/$1/jvm/threading/daemonthreadcount": {
- "metric": "Worker.(.+).JVM.Threading.DaemonThreadCount",
- "pointInTime": true,
- "temporal": true
- },
- "metrics/storm/worker/$1/jvm/threading/threadcount": {
- "metric": "Worker.(.+).JVM.Threading.ThreadCount",
- "pointInTime": true,
- "temporal": true
+ "metrics": {
+ "default": {
+ "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/cpu/cpu_aidle": {
+ "metric": "cpu_aidle",
+ "pointInTime": true,
+ "temporal": true
+ },
+ "metrics/load_fifteen": {
+ "metric": "load_fifteen",
+ "pointInTime": true,
+ "temporal": true
+ },
+ "metrics/load_five": {
+ "metric": "load_five",
+ "pointInTime": true,
+ "temporal": true
+ },
+ "metrics/load_one": {
+ "metric": "load_one",
+ "pointInTime": true,
+ "temporal": true
+ },
+ "metrics/memory/mem_buffers": {
+ "metric": "mem_buffers",
+ "pointInTime": true,
+ "temporal": true
+ },
+ "metrics/disk/part_max_used": {
+ "metric": "part_max_used",
+ "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/memory/swap_total": {
+ "metric": "swap_total",
+ "pointInTime": true,
+ "temporal": true
+ },
+ "metrics/storm/supervisor/jvm/memory/heap/committed": {
+ "metric": "Supervisor.JVM.Memory.Heap.committed",
+ "pointInTime": true,
+ "temporal": true
+ },
+ "metrics/storm/supervisor/jvm/memory/heap/init": {
+ "metric": "Supervisor.JVM.Memory.Heap.init",
+ "pointInTime": true,
+ "temporal": true
+ },
+ "metrics/storm/supervisor/jvm/memory/heap/max": {
+ "metric": "Supervisor.JVM.Memory.Heap.max",
+ "pointInTime": true,
+ "temporal": true
+ },
+ "metrics/storm/supervisor/jvm/memory/heap/used": {
+ "metric": "Supervisor.JVM.Memory.Heap.used",
+ "pointInTime": true,
+ "temporal": true
+ },
+ "metrics/storm/supervisor/jvm/memory/nonheap/committed": {
+ "metric": "Supervisor.JVM.Memory.NonHeap.committed",
+ "pointInTime": true,
+ "temporal": true
+ },
+ "metrics/storm/supervisor/jvm/memory/nonheap/init": {
+ "metric": "Supervisor.JVM.Memory.NonHeap.init",
+ "pointInTime": true,
+ "temporal": true
+ },
+ "metrics/storm/supervisor/jvm/memory/nonheap/max": {
+ "metric": "Supervisor.JVM.Memory.NonHeap.max",
+ "pointInTime": true,
+ "temporal": true
+ },
+ "metrics/storm/supervisor/jvm/memory/nonheap/used": {
+ "metric": "Supervisor.JVM.Memory.NonHeap.used",
+ "pointInTime": true,
+ "temporal": true
+ },
+ "metrics/storm/supervisor/jvm/os/processcputime": {
+ "metric": "Supervisor.JVM.OS.ProcessCpuTime",
+ "pointInTime": true,
+ "temporal": true
+ },
+ "metrics/storm/supervisor/jvm/threading/daemonthreadcount": {
+ "metric": "Supervisor.JVM.Threading.DaemonThreadCount",
+ "pointInTime": true,
+ "temporal": true
+ },
+ "metrics/storm/supervisor/jvm/threading/threadcount": {
+ "metric": "Supervisor.JVM.Threading.ThreadCount",
+ "pointInTime": true,
+ "temporal": true
+ },
+ "metrics/storm/worker/$1/jvm/memory/heap/committed": {
+ "metric": "Worker.(.+).JVM.Memory.Heap.committed",
+ "pointInTime": true,
+ "temporal": true
+ },
+ "metrics/storm/worker/$1/jvm/memory/heap/init": {
+ "metric": "Worker.(.+).JVM.Memory.Heap.init",
+ "pointInTime": true,
+ "temporal": true
+ },
+ "metrics/storm/worker/$1/jvm/memory/heap/max": {
+ "metric": "Worker.(.+).JVM.Memory.Heap.max",
+ "pointInTime": true,
+ "temporal": true
+ },
+ "metrics/storm/worker/$1/jvm/memory/heap/used": {
+ "metric": "Worker.(.+).JVM.Memory.Heap.used",
+ "pointInTime": true,
+ "temporal": true
+ },
+ "metrics/storm/worker/$1/jvm/memory/nonheap/committed": {
+ "metric": "Worker.(.+).JVM.Memory.NonHeap.committed",
+ "pointInTime": true,
+ "temporal": true
+ },
+ "metrics/storm/worker/$1/jvm/memory/nonheap/init": {
+ "metric": "Worker.(.+).JVM.Memory.NonHeap.init",
+ "pointInTime": true,
+ "temporal": true
+ },
+ "metrics/storm/worker/$1/jvm/memory/nonheap/max": {
+ "metric": "Worker.(.+).JVM.Memory.NonHeap.max",
+ "pointInTime": true,
+ "temporal": true
+ },
+ "metrics/storm/worker/$1/jvm/memory/nonheap/used": {
+ "metric": "Worker.(.+).JVM.Memory.NonHeap.used",
+ "pointInTime": true,
+ "temporal": true
+ },
+ "metrics/storm/worker/$1/jvm/os/processcputime": {
+ "metric": "Worker.(.+).JVM.OS.ProcessCpuTime",
+ "pointInTime": true,
+ "temporal": true
+ },
+ "metrics/storm/worker/$1/jvm/threading/daemonthreadcount": {
+ "metric": "Worker.(.+).JVM.Threading.DaemonThreadCount",
+ "pointInTime": true,
+ "temporal": true
+ },
+ "metrics/storm/worker/$1/jvm/threading/threadcount": {
+ "metric": "Worker.(.+).JVM.Threading.ThreadCount",
+ "pointInTime": true,
+ "temporal": true
+ }
}
- }}
+ }
}
],
"HostComponent": [
{
"type": "ganglia",
- "metrics": {"default":{
- "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/cpu/cpu_aidle": {
- "metric": "cpu_aidle",
- "pointInTime": true,
- "temporal": true
- },
- "metrics/load_fifteen": {
- "metric": "load_fifteen",
- "pointInTime": true,
- "temporal": true
- },
- "metrics/load_five": {
- "metric": "load_five",
- "pointInTime": true,
- "temporal": true
- },
- "metrics/load_one": {
- "metric": "load_one",
- "pointInTime": true,
- "temporal": true
- },
- "metrics/memory/mem_buffers": {
- "metric": "mem_buffers",
- "pointInTime": true,
- "temporal": true
- },
- "metrics/disk/part_max_used": {
- "metric": "part_max_used",
- "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/memory/swap_total": {
- "metric": "swap_total",
- "pointInTime": true,
- "temporal": true
- },
- "metrics/storm/supervisor/jvm/memory/heap/committed": {
- "metric": "Supervisor.JVM.Memory.Heap.committed",
- "pointInTime": true,
- "temporal": true
- },
- "metrics/storm/supervisor/jvm/memory/heap/init": {
- "metric": "Supervisor.JVM.Memory.Heap.init",
- "pointInTime": true,
- "temporal": true
- },
- "metrics/storm/supervisor/jvm/memory/heap/max": {
- "metric": "Supervisor.JVM.Memory.Heap.max",
- "pointInTime": true,
- "temporal": true
- },
- "metrics/storm/supervisor/jvm/memory/heap/used": {
- "metric": "Supervisor.JVM.Memory.Heap.used",
- "pointInTime": true,
- "temporal": true
- },
- "metrics/storm/supervisor/jvm/memory/nonheap/committed": {
- "metric": "Supervisor.JVM.Memory.NonHeap.committed",
- "pointInTime": true,
- "temporal": true
- },
- "metrics/storm/supervisor/jvm/memory/nonheap/init": {
- "metric": "Supervisor.JVM.Memory.NonHeap.init",
- "pointInTime": true,
- "temporal": true
- },
- "metrics/storm/supervisor/jvm/memory/nonheap/max": {
- "metric": "Supervisor.JVM.Memory.NonHeap.max",
- "pointInTime": true,
- "temporal": true
- },
- "metrics/storm/supervisor/jvm/memory/nonheap/used": {
- "metric": "Supervisor.JVM.Memory.NonHeap.used",
- "pointInTime": true,
- "temporal": true
- },
- "metrics/storm/supervisor/jvm/os/processcputime": {
- "metric": "Supervisor.JVM.OS.ProcessCpuTime",
- "pointInTime": true,
- "temporal": true
- },
- "metrics/storm/supervisor/jvm/threading/daemonthreadcount": {
- "metric": "Supervisor.JVM.Threading.DaemonThreadCount",
- "pointInTime": true,
- "temporal": true
- },
- "metrics/storm/supervisor/jvm/threading/threadcount": {
- "metric": "Supervisor.JVM.Threading.ThreadCount",
- "pointInTime": true,
- "temporal": true
- },
- "metrics/storm/worker/$1/jvm/memory/heap/committed": {
- "metric": "Worker.(.+).JVM.Memory.Heap.committed",
- "pointInTime": true,
- "temporal": true
- },
- "metrics/storm/worker/$1/jvm/memory/heap/init": {
- "metric": "Worker.(.+).JVM.Memory.Heap.init",
- "pointInTime": true,
- "temporal": true
- },
- "metrics/storm/worker/$1/jvm/memory/heap/max": {
- "metric": "Worker.(.+).JVM.Memory.Heap.max",
- "pointInTime": true,
- "temporal": true
- },
- "metrics/storm/worker/$1/jvm/memory/heap/used": {
- "metric": "Worker.(.+).JVM.Memory.Heap.used",
- "pointInTime": true,
- "temporal": true
- },
- "metrics/storm/worker/$1/jvm/memory/nonheap/committed": {
- "metric": "Worker.(.+).JVM.Memory.NonHeap.committed",
- "pointInTime": true,
- "temporal": true
- },
- "metrics/storm/worker/$1/jvm/memory/nonheap/init": {
- "metric": "Worker.(.+).JVM.Memory.NonHeap.init",
- "pointInTime": true,
- "temporal": true
- },
- "metrics/storm/worker/$1/jvm/memory/nonheap/max": {
- "metric": "Worker.(.+).JVM.Memory.NonHeap.max",
- "pointInTime": true,
- "temporal": true
- },
- "metrics/storm/worker/$1/jvm/memory/nonheap/used": {
- "metric": "Worker.(.+).JVM.Memory.NonHeap.used",
- "pointInTime": true,
- "temporal": true
- },
- "metrics/storm/worker/$1/jvm/os/processcputime": {
- "metric": "Worker.(.+).JVM.OS.ProcessCpuTime",
- "pointInTime": true,
- "temporal": true
- },
- "metrics/storm/worker/$1/jvm/threading/daemonthreadcount": {
- "metric": "Worker.(.+).JVM.Threading.DaemonThreadCount",
- "pointInTime": true,
- "temporal": true
- },
- "metrics/storm/worker/$1/jvm/threading/threadcount": {
- "metric": "Worker.(.+).JVM.Threading.ThreadCount",
- "pointInTime": true,
- "temporal": true
+ "metrics": {
+ "default": {
+ "metrics/boottime": {
+ "metric": "boottime",
+ "pointInTime": true,
+ "temporal": true,
+ "amsHostMetric":true
+ },
+ "metrics/network/bytes_in": {
+ "metric": "bytes_in",
+ "pointInTime": true,
+ "temporal": true,
+ "amsHostMetric":true
+ },
+ "metrics/network/bytes_out": {
+ "metric": "bytes_out",
+ "pointInTime": true,
+ "temporal": true,
+ "amsHostMetric":true
+ },
+ "metrics/cpu/cpu_aidle": {
+ "metric": "cpu_aidle",
+ "pointInTime": true,
+ "temporal": true,
+ "amsHostMetric":true
+ },
+ "metrics/load_fifteen": {
+ "metric": "load_fifteen",
+ "pointInTime": true,
+ "temporal": true,
+ "amsHostMetric":true
+ },
+ "metrics/load_five": {
+ "metric": "load_five",
+ "pointInTime": true,
+ "temporal": true,
+ "amsHostMetric":true
+ },
+ "metrics/load_one": {
+ "metric": "load_one",
+ "pointInTime": true,
+ "temporal": true,
+ "amsHostMetric":true
+ },
+ "metrics/memory/mem_buffers": {
+ "metric": "mem_buffers",
+ "pointInTime": true,
+ "temporal": true,
+ "amsHostMetric":true
+ },
+ "metrics/disk/part_max_used": {
+ "metric": "part_max_used",
+ "pointInTime": true,
+ "temporal": true,
+ "amsHostMetric":true
+ },
+ "metrics/network/pkts_in": {
+ "metric": "pkts_in",
+ "pointInTime": true,
+ "temporal": true,
+ "amsHostMetric":true
+ },
+ "metrics/network/pkts_out": {
+ "metric": "pkts_out",
+ "pointInTime": true,
+ "temporal": true,
+ "amsHostMetric":true
+ },
+ "metrics/process/proc_run": {
+ "metric": "proc_run",
+ "pointInTime": true,
+ "temporal": true,
+ "amsHostMetric":true
+ },
+ "metrics/process/proc_total": {
+ "metric": "proc_total",
+ "pointInTime": true,
+ "temporal": true,
+ "amsHostMetric":true
+ },
+ "metrics/memory/swap_total": {
+ "metric": "swap_total",
+ "pointInTime": true,
+ "temporal": true,
+ "amsHostMetric":true
+ },
+ "metrics/storm/supervisor/jvm/memory/heap/committed": {
+ "metric": "Supervisor.JVM.Memory.Heap.committed",
+ "pointInTime": true,
+ "temporal": true
+ },
+ "metrics/storm/supervisor/jvm/memory/heap/init": {
+ "metric": "Supervisor.JVM.Memory.Heap.init",
+ "pointInTime": true,
+ "temporal": true
+ },
+ "metrics/storm/supervisor/jvm/memory/heap/max": {
+ "metric": "Supervisor.JVM.Memory.Heap.max",
+ "pointInTime": true,
+ "temporal": true
+ },
+ "metrics/storm/supervisor/jvm/memory/heap/used": {
+ "metric": "Supervisor.JVM.Memory.Heap.used",
+ "pointInTime": true,
+ "temporal": true
+ },
+ "metrics/storm/supervisor/jvm/memory/nonheap/committed": {
+ "metric": "Supervisor.JVM.Memory.NonHeap.committed",
+ "pointInTime": true,
+ "temporal": true
+ },
+ "metrics/storm/supervisor/jvm/memory/nonheap/init": {
+ "metric": "Supervisor.JVM.Memory.NonHeap.init",
+ "pointInTime": true,
+ "temporal": true
+ },
+ "metrics/storm/supervisor/jvm/memory/nonheap/max": {
+ "metric": "Supervisor.JVM.Memory.NonHeap.max",
+ "pointInTime": true,
+ "temporal": true
+ },
+ "metrics/storm/supervisor/jvm/memory/nonheap/used": {
+ "metric": "Supervisor.JVM.Memory.NonHeap.used",
+ "pointInTime": true,
+ "temporal": true
+ },
+ "metrics/storm/supervisor/jvm/os/processcputime": {
+ "metric": "Supervisor.JVM.OS.ProcessCpuTime",
+ "pointInTime": true,
+ "temporal": true
+ },
+ "metrics/storm/supervisor/jvm/threading/daemonthreadcount": {
+ "metric": "Supervisor.JVM.Threading.DaemonThreadCount",
+ "pointInTime": true,
+ "temporal": true
+ },
+ "metrics/storm/supervisor/jvm/threading/threadcount": {
+ "metric": "Supervisor.JVM.Threading.ThreadCount",
+ "pointInTime": true,
+ "temporal": true
+ },
+ "metrics/storm/worker/$1/jvm/memory/heap/committed": {
+ "metric": "Worker.(.+).JVM.Memory.Heap.committed",
+ "pointInTime": true,
+ "temporal": true
+ },
+ "metrics/storm/worker/$1/jvm/memory/heap/init": {
+ "metric": "Worker.(.+).JVM.Memory.Heap.init",
+ "pointInTime": true,
+ "temporal": true
+ },
+ "metrics/storm/worker/$1/jvm/memory/heap/max": {
+ "metric": "Worker.(.+).JVM.Memory.Heap.max",
+ "pointInTime": true,
+ "temporal": true
+ },
+ "metrics/storm/worker/$1/jvm/memory/heap/used": {
+ "metric": "Worker.(.+).JVM.Memory.Heap.used",
+ "pointInTime": true,
+ "temporal": true
+ },
+ "metrics/storm/worker/$1/jvm/memory/nonheap/committed": {
+ "metric": "Worker.(.+).JVM.Memory.NonHeap.committed",
+ "pointInTime": true,
+ "temporal": true
+ },
+ "metrics/storm/worker/$1/jvm/memory/nonheap/init": {
+ "metric": "Worker.(.+).JVM.Memory.NonHeap.init",
+ "pointInTime": true,
+ "temporal": true
+ },
+ "metrics/storm/worker/$1/jvm/memory/nonheap/max": {
+ "metric": "Worker.(.+).JVM.Memory.NonHeap.max",
+ "pointInTime": true,
+ "temporal": true
+ },
+ "metrics/storm/worker/$1/jvm/memory/nonheap/used": {
+ "metric": "Worker.(.+).JVM.Memory.NonHeap.used",
+ "pointInTime": true,
+ "temporal": true
+ },
+ "metrics/storm/worker/$1/jvm/os/processcputime": {
+ "metric": "Worker.(.+).JVM.OS.ProcessCpuTime",
+ "pointInTime": true,
+ "temporal": true
+ },
+ "metrics/storm/worker/$1/jvm/threading/daemonthreadcount": {
+ "metric": "Worker.(.+).JVM.Threading.DaemonThreadCount",
+ "pointInTime": true,
+ "temporal": true
+ },
+ "metrics/storm/worker/$1/jvm/threading/threadcount": {
+ "metric": "Worker.(.+).JVM.Threading.ThreadCount",
+ "pointInTime": true,
+ "temporal": true
+ }
}
- }}
+ }
}
]
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/23faabc4/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/metrics.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/metrics.json b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/metrics.json
index c719141..ce71a8c 100644
--- a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/metrics.json
+++ b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/metrics.json
@@ -5,6 +5,153 @@
"type": "ganglia",
"metrics": {
"default": {
+ "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_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/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,
+ "amsHostMetric":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/disk/read_count":{
+ "metric":"read_count",
+ "pointInTime":true,
+ "temporal":true
+ },
+ "metrics/disk/write_count":{
+ "metric":"write_count",
+ "pointInTime":true,
+ "temporal":true
+ },
+ "metrics/disk/read_bytes":{
+ "metric":"read_bytes",
+ "pointInTime":true,
+ "temporal":true
+ },
+ "metrics/disk/write_bytes":{
+ "metric":"write_bytes",
+ "pointInTime":true,
+ "temporal":true,
+ "amsHostMetric":true
+ },
+ "metrics/disk/read_time":{
+ "metric":"read_time",
+ "pointInTime":true,
+ "temporal":true
+ },
+ "metrics/disk/write_time":{
+ "metric":"write_time",
+ "pointInTime":true,
+ "temporal":true
+ },
"metrics/jvm/memHeapCommittedM": {
"metric": "jvm.JvmMetrics.MemHeapCommittedM",
"pointInTime": false,
@@ -75,16 +222,6 @@
"pointInTime": false,
"temporal": true
},
- "metrics/process/proc_run": {
- "metric": "proc_run",
- "pointInTime": true,
- "temporal": true
- },
- "metrics/memory/swap_total": {
- "metric": "swap_total",
- "pointInTime": true,
- "temporal": true
- },
"metrics/rpc/ReceivedBytes": {
"metric": "rpc.rpc.ReceivedBytes",
"pointInTime": false,
@@ -100,11 +237,6 @@
"pointInTime": false,
"temporal": true
},
- "metrics/process/proc_total": {
- "metric": "proc_total",
- "pointInTime": true,
- "temporal": true
- },
"metrics/yarn/AllocatedGB": {
"metric": "yarn.NodeManagerMetrics.AllocatedGB",
"pointInTime": true,
@@ -140,11 +272,6 @@
"pointInTime": true,
"temporal": true
},
- "metrics/memory/mem_buffers": {
- "metric": "mem_buffers",
- "pointInTime": true,
- "temporal": true
- },
"metrics/ugi/loginSuccess_num_ops": {
"metric": "ugi.ugi.LoginSuccessNumOps",
"pointInTime": false,
@@ -165,31 +292,16 @@
"pointInTime": false,
"temporal": true
},
- "metrics/network/bytes_out": {
- "metric": "bytes_out",
- "pointInTime": true,
- "temporal": true
- },
"metrics/cpu/cpu_aidle": {
"metric": "cpu_aidle",
"pointInTime": true,
"temporal": true
},
- "metrics/network/bytes_in": {
- "metric": "bytes_in",
- "pointInTime": true,
- "temporal": true
- },
"metrics/boottime": {
"metric": "boottime",
"pointInTime": true,
"temporal": true
},
- "metrics/network/pkts_out": {
- "metric": "pkts_out",
- "pointInTime": true,
- "temporal": true
- },
"metrics/jvm/memNonHeapCommittedM": {
"metric": "jvm.JvmMetrics.MemNonHeapCommittedM",
"pointInTime": false,
@@ -279,11 +391,6 @@
"metric": "rpc.metrics.RpcAuthenticationFailures",
"pointInTime": false,
"temporal": true
- },
- "metrics/network/pkts_in": {
- "metric": "pkts_in",
- "pointInTime": true,
- "temporal": true
}
}
}
@@ -293,6 +400,180 @@
{
"type": "ganglia",
"metrics": {
+ "metrics/cpu/cpu_idle":{
+ "metric":"cpu_idle",
+ "pointInTime":true,
+ "temporal":true,
+ "amsHostMetric":true
+ },
+ "metrics/cpu/cpu_nice":{
+ "metric":"cpu_nice",
+ "pointInTime":true,
+ "temporal":true,
+ "amsHostMetric":true
+ },
+ "metrics/cpu/cpu_system":{
+ "metric":"cpu_system",
+ "pointInTime":true,
+ "temporal":true,
+ "amsHostMetric":true
+ },
+ "metrics/cpu/cpu_user":{
+ "metric":"cpu_user",
+ "pointInTime":true,
+ "temporal":true,
+ "amsHostMetric":true
+ },
+ "metrics/cpu/cpu_wio":{
+ "metric":"cpu_wio",
+ "pointInTime":true,
+ "temporal":true,
+ "amsHostMetric":true
+ },
+ "metrics/disk/disk_free":{
+ "metric":"disk_free",
+ "pointInTime":true,
+ "temporal":true,
+ "amsHostMetric":true
+ },
+ "metrics/disk/disk_total":{
+ "metric":"disk_total",
+ "pointInTime":true,
+ "temporal":true,
+ "amsHostMetric":true
+ },
+ "metrics/load/load_fifteen":{
+ "metric":"load_fifteen",
+ "pointInTime":true,
+ "temporal":true,
+ "amsHostMetric":true
+ },
+ "metrics/load/load_five":{
+ "metric":"load_five",
+ "pointInTime":true,
+ "temporal":true,
+ "amsHostMetric":true
+ },
+ "metrics/load/load_one":{
+ "metric":"load_one",
+ "pointInTime":true,
+ "temporal":true,
+ "amsHostMetric":true
+ },
+ "metrics/memory/mem_buffers":{
+ "metric":"mem_buffers",
+ "pointInTime":true,
+ "temporal":true,
+ "amsHostMetric":true
+ },
+ "metrics/memory/mem_cached":{
+ "metric":"mem_cached",
+ "pointInTime":true,
+ "temporal":true,
+ "amsHostMetric":true
+ },
+ "metrics/memory/mem_free":{
+ "metric":"mem_free",
+ "pointInTime":true,
+ "temporal":true,
+ "amsHostMetric":true
+ },
+ "metrics/memory/mem_shared":{
+ "metric":"mem_shared",
+ "pointInTime":true,
+ "temporal":true,
+ "amsHostMetric":true
+ },
+ "metrics/memory/mem_total":{
+ "metric":"mem_total",
+ "pointInTime":true,
+ "temporal":true,
+ "amsHostMetric":true
+ },
+ "metrics/memory/swap_free":{
+ "metric":"swap_free",
+ "pointInTime":true,
+ "temporal":true,
+ "amsHostMetric":true
+ },
+ "metrics/memory/swap_total":{
+ "metric":"swap_total",
+ "pointInTime":true,
+ "temporal":true,
+ "amsHostMetric":true
+ },
+ "metrics/network/bytes_in":{
+ "metric":"bytes_in",
+ "pointInTime":true,
+ "temporal":true,
+ "amsHostMetric":true
+ },
+ "metrics/network/bytes_out":{
+ "metric":"bytes_out",
+ "pointInTime":true,
+ "temporal":true,
+ "amsHostMetric":true
+ },
+ "metrics/network/pkts_in":{
+ "metric":"pkts_in",
+ "pointInTime":true,
+ "temporal":true,
+ "amsHostMetric":true
+ },
+ "metrics/network/pkts_out":{
+ "metric":"pkts_out",
+ "pointInTime":true,
+ "temporal":true,
+ "amsHostMetric":true
+ },
+ "metrics/process/proc_run":{
+ "metric":"proc_run",
+ "pointInTime":true,
+ "temporal":true,
+ "amsHostMetric":true
+ },
+ "metrics/process/proc_total":{
+ "metric":"proc_total",
+ "pointInTime":true,
+ "temporal":true,
+ "amsHostMetric":true
+ },
+ "metrics/disk/read_count":{
+ "metric":"read_count",
+ "pointInTime":true,
+ "temporal":true,
+ "amsHostMetric":true
+ },
+ "metrics/disk/write_count":{
+ "metric":"write_count",
+ "pointInTime":true,
+ "temporal":true,
+ "amsHostMetric":true
+ },
+ "metrics/disk/read_bytes":{
+ "metric":"read_bytes",
+ "pointInTime":true,
+ "temporal":true,
+ "amsHostMetric":true
+ },
+ "metrics/disk/write_bytes":{
+ "metric":"write_bytes",
+ "pointInTime":true,
+ "temporal":true,
+ "amsHostMetric":true
+ },
+ "metrics/disk/read_time":{
+ "metric":"read_time",
+ "pointInTime":true,
+ "temporal":true,
+ "amsHostMetric":true
+ },
+ "metrics/disk/write_time":{
+ "metric":"write_time",
+ "pointInTime":true,
+ "temporal":true,
+ "amsHostMetric":true
+ },
"default": {
"metrics/jvm/memHeapCommittedM": {
"metric": "jvm.JvmMetrics.MemHeapCommittedM",
http://git-wip-us.apache.org/repos/asf/ambari/blob/23faabc4/ambari-server/src/main/resources/ganglia_properties.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/ganglia_properties.json b/ambari-server/src/main/resources/ganglia_properties.json
index 5984b73..05360da 100644
--- a/ambari-server/src/main/resources/ganglia_properties.json
+++ b/ambari-server/src/main/resources/ganglia_properties.json
@@ -112,28 +112,28 @@
"pointInTime":true,
"temporal":true
},
- "metrics/cpu/cpu_aidle":{
- "metric":"cpu_aidle",
+ "metrics/cpu/cpu_num":{
+ "metric":"cpu_num",
"pointInTime":true,
"temporal":true
},
- "metrics/cpu/cpu_idle":{
- "metric":"cpu_idle",
+ "metrics/cpu/cpu_speed":{
+ "metric":"cpu_speed",
"pointInTime":true,
"temporal":true
},
- "metrics/cpu/cpu_nice":{
- "metric":"cpu_nice",
+ "metrics/cpu/cpu_aidle":{
+ "metric":"cpu_aidle",
"pointInTime":true,
"temporal":true
},
- "metrics/cpu/cpu_num":{
- "metric":"cpu_num",
+ "metrics/cpu/cpu_idle":{
+ "metric":"cpu_idle",
"pointInTime":true,
"temporal":true
},
- "metrics/cpu/cpu_speed":{
- "metric":"cpu_speed",
+ "metrics/cpu/cpu_nice":{
+ "metric":"cpu_nice",
"pointInTime":true,
"temporal":true
},
@@ -162,173 +162,203 @@
"pointInTime":true,
"temporal":true
},
- "metrics/jvm/gcCount":{
- "metric":"jvm.metrics.gcCount",
+ "metrics/load/load_fifteen":{
+ "metric":"load_fifteen",
"pointInTime":true,
"temporal":true
},
- "metrics/jvm/gcTimeMillis":{
- "metric":"jvm.metrics.gcTimeMillis",
+ "metrics/load/load_five":{
+ "metric":"load_five",
"pointInTime":true,
"temporal":true
},
- "metrics/jvm/logError":{
- "metric":"jvm.metrics.logError",
+ "metrics/load/load_one":{
+ "metric":"load_one",
"pointInTime":true,
"temporal":true
},
- "metrics/jvm/logFatal":{
- "metric":"jvm.metrics.logFatal",
+ "metrics/memory/mem_buffers":{
+ "metric":"mem_buffers",
"pointInTime":true,
"temporal":true
},
- "metrics/jvm/logInfo":{
- "metric":"jvm.metrics.logInfo",
+ "metrics/memory/mem_cached":{
+ "metric":"mem_cached",
"pointInTime":true,
"temporal":true
},
- "metrics/jvm/logWarn":{
- "metric":"jvm.metrics.logWarn",
+ "metrics/memory/mem_free":{
+ "metric":"mem_free",
"pointInTime":true,
"temporal":true
},
- "metrics/jvm/maxMemoryM":{
- "metric":"jvm.metrics.maxMemoryM",
+ "metrics/memory/mem_shared":{
+ "metric":"mem_shared",
"pointInTime":true,
"temporal":true
},
- "metrics/jvm/memHeapCommittedM":{
- "metric":"jvm.metrics.memHeapCommittedM",
+ "metrics/memory/mem_total":{
+ "metric":"mem_total",
"pointInTime":true,
"temporal":true
},
- "metrics/jvm/memHeapUsedM":{
- "metric":"jvm.metrics.memHeapUsedM",
+ "metrics/memory/swap_free":{
+ "metric":"swap_free",
"pointInTime":true,
"temporal":true
},
- "metrics/jvm/memNonHeapCommittedM":{
- "metric":"jvm.metrics.memNonHeapCommittedM",
+ "metrics/memory/swap_total":{
+ "metric":"swap_total",
"pointInTime":true,
"temporal":true
},
- "metrics/jvm/memNonHeapUsedM":{
- "metric":"jvm.metrics.memNonHeapUsedM",
+ "metrics/network/bytes_in":{
+ "metric":"bytes_in",
"pointInTime":true,
"temporal":true
},
- "metrics/jvm/threadsBlocked":{
- "metric":"jvm.metrics.threadsBlocked",
+ "metrics/network/bytes_out":{
+ "metric":"bytes_out",
"pointInTime":true,
"temporal":true
},
- "metrics/jvm/threadsNew":{
- "metric":"jvm.metrics.threadsNew",
+ "metrics/network/pkts_in":{
+ "metric":"pkts_in",
"pointInTime":true,
"temporal":true
},
- "metrics/jvm/threadsRunnable":{
- "metric":"jvm.metrics.threadsRunnable",
+ "metrics/network/pkts_out":{
+ "metric":"pkts_out",
"pointInTime":true,
"temporal":true
},
- "metrics/jvm/threadsTerminated":{
- "metric":"jvm.metrics.threadsTerminated",
+ "metrics/part_max_used":{
+ "metric":"part_max_used",
"pointInTime":true,
"temporal":true
},
- "metrics/jvm/threadsTimedWaiting":{
- "metric":"jvm.metrics.threadsTimedWaiting",
+ "metrics/process/proc_run":{
+ "metric":"proc_run",
"pointInTime":true,
"temporal":true
},
- "metrics/jvm/threadsWaiting":{
- "metric":"jvm.metrics.threadsWaiting",
+ "metrics/process/proc_total":{
+ "metric":"proc_total",
"pointInTime":true,
"temporal":true
},
- "metrics/load/load_fifteen":{
- "metric":"load_fifteen",
+ "metrics/disk/read_count":{
+ "metric":"read_count",
"pointInTime":true,
"temporal":true
},
- "metrics/load/load_five":{
- "metric":"load_five",
+ "metrics/disk/write_count":{
+ "metric":"write_count",
"pointInTime":true,
"temporal":true
},
- "metrics/load/load_one":{
- "metric":"load_one",
+ "metrics/disk/read_bytes":{
+ "metric":"read_bytes",
"pointInTime":true,
"temporal":true
},
- "metrics/memory/mem_buffers":{
- "metric":"mem_buffers",
+ "metrics/disk/write_bytes":{
+ "metric":"write_bytes",
"pointInTime":true,
"temporal":true
},
- "metrics/memory/mem_cached":{
- "metric":"mem_cached",
+ "metrics/disk/read_time":{
+ "metric":"read_time",
"pointInTime":true,
"temporal":true
},
- "metrics/memory/mem_free":{
- "metric":"mem_free",
+ "metrics/disk/write_time":{
+ "metric":"write_time",
"pointInTime":true,
"temporal":true
},
- "metrics/memory/mem_shared":{
- "metric":"mem_shared",
+ "metrics/jvm/gcCount":{
+ "metric":"jvm.metrics.gcCount",
"pointInTime":true,
"temporal":true
},
- "metrics/memory/mem_total":{
- "metric":"mem_total",
+ "metrics/jvm/gcTimeMillis":{
+ "metric":"jvm.metrics.gcTimeMillis",
"pointInTime":true,
"temporal":true
},
- "metrics/memory/swap_free":{
- "metric":"swap_free",
+ "metrics/jvm/logError":{
+ "metric":"jvm.metrics.logError",
"pointInTime":true,
"temporal":true
},
- "metrics/memory/swap_total":{
- "metric":"swap_total",
+ "metrics/jvm/logFatal":{
+ "metric":"jvm.metrics.logFatal",
"pointInTime":true,
"temporal":true
},
- "metrics/network/bytes_in":{
- "metric":"bytes_in",
+ "metrics/jvm/logInfo":{
+ "metric":"jvm.metrics.logInfo",
"pointInTime":true,
"temporal":true
},
- "metrics/network/bytes_out":{
- "metric":"bytes_out",
+ "metrics/jvm/logWarn":{
+ "metric":"jvm.metrics.logWarn",
"pointInTime":true,
"temporal":true
},
- "metrics/network/pkts_in":{
- "metric":"pkts_in",
+ "metrics/jvm/maxMemoryM":{
+ "metric":"jvm.metrics.maxMemoryM",
"pointInTime":true,
"temporal":true
},
- "metrics/network/pkts_out":{
- "metric":"pkts_out",
+ "metrics/jvm/memHeapCommittedM":{
+ "metric":"jvm.metrics.memHeapCommittedM",
"pointInTime":true,
"temporal":true
},
- "metrics/part_max_used":{
- "metric":"part_max_used",
+ "metrics/jvm/memHeapUsedM":{
+ "metric":"jvm.metrics.memHeapUsedM",
"pointInTime":true,
"temporal":true
},
- "metrics/process/proc_run":{
- "metric":"proc_run",
+ "metrics/jvm/memNonHeapCommittedM":{
+ "metric":"jvm.metrics.memNonHeapCommittedM",
"pointInTime":true,
"temporal":true
},
- "metrics/process/proc_total":{
- "metric":"proc_total",
+ "metrics/jvm/memNonHeapUsedM":{
+ "metric":"jvm.metrics.memNonHeapUsedM",
+ "pointInTime":true,
+ "temporal":true
+ },
+ "metrics/jvm/threadsBlocked":{
+ "metric":"jvm.metrics.threadsBlocked",
+ "pointInTime":true,
+ "temporal":true
+ },
+ "metrics/jvm/threadsNew":{
+ "metric":"jvm.metrics.threadsNew",
+ "pointInTime":true,
+ "temporal":true
+ },
+ "metrics/jvm/threadsRunnable":{
+ "metric":"jvm.metrics.threadsRunnable",
+ "pointInTime":true,
+ "temporal":true
+ },
+ "metrics/jvm/threadsTerminated":{
+ "metric":"jvm.metrics.threadsTerminated",
+ "pointInTime":true,
+ "temporal":true
+ },
+ "metrics/jvm/threadsTimedWaiting":{
+ "metric":"jvm.metrics.threadsTimedWaiting",
+ "pointInTime":true,
+ "temporal":true
+ },
+ "metrics/jvm/threadsWaiting":{
+ "metric":"jvm.metrics.threadsWaiting",
"pointInTime":true,
"temporal":true
},
@@ -2426,7 +2456,7 @@
"temporal":true
},
"metrics/dfs/datanode/blocks_replicated":{
- "metric":"dfs.datanode.blocks_replicated",
+ "metric":"dfs.datanode.BlocksReplicated",
"pointInTime":true,
"temporal":true
},
@@ -11830,47 +11860,56 @@
"metrics/boottime":{
"metric":"boottime",
"pointInTime":true,
- "temporal":true
+ "temporal":true,
+ "amsHostMetric":true
},
"metrics/cpu/cpu_aidle":{
"metric":"cpu_aidle",
"pointInTime":true,
- "temporal":true
+ "temporal":true,
+ "amsHostMetric":true
},
"metrics/cpu/cpu_idle":{
"metric":"cpu_idle",
"pointInTime":true,
- "temporal":true
+ "temporal":true,
+ "amsHostMetric":true
},
"metrics/cpu/cpu_nice":{
"metric":"cpu_nice",
"pointInTime":true,
- "temporal":true
+ "temporal":true,
+ "amsHostMetric":true
},
"metrics/cpu/cpu_num":{
"metric":"cpu_num",
"pointInTime":true,
- "temporal":true
+ "temporal":true,
+ "amsHostMetric":true
},
"metrics/cpu/cpu_speed":{
"metric":"cpu_speed",
"pointInTime":true,
- "temporal":true
+ "temporal":true,
+ "amsHostMetric":true
},
"metrics/cpu/cpu_system":{
"metric":"cpu_system",
"pointInTime":true,
- "temporal":true
+ "temporal":true,
+ "amsHostMetric":true
},
"metrics/cpu/cpu_user":{
"metric":"cpu_user",
"pointInTime":true,
- "temporal":true
+ "temporal":true,
+ "amsHostMetric":true
},
"metrics/cpu/cpu_wio":{
"metric":"cpu_wio",
"pointInTime":true,
- "temporal":true
+ "temporal":true,
+ "amsHostMetric":true
},
"metrics/dfs/datanode/blockChecksumOp_avg_time":{
"metric":"dfs.datanode.blockChecksumOp_avg_time",
@@ -11913,7 +11952,7 @@
"temporal":true
},
"metrics/dfs/datanode/blocks_replicated":{
- "metric":"dfs.datanode.blocks_replicated",
+ "metric":"dfs.datanode.BlocksReplicated",
"pointInTime":true,
"temporal":true
},
@@ -12010,17 +12049,20 @@
"metrics/disk/disk_free":{
"metric":"disk_free",
"pointInTime":true,
- "temporal":true
+ "temporal":true,
+ "amsHostMetric":true
},
"metrics/disk/disk_total":{
"metric":"disk_total",
"pointInTime":true,
- "temporal":true
+ "temporal":true,
+ "amsHostMetric":true
},
"metrics/disk/part_max_used":{
"metric":"part_max_used",
"pointInTime":true,
- "temporal":true
+ "temporal":true,
+ "amsHostMetric":true
},
"metrics/jvm/gcCount":{
"metric":"jvm.metrics.gcCount",
@@ -12110,17 +12152,20 @@
"metrics/load/load_fifteen":{
"metric":"load_fifteen",
"pointInTime":true,
- "temporal":true
+ "temporal":true,
+ "amsHostMetric":true
},
"metrics/load/load_five":{
"metric":"load_five",
"pointInTime":true,
- "temporal":true
+ "temporal":true,
+ "amsHostMetric":true
},
"metrics/load/load_one":{
"metric":"load_one",
"pointInTime":true,
- "temporal":true
+ "temporal":true,
+ "amsHostMetric":true
},
"metrics/memory/mem_buffers":{
"metric":"mem_buffers",
@@ -12130,17 +12175,20 @@
"metrics/memory/mem_cached":{
"metric":"mem_cached",
"pointInTime":true,
- "temporal":true
+ "temporal":true,
+ "amsHostMetric":true
},
"metrics/memory/mem_free":{
"metric":"mem_free",
"pointInTime":true,
- "temporal":true
+ "temporal":true,
+ "amsHostMetric":true
},
"metrics/memory/mem_shared":{
"metric":"mem_shared",
"pointInTime":true,
- "temporal":true
+ "temporal":true,
+ "amsHostMetric":true
},
"metrics/memory/mem_total":{
"metric":"mem_total",
@@ -12150,42 +12198,50 @@
"metrics/memory/swap_free":{
"metric":"swap_free",
"pointInTime":true,
- "temporal":true
+ "temporal":true,
+ "amsHostMetric":true
},
"metrics/memory/swap_total":{
"metric":"swap_total",
"pointInTime":true,
- "temporal":true
+ "temporal":true,
+ "amsHostMetric":true
},
"metrics/network/bytes_in":{
"metric":"bytes_in",
"pointInTime":true,
- "temporal":true
+ "temporal":true,
+ "amsHostMetric":true
},
"metrics/network/bytes_out":{
"metric":"bytes_out",
"pointInTime":true,
- "temporal":true
+ "temporal":true,
+ "amsHostMetric":true
},
"metrics/network/pkts_in":{
"metric":"pkts_in",
"pointInTime":true,
- "temporal":true
+ "temporal":true,
+ "amsHostMetric":true
},
"metrics/network/pkts_out":{
"metric":"pkts_out",
"pointInTime":true,
- "temporal":true
+ "temporal":true,
+ "amsHostMetric":true
},
"metrics/process/proc_run":{
"metric":"proc_run",
"pointInTime":true,
- "temporal":true
+ "temporal":true,
+ "amsHostMetric":true
},
"metrics/process/proc_total":{
"metric":"proc_total",
"pointInTime":true,
- "temporal":true
+ "temporal":true,
+ "amsHostMetric":true
},
"metrics/rpc/NumOpenConnections":{
"metric":"rpc.rpc.NumOpenConnections",
http://git-wip-us.apache.org/repos/asf/ambari/blob/23faabc4/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackArtifactResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackArtifactResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackArtifactResourceProviderTest.java
index b00ca4b..8e5d017 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackArtifactResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackArtifactResourceProviderTest.java
@@ -42,6 +42,7 @@ import org.apache.ambari.server.controller.utilities.PredicateBuilder;
import org.apache.ambari.server.controller.utilities.PropertyHelper;
import org.apache.ambari.server.orm.GuiceJpaInitializer;
import org.apache.ambari.server.orm.InMemoryDefaultTestModule;
+import org.apache.ambari.server.state.stack.Metric;
import org.apache.ambari.server.state.stack.MetricDefinition;
import org.apache.ambari.server.state.stack.WidgetLayout;
import org.junit.After;
@@ -119,7 +120,12 @@ public class StackArtifactResourceProviderTest {
Assert.assertEquals(1, ((ArrayList) descriptor.get("Component")).size());
MetricDefinition md = (MetricDefinition) ((ArrayList) descriptor.get
("Component")).iterator().next();
+
+ Metric m1 = md.getMetrics().get("metrics/dfs/datanode/heartBeats_avg_time");
+ Metric m2 = md.getMetrics().get("metrics/rpc/closeRegion_num_ops");
Assert.assertEquals(326, md.getMetrics().size());
+ Assert.assertTrue(m1.isAmsHostMetric());
+ Assert.assertFalse(m2.isAmsHostMetric());
verify(managementController);
}