http://git-wip-us.apache.org/repos/asf/ambari/blob/8e5eeb4d/ambari-server/src/main/resources/common-services/STORM/0.9.3/configuration/storm-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/STORM/0.9.3/configuration/storm-site.xml b/ambari-server/src/main/resources/common-services/STORM/0.9.3/configuration/storm-site.xml new file mode 100644 index 0000000..62cd3db --- /dev/null +++ b/ambari-server/src/main/resources/common-services/STORM/0.9.3/configuration/storm-site.xml @@ -0,0 +1,123 @@ +<?xml version="1.0"?> +<?xml-stylesheet type="text/xsl" href="configuration.xsl"?> +<!-- +/** + * 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 supports_final="true"> + + <property> + <name>storm.thrift.transport</name> + <value>{{storm_thrift_transport}}</value> + <description>The transport plug-in that used for Thrift client/server communication.</description> + </property> + <property> + <name>_storm.thrift.nonsecure.transport</name> + <value>backtype.storm.security.auth.SimpleTransportPlugin</value> + <description>The transport plug-in that used for non-secure mode for for Thrift client/server communication.</description> + </property> + <property> + <name>_storm.thrift.secure.transport</name> + <value>backtype.storm.security.auth.kerberos.KerberosSaslTransportPlugin</value> + <description>The transport plug-in that used for secure mode for Thrift client/server communication.</description> + </property> + + <property> + <name>java.library.path</name> + <value>/usr/local/lib:/opt/local/lib:/usr/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>nimbus.childopts</name> + <value>-Xmx1024m</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>worker.childopts</name> + <value>-Xmx768m</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>ui.childopts</name> + <value>-Xmx768m _JAAS_PLACEHOLDER</value> + <description>Childopts for Storm UI Java process.</description> + </property> + + <property> + <name>ui.filter</name> + <value>null</value> + <description>Class for Storm UI authentication</description> + </property> + + <property> + <name>supervisor.childopts</name> + <value>-Xmx256m</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> + + <property> + <name>logviewer.childopts</name> + <value>-Xmx128m _JAAS_PLACEHOLDER</value> + <description>Childopts for log viewer java process.</description> + </property> + + <property> + <name>drpc.childopts</name> + <value>-Xmx768m _JAAS_PLACEHOLDER</value> + <description>Childopts for Storm DRPC Java process.</description> + </property> + + <property> + <name>_storm.min.ruid</name> + <value>null</value> + <description>min.user.id is set to the first real user id on the system. If value is 'null' than default value will be taken from key UID_MIN of /etc/login.defs otherwise the specified value will be used for all hosts.</description> + </property> + + <property> + <name>storm.log.dir</name> + <value>{{log_dir}}</value> + <description>Log directory for Storm.</description> + </property> + + <property> + <name>nimbus.authorizer</name> + <description>Log directory for Storm.</description> + <depends-on> + <property> + <type>ranger-storm-plugin-properties</type> + <name>ranger-storm-plugin-enabled</name> + </property> + </depends-on> + </property> +</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/8e5eeb4d/ambari-server/src/main/resources/common-services/STORM/0.9.3/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/STORM/0.9.3/metainfo.xml b/ambari-server/src/main/resources/common-services/STORM/0.9.3/metainfo.xml new file mode 100644 index 0000000..ed4337c --- /dev/null +++ b/ambari-server/src/main/resources/common-services/STORM/0.9.3/metainfo.xml @@ -0,0 +1,53 @@ +<?xml version="1.0"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<metainfo> + <schemaVersion>2.0</schemaVersion> + <services> + <service> + <name>STORM</name> + <displayName>Storm</displayName> + <version>0.9.3</version> + <extends>common-services/STORM/0.9.1</extends> + <components> + <component> + <name>STORM_REST_API</name> + <deleted>true</deleted> + </component> + </components> + <osSpecifics> + <osSpecific> + <osFamily>redhat7,amazon2015,redhat6,suse11,suse12</osFamily> + <packages> + <package> + <name>storm_${stack_version}</name> + </package> + </packages> + </osSpecific> + <osSpecific> + <osFamily>debian7,ubuntu12,ubuntu14</osFamily> + <packages> + <package> + <name>storm-${stack_version}</name> + </package> + </packages> + </osSpecific> + </osSpecifics> + </service> + </services> +</metainfo> http://git-wip-us.apache.org/repos/asf/ambari/blob/8e5eeb4d/ambari-server/src/main/resources/common-services/STORM/0.9.3/metrics.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/STORM/0.9.3/metrics.json b/ambari-server/src/main/resources/common-services/STORM/0.9.3/metrics.json new file mode 100644 index 0000000..2b46faf --- /dev/null +++ b/ambari-server/src/main/resources/common-services/STORM/0.9.3/metrics.json @@ -0,0 +1,1087 @@ +{ + "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/cluster/summary/nimbusUptime": { + "metric": "/api/v1/cluster/summary##nimbusUptime", + "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/8e5eeb4d/ambari-server/src/main/resources/common-services/STORM/1.0.1/configuration/ranger-storm-audit.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/STORM/1.0.1/configuration/ranger-storm-audit.xml b/ambari-server/src/main/resources/common-services/STORM/1.0.1/configuration/ranger-storm-audit.xml new file mode 100644 index 0000000..bfa0fd2 --- /dev/null +++ b/ambari-server/src/main/resources/common-services/STORM/1.0.1/configuration/ranger-storm-audit.xml @@ -0,0 +1,58 @@ +<?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/8e5eeb4d/ambari-server/src/main/resources/common-services/STORM/1.0.1/configuration/storm-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/STORM/1.0.1/configuration/storm-site.xml b/ambari-server/src/main/resources/common-services/STORM/1.0.1/configuration/storm-site.xml new file mode 100644 index 0000000..19d4961 --- /dev/null +++ b/ambari-server/src/main/resources/common-services/STORM/1.0.1/configuration/storm-site.xml @@ -0,0 +1,67 @@ +<?xml version="1.0"?> +<?xml-stylesheet type="text/xsl" href="configuration.xsl"?> +<!-- +/** + * 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 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> + <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> + </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> + </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> + </property> + <property> + <name>client.jartransformer.class</name> + <description>Storm Topology backward comptability transformer</description> + <value>org.apache.storm.hack.StormShadeTransformer</value> + </property> +</configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/8e5eeb4d/ambari-server/src/main/resources/common-services/STORM/1.0.1/kerberos.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/STORM/1.0.1/kerberos.json b/ambari-server/src/main/resources/common-services/STORM/1.0.1/kerberos.json new file mode 100644 index 0000000..b88dd44 --- /dev/null +++ b/ambari-server/src/main/resources/common-services/STORM/1.0.1/kerberos.json @@ -0,0 +1,120 @@ +{ + "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/8e5eeb4d/ambari-server/src/main/resources/common-services/STORM/1.0.1/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/STORM/1.0.1/metainfo.xml b/ambari-server/src/main/resources/common-services/STORM/1.0.1/metainfo.xml new file mode 100644 index 0000000..3c54a1e --- /dev/null +++ b/ambari-server/src/main/resources/common-services/STORM/1.0.1/metainfo.xml @@ -0,0 +1,28 @@ +<?xml version="1.0"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<metainfo> + <schemaVersion>2.0</schemaVersion> + <services> + <service> + <name>STORM</name> + <version>1.0.1</version> + <extends>common-services/STORM/0.10.0</extends> + </service> + </services> +</metainfo> http://git-wip-us.apache.org/repos/asf/ambari/blob/8e5eeb4d/ambari-server/src/main/resources/stacks/HDP/2.1/services/STORM/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1/services/STORM/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.1/services/STORM/metainfo.xml index 02322c1..3e0d396 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.1/services/STORM/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.1/services/STORM/metainfo.xml @@ -21,7 +21,8 @@ <services> <service> <name>STORM</name> - <extends>common-services/STORM/0.9.1.2.1</extends> + <version>0.9.1.2.1</version> + <extends>common-services/STORM/0.9.1</extends> </service> </services> </metainfo> http://git-wip-us.apache.org/repos/asf/ambari/blob/8e5eeb4d/ambari-server/src/main/resources/stacks/HDP/2.2/services/STORM/configuration/ranger-storm-plugin-properties.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/STORM/configuration/ranger-storm-plugin-properties.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/STORM/configuration/ranger-storm-plugin-properties.xml deleted file mode 100644 index 13acbff..0000000 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/STORM/configuration/ranger-storm-plugin-properties.xml +++ /dev/null @@ -1,263 +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 supports_final="true"> - - <property> - <name>policy_user</name> - <value>storm</value> - <display-name>Policy user for STORM</display-name> - <description>This user must be system user and also present at Ranger admin portal</description> - </property> - - <property> - <name>common.name.for.certificate</name> - <value></value> - <description>Common name for certificate, this value should match what is specified in repo within ranger admin</description> - <value-attributes> - <empty-value-valid>true</empty-value-valid> - </value-attributes> - </property> - - <property> - <name>ranger-storm-plugin-enabled</name> - <value>No</value> - <display-name>Enable Ranger for STORM</display-name> - <description>Enable ranger storm plugin ?</description> - <depends-on> - <property> - <type>ranger-env</type> - <name>ranger-storm-plugin-enabled</name> - </property> - </depends-on> - <value-attributes> - <type>boolean</type> - <overridable>false</overridable> - </value-attributes> - </property> - - <property> - <name>REPOSITORY_CONFIG_USERNAME</name> - <value>[email protected]</value> - <display-name>Ranger repository config user</display-name> - <description>Used for repository creation on ranger admin</description> - </property> - - <property> - <name>REPOSITORY_CONFIG_PASSWORD</name> - <value>stormtestuser</value> - <display-name>Ranger repository config password</display-name> - <property-type>PASSWORD</property-type> - <description>Used for repository creation on ranger admin</description> - <value-attributes> - <type>password</type> - </value-attributes> - </property> - - <property> - <name>XAAUDIT.DB.IS_ENABLED</name> - <value>true</value> - <display-name>Audit to DB</display-name> - <description></description> - <value-attributes> - <type>boolean</type> - </value-attributes> - <depends-on> - <property> - <type>ranger-env</type> - <name>xasecure.audit.destination.db</name> - </property> - </depends-on> - </property> - - <property> - <name>XAAUDIT.HDFS.IS_ENABLED</name> - <value>false</value> - <display-name>Audit to HDFS</display-name> - <description></description> - <value-attributes> - <type>boolean</type> - </value-attributes> - <depends-on> - <property> - <type>ranger-env</type> - <name>xasecure.audit.destination.hdfs</name> - </property> - </depends-on> - </property> - - <property> - <name>XAAUDIT.HDFS.DESTINATION_DIRECTORY</name> - <value>hdfs://localhost:8020/ranger/audit/%app-type%/%time:yyyyMMdd%</value> - <property-type>DONT_ADD_ON_UPGRADE</property-type> - <description></description> - <depends-on> - <property> - <type>ranger-env</type> - <name>xasecure.audit.destination.hdfs.dir</name> - </property> - </depends-on> - </property> - - <property> - <name>XAAUDIT.HDFS.LOCAL_BUFFER_DIRECTORY</name> - <value>__REPLACE__LOG_DIR/hadoop/%app-type%/audit</value> - <description></description> - </property> - - <property> - <name>XAAUDIT.HDFS.LOCAL_ARCHIVE_DIRECTORY</name> - <value>__REPLACE__LOG_DIR/hadoop/%app-type%/audit/archive</value> - <description></description> - </property> - - <property> - <name>XAAUDIT.HDFS.DESTINTATION_FILE</name> - <value>%hostname%-audit.log</value> - <description></description> - </property> - - <property> - <name>XAAUDIT.HDFS.DESTINTATION_FLUSH_INTERVAL_SECONDS</name> - <value>900</value> - <description></description> - </property> - - <property> - <name>XAAUDIT.HDFS.DESTINTATION_ROLLOVER_INTERVAL_SECONDS</name> - <value>86400</value> - <description></description> - </property> - - <property> - <name>XAAUDIT.HDFS.DESTINTATION_OPEN_RETRY_INTERVAL_SECONDS</name> - <value>60</value> - <description></description> - </property> - - <property> - <name>XAAUDIT.HDFS.LOCAL_BUFFER_FILE</name> - <value>%time:yyyyMMdd-HHmm.ss%.log</value> - <description></description> - </property> - - <property> - <name>XAAUDIT.HDFS.LOCAL_BUFFER_FLUSH_INTERVAL_SECONDS</name> - <value>60</value> - <description></description> - </property> - - <property> - <name>XAAUDIT.HDFS.LOCAL_BUFFER_ROLLOVER_INTERVAL_SECONDS</name> - <value>600</value> - <description></description> - </property> - - <property> - <name>XAAUDIT.HDFS.LOCAL_ARCHIVE_MAX_FILE_COUNT</name> - <value>10</value> - <description></description> - <value-attributes> - <type>password</type> - </value-attributes> - </property> - - <property> - <name>SSL_KEYSTORE_FILE_PATH</name> - <value>/etc/hadoop/conf/ranger-plugin-keystore.jks</value> - <description></description> - </property> - - <property> - <name>SSL_KEYSTORE_PASSWORD</name> - <value>myKeyFilePassword</value> - <property-type>PASSWORD</property-type> - <description></description> - </property> - - <property> - <name>SSL_TRUSTSTORE_FILE_PATH</name> - <value>/etc/hadoop/conf/ranger-plugin-truststore.jks</value> - <description></description> - </property> - - <property> - <name>SSL_TRUSTSTORE_PASSWORD</name> - <value>changeit</value> - <property-type>PASSWORD</property-type> - <description></description> - <value-attributes> - <type>password</type> - </value-attributes> - </property> - - <property> - <name>POLICY_MGR_URL</name> - <value>{{policymgr_mgr_url}}</value> - <description>Policy Manager url</description> - </property> - - <property> - <name>SQL_CONNECTOR_JAR</name> - <value>{{sql_connector_jar}}</value> - <description>Location of DB client library (please check the location of the jar file)</description> - </property> - - <property> - <name>XAAUDIT.DB.FLAVOUR</name> - <value>{{xa_audit_db_flavor}}</value> - <description>The database type to be used (mysql/oracle)</description> - </property> - - <property> - <name>XAAUDIT.DB.DATABASE_NAME</name> - <value>{{xa_audit_db_name}}</value> - <description>Audit database name</description> - </property> - - <property> - <name>XAAUDIT.DB.USER_NAME</name> - <value>{{xa_audit_db_user}}</value> - <description>Audit database user</description> - </property> - - <property> - <name>XAAUDIT.DB.PASSWORD</name> - <value>{{xa_audit_db_password}}</value> - <property-type>PASSWORD</property-type> - <description>Audit database password</description> - <value-attributes> - <type>password</type> - </value-attributes> - </property> - - <property> - <name>XAAUDIT.DB.HOSTNAME</name> - <value>{{xa_db_host}}</value> - <description>Audit database hostname</description> - </property> - - <property> - <name>REPOSITORY_NAME</name> - <value>{{repo_name}}</value> - <description>Ranger repository name</description> - </property> - -</configuration> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/8e5eeb4d/ambari-server/src/main/resources/stacks/HDP/2.2/services/STORM/configuration/storm-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/STORM/configuration/storm-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/STORM/configuration/storm-env.xml deleted file mode 100644 index 26568ef..0000000 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/STORM/configuration/storm-env.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0"?> -<?xml-stylesheet type="text/xsl" href="configuration.xsl"?> -<!-- -/** - * 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 supports_adding_forbidden="true"> - <!-- storm-env.sh --> - <property> - <name>content</name> - <description>This is the jinja template for storm-env.sh file</description> - <value> -#!/bin/bash - -# Set Storm specific environment variables here. - -# The java implementation to use. -export JAVA_HOME={{java64_home}} - -export STORM_CONF_DIR={{conf_dir}} -export STORM_HOME={{storm_component_home_dir}} - </value> - <value-attributes> - <type>content</type> - </value-attributes> - </property> -</configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/8e5eeb4d/ambari-server/src/main/resources/stacks/HDP/2.2/services/STORM/configuration/storm-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/STORM/configuration/storm-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/STORM/configuration/storm-site.xml index 88b9364..a531c61 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/STORM/configuration/storm-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/STORM/configuration/storm-site.xml @@ -23,22 +23,6 @@ <configuration supports_final="true"> <property> - <name>storm.thrift.transport</name> - <value>{{storm_thrift_transport}}</value> - <description>The transport plug-in that used for Thrift client/server communication.</description> - </property> - <property> - <name>_storm.thrift.nonsecure.transport</name> - <value>backtype.storm.security.auth.SimpleTransportPlugin</value> - <description>The transport plug-in that used for non-secure mode for for Thrift client/server communication.</description> - </property> - <property> - <name>_storm.thrift.secure.transport</name> - <value>backtype.storm.security.auth.kerberos.KerberosSaslTransportPlugin</value> - <description>The transport plug-in that used for secure mode for Thrift client/server communication.</description> - </property> - - <property> <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) @@ -66,18 +50,6 @@ </property> <property> - <name>ui.childopts</name> - <value>-Xmx768m _JAAS_PLACEHOLDER</value> - <description>Childopts for Storm UI Java process.</description> - </property> - - <property> - <name>ui.filter</name> - <value>null</value> - <description>Class for Storm UI authentication</description> - </property> - - <property> <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> @@ -86,38 +58,4 @@ </value-attributes> </property> - <property> - <name>logviewer.childopts</name> - <value>-Xmx128m _JAAS_PLACEHOLDER</value> - <description>Childopts for log viewer java process.</description> - </property> - - <property> - <name>drpc.childopts</name> - <value>-Xmx768m _JAAS_PLACEHOLDER</value> - <description>Childopts for Storm DRPC Java process.</description> - </property> - - <property> - <name>_storm.min.ruid</name> - <value>null</value> - <description>min.user.id is set to the first real user id on the system. If value is 'null' than default value will be taken from key UID_MIN of /etc/login.defs otherwise the specified value will be used for all hosts.</description> - </property> - - <property> - <name>storm.log.dir</name> - <value>{{log_dir}}</value> - <description>Log directory for Storm.</description> - </property> - - <property> - <name>nimbus.authorizer</name> - <description>Log directory for Storm.</description> - <depends-on> - <property> - <type>ranger-storm-plugin-properties</type> - <name>ranger-storm-plugin-enabled</name> - </property> - </depends-on> - </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/8e5eeb4d/ambari-server/src/main/resources/stacks/HDP/2.2/services/STORM/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/STORM/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/STORM/metainfo.xml index 318116f..3fb8e73 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/STORM/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/STORM/metainfo.xml @@ -23,30 +23,7 @@ <name>STORM</name> <displayName>Storm</displayName> <version>0.9.3.2.2</version> - <components> - <component> - <name>STORM_REST_API</name> - <deleted>true</deleted> - </component> - </components> - <osSpecifics> - <osSpecific> - <osFamily>redhat7,amazon2015,redhat6,suse11,suse12</osFamily> - <packages> - <package> - <name>storm_${stack_version}</name> - </package> - </packages> - </osSpecific> - <osSpecific> - <osFamily>debian7,ubuntu12,ubuntu14</osFamily> - <packages> - <package> - <name>storm-${stack_version}</name> - </package> - </packages> - </osSpecific> - </osSpecifics> + <extends>common-services/STORM/0.9.3</extends> </service> </services> </metainfo>
