tyler.durden
/
centreon-plugins
mirror of https://github.com/centreon/centreon-plugins.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix #1607

This commit is contained in:
garnier-quentin 2019-08-07 10:09:15 +02:00
parent b6c09022d3
commit 668e899f1c
3 changed files with 51 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
database/mysql/dbi.pm
View File

@ -25,14 +25,21 @@ use base qw(centreon::plugins::dbi);
use strict; use strict;
use warnings; use warnings;
sub is_mariadb {
my ($self) = @_;
return $self->{is_mariadb};
}
sub set_version { sub set_version {
my ($self) = @_; my ($self) = @_;
$self->{is_mariadb} = 0;
$self->{version} = $self->{instance}->get_info(18); # SQL_DBMS_VER $self->{version} = $self->{instance}->get_info(18); # SQL_DBMS_VER
# MariaDB: 5.5.5-10.1.36-MariaDB # MariaDB: 5.5.5-10.1.36-MariaDB or 10.1.36-MariaDB
if ($self->{version} =~ /^(.*.)-(.*?)-MariaDB/i) { if ($self->{version} =~ /([0-9\.]*?)-MariaDB/i) {
$self->{version} = $1; $self->{version} = $1;
$self->{mariadb_version} = $2; $self->{is_mariadb} = 1;
} }
} }

2
database/mysql/mode/threadsconnected.pm
View File

@ -86,7 +86,7 @@ sub manage_selection {
} }
my $infos = {}; my $infos = {};
if ($options{sql}->is_version_minimum(version => '5.7.6')) { if (!$options{sql}->is_mariadb() && $options{sql}->is_version_minimum(version => '5.7.6')) {
$options{sql}->query(query => q{ $options{sql}->query(query => q{
SELECT 'max_connections' as name, @@GLOBAL.max_connections as value SELECT 'max_connections' as name, @@GLOBAL.max_connections as value
UNION UNION

46
database/mysql/mysqlcmd.pm
View File

@ -43,14 +43,14 @@ sub new {
$options{output}->option_exit(); $options{output}->option_exit();
} }
if (!defined($options{noptions})) { if (!defined($options{noptions})) {
$options{options}->add_options(arguments => $options{options}->add_options(arguments => {
{ "mysql-cmd:s" => { name => 'mysql_cmd', default => '/usr/bin/mysql' }, 'mysql-cmd:s' => { name => 'mysql_cmd', default => '/usr/bin/mysql' },
"host:s@" => { name => 'host' }, 'host:s@' => { name => 'host' },
"port:s@" => { name => 'port' }, 'port:s@' => { name => 'port' },
"username:s@" => { name => 'username' }, 'username:s@' => { name => 'username' },
"password:s@" => { name => 'password' }, 'password:s@' => { name => 'password' },
"socket:s@" => { name => 'socket' }, 'socket:s@' => { name => 'socket' },
"sql-errors-exit:s" => { name => 'sql_errors_exit', default => 'unknown' }, 'sql-errors-exit:s' => { name => 'sql_errors_exit', default => 'unknown' },
}); });
} }
$options{options}->add_help(package => __PACKAGE__, sections => 'MYSQLCMD OPTIONS', once => 1); $options{options}->add_help(package => __PACKAGE__, sections => 'MYSQLCMD OPTIONS', once => 1);
@ -112,7 +112,7 @@ sub check_options {
$self->{mysql_cmd} = $self->{option_results}->{mysql_cmd}; $self->{mysql_cmd} = $self->{option_results}->{mysql_cmd};
if (!defined($self->{host}) || $self->{host} eq '') { if (!defined($self->{host}) || $self->{host} eq '') {
$self->{output}->add_option_msg(short_msg => "Need to specify host argument."); $self->{output}->add_option_msg(short_msg => 'Need to specify host argument.');
$self->{output}->option_exit(exit_litteral => $self->{sql_errors_exit}); $self->{output}->option_exit(exit_litteral => $self->{sql_errors_exit});
} }
@ -190,6 +190,7 @@ sub command_execution {
wait_exit => 1, wait_exit => 1,
redirect_stderr => 1 redirect_stderr => 1
); );
if ($exit_code <= -1000) { if ($exit_code <= -1000) {
if ($exit_code == -1000) { if ($exit_code == -1000) {
$self->{output}->output_add(severity => 'UNKNOWN', $self->{output}->output_add(severity => 'UNKNOWN',
@ -204,7 +205,24 @@ sub command_execution {
sub disconnect {} sub disconnect {}
# Connection initializer sub is_mariadb {
my ($self) = @_;
return $self->{is_mariadb};
}
sub set_version {
my ($self, %options) = @_;
$self->{is_mariadb} = 0;
$self->{version} = $options{version};
# MariaDB: 5.5.5-10.1.36-MariaDB or 10.1.36-MariaDB
if ($self->{version} =~ /([0-9\.]*?)-MariaDB/i) {
$self->{version} = $1;
$self->{is_mariadb} = 1;
}
}
sub connect { sub connect {
my ($self, %options) = @_; my ($self, %options) = @_;
my $dontquit = (defined($options{dontquit}) && $options{dontquit} == 1) ? 1 : 0; my $dontquit = (defined($options{dontquit}) && $options{dontquit} == 1) ? 1 : 0;
@ -212,14 +230,14 @@ sub connect {
(my $exit_code, $self->{stdout}) = $self->command_execution(request => "SHOW VARIABLES LIKE 'version'"); (my $exit_code, $self->{stdout}) = $self->command_execution(request => "SHOW VARIABLES LIKE 'version'");
if ($exit_code != 0) { if ($exit_code != 0) {
if ($dontquit == 0) { if ($dontquit == 0) {
$self->{output}->add_option_msg(short_msg => "Cannot connect: " . $self->{stdout}); $self->{output}->add_option_msg(short_msg => 'Cannot connect: ' . $self->{stdout});
$self->{output}->option_exit(exit_litteral => $self->{sql_errors_exit}); $self->{output}->option_exit(exit_litteral => $self->{sql_errors_exit});
} }
return (-1, "Cannot connect: " . $self->{stdout}); return (-1, 'Cannot connect: ' . $self->{stdout});
} }
my $row = $self->fetchrow_hashref(); my $row = $self->fetchrow_hashref();
$self->{version} = $row->{Value}; $self->set_version(version => $row->{Value});
return 0; return 0;
} }
@ -284,7 +302,7 @@ sub query {
(my $exit_code, $self->{stdout}) = $self->command_execution(request => $options{query}); (my $exit_code, $self->{stdout}) = $self->command_execution(request => $options{query});
if ($exit_code != 0) { if ($exit_code != 0) {
$self->{output}->add_option_msg(short_msg => "Cannot execute query: " . $self->{stdout}); $self->{output}->add_option_msg(short_msg => 'Cannot execute query: ' . $self->{stdout});
$self->{output}->option_exit(exit_litteral => $self->{sql_errors_exit}); $self->{output}->option_exit(exit_litteral => $self->{sql_errors_exit});
} }