Merge pull request #1 from jayceeb/jaycee-fork

Merge changes to upstream
alteryx · May 11, 2016 · 4147c96 · 4147c96
2 parents abcc8eb + cbecdb4
commit 4147c96
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/attributes/default.rb b/attributes/default.rb
@@ -29,6 +29,7 @@
 
 default['activemq']['enabled'] = true
 default['activemq']['enable_stomp'] = true
+default['activemq']['enable_broker_statistics'] = true
 default['activemq']['use_default_config'] = false
 default['activemq']['install_java'] = true
 # set to 'TLSv1,TLSv1.1,TLSv1.2'

diff --git a/metadata.rb b/metadata.rb
@@ -4,7 +4,7 @@
 license 'Apache 2.0'
 description 'Installs activemq and sets it up as service'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version '2.0.4'
+version '2.0.1005'
 
 recipe 'activemq::default', 'Installs Apache ActiveMQ and sets up the service using the included init script.'
 

diff --git a/templates/default/activemq.xml.erb b/templates/default/activemq.xml.erb
@@ -38,7 +38,11 @@
         The <broker> element is used to configure the ActiveMQ broker.
     -->
     <broker xmlns="http://activemq.apache.org/schema/core" brokerName="localhost" dataDirectory="${activemq.data}">
-
+        <% if node['activemq']['enable_broker_statistics'] -%> 
+        <plugins>
+          <statisticsBrokerPlugin/>
+        </plugins>
+        <% end -%>
         <destinationPolicy>
             <policyMap>
               <policyEntries>