diff --git a/pandora_console/extras/mr/16.sql b/pandora_console/extras/mr/16.sql new file mode 100644 index 0000000000..354d3377f2 --- /dev/null +++ b/pandora_console/extras/mr/16.sql @@ -0,0 +1,8 @@ +START TRANSACTION; + +INSERT INTO `tconfig` (`token`, `value`) VALUES ('custom_docs_logo', 'default_docs.png'); +INSERT INTO `tconfig` (`token`, `value`) VALUES ('custom_support_logo', 'default_support.png'); + +UPDATE talert_actions SET name='Monitoring Event' WHERE name='Pandora FMS Event'; + +COMMIT; \ No newline at end of file diff --git a/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql b/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql index b8f41cedf4..551225e14d 100644 --- a/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql +++ b/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql @@ -1123,6 +1123,7 @@ UPDATE talert_actions SET `field4` = 'integria', `field9` = 'admin', `field10` = '_alert_description_' WHERE `id` = 4 AND `id_alert_command` = 11; +UPDATE talert_actions SET name='Monitoring Event' WHERE name='Pandora FMS Event'; ALTER TABLE talert_actions ADD COLUMN `field11` TEXT NOT NULL DEFAULT ""; ALTER TABLE talert_actions ADD COLUMN `field12` TEXT NOT NULL DEFAULT ""; ALTER TABLE talert_actions ADD COLUMN `field13` TEXT NOT NULL DEFAULT ""; diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm index c3e0bba259..f5e1c1ff30 100644 --- a/pandora_server/lib/PandoraFMS/Core.pm +++ b/pandora_server/lib/PandoraFMS/Core.pm @@ -822,7 +822,7 @@ sub pandora_execute_alert ($$$$$$$$$;$) { if (time () >= ($action->{'last_execution'} + $threshold)) { # Does the action generate an event? - if (safe_output($action->{'name'}) eq "Pandora FMS Event") { + if (safe_output($action->{'name'}) eq "Monitoring Event") { $event_generated = 1; } @@ -1290,7 +1290,7 @@ sub pandora_execute_action ($$$$$$$$$;$) { } # Pandora FMS Event - } elsif ($clean_name eq "Pandora FMS Event") { + } elsif ($clean_name eq "Monitoring Event") { $field1 = subst_alert_macros ($field1, \%macros, $pa_config, $dbh, $agent, $module); $field3 = subst_alert_macros ($field3, \%macros, $pa_config, $dbh, $agent, $module); $field4 = subst_alert_macros ($field4, \%macros, $pa_config, $dbh, $agent, $module);