From cfd5d31396ff39862fe7c88835cd9056d23e5ea4 Mon Sep 17 00:00:00 2001 From: ramonn Date: Tue, 20 Jul 2010 16:30:18 +0000 Subject: [PATCH] 2010-07-20 Ramon Novoa * lib/PandoraFMS/SNMPServer.pm: Add extended information when saving an SNMP trap to a module. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3042 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_server/ChangeLog | 5 +++++ pandora_server/lib/PandoraFMS/SNMPServer.pm | 6 +----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog index 6c96a0a68b..47445cd7eb 100644 --- a/pandora_server/ChangeLog +++ b/pandora_server/ChangeLog @@ -1,3 +1,8 @@ +2010-07-20 Ramon Novoa + + * lib/PandoraFMS/SNMPServer.pm: Add extended information when saving + an SNMP trap to a module. + 2010-07-20 Ramon Novoa * pandora_server_installer: Delete the spool/pandora directory diff --git a/pandora_server/lib/PandoraFMS/SNMPServer.pm b/pandora_server/lib/PandoraFMS/SNMPServer.pm index 734e2bdb0e..5887d10683 100644 --- a/pandora_server/lib/PandoraFMS/SNMPServer.pm +++ b/pandora_server/lib/PandoraFMS/SNMPServer.pm @@ -109,8 +109,6 @@ sub pandora_snmptrapd { # Skip already processed lines readline SNMPLOGFILE for (1..$last_line); - my $trap2agent = enterprise_hook('snmp_get_trap2agent', [$dbh]); - # Main loop while (1) { while (my $line = ) { @@ -144,7 +142,7 @@ sub pandora_snmptrapd { $custom_value = $data if ($custom_value eq ''); # Insert the trap into the DB - if (! defined(enterprise_hook ('snmp_insert_trap', [$pa_config, $source, $oid, $type, $value, $custom_oid, $custom_value, $custom_type, $timestamp, $dbh]))) { + if (! defined(enterprise_hook ('snmp_insert_trap', [$pa_config, $source, $oid, $type, $value, $custom_oid, $custom_value, $custom_type, $timestamp, $self->getServerID (), $dbh]))) { my $trap_id = db_insert ($dbh, 'INSERT INTO ttrap (timestamp, source, oid, type, value, oid_custom, value_custom, type_custom) VALUES (?, ?, ?, ?, ?, ?, ?, ?)', $timestamp, $source, $oid, $type, $value, $custom_oid, $custom_value, $custom_type); logger ($pa_config, "Received SNMP Trap from $source", 4); @@ -152,8 +150,6 @@ sub pandora_snmptrapd { # Evaluate alerts for this trap pandora_evaluate_snmp_alerts ($pa_config, $trap_id, $source, $oid, $oid, $custom_oid, $custom_value, $dbh); } - - enterprise_hook ('snmp_trap2agent', [$trap2agent, $pa_config, $source, $oid, $value, $custom_oid, $custom_value, $timestamp, $self->getServerID (), $dbh]); } sleep ($pa_config->{'server_threshold'});