diff --git a/apps/java/solr/jmx/mode/requesthandlerusage.pm b/apps/java/solr/jmx/mode/requesthandlerusage.pm
index 735f5d26f..244f703de 100644
--- a/apps/java/solr/jmx/mode/requesthandlerusage.pm
+++ b/apps/java/solr/jmx/mode/requesthandlerusage.pm
@@ -77,12 +77,11 @@ sub new {
     my ($class, %options) = @_;
     my $self = $class->SUPER::new(package => __PACKAGE__, %options, statefile => 1);
     bless $self, $class;
-    
-    $options{options}->add_options(arguments =>
-                                { 
-                                  "filter-name:s"       => { name => 'filter_name', default => '(/select|/update)$' },
-                                });
-    
+
+    $options{options}->add_options(arguments => { 
+        'filter-name:s' => { name => 'filter_name', default => '(/select|/update)$' }
+    });
+
     return $self;
 }
 
diff --git a/apps/mq/activemq/jmx/mode/brokers.pm b/apps/mq/activemq/jmx/mode/brokers.pm
new file mode 100644
index 000000000..b8f1c746b
--- /dev/null
+++ b/apps/mq/activemq/jmx/mode/brokers.pm
@@ -0,0 +1,284 @@
+#
+# Copyright 2020 Centreon (http://www.centreon.com/)
+#
+# Centreon is a full-fledged industry-strength solution that meets
+# the needs in IT infrastructure and application monitoring for
+# service performance.
+#
+# Licensed 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.
+#
+
+package apps::mq::activemq::jmx::mode::brokers;
+
+use base qw(centreon::plugins::templates::counter);
+
+use strict;
+use warnings;
+use Digest::MD5 qw(md5_hex);
+
+sub set_counters {
+    my ($self, %options) = @_;
+
+    $self->{maps_counters_type} = [
+        { name => 'brokers', type => 3, cb_prefix_output => 'prefix_broker_output', cb_long_output => 'broker_long_output', indent_long_output => '    ', message_multiple => 'All brokers are ok',
+            group => [
+                { name => 'global', type => 0, skipped_code => { -10 => 1 } },
+                { name => 'queues', display_long => 1, cb_prefix_output => 'prefix_queue_output',  message_multiple => 'All queue destinations are ok', type => 1, skipped_code => { -10 => 1 } }
+            ]
+        }
+    ];
+
+    $self->{maps_counters}->{global} = [
+        { label => 'store-usage', nlabel => 'broker.store.usage.percentage', set => {
+                key_values => [ { name => 'StorePercentUsage' }, { name => 'display' } ],
+                output_template => 'store usage: %.2f %%',
+                perfdatas => [
+                    { value => 'StorePercentUsage_absolute', template => '%.2f', unit => '%', min => 0, max => 100, label_extra_instance => 1 }
+                ]
+            }
+        },
+        { label => 'temporary-usage', nlabel => 'broker.temporary.usage.percentage', set => {
+                key_values => [ { name => 'TempPercentUsage' }, { name => 'display' } ],
+                output_template => 'temporary usage: %.2f %%',
+                perfdatas => [
+                    { value => 'TempPercentUsage_absolute', template => '%.2f', unit => '%', min => 0, max => 100, label_extra_instance => 1 }
+                ]
+            }
+        },
+        { label => 'memory-usage', nlabel => 'broker.memory.usage.percentage', set => {
+                key_values => [ { name => 'MemoryPercentUsage' }, { name => 'display' } ],
+                output_template => 'memory usage: %.2f %%',
+                perfdatas => [
+                    { value => 'MemoryPercentUsage_absolute', template => '%.2f', unit => '%', min => 0, max => 100, label_extra_instance => 1 }
+                ]
+            }
+        }
+    ];
+
+    $self->{maps_counters}->{queues} = [
+        { label => 'queue-average-enqueue-time', nlabel => 'broker.queue.average.enqueue.time.milliseconds', set => {
+                key_values => [ { name => 'AverageEnqueueTime' }, { name => 'display' } ],
+                output_template => 'average time messages remained enqueued: %.3f ms',
+                perfdatas => [
+                    { value => 'AverageEnqueueTime_absolute',
+                      template => '%.3f', unit => 'ms', min => 0, label_extra_instance => 1 }
+                ]
+            }
+        },
+        { label => 'queue-consumers-connected', nlabel => 'broker.queue.consumers.connected.count', set => {
+                key_values => [ { name => 'ConsumerCount' }, { name => 'display' } ],
+                output_template => 'consumers connected: %s',
+                perfdatas => [
+                    { value => 'ConsumerCount_absolute',
+                      template => '%s', min => 0, label_extra_instance => 1 }
+                ]
+            }
+        },
+        { label => 'queue-producers-connected', nlabel => 'broker.queue.producers.connected.count', display_ok => 0, set => {
+                key_values => [ { name => 'ProducerCount' }, { name => 'display' } ],
+                output_template => 'producers connected: %s',
+                perfdatas => [
+                    { value => 'ProducerCount_absolute',
+                      template => '%s', min => 0, label_extra_instance => 1 }
+                ]
+            }
+        },
+        { label => 'queue-memory-usage', nlabel => 'broker.queue.memory.usage.percentage', display_ok => 0, set => {
+                key_values => [ { name => 'MemoryPercentUsage' }, { name => 'display' } ],
+                output_template => 'memory usage: %.2f %%',
+                perfdatas => [
+                    { value => 'MemoryPercentUsage_absolute',
+                      template => '%.2f', unit => '%', min => 0, max => 100, label_extra_instance => 1 }
+                ]
+            }
+        },
+        { label => 'queue-size', nlabel => 'broker.queue.size.count', set => {
+                key_values => [ { name => 'QueueSize' }, { name => 'display' } ],
+                output_template => 'queue size: %s',
+                perfdatas => [
+                    { value => 'QueueSize_absolute',
+                      template => '%s', min => 0, label_extra_instance => 1 }
+                ]
+            }
+        },
+        { label => 'queue-enqueued', nlabel => 'broker.queue.enqueued.count', display_ok => 0, set => {
+                key_values => [ { name => 'EnqueueCount', diff => 1 }, { name => 'display' } ],
+                output_template => 'messages enqueued: %s',
+                perfdatas => [
+                    { value => 'EnqueueCount_absolute',
+                      template => '%s', min => 0, label_extra_instance => 1 }
+                ]
+            }
+        },
+        { label => 'queue-dequeued', nlabel => 'broker.queue.dequeue.count', display_ok => 0, set => {
+                key_values => [ { name => 'DequeueCount', diff => 1 }, { name => 'display' } ],
+                output_template => 'messages dequeued: %s',
+                perfdatas => [
+                    { value => 'DequeueCount_absolute',
+                      template => '%s', min => 0, label_extra_instance => 1 }
+                ]
+            }
+        },
+        { label => 'queue-expired', nlabel => 'broker.queue.expired.count', display_ok => 0, set => {
+                key_values => [ { name => 'ExpiredCount', diff => 1 }, { name => 'display' } ],
+                output_template => 'messages expired: %s',
+                perfdatas => [
+                    { value => 'ExpiredCount_absolute',
+                      template => '%s', min => 0, label_extra_instance => 1 }
+                ]
+            }
+        },
+        { label => 'queue-inflighted', nlabel => 'broker.queue.inflighted.count', display_ok => 0, set => {
+                key_values => [ { name => 'InFlightCount', diff => 1 }, { name => 'display' } ],
+                output_template => 'messages in-flighted: %s',
+                perfdatas => [
+                    { value => 'InFlightCount_absolute',
+                      template => '%s', min => 0, label_extra_instance => 1 }
+                ]
+            }
+        }
+    ];
+}
+
+sub broker_long_output {
+    my ($self, %options) = @_;
+
+    return "checking broker '" . $options{instance_value}->{display} . "'";
+}
+
+sub prefix_broker_output {
+    my ($self, %options) = @_;
+
+    return "Broker '" . $options{instance_value}->{display} . "' ";
+}
+
+sub prefix_qeueue_output {
+    my ($self, %options) = @_;
+
+    return "queue destination '" . $options{instance_value}->{display} . "' ";
+}
+
+sub new {
+    my ($class, %options) = @_;
+    my $self = $class->SUPER::new(package => __PACKAGE__, %options, statefile => 1, force_new_perfdata => 1);
+    bless $self, $class;
+
+    $options{options}->add_options(arguments => {
+        'filter-broker-name:s'      => { name => 'filter_broker_name' },
+        'filter-destination-name:s' => { name => 'filter_destination_name' }
+    });
+
+    return $self;
+}
+
+sub manage_selection {
+    my ($self, %options) = @_;
+
+    my $request = [
+        {
+            mbean => 'org.apache.activemq:brokerName=*,destinationName=*,destinationType=Topic,type=Broker',
+            attributes => [
+                { name => 'AverageEnqueueTime' }, { name => 'ConsumerCount' }, 
+                { name => 'ProducerCount' }, { name => 'MemoryPercentUsage' },
+                { name => 'QueueSize' }, { name => 'EnqueueCount' },
+                { name => 'DequeueCount' }, { name => 'ExpiredCount' },
+                { name => 'InFlightCount' }
+            ] 
+        },
+        {
+            mbean => 'org.apache.activemq:brokerName=*,type=Broker',
+            attributes => [
+                { name => 'StorePercentUsage' }, { name => 'TempPercentUsage' }, 
+                { name => 'MemoryPercentUsage' }
+            ] 
+        }
+    ];
+    my $result = $options{custom}->get_attributes(request => $request, nothing_quit => 1);
+
+    $self->{cache_name} = 'activemq_' . $self->{mode} . '_' . md5_hex($options{custom}->get_connection_info()) . '_' .
+        (defined($self->{option_results}->{filter_counters}) ? md5_hex($self->{option_results}->{filter_counters}) : md5_hex('all')) . '_' .
+        (defined($self->{option_results}->{filter_broker_name}) ? md5_hex($self->{option_results}->{filter_broker_name}) : md5_hex('all')) . '_' .
+        (defined($self->{option_results}->{filter_destination_name}) ? md5_hex($self->{option_results}->{filter_destination_name}) : md5_hex('all'));
+
+    $self->{brokers} = {};
+    foreach my $mbean (keys %$result) {
+        next if ($mbean !~ /org.apache.activemq:brokerName=(.*?),(?:destinationName=(.*?),|type=Broker)/);
+        my ($broker_name, $destination_name) = ($1, $2);
+
+        if (defined($self->{option_results}->{filter_broker_name}) && $self->{option_results}->{filter_broker_name} ne '' &&
+            $broker_name !~ /$self->{option_results}->{filter_broker_name}/) {
+            $self->{output}->output_add(long_msg => "skipping '" . $broker_name . "': no matching filter.", debug => 1);
+            next;
+        }
+
+        if (!defined($self->{brokers}->{$broker_name})) {
+            $self->{brokers}->{$broker_name} = {
+                display => $broker_name,
+                queues => {}
+            };
+        }
+
+        if (defined($destination_name)) {
+            if (defined($self->{option_results}->{filter_destination_name}) && $self->{option_results}->{filter_destination_name} ne '' &&
+                $destination_name !~ /$self->{option_results}->{filter_destination_name}/) {
+                $self->{output}->output_add(long_msg => "skipping '" . $destination_name . "': no matching filter.", debug => 1);
+                next;
+            }
+
+            $self->{brokers}->{$broker_name}->{queues}->{$destination_name} = {
+                display => $destination_name,
+                %{$result->{$mbean}}
+            };
+        } else {
+            $self->{brokers}->{$broker_name}->{global} = {
+                display => $broker_name,
+                %{$result->{$mbean}}
+            };
+        }
+        
+    }
+
+    if (scalar(keys %{$self->{brokers}}) <= 0) {
+        $self->{output}->output_add(short_msg => 'no brokers found');
+    }
+}
+
+1;
+
+__END__
+
+=head1 MODE
+
+Check brokers.
+
+=over 8
+
+=item B<--filter-broker-name>
+
+Filter broker name (Can be a regexp).
+
+=item B<--filter-destination-name>
+
+Filter destination name (Can be a regexp).
+
+=item B<--warning-*> B<--critical-*>
+
+Thresholds.
+Can be: 'store-usage' (%), 'temporary-usage' (%), 'memory-usage' (%),
+'queue-average-enqueue-time' (ms), 'queue-consumers-connected',
+'queue-producers-connected', 'queue-memory-usage' (%), 'queue-size',
+'queue-enqueued', 'queue-dequeued', 'queue-expired', 'queue-inflighted'.
+
+=back
+
+=cut
diff --git a/apps/mq/activemq/jmx/mode/listbrokers.pm b/apps/mq/activemq/jmx/mode/listbrokers.pm
new file mode 100644
index 000000000..0457cbae7
--- /dev/null
+++ b/apps/mq/activemq/jmx/mode/listbrokers.pm
@@ -0,0 +1,116 @@
+#
+# Copyright 2020 Centreon (http://www.centreon.com/)
+#
+# Centreon is a full-fledged industry-strength solution that meets
+# the needs in IT infrastructure and application monitoring for
+# service performance.
+#
+# Licensed 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.
+#
+
+package apps::mq::activemq::jmx::mode::listbrokers;
+
+use base qw(centreon::plugins::mode);
+
+use strict;
+use warnings;
+
+sub new {
+    my ($class, %options) = @_;
+    my $self = $class->SUPER::new(package => __PACKAGE__, %options);
+    bless $self, $class;
+
+    $options{options}->add_options(arguments => {
+    });
+
+    return $self;
+}
+
+sub check_options {
+    my ($self, %options) = @_;
+    $self->SUPER::init(%options);
+}
+
+sub manage_selection {
+    my ($self, %options) = @_;
+
+    my $request = [
+        {
+            mbean => 'org.apache.activemq:brokerName=*,type=Broker',
+            attributes => [
+                { name => 'BrokerName' }
+            ] 
+        }
+    ];
+    my $datas = $options{custom}->get_attributes(request => $request);
+
+    my $results = {}; 
+    foreach (keys %$datas) {
+        $results->{$datas->{$_}->{BrokerName}} = { name => $datas->{$_}->{BrokerName} };
+    }
+
+    return $results;
+}
+
+sub run {
+    my ($self, %options) = @_;
+  
+    my $results = $self->manage_selection(custom => $options{custom});
+    foreach (sort keys %$results) { 
+        $self->{output}->output_add(
+            long_msg => sprintf(
+                '[name = %s]',
+                $_
+            )
+        );
+    }
+    
+    $self->{output}->output_add(
+        severity => 'OK',
+        short_msg => 'List brokers:'
+    );
+    $self->{output}->display(nolabel => 1, force_ignore_perfdata => 1, force_long_output => 1);
+    $self->{output}->exit();
+}
+
+sub disco_format {
+    my ($self, %options) = @_;
+    
+    $self->{output}->add_disco_format(elements => ['name']);
+}
+
+sub disco_show {
+    my ($self, %options) = @_;
+
+    my $results = $self->manage_selection(custom => $options{custom});
+    foreach (sort keys %$results) {
+        $self->{output}->add_disco_entry(
+            name => $_
+        );
+    }
+}
+
+1;
+
+__END__
+
+=head1 MODE
+
+List brokers.
+
+=over 8
+
+=back
+
+=cut
+    
diff --git a/apps/mq/activemq/jmx/plugin.pm b/apps/mq/activemq/jmx/plugin.pm
new file mode 100644
index 000000000..553b638e7
--- /dev/null
+++ b/apps/mq/activemq/jmx/plugin.pm
@@ -0,0 +1,50 @@
+#
+# Copyright 2020 Centreon (http://www.centreon.com/)
+#
+# Centreon is a full-fledged industry-strength solution that meets
+# the needs in IT infrastructure and application monitoring for
+# service performance.
+#
+# Licensed 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.
+#
+
+package apps::mq::activemq::jmx::plugin;
+
+use strict;
+use warnings;
+use base qw(centreon::plugins::script_custom);
+
+sub new {
+    my ($class, %options) = @_;
+    my $self = $class->SUPER::new(package => __PACKAGE__, %options);
+    bless $self, $class;
+
+    $self->{version} = '0.1';
+    %{$self->{modes}} = (
+        'brokers'      => 'apps::mq::activemq::jmx::mode::brokers',
+        'list-brokers' => 'apps::mq::activemq::jmx::mode::listbrokers'
+    );
+
+    $self->{custom_modes}{jolokia} = 'centreon::common::protocols::jmx::custom::jolokia';
+    return $self;
+}
+
+1;
+
+__END__
+
+=head1 PLUGIN DESCRIPTION
+
+Check ActiveMQ in JMX. Need Jolokia agent.
+
+=cut