fix psql vacuum (#2186)

This commit is contained in:
qgarnier 2020-09-02 17:34:29 +02:00 committed by GitHub
parent 19b8c73a24
commit 0fd43b02da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 41 additions and 66 deletions

View File

@ -30,11 +30,10 @@ sub new {
my $self = $class->SUPER::new(package => __PACKAGE__, %options); my $self = $class->SUPER::new(package => __PACKAGE__, %options);
bless $self, $class; bless $self, $class;
$options{options}->add_options(arguments => $options{options}->add_options(arguments => {
{ 'warning:s' => { name => 'warning' },
"warning:s" => { name => 'warning', }, 'critical:s' => { name => 'critical' }
"critical:s" => { name => 'critical', }, });
});
return $self; return $self;
} }
@ -44,75 +43,51 @@ sub check_options {
$self->SUPER::init(%options); $self->SUPER::init(%options);
if (($self->{perfdata}->threshold_validate(label => 'warning', value => $self->{option_results}->{warning})) == 0) { 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}->add_option_msg(short_msg => "Wrong warning threshold '" . $self->{option_results}->{warning} . "'.");
$self->{output}->option_exit(); $self->{output}->option_exit();
} }
if (($self->{perfdata}->threshold_validate(label => 'critical', value => $self->{option_results}->{critical})) == 0) { 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}->add_option_msg(short_msg => "Wrong critical threshold '" . $self->{option_results}->{critical} . "'.");
$self->{output}->option_exit(); self->{output}->option_exit();
} }
if (($self->{perfdata}->threshold_validate(label => 'dbname', value => $self->{option_results}->{dbname})) eq 'postgres') {
$self->{output}->add_option_msg(short_msg => "Invalid db.");
$self->{output}->option_exit();
}
} }
sub run { sub run {
my ($self, %options) = @_; my ($self, %options) = @_;
# $options{sql} = sqlmode object
$self->{sql} = $options{sql};
# Ensures a DB has been specified $options{sql}->connect();
# otherwise we endup in default system table (postgres)
# and the check does not support this behaviour (empty pg_stat_user_table => no need to check)
# FIXME this check should be performed in check_options() but these settings are not available at the moment
my $data_source = $self->{sql}->{data_source};
if ($data_source =~ /.*;database=(.*)/) {
if ($1 eq 'postgres') {
$self->{output}->add_option_msg(short_msg => "Cannot use system 'postgres' database ; you must use a real database.");
$self->{output}->option_exit();
} elsif ($1 eq '') {
$self->{output}->add_option_msg(short_msg => "Database must be specified.");
$self->{output}->option_exit();
}
} else {
$self->{output}->add_option_msg(short_msg => "Need to specify database argument.");
$self->{output}->option_exit();
}
$self->{sql}->connect();
my $target_fields = undef; my $target_fields = 'last_vacuum';
# Autovacuum feature has only been impleted starting PG 8.2 # Autovacuum feature has only been impleted starting PG 8.2
# (options needed http://www.postgresql.org/docs/8.2/static/runtime-config-autovacuum.html, no need starting 8.3) # (options needed http://www.postgresql.org/docs/8.2/static/runtime-config-autovacuum.html, no need starting 8.3)
if ($self->{sql}->is_version_minimum(version => '8.2.0')) { if ($self->{sql}->is_version_minimum(version => '8.2.0')) {
$target_fields = 'greatest(last_autovacuum,last_vacuum)'; $target_fields = 'greatest(last_autovacuum,last_vacuum)';
} else {
$target_fields = 'last_vacuum';
} }
my $query = sprintf("SELECT ROUND(EXTRACT(EPOCH from (select min (now() - %s) my $query = sprintf(
from pg_stat_user_tables where %s is not null)))", $target_fields, $target_fields); 'SELECT ROUND(EXTRACT(EPOCH from (select min (now() - %s) from pg_stat_all_tables where %s is not null)))',
$self->{sql}->query(query => $query); $target_fields,
$target_fields
my $result = $self->{sql}->fetchrow_array(); );
$options{sql}->query(query => $query);
my $result = $options{sql}->fetchrow_array();
if (defined($result)) { if (defined($result)) {
my $exit_code = $self->{perfdata}->threshold_check(value => $result, threshold => [ { label => 'critical', exit_litteral => 'critical' }, { label => 'warning', exit_litteral => 'warning' } ]);
my $exit_code = $self->{perfdata}->threshold_check(value => $result, threshold => [ { label => 'critical', 'exit_litteral' => 'critical' }, { label => 'warning', exit_litteral => 'warning' } ]); $self->{output}->output_add(
$self->{output}->output_add(severity => $exit_code, severity => $exit_code,
short_msg => sprintf("Most recent vacuum dates back from %d seconds", $result)); short_msg => sprintf('Most recent vacuum dates back from %d seconds', $result)
);
$self->{output}->perfdata_add(label => 'last_vacuum', $self->{output}->perfdata_add(
value => $result, label => 'last_vacuum',
warning => $self->{perfdata}->get_perfdata_for_output(label => 'warning'), value => $result,
critical => $self->{perfdata}->get_perfdata_for_output(label => 'critical')); warning => $self->{perfdata}->get_perfdata_for_output(label => 'warning'),
critical => $self->{perfdata}->get_perfdata_for_output(label => 'critical')
);
} else { } else {
$self->{output}->output_add(severity => 'UNKNOWN', $self->{output}->output_add(
short_msg => 'No vacuum performed on this BD yet.'); severity => 'UNKNOWN',
short_msg => 'No vacuum performed on this BD yet.'
);
} }
$self->{output}->display(); $self->{output}->display();

View File

@ -57,7 +57,7 @@ sub init {
arguments => { arguments => {
'host:s@' => { name => 'db_host' }, 'host:s@' => { name => 'db_host' },
'port:s@' => { name => 'db_port' }, 'port:s@' => { name => 'db_port' },
'database:s@' => { name => 'db_name' }, 'database:s@' => { name => 'db_name' }
} }
); );
$self->{options}->parse_options(); $self->{options}->parse_options();
@ -68,15 +68,15 @@ sub init {
@{$self->{sqldefault}->{dbi}} = (); @{$self->{sqldefault}->{dbi}} = ();
@{$self->{sqldefault}->{psqlcmd}} = (); @{$self->{sqldefault}->{psqlcmd}} = ();
for (my $i = 0; $i < scalar(@{$options_result->{db_host}}); $i++) { for (my $i = 0; $i < scalar(@{$options_result->{db_host}}); $i++) {
$self->{sqldefault}->{dbi}[$i] = { data_source => 'Pg:host=' . $options_result->{db_host}[$i] }; $self->{sqldefault}->{dbi}->[$i] = { data_source => 'Pg:host=' . $options_result->{db_host}->[$i] };
$self->{sqldefault}->{psqlcmd}[$i] = { host => $options_result->{db_host}[$i] }; $self->{sqldefault}->{psqlcmd}->[$i] = { host => $options_result->{db_host}->[$i] };
if (defined($options_result->{db_port}[$i])) { if (defined($options_result->{db_port}->[$i])) {
$self->{sqldefault}->{dbi}[$i]->{data_source} .= ';port=' . $options_result->{db_port}[$i]; $self->{sqldefault}->{dbi}->[$i]->{data_source} .= ';port=' . $options_result->{db_port}->[$i];
$self->{sqldefault}->{psqlcmd}[$i]->{port} = $options_result->{db_port}[$i]; $self->{sqldefault}->{psqlcmd}->[$i]->{port} = $options_result->{db_port}->[$i];
} }
$options_result->{db_name}[$i] = (defined($options_result->{db_name}[$i]) && $options_result->{db_name}[$i] ne '') ? $options_result->{db_name}[$i] : 'postgres'; $options_result->{db_name}->[$i] = (defined($options_result->{db_name}[$i]) && $options_result->{db_name}->[$i] ne '') ? $options_result->{db_name}->[$i] : 'postgres';
$self->{sqldefault}->{dbi}[$i]->{data_source} .= ';database=' . $options_result->{db_name}[$i]; $self->{sqldefault}->{dbi}->[$i]->{data_source} .= ';database=' . $options_result->{db_name}->[$i];
$self->{sqldefault}->{psqlcmd}[$i]->{dbname} = $options_result->{db_name}[$i]; $self->{sqldefault}->{psqlcmd}->[$i]->{dbname} = $options_result->{db_name}->[$i];
} }
} }