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

2010-05-05 Ramon Novoa <rnovoa@artica.es> 

* lib/PandoraFMS/Core.pm: Use the data timestamp instead of the
          current time in the compression algorithm. Fixed regexps in
          SNMP alerts.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2668 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
Ramon Novoa 2010-05-05 13:42:15 +00:00
parent 4b8601207b
commit a49d5e830f
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_server/ChangeLog
View File

@ -1,3 +1,9 @@
2010-05-05 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/Core.pm: Use the data timestamp instead of the
current time in the compression algorithm. Fixed regexps in
SNMP alerts.
2010-04-30 Ramon Novoa <rnovoa@artica.es> 2010-04-30 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/Core.pm: Changed the behaviour of SNMP alerts. * lib/PandoraFMS/Core.pm: Changed the behaviour of SNMP alerts.

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

@ -753,7 +753,7 @@ sub pandora_process_module ($$$$$$$$$;$) {
} }
my $last_try = ($1 == 0) ? 0 : timelocal($6, $5, $4, $3, $2 - 1, $1 - 1900); my $last_try = ($1 == 0) ? 0 : timelocal($6, $5, $4, $3, $2 - 1, $1 - 1900);
my $save = ($module->{'history_data'} == 1 && ($agent_status->{'datos'} ne $processed_data || $last_try < (time() - 86400))) ? 1 : 0; my $save = ($module->{'history_data'} == 1 && ($agent_status->{'datos'} ne $processed_data || $last_try < ($utimestamp - 86400))) ? 1 : 0;
my $current_interval = ($module->{'module_interval'} == 0 ? $agent->{'intervalo'} : $module->{'module_interval'}); my $current_interval = ($module->{'module_interval'} == 0 ? $agent->{'intervalo'} : $module->{'module_interval'});
db_do ($dbh, 'UPDATE tagente_estado SET datos = ?, estado = ?, last_status = ?, status_changes = ?, utimestamp = ?, timestamp = ?, db_do ($dbh, 'UPDATE tagente_estado SET datos = ?, estado = ?, last_status = ?, status_changes = ?, utimestamp = ?, timestamp = ?,
@ -1235,21 +1235,21 @@ sub pandora_evaluate_snmp_alerts ($$$$$$$$) {
# OID # OID
my $oid = $alert->{'oid'}; my $oid = $alert->{'oid'};
if ($oid ne '') { if ($oid ne '') {
next if ($trap_oid !~ m/$oid/i && $trap_oid_text !~ m/$oid/i); next if ($trap_oid !~ m/^$oid$/i && $trap_oid_text !~ m/^$oid$/i);
$alert_data .= "OID: $oid "; $alert_data .= "OID: $oid ";
} }
# Custom OID/value # Custom OID/value
my $custom_oid = $alert->{'custom_oid'}; my $custom_oid = $alert->{'custom_oid'};
if ($custom_oid ne '') { if ($custom_oid ne '') {
next if ($trap_custom_value !~ m/$custom_oid/i && $trap_custom_oid !~ m/$custom_oid/i); next if ($trap_custom_value !~ m/^$custom_oid$/i && $trap_custom_oid !~ m/^$custom_oid$/i);
$alert_data .= "CUSTOM OID: $custom_oid "; $alert_data .= "CUSTOM OID: $custom_oid ";
} }
# Agent IP # Agent IP
my $agent = $alert->{'agent'}; my $agent = $alert->{'agent'};
if ($agent ne '') { if ($agent ne '') {
next if ($trap_agent !~ m/$agent/i ); next if ($trap_agent !~ m/^$agent$/i );
$alert_data .= "AGENT: $agent"; $alert_data .= "AGENT: $agent";
} }