enh(postgres): use include and exclude filter

Refs:CTOR-2319

Author: Evan-Adam

src/database/postgres/mode/locks.pm

@@ -25,7 +25,7 @@ use base qw(centreon::plugins::templates::counter);
 use strict;
 use warnings;
 
-use centreon::plugins::constants qw(:values);
+use centreon::plugins::constants qw(:values :counters);
 use centreon::plugins::misc qw/is_excluded is_empty/;
 
 sub new {
@@ -40,7 +40,8 @@ sub new {
         'exclude-database:s'  => { name => 'exclude_database', default => '' },
         'include:s'           => { name => 'include_database' },
         'exclude:s'           => { name => 'exclude_database' },
-        'include-locktype:s'  => {name => 'include_locktype', default => '%'},
+        'include-locktype:s'  => {name => 'include_locktype', default => 'relation'},
+        'exclude-locktype:s'  => {name => 'exclude_locktype', default => ''},
     });
 
     return $self;
@@ -137,10 +138,7 @@ sub check_options {
         $self->{output}->option_exit(short_msg => "Critical warning ('$label' locks) threshold '" . $value . "'.")
             unless $self->{perfdata}->threshold_validate(label => 'crit-' . $label, value => $value);
     }
-    # the add_options 'default' property do not transform an empty string to the default value, so we do it here too
-    if (is_empty($self->{option_results}->{include_locktype})) {
-        $self->{option_results}->{include_locktype} = '%';
-    }
+
 }
 
 sub manage_selection {
@@ -149,17 +147,17 @@ sub manage_selection {
     $options{sql}->connect();
 
     $options{sql}->query(query => q{
-        SELECT granted, mode, datname FROM pg_database d LEFT JOIN pg_locks l ON (d.oid=l.database AND locktype like ?) WHERE d.datallowconn
-    },
-        param=> [$self->{option_results}->{include_locktype}]);
+        SELECT granted, mode, datname, locktype FROM pg_database d LEFT JOIN pg_locks l ON (d.oid=l.database) WHERE d.datallowconn
+    });
 
     my $result = $options{sql}->fetchall_arrayref();
     $self->{output}->option_exit(short_msg => "No databases found. Do you have sufficient permissions ?") if scalar(@{$result}) == 0;
 
     my $dblocks = {};
     foreach my $row (@{$result}) {        
-        my ($granted, $mode, $dbname) = ($$row[0], $$row[1], $$row[2]);
+        my ($granted, $mode, $dbname, $locktype) = ($$row[0], $$row[1], $$row[2], $$row[3]);
         next if is_excluded($dbname, $self->{option_results}->{include_database}, $self->{option_results}->{exclude_database});
+        next if is_excluded($locktype, $self->{option_results}->{include_locktype}, $self->{option_results}->{exclude_locktype});
         if (!defined($dblocks->{$dbname})) {
             $dblocks->{$dbname} = {total => 0, waiting => 0, database => $dbname };
             # Empty. no lock (left join)
@@ -226,7 +224,11 @@ Exclude databases using a regular expression.
 
 =item B<--include-locktype>
 
-Include lock type using a SQL 'like' format. by default all lock type are included (default: '%').
+Filter lock type by C<pg_locks.locktype> column. (default: 'relation').
+
+=item B<--exclude-locktype>
+
+Filter lock type by C<pg_locks.locktype> column.
 
 =back