tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-29 16:55:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

[Rebranding] Change alert action Pandora FMS Event to Monitoring Event

Browse Source
This commit is contained in:
fermin831 2018-05-24 11:16:30 +02:00
parent bcb3af09ca
commit 66dfd9b171
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pandora_console/extras/mr/16.sql Normal file
View File

@ -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;

1
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
View File

@ -1123,6 +1123,7 @@ UPDATE talert_actions SET `field4` = 'integria',
`field9` = 'admin', `field9` = 'admin',
`field10` = '_alert_description_' `field10` = '_alert_description_'
WHERE `id` = 4 AND `id_alert_command` = 11; 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 `field11` TEXT NOT NULL DEFAULT "";
ALTER TABLE talert_actions ADD COLUMN `field12` 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 ""; ALTER TABLE talert_actions ADD COLUMN `field13` TEXT NOT NULL DEFAULT "";

4
pandora_server/lib/PandoraFMS/Core.pm
View File

@ -822,7 +822,7 @@ sub pandora_execute_alert ($$$$$$$$$;$) {
if (time () >= ($action->{'last_execution'} + $threshold)) { if (time () >= ($action->{'last_execution'} + $threshold)) {
# Does the action generate an event? # 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; $event_generated = 1;
} }
@ -1290,7 +1290,7 @@ sub pandora_execute_action ($$$$$$$$$;$) {
} }
# Pandora FMS Event # 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); $field1 = subst_alert_macros ($field1, \%macros, $pa_config, $dbh, $agent, $module);
$field3 = subst_alert_macros ($field3, \%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); $field4 = subst_alert_macros ($field4, \%macros, $pa_config, $dbh, $agent, $module);