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

Updated DataServer to accept 'alert_template' directive.

This commit is contained in:
Hirofumi Kosaka 2016-01-13 15:25:47 +09:00
parent 9b46a08991
commit fae63047ef
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -540,7 +540,7 @@ sub process_module_data ($$$$$$$$$) {
'datalist' => 0, 'status' => 0, 'unit' => 0, 'timestamp' => 0, 'module_group' => 0, 'custom_id' => '',
'str_warning' => '', 'str_critical' => '', 'critical_instructions' => '', 'warning_instructions' => '',
'unknown_instructions' => '', 'tags' => '', 'critical_inverse' => 0, 'warning_inverse' => 0, 'quiet' => 0,
'module_ff_interval' => 0};
'module_ff_interval' => 0, 'alert_template' => ''};
# Other tags will be saved here
$module_conf->{'extended_info'} = '';
@ -618,7 +618,13 @@ sub process_module_data ($$$$$$$$$) {
$module_tags = $module_conf->{'tags'};
delete $module_conf->{'tags'};
}
my $initial_alert_template = undef;
if(defined ($module_conf->{'alert_template'})) {
$initial_alert_template = $module_conf->{'alert_template'};
delete $module_conf->{'alert_template'};
}
# Create the module
my $module_id = pandora_create_module_from_hash ($pa_config, $module_conf, $dbh);
@ -645,7 +651,17 @@ sub process_module_data ($$$$$$$$$) {
}
}
}
# Assign alert-template if the spceicied one exists
if( $initial_alert_template ) {
my $id_alert_template = get_db_value ($dbh,
'SELECT id FROM talert_templates WHERE talert_templates.name = ?',
safe_input($initial_alert_template) );
if( defined($id_alert_template) ) {
pandora_create_template_module ($pa_config, $dbh, $module->{'id_agente_modulo'}, $id_alert_template);
}
}
}
else {
# Control NULL columns