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

2012-12-17 Sancho Lerena <slerena@artica.es> 

* util/pandora_db.pl: Added feature to delete
        inventory data older than X days (taken from
        deletion for regular data).




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7293 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
slerena 2012-12-17 17:11:00 +00:00
parent 276dc53b02
commit ea703fe557
2 changed files with 43 additions and 9 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 @@
2012-12-17 Sancho Lerena <slerena@artica.es>
* util/pandora_db.pl: Added feature to delete
inventory data older than X days (taken from
deletion for regular data).
2012-12-17 Sergio Martin <sergio.martin@artica.es>
* lib/PandoraFMS/DataServer.pm: Unset a missed data of the

46
pandora_server/util/pandora_db.pl
View File

@ -30,7 +30,7 @@ use PandoraFMS::Tools;
use PandoraFMS::DB;
# version: define current version
my $version = "5.0dev PS120621";
my $version = "5.0dev PS121217";
# Pandora server configuration
my %conf;
@ -110,6 +110,35 @@ sub pandora_purgedb ($$) {
print "[PURGE] No data in tagente_datos\n";
}
# Delete inventory data, only if enterprise is enabled
# We use the same value than regular data purge interval
if (enterprise_load (\%conf) != 0) {
print "[PURGE] Deleting old inventory data... \n";
# This could be very timing consuming, so make
# this operation in $BIG_OPERATION_STEP
# steps (100 fixed by default)
# Starting from the oldest record on the table
$first_mark = get_db_value ($dbh, 'SELECT utimestamp FROM tagente_datos_inventory ORDER BY utimestamp ASC LIMIT 1');
if (defined ($first_mark)) {
$total_time = $ulimit_timestamp - $first_mark;
$purge_steps = int($total_time / $BIG_OPERATION_STEP);
for (my $ax = 1; $ax <= $BIG_OPERATION_STEP; $ax++){
db_do ($dbh, "DELETE FROM tagente_datos_inventory WHERE utimestamp < ". ($first_mark + ($purge_steps * $ax)) . " AND utimestamp >= ". $first_mark );
print "[PURGE] Inventory data deletion Progress %$ax .. \r";
}
print "\n";
} else {
print "[PURGE] No data in tagente_datos_inventory\n";
}
}
#
# Now the log4x data
#
@ -175,6 +204,7 @@ sub pandora_purgedb ($$) {
my $trap_limit = time() - 86400 * $conf->{'_trap_purge'};
$trap_limit = strftime ("%Y-%m-%d %H:%M:%S", localtime($trap_limit));
print "[PURGE] Deleting old SNMP traps data (More than " . $conf->{'__trap_purge'} . " days)... \n";
db_do($dbh, "DELETE FROM ttrap WHERE timestamp < '$trap_limit'");
# Delete policy queue data
@ -187,6 +217,7 @@ sub pandora_purgedb ($$) {
my $gis_limit = time() - 86400 * $conf->{'_gis_purge'};
$gis_limit = strftime ("%Y-%m-%d %H:%M:%S", localtime($gis_limit));
print "[PURGE] Deleting old GID data (More than " . $conf->{'__gis_purge'} . " days)... \n";
db_do($dbh, "DELETE FROM tgis_data_history WHERE end_timestamp < '$gis_limit'");
# Delete pending modules
@ -198,7 +229,7 @@ sub pandora_purgedb ($$) {
my $buffer = 1000;
my $id_module = $module->{'id_agente_modulo'};
print " Deleting data for module " . $id_module . "\n";
print " + Deleting data for module " . $id_module . "\n";
while(1) {
my $nstate = get_db_value ($dbh, 'SELECT count(id_agente_modulo) FROM tagente_estado WHERE id_agente_modulo=?', $id_module);
@ -553,12 +584,8 @@ sub pandora_checkdb_consistency {
##############################################################################
sub help_screen{
print "Usage: $0 <path to pandora_server.conf> [options]\n\n";
print "\n\tAvailable options:\n";
#~ print "\t\t-d Debug output (very verbose).\n";
#~ print "\t\t-v Verbose output.\n";
#~ print "\t\t-q Quiet output.\n";
print "\t\t-p Only purge and consistency check, skip compact.\n\n";
exit;
print "\t\t-p Only purge and consistency check, skip compact.\n\n";
exit -1;
}
###############################################################################
@ -593,5 +620,6 @@ sub pandoradb_main ($$$) {
db_do ($dbh, "DELETE FROM tconfig WHERE token = 'db_maintance'");
db_do ($dbh, "INSERT INTO tconfig (token, value) VALUES ('db_maintance', '".time()."')");
print "Ending at ". strftime ("%Y-%m-%d %H:%M:%S", localtime()) . "\n";
print "\nEnding at ". strftime ("%Y-%m-%d %H:%M:%S", localtime()) . "\n";
exit 0;
}