tyler.durden/centreon-plugins
1
0
Fork 0
mirror of https://github.com/centreon/centreon-plugins.git synced 2025-07-27 07:34:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

(collection) use all variables in thresholds attributes (#3569)

Browse Source
This commit is contained in:
qgarnier 2022-03-29 10:34:59 +02:00 committed by GitHub
parent 75aa25b152
commit d039666f45
3 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
centreon-plugins/apps/protocols/http/mode/collection.pm
View File

@ -1460,8 +1460,14 @@ sub prepare_variables {
my ($self, %options) = @_;
return undef if (!defined($options{value}));
$options{value} =~ s/%\(([a-zA-Z0-9\._:]+?)\)/\$expand->{'$1'}/g;
return $options{value};
while ($options{value} =~ /%\(([a-zA-Z0-9\.]+?)\)/g) {
next if ($1 =~ /^http\./);
$options{value} =~ s/%\(($1)\)/\$expand->{'$1'}/g;
}
my $expression = $self->substitute_string(value => $options{value});
return $expression;
}
sub check_filter {

10
centreon-plugins/apps/protocols/snmp/mode/collection.pm
View File

@ -1318,8 +1318,14 @@ sub prepare_variables {
my ($self, %options) = @_;
return undef if (!defined($options{value}));
$options{value} =~ s/%\(([a-zA-Z0-9\.]+?)\)/\$expand->{'$1'}/g;
return $options{value};
while ($options{value} =~ /%\(([a-zA-Z0-9\.]+?)\)/g) {
next if ($1 =~ /^snmp\./);
$options{value} =~ s/%\(($1)\)/\$expand->{'$1'}/g;
}
my $expression = $self->substitute_string(value => $options{value});
return $expression;
}
sub check_filter {

10
centreon-plugins/centreon/common/protocols/sql/mode/collection.pm
View File

@ -1222,8 +1222,14 @@ sub prepare_variables {
my ($self, %options) = @_;
return undef if (!defined($options{value}));
$options{value} =~ s/%\(([a-zA-Z0-9\._:]+?)\)/\$expand->{'$1'}/g;
return $options{value};
while ($options{value} =~ /%\(([a-zA-Z0-9\.]+?)\)/g) {
next if ($1 =~ /^sql\./);
$options{value} =~ s/%\(($1)\)/\$expand->{'$1'}/g;
}
my $expression = $self->substitute_string(value => $options{value});
return $expression;
}
sub check_filter {