diff --git a/centreon-plugins/network/netasq/snmp/mode/hanodes.pm b/centreon-plugins/network/netasq/snmp/mode/hanodes.pm
new file mode 100644
index 000000000..4936330d2
--- /dev/null
+++ b/centreon-plugins/network/netasq/snmp/mode/hanodes.pm
@@ -0,0 +1,270 @@
+#
+# Copyright 2016 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 network::netasq::snmp::mode::hanodes;
+
+use base qw(centreon::plugins::templates::counter);
+
+use strict;
+use warnings;
+
+my $instance_mode;
+
+sub custom_node_threshold {
+    my ($self, %options) = @_;
+
+    my ($exit, $threshold_value);
+    $threshold_value = defined($instance_mode->{option_results}->{percent}) ? $self->{result_values}->{prct_dead} : $self->{result_values}->{dead_nodes} ;
+    $exit = $self->{perfdata}->threshold_check(value => $threshold_value, threshold => [ { label => 'critical-' . $self->{label}, exit_litteral => 'critical' }, { label => 'warning-'. $self->{label}, exit_litteral => 'warning' } ]);
+    return $exit;
+}
+
+sub custom_node_output {
+    my ($self, %options) = @_;
+
+    my $msg = sprintf("Dead nodes: absolute: %d/%d - percentage: %.2f%% ", 
+                    $self->{result_values}->{dead_nodes}, $self->{result_values}->{total_nodes}, $self->{result_values}->{prct_dead});
+    return $msg;
+}
+
+sub custom_node_calc {
+    my ($self, %options) = @_;
+
+    $self->{result_values}->{dead_nodes} = $options{new_datas}->{$self->{instance} . '_dead_nodes'};
+    $self->{result_values}->{total_nodes} = $options{new_datas}->{$self->{instance} . '_total_nodes'};
+    $self->{result_values}->{prct_dead} = $options{new_datas}->{$self->{instance} . '_prct_dead'};
+
+    return 0;
+}
+
+sub custom_threshold_output {
+    my ($self, %options) = @_;
+    my $status = 'ok';
+    my $message;
+
+    eval {
+        local $SIG{__WARN__} = sub { $message = $_[0]; };
+        local $SIG{__DIE__} = sub { $message = $_[0]; };
+
+        if (defined($instance_mode->{option_results}->{critical_state}) && $instance_mode->{option_results}->{critical_state} ne '' &&
+            eval "$instance_mode->{option_results}->{critical_state}") {
+            $status = 'critical';
+        } elsif (defined($instance_mode->{option_results}->{warning_state}) && $instance_mode->{option_results}->{warning_state} ne '' &&
+                 eval "$instance_mode->{option_results}->{warning_state}") {
+            $status = 'warning';
+        }
+    };
+    if (defined($message)) {
+        $self->{output}->output_add(long_msg => 'filter status issue: ' . $message);
+    }
+
+    return $status;
+}
+
+sub custom_state_output {
+    my ($self, %options) = @_;
+
+    my $msg = sprintf("state is '%s'", $self->{result_values}->{state});
+    return $msg;
+}
+
+sub custom_state_calc {
+    my ($self, %options) = @_;
+
+    $self->{result_values}->{state} = $options{new_datas}->{$self->{instance} . '_state'};
+    $self->{result_values}->{display} = $options{new_datas}->{$self->{instance} . '_display'};
+    return 0;
+}
+
+sub set_counters {
+    my ($self, %options) = @_;
+
+    $self->{maps_counters_type} = [
+        { name => 'global', type => 0 },
+        { name => 'nodes', type => 1, cb_prefix_output => 'prefix_node_output', message_multiple => 'All HA nodes are OK' },
+    ];
+
+    $self->{maps_counters}->{global} = [
+        { label => 'dead-nodes', set => {
+                key_values => [ { name => 'dead_nodes' }, { name => 'prct_dead' }, { name => 'total_nodes' } ],
+                closure_custom_calc => \&custom_node_calc,
+                closure_custom_output => \&custom_node_output,
+                closure_custom_threshold_check => \&custom_node_threshold,
+                perfdatas => [
+                    { label => 'dead_nodes', value => 'dead_nodes', template => '%d',
+                      min => 0, unit => 'nodes' },
+                ],
+            }
+        }
+    ];
+    $self->{maps_counters}->{nodes} = [
+        { label => 'state', threshold => 0,  set => {
+                key_values => [ { name => 'state' }, { name => 'display' } ],
+                closure_custom_calc => \&custom_state_calc,
+                closure_custom_output => \&custom_state_output,
+                closure_custom_perfdata => sub { return 0; },
+                closure_custom_threshold_check => \&custom_threshold_output,
+            }
+        },
+        { label => 'health', set => {
+                key_values => [ { name => 'health' }, { name => 'display' } ],
+                output_template => 'node health: %s%%',
+                perfdatas => [
+                    { label => 'health', value => 'health_absolute', template => '%d',
+                      min => 0, max => 100, label_extra_instance => 1, instance_use => 'display_absolute' },
+                ],
+            }
+        }
+    ];
+}
+
+sub prefix_node_output {
+    my ($self, %options) = @_;
+
+    return "Node '" . $options{instance_value}->{display} . "' ";
+}
+
+sub new {
+    my ($class, %options) = @_;
+    my $self = $class->SUPER::new(package => __PACKAGE__, %options);
+    bless $self, $class;
+
+    $self->{version} = '1.0';
+    $options{options}->add_options(arguments =>
+                                {
+                                "filter-node:s"         => { name => 'filter_node' },
+                                "percent"               => { name => 'percent' },
+                                "warning-state:s"       => { name => 'warning_state', default => '' },
+                                "critical-state:s"      => { name => 'critical_state', default => '%{state} eq "offline"' },
+                                });
+    return $self;
+}
+
+sub change_macros {
+    my ($self, %options) = @_;
+
+    foreach (('warning_state', 'critical_state')) {
+        if (defined($self->{option_results}->{$_})) {
+            $self->{option_results}->{$_} =~ s/%\{(.*?)\}/\$self->{result_values}->{$1}/g;
+        }
+    }
+}
+
+sub check_options {
+    my ($self, %options) = @_;
+    $self->SUPER::check_options(%options);
+
+    $self->change_macros();
+    $instance_mode = $self;
+}
+
+my %map_status = (
+    1 => 'online',
+    2 => 'offline',
+);
+
+my $mapping = {
+    ntqFwSerial  => { oid => '.1.3.6.1.4.1.11256.1.11.7.1.2' },
+    ntqHAQuality => { oid => '.1.3.6.1.4.1.11256.1.11.7.1.7' },
+    ntqOnline    => { oid => '.1.3.6.1.4.1.11256.1.11.7.1.3', map => \%map_status },
+};
+
+my $oid_ntqNodeTable = '.1.3.6.1.4.1.11256.1.11.7';
+my $oid_ntqNbNode = '.1.3.6.1.4.1.11256.1.11.1';
+my $oid_ntqNbDeadNode = '.1.3.6.1.4.1.11256.1.11.2';
+
+sub manage_selection {
+    my ($self, %options) = @_;
+    $self->{snmp} = $options{snmp};
+
+    $self->{results} = $options{snmp}->get_multiple_table(oids => [ { oid => $oid_ntqNodeTable },
+                                                                    { oid => $oid_ntqNbNode },
+                                                                    { oid => $oid_ntqNbDeadNode } ],
+                                                          nothing_quit => 1);
+
+    foreach my $oid (keys %{$self->{results}->{$oid_ntqNodeTable}}) {
+        $oid =~ /^$mapping->{ntqOnline}->{oid}\.(.*)$/;
+        my $instance = $1;
+        my $result = $self->{snmp}->map_instance(mapping => $mapping, results => $self->{results}->{$oid_ntqNodeTable}, instance => $instance);
+
+        if (defined($self->{option_results}->{filter_node}) && $self->{option_results}->{filter_node} ne '' &&
+            $result->{ntqFwSerial} !~ /$self->{option_results}->{filter_node}/) {
+            $self->{output}->output_add(long_msg => "Skipping  '" . $result->{ntqFwSerial} . "': no matching filter.", debug => 1);
+            next;
+        }
+        $self->{nodes}->{$result->{ntqFwSerial}} = { state   => $result->{ntqOnline},
+                                                     health  => $result->{ntqHAQuality},
+                                                     display => $result->{ntqFwSerial} };
+    }
+
+    my $prct_dead = $self->{results}->{$oid_ntqNbDeadNode}->{$oid_ntqNbDeadNode . '.' . '0'}/$self->{results}->{$oid_ntqNbNode}->{$oid_ntqNbNode . '.' . '0'}*100;
+
+    $self->{global} = { dead_nodes => $self->{results}->{$oid_ntqNbDeadNode}->{$oid_ntqNbDeadNode . '.' . '0'},
+                        toatl_nodes => $self->{results}->{$oid_ntqNbDeadNode}->{$oid_ntqNbNode . '.' . '0'},
+                        prct_dead => $prct_dead };
+}
+
+1;
+
+__END__
+
+=head1 MODE
+
+Check Netasq dead nodes and state and health of nodes
+
+=over 8
+
+=item B<--filter-node>
+
+Filter name with regexp (based on serial)
+
+=item B<--warning-health>
+
+Warning on health level. (e.g --warning 90:)
+
+=item B<--critical-health>
+
+Critical on health level. (e.g --critical 80:)
+
+=item B<--warning-dead-nodes>
+
+Warning on deadnode (absolute unless --percent is used)
+
+=item B<--critical-dead-nodes>
+
+Critical on deadnode (absolute unless --percent is used)
+
+=item B<--warning-state>
+
+Set warning threshold for status. Use "%{state}" as a special variable.
+Value can be 'online' or 'offline'.
+
+=item B<--critical-state>
+
+Set critical threshold for status. Use "%{state}" as a special variable.
+Value can be 'online' or 'offline'.
+
+=item B<--percent>
+
+Set this option if you want to warn on percent 
+
+=back
+
+=cut
diff --git a/centreon-plugins/network/netasq/snmp/mode/hastatus.pm b/centreon-plugins/network/netasq/snmp/mode/hastatus.pm
deleted file mode 100644
index 41eb97e6b..000000000
--- a/centreon-plugins/network/netasq/snmp/mode/hastatus.pm
+++ /dev/null
@@ -1,105 +0,0 @@
-#
-# Copyright 2016 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 network::netasq::snmp::mode::hastatus;
-
-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;
-    
-    $self->{version} = '1.0';
-    $options{options}->add_options(arguments =>
-                                { 
-                                  "warning:s"      => { name => 'warning' },
-                                  "critical:s"     => { name => 'critical' },
-                                });
-                                
-    return $self;
-}
-
-sub check_options {
-    my ($self, %options) = @_;
-    $self->SUPER::init(%options);
-    
-    if (($self->{perfdata}->threshold_validate(label => 'warning', value => $self->{option_results}->{warning})) == 0) {
-        $self->{output}->add_option_msg(short_msg => "Wrong warning threshold '" . $self->{option_results}->{warning} . "'.");
-        $self->{output}->option_exit();
-    }
-    if (($self->{perfdata}->threshold_validate(label => 'critical', value => $self->{option_results}->{critical})) == 0) {
-        $self->{output}->add_option_msg(short_msg => "Wrong critical threshold '" . $self->{option_results}->{critical} . "'.");
-        $self->{output}->option_exit();
-    }
-}
-
-sub run {
-    my ($self, %options) = @_;
-    # $options{snmp} = snmp object
-    $self->{snmp} = $options{snmp};
-    
-    my $oid_ntqNbNode = '.1.3.6.1.4.1.11256.1.11.1.0';
-    my $oid_ntqNbDeadNode = '.1.3.6.1.4.1.11256.1.11.2.0';
-    my $result = $self->{snmp}->get_leef(oids => [$oid_ntqNbNode, $oid_ntqNbDeadNode], nothing_quit => 1);
-    
-    if ($result->{$oid_ntqNbNode} == 1) {
-        $self->{output}->output_add(severity => 'OK',
-                                    short_msg => "Only one node. No ha.");
-    } else {
-        my $exit = $self->{perfdata}->threshold_check(value => $result->{$oid_ntqNbDeadNode}, threshold => [ { label => 'critical', exit_litteral => 'critical' }, { label => 'warning', exit_litteral => 'warning' } ]);
-        $self->{output}->output_add(severity => $exit,
-                                    short_msg => sprintf("%d dead nodes on %d nodes", 
-                                                        $result->{$oid_ntqNbDeadNode}, $result->{$oid_ntqNbNode}));
-        $self->{output}->perfdata_add(label => 'dead_nodes',
-                                      value => $result->{$oid_ntqNbDeadNode},
-                                      warning => $self->{perfdata}->get_perfdata_for_output(label => 'warning'),
-                                      critical => $self->{perfdata}->get_perfdata_for_output(label => 'critical'),
-                                      min => 0, max => $result->{$oid_ntqNbNode});
-    }
-    
-    $self->{output}->display();
-    $self->{output}->exit();
-}
-
-1;
-
-__END__
-
-=head1 MODE
-
-Check ha status.
-
-=over 8
-
-=item B<--warning>
-
-Threshold warning (number of dead nodes).
-
-=item B<--critical>
-
-Threshold critical (number of dead nodes).
-
-=back
-
-=cut
diff --git a/centreon-plugins/network/netasq/snmp/plugin.pm b/centreon-plugins/network/netasq/snmp/plugin.pm
index 751fb4acf..8152bc355 100644
--- a/centreon-plugins/network/netasq/snmp/plugin.pm
+++ b/centreon-plugins/network/netasq/snmp/plugin.pm
@@ -38,7 +38,7 @@ sub new {
                          'interfaces'           => 'snmp_standard::mode::interfaces',
                          'list-interfaces'      => 'snmp_standard::mode::listinterfaces',
                          'load'                 => 'snmp_standard::mode::loadaverage',
-                         'ha-status'            => 'network::netasq::snmp::mode::hastatus',
+                         'ha-nodes'             => 'network::netasq::snmp::mode::hanodes',
                          'memory'               => 'os::freebsd::snmp::mode::memory',
                          'storage'              => 'snmp_standard::mode::storage',
                          'swap'                 => 'snmp_standard::mode::swap',