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

Set default value when no formatting defined

This commit is contained in:
Sims24 2017-03-01 20:11:44 +01:00
parent fb647abf22
commit 4d356553df
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
apps/centreon/sql/mode/virtualservice.pm
View File

@ -47,12 +47,14 @@ sub custom_metric_output {
local $SIG{__DIE__} = sub { $message = $_[0]; }; local $SIG{__DIE__} = sub { $message = $_[0]; };
$msg = sprintf("$config_data->{filters}->{formatting}->{printf_msg}", eval "$config_data->{filters}->{formatting}->{printf_var}"); $msg = sprintf("$config_data->{filters}->{formatting}->{printf_msg}", eval "$config_data->{filters}->{formatting}->{printf_var}");
}; };
} else { } elsif (defined($config_data->{formatting}->{printf_var}) && defined($config_data->{formatting}->{printf_msg})) {
eval { eval {
local $SIG{__WARN__} = sub { $message = $_[0]; }; local $SIG{__WARN__} = sub { $message = $_[0]; };
local $SIG{__DIE__} = sub { $message = $_[0]; }; local $SIG{__DIE__} = sub { $message = $_[0]; };
$msg = sprintf("$config_data->{formatting}->{printf_msg}", eval "$config_data->{formatting}->{printf_var}"); $msg = sprintf("$config_data->{formatting}->{printf_msg}", eval "$config_data->{formatting}->{printf_var}");
}; };
} else {
$msg = sprintf($config_data->{formatting}->{printf_msg}, $self->{result_values}->{instance}, $self->{result_values}->{value});
} }
if (defined($message)) { if (defined($message)) {
@ -172,8 +174,11 @@ sub check_options {
} }
if (!exists($config_data->{formatting})) { if (!exists($config_data->{formatting})) {
$self->{output}->add_option_msg(short_msg => "Config_error: formatting section is mandatory in yout JSON condiguration !"); $config_data->{formatting}->{printf_msg} = "Metric '%s' value is %d";
$self->{output}->option_exit(); $config_data->{formatting}->{printf_metric_value} = "%d";
$config_data->{formatting}->{custom_message_global} = "Global metrics are OK";
$config_data->{formatting}->{custom_message_metric} = "All metrics are OK";
$config_data->{formatting}->{cannonical_separator} = "#";
} }
} }