Repository: ambari Updated Branches: refs/heads/trunk 10e4d1cd5 -> f1c7514d6
http://git-wip-us.apache.org/repos/asf/ambari/blob/f1c7514d/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/metrics.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/metrics.json b/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/metrics.json deleted file mode 100644 index 3d0fdd3..0000000 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/metrics.json +++ /dev/null @@ -1,1088 +0,0 @@ -{ - "STORM_UI_SERVER": { - "Component": [ - { - "type": "org.apache.ambari.server.controller.metrics.RestMetricsPropertyProvider", - "properties": { - "default_port": "8744", - "port_config_type": "storm-site", - "port_property_name": "storm.port", - "protocol": "http" - }, - "metrics": { - "default": { - "metrics/api/v1/cluster/summary/tasksTotal": { - "metric": "/api/v1/cluster/summary##tasksTotal", - "pointInTime": true, - "temporal": false - }, - "metrics/api/v1/topology/summary": { - "metric": "/api/v1/topology/summary?field=topologies##topologies", - "pointInTime": true, - "temporal": false - }, - "metrics/api/v1/cluster/summary/slotsTotal": { - "metric": "/api/v1/cluster/summary##slotsTotal", - "pointInTime": true, - "temporal": false - }, - "metrics/api/v1/cluster/summary/slotsFree": { - "metric": "/api/v1/cluster/summary##slotsFree", - "pointInTime": true, - "temporal": false - }, - "metrics/api/v1/cluster/summary/supervisors": { - "metric": "/api/v1/cluster/summary##supervisors", - "pointInTime": true, - "temporal": false - }, - "metrics/api/v1/cluster/summary/executorsTotal": { - "metric": "/api/v1/cluster/summary##executorsTotal", - "pointInTime": true, - "temporal": false - }, - "metrics/api/v1/cluster/summary/slotsUsed": { - "metric": "/api/v1/cluster/summary##slotsUsed", - "pointInTime": true, - "temporal": false - }, - "metrics/api/v1/nimbus/summary": { - "metric": "/api/v1/nimbus/summary?field=nimbuses##nimbuses", - "pointInTime": true, - "temporal": false - } - - } - } - } - ], - "HostComponent": [ - { - "type": "org.apache.ambari.server.controller.metrics.RestMetricsPropertyProvider", - "properties": { - "default_port": "8744", - "port_config_type": "storm-site", - "port_property_name": "storm.port", - "protocol": "http" - }, - "metrics": { - "default": { - "metrics/api/v1/cluster/summary/tasksTotal": { - "metric": "/api/v1/cluster/summary##tasksTotal", - "pointInTime": true, - "temporal": false - }, - "metrics/api/v1/topology/summary": { - "metric": "/api/v1/topology/summary?field=topologies##topologies", - "pointInTime": true, - "temporal": false - }, - "metrics/api/v1/cluster/summary/slotsTotal": { - "metric": "/api/v1/cluster/summary##slotsTotal", - "pointInTime": true, - "temporal": false - }, - "metrics/api/v1/cluster/summary/slotsFree": { - "metric": "/api/v1/cluster/summary##slotsFree", - "pointInTime": true, - "temporal": false - }, - "metrics/api/v1/cluster/summary/supervisors": { - "metric": "/api/v1/cluster/summary##supervisors", - "pointInTime": true, - "temporal": false - }, - "metrics/api/v1/cluster/summary/executorsTotal": { - "metric": "/api/v1/cluster/summary##executorsTotal", - "pointInTime": true, - "temporal": false - }, - "metrics/api/v1/cluster/summary/slotsUsed": { - "metric": "/api/v1/cluster/summary##slotsUsed", - "pointInTime": true, - "temporal": false - }, - "metrics/api/v1/cluster/summary/nimbusUptime": { - "metric": "/api/v1/cluster/summary##nimbusUptime", - "pointInTime": true, - "temporal": false - } - } - } - } - ] - }, - "NIMBUS": { - "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/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/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/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/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_free": { - "metric": "swap_free", - "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 - } - } - } - } - ], - "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/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/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/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/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_free": { - "metric": "swap_free", - "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 - } - - } - } - } - ] - }, - "SUPERVISOR": { - "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/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/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/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/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_free": { - "metric": "swap_free", - "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/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/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/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/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_free": { - "metric": "swap_free", - "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 - } - } - } - } - ] - } -} http://git-wip-us.apache.org/repos/asf/ambari/blob/f1c7514d/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/widgets.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/widgets.json b/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/widgets.json deleted file mode 100644 index d22a1ed..0000000 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/widgets.json +++ /dev/null @@ -1,127 +0,0 @@ -{ - "layouts": [ - { - "layout_name": "default_storm_dashboard", - "display_name": "Standard Storm Dashboard", - "section_name": "STORM_SUMMARY", - "widgetLayoutInfo": [ - { - "widget_name": "Number of Slots", - "description": "Number of Slots", - "widget_type": "GRAPH", - "is_visible": true, - "metrics": [ - { - "name": "Used Slots", - "metric_path": "metrics/storm/nimbus/usedslots", - "service_name": "STORM", - "component_name": "NIMBUS" - }, - { - "name": "Free Slots", - "metric_path": "metrics/storm/nimbus/freeslots", - "service_name": "STORM", - "component_name": "NIMBUS" - }, - { - "name": "Total Slots", - "metric_path": "metrics/storm/nimbus/totalslots", - "service_name": "STORM", - "component_name": "NIMBUS" - } - ], - "values": [ - { - "name": "Used slots", - "value": "${Used Slots}" - }, - { - "name": "Free slots", - "value": "${Free Slots}" - }, - { - "name": "Total slots", - "value": "${Total Slots}" - } - ], - "properties": { - "graph_type": "LINE", - "time_range": "1" - } - }, - { - "widget_name": "Number of executors", - "description": "Number of executors", - "widget_type": "GRAPH", - "is_visible": true, - "metrics": [ - { - "name": "Total Executors", - "metric_path": "metrics/storm/nimbus/totalexecutors", - "service_name": "STORM", - "component_name": "NIMBUS" - } - ], - "values": [ - { - "name": "Total executors", - "value": "${Total Executors}" - } - ], - "properties": { - "graph_type": "LINE", - "time_range": "1" - } - }, - { - "widget_name": "Number of topologies", - "description": "Number of topologies", - "widget_type": "GRAPH", - "is_visible": true, - "metrics": [ - { - "name": "Topologies", - "metric_path": "metrics/storm/nimbus/topologies", - "service_name": "STORM", - "component_name": "NIMBUS" - } - ], - "values": [ - { - "name": "Total topologies", - "value": "${Topologies}" - } - ], - "properties": { - "graph_type": "LINE", - "time_range": "1" - } - }, - { - "widget_name": "Number of tasks", - "description": "Number of tasks", - "widget_type": "GRAPH", - "is_visible": true, - "metrics": [ - { - "name": "Total Tasks", - "metric_path": "metrics/storm/nimbus/totaltasks", - "service_name": "STORM", - "component_name": "NIMBUS" - } - ], - "values": [ - { - "name": "Total tasks", - "value": "${Total Tasks}" - } - ], - "properties": { - "graph_type": "LINE", - "time_range": "1" - } - } - ] - } - ] -} http://git-wip-us.apache.org/repos/asf/ambari/blob/f1c7514d/ambari-server/src/main/resources/stacks/HDP/2.5/services/STORM/configuration/ranger-storm-audit.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/STORM/configuration/ranger-storm-audit.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/STORM/configuration/ranger-storm-audit.xml deleted file mode 100644 index bfa0fd2..0000000 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/STORM/configuration/ranger-storm-audit.xml +++ /dev/null @@ -1,58 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -/** - * 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. - */ ---> -<configuration> - - <property> - <name>xasecure.audit.destination.db</name> - <deleted>true</deleted> - </property> - - <property> - <name>xasecure.audit.destination.db.jdbc.url</name> - <deleted>true</deleted> - </property> - - <property> - <name>xasecure.audit.destination.db.user</name> - <deleted>true</deleted> - </property> - - <property> - <name>xasecure.audit.destination.db.password</name> - <deleted>true</deleted> - </property> - - <property> - <name>xasecure.audit.destination.db.jdbc.driver</name> - <deleted>true</deleted> - </property> - - <property> - <name>xasecure.audit.credential.provider.file</name> - <deleted>true</deleted> - </property> - - <property> - <name>xasecure.audit.destination.db.batch.filespool.dir</name> - <deleted>true</deleted> - </property> - -</configuration> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/f1c7514d/ambari-server/src/main/resources/stacks/HDP/2.5/services/STORM/configuration/ranger-storm-policymgr-ssl.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/STORM/configuration/ranger-storm-policymgr-ssl.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/STORM/configuration/ranger-storm-policymgr-ssl.xml new file mode 100644 index 0000000..b2d979e --- /dev/null +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/STORM/configuration/ranger-storm-policymgr-ssl.xml @@ -0,0 +1,35 @@ +<?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. + */ +--> +<configuration> + + <property> + <name>xasecure.policymgr.clientssl.keystore</name> + <value>/usr/hdp/current/storm-client/conf/ranger-plugin-keystore.jks</value> + <description>Java Keystore files</description> + </property> + + <property> + <name>xasecure.policymgr.clientssl.truststore</name> + <value>/usr/hdp/current/storm-client/conf/ranger-plugin-truststore.jks</value> + <description>java truststore file</description> + </property> + +</configuration> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/f1c7514d/ambari-server/src/main/resources/stacks/HDP/2.5/services/STORM/configuration/ranger-storm-security.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/STORM/configuration/ranger-storm-security.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/STORM/configuration/ranger-storm-security.xml new file mode 100644 index 0000000..f2c3bb7 --- /dev/null +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/STORM/configuration/ranger-storm-security.xml @@ -0,0 +1,29 @@ +<?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. + */ +--> +<configuration> + + <property> + <name>ranger.plugin.storm.policy.rest.ssl.config.file</name> + <value>/usr/hdp/current/storm-client/conf/ranger-policymgr-ssl.xml</value> + <description>Path to the file containing SSL details to contact Ranger Admin</description> + </property> + +</configuration> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/f1c7514d/ambari-server/src/main/resources/stacks/HDP/2.5/services/STORM/configuration/storm-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/STORM/configuration/storm-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/STORM/configuration/storm-site.xml index 19d4961..3a871ac 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/STORM/configuration/storm-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/STORM/configuration/storm-site.xml @@ -1,8 +1,6 @@ <?xml version="1.0"?> -<?xml-stylesheet type="text/xsl" href="configuration.xsl"?> <!-- -/** - * Licensed to the Apache Software Foundation (ASF) under one + censed 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 @@ -19,49 +17,42 @@ * limitations under the License. */ --> -<configuration supports_final="true"> - <property> - <name>storm.thrift.transport</name> - <value>org.apache.storm.security.auth.SimpleTransportPlugin</value> - <description>The transport plug-in for Thrift client/server communication.</description> - </property> - <property> - <name>storm.messaging.transport</name> - <value>org.apache.storm.messaging.netty.Context</value> - <description>The transporter for communication among Storm tasks.</description> - </property> + +<configuration supports_final="true" xmlns:xi="http://www.w3.org/2001/XInclude";> <property> - <name>nimbus.topology.validator</name> - <value>org.apache.storm.nimbus.DefaultTopologyValidator</value> - <description>A custom class that implements ITopologyValidator that is run whenever a - topology is submitted. Can be used to provide business-specific logic for - whether topologies are allowed to run or not.</description> + <name>java.library.path</name> + <value>/usr/local/lib:/opt/local/lib:/usr/lib:/usr/hdp/current/storm-client/lib</value> + <description>This value is passed to spawned JVMs (e.g., Nimbus, Supervisor, and Workers) + for the java.library.path value. java.library.path tells the JVM where + to look for native libraries. It is necessary to set this config correctly since + Storm uses the ZeroMQ and JZMQ native libs. </description> </property> - <property> - <name>topology.spout.wait.strategy</name> - <value>org.apache.storm.spout.SleepSpoutWaitStrategy</value> - <description>A class that implements a strategy for what to do when a spout needs to wait. Waiting is - triggered in one of two conditions: - 1. nextTuple emits no tuples - 2. The spout has hit maxSpoutPending and can't emit any more tuples</description> - </property> <property> - <name>topology.kryo.factory</name> - <value>org.apache.storm.serialization.DefaultKryoFactory</value> - <description>Class that specifies how to create a Kryo instance for serialization. Storm will then apply - topology.kryo.register and topology.kryo.decorators on top of this. The default implementation - implements topology.fall.back.on.java.serialization and turns references off.</description> + <name>nimbus.childopts</name> + <value>-Xmx1024m _JAAS_PLACEHOLDER -javaagent:/usr/hdp/current/storm-nimbus/contrib/storm-jmxetric/lib/jmxetric-1.0.4.jar=host=localhost,port=8649,wireformat31x=true,mode=multicast,config=/usr/hdp/current/storm-nimbus/contrib/storm-jmxetric/conf/jmxetric-conf.xml,process=Nimbus_JVM</value> + <description>This parameter is used by the storm-deploy project to configure the jvm options for the nimbus daemon.</description> + <value-attributes> + <overridable>false</overridable> + </value-attributes> </property> + <property> - <name>topology.tuple.serializer</name> - <value>org.apache.storm.serialization.types.ListDelegateSerializer</value> - <description>The serializer class for ListDelegate (tuple payload). - The default serializer will be ListDelegateSerializer</description> + <name>worker.childopts</name> + <value>-Xmx768m _JAAS_PLACEHOLDER -javaagent:/usr/hdp/current/storm-client/contrib/storm-jmxetric/lib/jmxetric-1.0.4.jar=host=localhost,port=8650,wireformat31x=true,mode=multicast,config=/usr/hdp/current/storm-client/contrib/storm-jmxetric/conf/jmxetric-conf.xml,process=Worker_%ID%_JVM</value> + <description>The jvm opts provided to workers launched by this supervisor. All \"%ID%\" substrings are replaced with an identifier for this worker.</description> + <value-attributes> + <type>multiLine</type> + </value-attributes> </property> + <property> - <name>client.jartransformer.class</name> - <description>Storm Topology backward comptability transformer</description> - <value>org.apache.storm.hack.StormShadeTransformer</value> + <name>supervisor.childopts</name> + <value>-Xmx256m _JAAS_PLACEHOLDER -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.port={{jmxremote_port}} -javaagent:/usr/hdp/current/storm-supervisor/contrib/storm-jmxetric/lib/jmxetric-1.0.4.jar=host=localhost,port=8650,wireformat31x=true,mode=multicast,config=/usr/hdp/current/storm-supervisor/contrib/storm-jmxetric/conf/jmxetric-conf.xml,process=Supervisor_JVM</value> + <description>This parameter is used by the storm-deploy project to configure the jvm options for the supervisor daemon.</description> + <value-attributes> + <overridable>false</overridable> + </value-attributes> </property> + </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/f1c7514d/ambari-server/src/main/resources/stacks/HDP/2.5/services/STORM/kerberos.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/STORM/kerberos.json b/ambari-server/src/main/resources/stacks/HDP/2.5/services/STORM/kerberos.json deleted file mode 100644 index b88dd44..0000000 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/STORM/kerberos.json +++ /dev/null @@ -1,120 +0,0 @@ -{ - "services": [ - { - "name": "STORM", - "identities": [ - { - "name": "/spnego" - }, - { - "name": "/smokeuser" - }, - { - "name": "storm_components", - "principal": { - "value": "${storm-env/storm_user}-${cluster_name|toLower()}@${realm}", - "type": "user", - "configuration": "storm-env/storm_principal_name" - }, - "keytab": { - "file": "${keytab_dir}/storm.headless.keytab", - "owner": { - "name": "${storm-env/storm_user}", - "access": "r" - }, - "group": { - "name": "${cluster-env/user_group}", - "access": "" - }, - "configuration": "storm-env/storm_keytab" - } - } - ], - "configurations": [ - { - "storm-site": { - "nimbus.authorizer": "org.apache.storm.security.auth.authorizer.SimpleACLAuthorizer", - "drpc.authorizer": "org.apache.storm.security.auth.authorizer.DRPCSimpleACLAuthorizer", - "ui.filter": "org.apache.hadoop.security.authentication.server.AuthenticationFilter", - "storm.principal.tolocal": "org.apache.storm.security.auth.KerberosPrincipalToLocal", - "supervisor.enable": "true", - "storm.zookeeper.superACL": "sasl:{{storm_bare_jaas_principal}}", - "java.security.auth.login.config": "{{conf_dir}}/storm_jaas.conf", - "nimbus.admins": "['{{storm_bare_jaas_principal}}']", - "nimbus.supervisor.users": "['{{storm_bare_jaas_principal}}']", - "ui.filter.params": "{'type': 'kerberos', 'kerberos.principal': '{{storm_ui_jaas_principal}}', 'kerberos.keytab': '{{storm_ui_keytab_path}}', 'kerberos.name.rules': 'DEFAULT'}" - } - } - ], - "components": [ - { - "name": "STORM_UI_SERVER", - "identities": [ - { - "name": "/spnego", - "principal": { - "configuration": "storm-env/storm_ui_principal_name" - }, - "keytab": { - "configuration": "storm-env/storm_ui_keytab" - } - } - ] - }, - { - "name": "NIMBUS", - "identities": [ - { - "name": "nimbus_server", - "principal": { - "value": "nimbus/_HOST@${realm}", - "type": "service", - "configuration": "storm-env/nimbus_principal_name" - }, - "keytab": { - "file": "${keytab_dir}/nimbus.service.keytab", - "owner": { - "name": "${storm-env/storm_user}", - "access": "r" - }, - "group": { - "name": "${cluster-env/user_group}", - "access": "" - }, - "configuration": "storm-env/nimbus_keytab" - } - } - ] - }, - { - "name": "DRPC_SERVER", - "identities": [ - { - "name": "nimbus_server", - "principal": { - "value": "nimbus/_HOST@${realm}", - "type": "service", - "configuration": "storm-env/nimbus_principal_name" - }, - "keytab": { - "file": "${keytab_dir}/nimbus.service.keytab", - "owner": { - "name": "${storm-env/storm_user}", - "access": "r" - }, - "group": { - "name": "${cluster-env/user_group}", - "access": "" - }, - "configuration": "storm-env/nimbus_keytab" - } - } - ] - }, - { - "name" : "SUPERVISOR" - } - ] - } - ] -} http://git-wip-us.apache.org/repos/asf/ambari/blob/f1c7514d/ambari-server/src/main/resources/stacks/HDP/2.5/services/STORM/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/STORM/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/STORM/metainfo.xml index c1e9490..3faadc0 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/STORM/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/STORM/metainfo.xml @@ -22,6 +22,7 @@ <service> <name>STORM</name> <version>1.0.1.2.5</version> + <extends>common-services/STORM/1.0.1</extends> </service> </services> </metainfo> http://git-wip-us.apache.org/repos/asf/ambari/blob/f1c7514d/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/STORM/alerts.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/STORM/alerts.json b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/STORM/alerts.json index e5d4e47..6c7410f 100644 --- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/STORM/alerts.json +++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/STORM/alerts.json @@ -166,7 +166,7 @@ "scope": "HOST", "source": { "type": "SCRIPT", - "path": "STORM/0.9.1.2.1/package/alerts/check_supervisor_process_win.py" + "path": "STORM/0.9.1/package/alerts/check_supervisor_process_win.py" } } ] http://git-wip-us.apache.org/repos/asf/ambari/blob/f1c7514d/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/STORM/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/STORM/metainfo.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/STORM/metainfo.xml index 76022cc..9d504ba 100644 --- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/STORM/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/STORM/metainfo.xml @@ -21,7 +21,7 @@ <services> <service> <name>STORM</name> - <extends>common-services/STORM/0.9.1.2.1</extends> + <extends>common-services/STORM/0.9.1</extends> <version>0.9.1.2.1.1.0</version> <components> <component> http://git-wip-us.apache.org/repos/asf/ambari/blob/f1c7514d/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_base.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_base.py b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_base.py index 023b811..dc1beef 100644 --- a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_base.py +++ b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_base.py @@ -25,7 +25,7 @@ import re class TestStormBase(RMFTestCase): - COMMON_SERVICES_PACKAGE_DIR = "STORM/0.9.1.2.1/package" + COMMON_SERVICES_PACKAGE_DIR = "STORM/0.9.1/package" STACK_VERSION = "2.1" def assert_configure_default(self, confDir="/etc/storm/conf"): http://git-wip-us.apache.org/repos/asf/ambari/blob/f1c7514d/ambari-server/src/test/python/stacks/2.3/STORM/test_storm_base.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.3/STORM/test_storm_base.py b/ambari-server/src/test/python/stacks/2.3/STORM/test_storm_base.py index 3c60234..d23c006 100644 --- a/ambari-server/src/test/python/stacks/2.3/STORM/test_storm_base.py +++ b/ambari-server/src/test/python/stacks/2.3/STORM/test_storm_base.py @@ -22,7 +22,7 @@ from stacks.utils.RMFTestCase import * class TestStormBase(RMFTestCase): - COMMON_SERVICES_PACKAGE_DIR = "STORM/0.9.1.2.1/package" + COMMON_SERVICES_PACKAGE_DIR = "STORM/0.9.1/package" STACK_VERSION = "2.3" def assert_configure_default(self, confDir="/etc/storm/conf"): http://git-wip-us.apache.org/repos/asf/ambari/blob/f1c7514d/ambari-server/src/test/python/stacks/2.3/STORM/test_storm_upgrade.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.3/STORM/test_storm_upgrade.py b/ambari-server/src/test/python/stacks/2.3/STORM/test_storm_upgrade.py index d0356ff..074ed68 100644 --- a/ambari-server/src/test/python/stacks/2.3/STORM/test_storm_upgrade.py +++ b/ambari-server/src/test/python/stacks/2.3/STORM/test_storm_upgrade.py @@ -24,7 +24,7 @@ from stacks.utils.RMFTestCase import * class TestStormUpgrade(RMFTestCase): - COMMON_SERVICES_PACKAGE_DIR = "STORM/0.9.1.2.1/package" + COMMON_SERVICES_PACKAGE_DIR = "STORM/0.9.1/package" STACK_VERSION = "2.3" def test_delete_zookeeper_data(self): http://git-wip-us.apache.org/repos/asf/ambari/blob/f1c7514d/ambari-server/src/test/python/stacks/2.3/configs/storm_default.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.3/configs/storm_default.json b/ambari-server/src/test/python/stacks/2.3/configs/storm_default.json index 72afd78..351025d 100644 --- a/ambari-server/src/test/python/stacks/2.3/configs/storm_default.json +++ b/ambari-server/src/test/python/stacks/2.3/configs/storm_default.json @@ -8,7 +8,7 @@ "cluster-env": {} }, "commandParams": { - "service_package_folder": "common-services/STORM/0.9.1.2.1/package", + "service_package_folder": "common-services/STORM/0.9.1/package", "script": "scripts/service_check.py", "hooks_folder": "HDP/2.0.6/hooks", "command_retry_max_attempt_count": "3", http://git-wip-us.apache.org/repos/asf/ambari/blob/f1c7514d/ambari-server/src/test/python/stacks/2.3/configs/storm_default_secure.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.3/configs/storm_default_secure.json b/ambari-server/src/test/python/stacks/2.3/configs/storm_default_secure.json index c1b7e10..c90d5bb 100644 --- a/ambari-server/src/test/python/stacks/2.3/configs/storm_default_secure.json +++ b/ambari-server/src/test/python/stacks/2.3/configs/storm_default_secure.json @@ -8,7 +8,7 @@ "cluster-env": {} }, "commandParams": { - "service_package_folder": "common-services/STORM/0.9.1.2.1/package", + "service_package_folder": "common-services/STORM/0.9.1/package", "script": "scripts/service_check.py", "hooks_folder": "HDP/2.0.6/hooks", "command_retry_max_attempt_count": "3",
