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

Added missing fields to alert snmp actions

This commit is contained in:
Luis 2021-05-12 12:54:36 +00:00 committed by Daniel Rodriguez
parent 4e871ed296
commit 7d56552e72
4 changed files with 39 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pandora_console/extras/mr/47.sql Normal file
View File

@ -0,0 +1,9 @@
START TRANSACTION;
ALTER TABLE `talert_snmp_action` ADD COLUMN `al_field16` TEXT NOT NULL AFTER `al_field15`;
ALTER TABLE `talert_snmp_action` ADD COLUMN `al_field17` TEXT NOT NULL AFTER `al_field16`;
ALTER TABLE `talert_snmp_action` ADD COLUMN `al_field18` TEXT NOT NULL AFTER `al_field17`;
ALTER TABLE `talert_snmp_action` ADD COLUMN `al_field19` TEXT NOT NULL AFTER `al_field18`;
ALTER TABLE `talert_snmp_action` ADD COLUMN `al_field20` TEXT NOT NULL AFTER `al_field19`;
COMMIT;

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

@ -1334,6 +1334,11 @@ ALTER TABLE talert_snmp_action ADD COLUMN `al_field12` TEXT NOT NULL DEFAULT "";
ALTER TABLE talert_snmp_action ADD COLUMN `al_field13` TEXT NOT NULL DEFAULT "";
ALTER TABLE talert_snmp_action ADD COLUMN `al_field14` TEXT NOT NULL DEFAULT "";
ALTER TABLE talert_snmp_action ADD COLUMN `al_field15` TEXT NOT NULL DEFAULT "";
ALTER TABLE `talert_snmp_action` ADD COLUMN `al_field16` TEXT NOT NULL AFTER `al_field15`;
ALTER TABLE `talert_snmp_action` ADD COLUMN `al_field17` TEXT NOT NULL AFTER `al_field16`;
ALTER TABLE `talert_snmp_action` ADD COLUMN `al_field18` TEXT NOT NULL AFTER `al_field17`;
ALTER TABLE `talert_snmp_action` ADD COLUMN `al_field19` TEXT NOT NULL AFTER `al_field18`;
ALTER TABLE `talert_snmp_action` ADD COLUMN `al_field20` TEXT NOT NULL AFTER `al_field19`;
-- ----------------------------------------------------------------------
-- Table `tserver`

5
pandora_console/pandoradb.sql
View File

@ -2263,6 +2263,11 @@ CREATE TABLE IF NOT EXISTS `talert_snmp_action` (
`al_field13` text NOT NULL,
`al_field14` text NOT NULL,
`al_field15` text NOT NULL,
`al_field16` text NOT NULL,
`al_field17` text NOT NULL,
`al_field18` text NOT NULL,
`al_field19` text NOT NULL,
`al_field20` text NOT NULL,
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;

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

@ -4031,6 +4031,12 @@ sub pandora_evaluate_snmp_alerts ($$$$$$$$$) {
$alert->{'al_field13'} = subst_alert_macros ($alert->{'al_field13'}, \%macros);
$alert->{'al_field14'} = subst_alert_macros ($alert->{'al_field14'}, \%macros);
$alert->{'al_field15'} = subst_alert_macros ($alert->{'al_field15'}, \%macros);
$alert->{'al_field16'} = subst_alert_macros ($alert->{'al_field16'}, \%macros);
$alert->{'al_field17'} = subst_alert_macros ($alert->{'al_field17'}, \%macros);
$alert->{'al_field18'} = subst_alert_macros ($alert->{'al_field18'}, \%macros);
$alert->{'al_field19'} = subst_alert_macros ($alert->{'al_field19'}, \%macros);
$alert->{'al_field20'} = subst_alert_macros ($alert->{'al_field20'}, \%macros);
# Check time threshold
$alert->{'last_fired'} = '1970-01-01 00:00:00' unless defined ($alert->{'last_fired'});
@ -4070,6 +4076,14 @@ sub pandora_evaluate_snmp_alerts ($$$$$$$$$) {
'field13' => $alert->{'al_field13'},
'field14' => $alert->{'al_field14'},
'field15' => $alert->{'al_field15'},
'field16' => $alert->{'al_field16'},
'field17' => $alert->{'al_field17'},
'field18' => $alert->{'al_field18'},
'field19' => $alert->{'al_field19'},
'field20' => $alert->{'al_field20'},
'description' => $alert->{'description'},
'times_fired' => $times_fired,
'time_threshold' => 0,
@ -4155,6 +4169,12 @@ sub pandora_evaluate_snmp_alerts ($$$$$$$$$) {
'field13' => $other_alert->{'al_field13'},
'field14' => $other_alert->{'al_field14'},
'field15' => $other_alert->{'al_field15'},
'field16' => $other_alert->{'al_field16'},
'field17' => $other_alert->{'al_field17'},
'field18' => $other_alert->{'al_field18'},
'field19' => $other_alert->{'al_field19'},
'field20' => $other_alert->{'al_field20'},
'description' => '',
'times_fired' => $times_fired,
'time_threshold' => 0,