diff --git a/centreon-plugins/os/linux/centos/local/mode/pendingupgrade.pm b/centreon-plugins/os/linux/centos/local/mode/pendingupgrade.pm
deleted file mode 100644
index f39227d15..000000000
--- a/centreon-plugins/os/linux/centos/local/mode/pendingupgrade.pm
+++ /dev/null
@@ -1,195 +0,0 @@
-#
-# Copyright 2018 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 os::linux::centos::local::mode::pendingupgrade;
-
-use base qw(centreon::plugins::mode);
-
-use strict;
-use warnings;
-use centreon::plugins::misc;
-
-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 =>
-                                {
-                                  "hostname:s"        => { name => 'hostname' },
-                                  "remote"            => { name => 'remote' },
-                                  "ssh-option:s@"     => { name => 'ssh_option' },
-                                  "ssh-path:s"        => { name => 'ssh_path' },
-                                  "ssh-command:s"     => { name => 'ssh_command', default => 'ssh' },
-                                  "timeout:s"         => { name => 'timeout', default => 30 },
-                                  "sudo"              => { name => 'sudo' },
-                                  "command:s"         => { name => 'command', default => 'yum' },
-                                  "command-path:s"    => { name => 'command_path', },
-                                  "command-options:s" => { name => 'command_options', default => 'check-update 2>&1' },
-                                  "warning:s"         => { name => 'warning', default => 40 },
-                                  "critical:s"        => { name => 'critical', default => 50 },
-                                  "filter-name:s"     => { name => 'filter_name',  },
-                                });
-    $self->{result} = {};
-    return $self;
-}
-
-sub check_options {
-    my ($self, %options) = @_;
-    $self->SUPER::init(%options);
-    $self->{warn} = $self->{option_results}->{warning};
-    if (($self->{perfdata}->threshold_validate(label => 'warn', value => $self->{warn})) == 0 || ( $self->{warn}<= 0)) {
-       $self->{output}->add_option_msg(short_msg => "Wrong warning threshold '" . $self->{warn} . "'.");
-       $self->{output}->option_exit();
-    }
-    $self->{crit} = $self->{option_results}->{critical};
-    if (($self->{perfdata}->threshold_validate(label => 'crit', value => $self->{crit})) == 0 ||  $self->{crit}<=0 ) {
-       $self->{output}->add_option_msg(short_msg => "Wrong critical threshold '" . $self->{crit} . "'.");
-       $self->{output}->option_exit();
-    }elsif ($self->{crit}<=$self->{warn}) {
-       $self->{output}->add_option_msg(short_msg => "Critical threshold should be greater then Warning threshold '" . $self->{crit} . " <= ".$self->{warn}."'.");
-       $self->{output}->option_exit();
-    }
-
-
-
-}
-
-sub manage_selection {
-    my ($self, %options) = @_;
-    my $no_errors;
-    my $stdout = centreon::plugins::misc::execute(output => $self->{output},
-                                                  options => $self->{option_results},
-                                                  sudo => $self->{option_results}->{sudo},
-                                                  command => $self->{option_results}->{command},
-                                                  command_path => $self->{option_results}->{command_path},
-                                                  command_options => $self->{option_results}->{command_options},
-                                                  no_errors => { 100 => 1 });
-    my @lines = split /\n/, $stdout;
-    foreach my $line (@lines) {
-        next if ($line !~ /^(\w\S+)\s*(\d\S+)\s*(\S+)/);
-        my ($package, $version, $upgradePath) = ($1, $2, $3);
-        $self->{result}->{$package} = $version.' '.$upgradePath;
-    }
-}
-
-sub run {
-    my ($self, %options) = @_;
-
-    $self->manage_selection();
-    my $amount=0;
-    foreach my $package (sort(keys %{$self->{result}})) {
-        if (defined($self->{option_results}->{filter_name}) && $self->{option_results}->{filter_name} ne '' &&
-            $self->{result}{$package} !~ /$self->{option_results}->{filter_name}/) {
-            $self->{output}->output_add(long_msg => "Skipping Package '" . $package . "': no security upgrade");
-            next;
-        }
-        $self->{output}->output_add(long_msg => "'package: " .$package. "\t". $self->{result}{$package} . "'");
-        $amount = $amount+1;
-    }
-    $self->{output}->perfdata_add(label => 'pendingUpgrades',
-                                value => $amount,
-                                critical => $self->{perfdata}->get_perfdata_for_output(label => 'crit'),
-                                min => 0);
-
-    my $exit = $self->{perfdata}->threshold_check(value => $amount,
-                                                  threshold => [ { label => 'crit', 'exit_litteral' => 'critical' } ]);
-        if (($amount >= 0 && $amount < $self->{warn})){
-            $self->{output}->output_add(severity => 'OK',
-                                short_msg => 'There are '.$amount.' pending upgrades');
-        }elsif ($amount >= $self->{warn} && $amount < $self->{crit}){
-            $self->{output}->output_add(severity => 'WARNING',
-                                short_msg => 'WARNING: There are '.$amount.' pending upgrades');
-        }elsif ($amount >= $self->{crit}){
-            $self->{output}->output_add(severity => 'CRITICAL',
-                                short_msg => 'CRITICAL: There are '.$amount.' pending upgrades');
-        }else{
-            $self->{output}->output_add(severity => 'UNKNOWN');
-        }
-    $self->{output}->display(nolabel => 1);
-    $self->{output}->exit();
-}
-
-1;
-
-__END__
-
-=head1 MODE
-
-List partitions.
-
-=over 8
-
-=item B<--remote>
-
-Execute command remotely in 'ssh'.
-
-=item B<--hostname>
-
-Hostname to query (need --remote).
-
-=item B<--warning>
-
-Threshold warning Amount of Pending Upgrades (default: 40)
-
-=item B<--critical>
-
-Threshold critical Amount of Pending Upgrades (default: 50)
-
-=item B<--ssh-option>
-
-Specify multiple options like the user (example: --ssh-option='-l=centreon-engine' --ssh-option='-p=52').
-
-=item B<--ssh-path>
-
-Specify ssh command path (default: none)
-
-=item B<--ssh-command>
-
-Specify ssh command (default: 'ssh'). Useful to use 'plink'.
-
-=item B<--timeout>
-
-Timeout in seconds for the command (Default: 30).
-
-=item B<--sudo>
-
-Use 'sudo' to execute the command.
-
-=item B<--command>
-
-Command to get information (Default: 'yum').
-
-=item B<--command-path>
-
-Command path (Default: none).
-
-=item B<--command-options>
-
-Command options (Default: 'check-updates 2>&1').
-
-=item B<--filter-name>
-
-Filter update path.
-
-=back
-
-=cut
\ No newline at end of file
diff --git a/centreon-plugins/os/linux/centos/local/plugin.pm b/centreon-plugins/os/linux/centos/local/plugin.pm
deleted file mode 100644
index 7f906f1d1..000000000
--- a/centreon-plugins/os/linux/centos/local/plugin.pm
+++ /dev/null
@@ -1,71 +0,0 @@
-#
-# Copyright 2018 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 os::linux::centos::local::plugin;
-
-use strict;
-use warnings;
-use base qw(centreon::plugins::script_simple);
-
-sub new {
-    my ($class, %options) = @_;
-    my $self = $class->SUPER::new(package => __PACKAGE__, %options);
-    bless $self, $class;
-
-    $self->{version} = '0.1';
-    %{$self->{modes}} = (
-                         'cpu'                  => 'os::linux::local::mode::cpu',
-                         'cpu-detailed'         => 'os::linux::local::mode::cpudetailed',
-                         'cmd-return'           => 'os::linux::local::mode::cmdreturn',
-                         'connections'          => 'os::linux::local::mode::connections',
-                         'directlvm-usage'      => 'os::linux::local::mode::directlvmusage',
-                         'diskio'               => 'os::linux::local::mode::diskio',
-                         'files-size'           => 'os::linux::local::mode::filessize',
-                         'files-date'           => 'os::linux::local::mode::filesdate',
-                         'inodes'               => 'os::linux::local::mode::inodes',
-                         'load'                 => 'os::linux::local::mode::loadaverage',
-                         'list-interfaces'      => 'os::linux::local::mode::listinterfaces',
-                         'list-partitions'      => 'os::linux::local::mode::listpartitions',
-                         'list-storages'        => 'os::linux::local::mode::liststorages',
-                         'memory'               => 'os::linux::local::mode::memory',
-                         'packet-errors'        => 'os::linux::local::mode::packeterrors',
-                         'paging'               => 'os::linux::local::mode::paging',
-                         'pending-upgrades'     => 'os::linux::centos::local::mode::pendingupgrade',
-                         'process'              => 'os::linux::local::mode::process',
-                         'quota'                => 'os::linux::local::mode::quota',
-                         'storage'              => 'os::linux::local::mode::storage',
-                         'swap'                 => 'os::linux::local::mode::swap',
-                         'systemd-sc-status'    => 'os::linux::local::mode::systemdscstatus',
-                         'traffic'              => 'os::linux::local::mode::traffic',
-                         'uptime'               => 'os::linux::local::mode::uptime',
-                         );
-
-    return $self;
-}
-
-1;
-
-__END__
-
-=head1 PLUGIN DESCRIPTION
-
-Check Linux through local commands (the plugin can use SSH).
-
-=cut
diff --git a/centreon-plugins/os/linux/local/mode/pendingupdates.pm b/centreon-plugins/os/linux/local/mode/pendingupdates.pm
new file mode 100644
index 000000000..1cf8c41f4
--- /dev/null
+++ b/centreon-plugins/os/linux/local/mode/pendingupdates.pm
@@ -0,0 +1,223 @@
+#
+# Copyright 2018 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 os::linux::local::mode::pendingupdates;
+
+use base qw(centreon::plugins::templates::counter);
+
+use strict;
+use warnings;
+use centreon::plugins::misc;
+
+sub set_counters {
+    my ($self, %options) = @_;
+    
+    $self->{maps_counters_type} = [
+        { name => 'global', type => 0 },
+        { name => 'updates', type => 1 }
+    ];
+    
+    $self->{maps_counters}->{global} = [
+        { label => 'total', set => {
+                key_values => [ { name => 'total' } ],
+                output_template => 'Number of pending updates : %d',
+                perfdatas => [
+                    { label => 'total', value => 'total_absolute', template => '%d',
+                      min => 0 },
+                ],
+            }
+        },
+    ];
+    
+    $self->{maps_counters}->{updates} = [
+        { label => 'update', set => {
+                key_values => [ { name => 'package' }, { name => 'version' }, { name => 'repository' } ],
+                closure_custom_calc => $self->can('custom_updates_calc'),
+                closure_custom_output => $self->can('custom_updates_output'),
+                closure_custom_perfdata => sub { return 0; },
+            }
+        },
+    ];
+}
+
+sub custom_updates_output {
+    my ($self, %options) = @_;
+    
+    my $msg = sprintf("Package '%s' [version: %s] [repository: %s]",
+                   $self->{result_values}->{package},
+                   $self->{result_values}->{version},
+                   $self->{result_values}->{repository});
+    return $msg;
+}
+
+sub custom_updates_calc {
+    my ($self, %options) = @_;
+
+    $self->{result_values}->{package} = $options{new_datas}->{$self->{instance} . '_package'};
+    $self->{result_values}->{version} = $options{new_datas}->{$self->{instance} . '_version'};
+    $self->{result_values}->{repository} = $options{new_datas}->{$self->{instance} . '_repository'};
+    return 0;
+}
+
+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 =>
+                                {
+                                  "hostname:s"              => { name => 'hostname' },
+                                  "remote"                  => { name => 'remote' },
+                                  "ssh-option:s@"           => { name => 'ssh_option' },
+                                  "ssh-path:s"              => { name => 'ssh_path' },
+                                  "ssh-command:s"           => { name => 'ssh_command', default => 'ssh' },
+                                  "timeout:s"               => { name => 'timeout', default => 30 },
+                                  "sudo"                    => { name => 'sudo' },
+                                  "command:s"               => { name => 'command', default => 'yum' },
+                                  "command-path:s"          => { name => 'command_path', },
+                                  "command-options:s"       => { name => 'command_options', default => 'check-update 2>&1' },
+                                  "filter-package:s"        => { name => 'filter_package' },
+                                  "filter-repository:s"     => { name => 'filter_repository' },
+                                });
+    $self->{result} = {};
+    return $self;
+}
+
+sub check_options {
+    my ($self, %options) = @_;
+    $self->SUPER::check_options(%options);
+}
+
+sub manage_selection {
+    my ($self, %options) = @_;
+
+    my ($stdout, $exit_code) = centreon::plugins::misc::execute(
+        output => $self->{output},
+        options => $self->{option_results},
+        sudo => $self->{option_results}->{sudo},
+        command => $self->{option_results}->{command},
+        command_path => $self->{option_results}->{command_path},
+        command_options => $self->{option_results}->{command_options},
+        no_quit => 1
+    );
+
+    $self->{global}->{total} = 0;
+    $self->{updates} = {};
+    my @lines = split /\n/, $stdout;
+    foreach my $line (@lines) {
+        next if ($line !~ /^(\S+)\s+(\d+\S+)\s+(\S+)/
+            && $line !~ /\s+(\S+)\s+\(\S+\s\=\>\s(\S+)\)/
+            && $line !~ /.*\|.*\|\s+(\S+)\s+\|.*\|\s+(\d+\S+)\s+\|.*/);
+        my ($package, $version, $repository) = ($1, $2, $3);
+        $repository = "-" if (!defined($repository) || $repository eq '');
+
+        if (defined($self->{option_results}->{filter_package}) && $self->{option_results}->{filter_package} ne '' &&
+            $package !~ /$self->{option_results}->{filter_package}/) {
+            $self->{output}->output_add(long_msg => "skipping '" . $package . "': no matching filter.", debug => 1);
+            next;
+        }
+        if (defined($self->{option_results}->{filter_repository}) && $self->{option_results}->{filter_repository} ne '' &&
+            $repository !~ /$self->{option_results}->{filter_repository}/) {
+            $self->{output}->output_add(long_msg => "skipping '" . $repository . "': no matching filter.", debug => 1);
+            next;
+        }
+        
+        $self->{updates}->{$package} = {
+            package => $package,
+            version => $version,
+            repository => $repository,
+        };
+
+        $self->{global}->{total}++;
+    }
+}
+
+1;
+
+__END__
+
+=head1 MODE
+
+Check pending updates.
+
+=over 8
+
+=item B<--remote>
+
+Execute command remotely in 'ssh'.
+
+=item B<--hostname>
+
+Hostname to query (need --remote).
+
+=item B<--ssh-option>
+
+Specify multiple options like the user (example: --ssh-option='-l=centreon-engine' --ssh-option='-p=52').
+
+=item B<--ssh-path>
+
+Specify ssh command path (Default: none)
+
+=item B<--ssh-command>
+
+Specify ssh command (Default: 'ssh'). Useful to use 'plink'.
+
+=item B<--timeout>
+
+Timeout in seconds for the command (Default: 30).
+
+=item B<--sudo>
+
+Use 'sudo' to execute the command.
+
+=item B<--command>
+
+Command to get information (Default: 'yum').
+Use 'apt-get' for Debian, 'zypper' for SUSE.
+
+=item B<--command-path>
+
+Command path (Default: none).
+
+=item B<--command-options>
+
+Command options (Default: 'check-updates 2>&1').
+Use 'upgrade -sVq 2>&1' for Debian, 'list-updates 2>&1' for SUSE.
+
+=item B<--warning-total>
+
+Threshold warning for total amount of pending updates.
+
+=item B<--critical-total>
+
+Threshold critical for total amount of pending updates.
+
+=item B<--filter-package>
+
+Filter package name.
+
+=item B<--filter-repository>
+
+Filter repository name.
+
+=back
+
+=cut
\ No newline at end of file
diff --git a/centreon-plugins/os/linux/local/plugin.pm b/centreon-plugins/os/linux/local/plugin.pm
index 61f663510..6befbca2e 100644
--- a/centreon-plugins/os/linux/local/plugin.pm
+++ b/centreon-plugins/os/linux/local/plugin.pm
@@ -48,6 +48,7 @@ sub new {
                          'mountpoint'                => 'os::linux::local::mode::mountpoint',
                          'packet-errors'             => 'os::linux::local::mode::packeterrors',
                          'paging'                    => 'os::linux::local::mode::paging',
+                         'pending-updates'           => 'os::linux::local::mode::pendingupdates',
                          'process'                   => 'os::linux::local::mode::process',
                          'quota'                     => 'os::linux::local::mode::quota',
                          'storage'                   => 'os::linux::local::mode::storage',