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

Merge branch '2488-ue-plugin-updates' into 'develop' 

Added extra compat. to print_module (plugintools)

See merge request artica/pandorafms!1620
This commit is contained in:
vgilc 2018-08-01 15:20:55 +02:00
parent fcda8f56f9 3cc1f815ff
commit 86122be7e7
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pandora_server/lib/PandoraFMS/PluginTools.pm
View File

@ -461,9 +461,7 @@ sub print_agent {
# print_module # print_module
################################################################################ ################################################################################
sub print_module { sub print_module {
my $conf = shift; my ($conf, $data, $not_print_flag) = @_;
my $data = shift;
my $not_print_flag = shift;
if ((ref($data) ne "HASH") || (!defined $data->{name})) { if ((ref($data) ne "HASH") || (!defined $data->{name})) {
return undef; return undef;
@ -476,9 +474,21 @@ sub print_module {
} }
$data->{value} = '' if empty($data->{value}); $data->{value} = '' if empty($data->{value});
$data->{tags} = $data->{tags}?$data->{tags}:($conf->{MODULE_TAG_LIST}?$conf->{MODULE_TAG_LIST}:undef);
$data->{interval} = $data->{interval}?$data->{interval}:($conf->{MODULE_INTERVAL}?$conf->{MODULE_INTERVAL}:undef); $data->{tags} = ($data->{tags} ?
$data->{module_group} = $data->{module_group}?$data->{module_group}:($conf->{MODULE_GROUP}?$conf->{MODULE_GROUP}:undef); $data->{tags} : ($conf->{MODULE_TAG_LIST} ?
$conf->{MODULE_TAG_LIST} : ($conf->{module_tag_list} ?
$conf->{module_tag_list} : undef)));
$data->{interval} = ($data->{interval} ?
$data->{interval} : ($conf->{MODULE_INTERVAL} ?
$conf->{MODULE_INTERVAL} : ($conf->{module_interval} ?
$conf->{module_interval} : undef)));
$data->{module_group} = ($data->{module_group} ?
$data->{module_group} : ($conf->{MODULE_GROUP} ?
$conf->{MODULE_GROUP} : ( $conf->{module_group} ?
$conf->{module_group} : undef)));
# Global instructions (if defined) # Global instructions (if defined)