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(multiservices) properly handle inline JSON (#2246)

This commit is contained in:
UrBnW 2020-10-13 07:43:33 +02:00 committed by GitHub
parent eee2b808cd
commit d028c414e3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
apps/centreon/sql/mode/multiservices.pm
View File

@ -290,7 +290,7 @@ sub new {
bless $self, $class; bless $self, $class;
$options{options}->add_options(arguments => { $options{options}->add_options(arguments => {
'config-file:s' => { name => 'config_file' }, 'config:s' => { name => 'config' },
'json-data:s' => { name => 'json_data' }, 'json-data:s' => { name => 'json_data' },
'warning-groups:s' => { name => 'warning_groups' }, 'warning-groups:s' => { name => 'warning_groups' },
'critical-groups:s' => { name => 'critical_groups' }, 'critical-groups:s' => { name => 'critical_groups' },
@ -305,19 +305,13 @@ sub check_options {
my ($self, %options) = @_; my ($self, %options) = @_;
$self->SUPER::check_options(%options); $self->SUPER::check_options(%options);
if (!defined($self->{option_results}->{config_file}) && !defined($self->{option_results}->{json_data})) { if (!defined($self->{option_results}->{config}) || $self->{option_results}->{config} eq '') {
$self->{output}->add_option_msg(short_msg => "Please define --config-file or --json-data option"); $self->{output}->add_option_msg(short_msg => "Please define --config option");
$self->{output}->option_exit();
}
if (defined($self->{option_results}->{config_file}) && $self->{option_results}->{config_file} ne '') {
$config_data = $self->parse_json_config(config => $self->{option_results}->{config_file});
} elsif (defined($self->{option_results}->{json_data}) && $self->{option_results}->{json_data} ne '') {
$config_data = $self->parse_json_config(config => $self->{option_results}->{json_data});
} else {
$self->{output}->add_option_msg(short_msg => "Can't find plugin configuration file / Cannot read from --json-data option");
$self->{output}->option_exit(); $self->{output}->option_exit();
} }
$config_data = $self->parse_json_config(config => $self->{option_results}->{config});
if (!exists($config_data->{mode})) { if (!exists($config_data->{mode})) {
$config_data->{mode} = 'sqlmatching'; $config_data->{mode} = 'sqlmatching';
} }
@ -364,23 +358,27 @@ sub prefix_groups_output {
sub parse_json_config { sub parse_json_config {
my ($self, %options) = @_; my ($self, %options) = @_;
my $data; my ($data, $json_text);
my $message;
my $json_text = do { if (-f $options{config} and -r $options{config}) {
open(my $json_fh, "<:encoding(UTF-8)", $options{config}) $json_text = do {
or die("Can't open '$options{config}': $!"); local $/;
local $/; my $fh;
<$json_fh> if (!open($fh, "<:encoding(UTF-8)", $options{config})) {
}; $self->{output}->add_option_msg(short_msg => "Can't open file $options{config}: $!");
$self->{output}->option_exit();
}
<$fh>;
};
} else {
$json_text = $options{config};
}
eval { eval {
local $SIG{__WARN__} = sub { $message = $_[0]; }; $data = decode_json($json_text);
local $SIG{__DIE__} = sub { $message = $_[0]; };
$data = JSON->new->utf8->decode($json_text);
}; };
if ($message) { if ($@) {
$self->{output}->add_option_msg(short_msg => "Cannot decode json config file: $message"); $self->{output}->add_option_msg(short_msg => "Cannot decode json config file: $@");
$self->{output}->option_exit(); $self->{output}->option_exit();
} }
return $data return $data
@ -502,13 +500,9 @@ __END__
=over 8 =over 8
=item B<--config-file> =item B<--config>
Specify the full path to a json config file Specify the config (can be a file or a json string directly).
=item B<--json-data>
JSON input
=item B<--filter-counters> =item B<--filter-counters>
@ -517,7 +511,7 @@ Can be 'totalhost','totalservice','groups'. Better to manage it in config file
=item B<--warning-*> =item B<--warning-*>
Can be 'total' for host and service, 'groups' for groups Can be 'total' for host and service, 'groups' for groups
e.g --warning-total '%{total_unreachable} > 4' --warning-groups '%{instance} eq 'ESX' && %{total_down} > 2 && %{total_critical} > 4' e.g --warning-total '%{total_unreachable} > 4' --warning-groups '%{instance} eq 'ESX' && %{total_down} > 2 && %{critical_total} > 4'
=item B<--critical-*> =item B<--critical-*>