Menu
▾
▴
[Perfparse-cvs] _perfparse/db_tools perfparse-db-purge.c,1.2,1.3
|
From: Florian G. <re...@us...> - 2006-10-31 15:28:41
|
Update of /cvsroot/perfparse/_perfparse/db_tools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv418 Modified Files: perfparse-db-purge.c Log Message: uncommented nagios output text and removed surrounding transaction since this transaction may run far too long Index: perfparse-db-purge.c =================================================================== RCS file: /cvsroot/perfparse/_perfparse/db_tools/perfparse-db-purge.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** perfparse-db-purge.c 15 Nov 2005 10:28:13 -0000 1.2 --- perfparse-db-purge.c 31 Oct 2006 15:28:36 -0000 1.3 *************** *** 4,8 **** * * Copyright (c) 2004 Ben Clewett (per...@cl...) ! * Last Modified: 2004-05-28 * * License: --- 4,8 ---- * * Copyright (c) 2004 Ben Clewett (per...@cl...) ! * $Id$ * * License: *************** *** 147,153 **** void now_purge() { - if (!config_get_value_as_boolean(CONFIG_ITEM_ID_NO_TRANSACTIONS)) { - query("START TRANSACTION"); - } deleteDaysOld(); --- 147,150 ---- *************** *** 161,168 **** deleteRawData(); - if (!config_get_value_as_boolean(CONFIG_ITEM_ID_NO_TRANSACTIONS)) { - query("COMMIT"); - } - } --- 158,161 ---- *************** *** 268,275 **** #ifdef USE_SOURCE_NAGIOS - /* printf("| %-75s |\n", _("There are no Hosts, Services or Metrics marked for deletion today.")); #elseif USE_SOURCE_ASNMTAP - */ printf("| %-75s |\n", _("There are no Plugins, Unique Key or Metrics marked for deletion today.")); #endif --- 261,266 ---- *************** *** 284,291 **** #ifdef USE_SOURCE_NAGIOS - /* printf("| %-75s |\n", _("Please ensure that NO data for these hosts will be added during deletion.")); #elseif USE_SOURCE_ASNMTAP - */ printf("| %-75s |\n", _("Please ensure that NO data for these plugins will be added during deletion.")); #endif --- 275,280 ---- *************** *** 295,303 **** #ifdef USE_SOURCE_NAGIOS - /* printf("| %-66s %08d |\n", _("Hosts marked for deletion:"), iCountHost); printf("| %-66s %08d |\n", _("Services marked for deletion:"), iCountService); #elseif USE_SOURCE_ASNMTAP - */ printf("| %-66s %08d |\n", _("Plugins marked for deletion:"), iCountHost); printf("| %-66s %08d |\n", _("Unique Keys marked for deletion:"), iCountService); --- 284,290 ---- *************** *** 326,333 **** if (config_get_value_as_boolean(CONFIG_ITEM_ID_DO_REPORT)) { #ifdef USE_SOURCE_NAGIOS - /* printf("| %-66s %08d |\n", _("Table: Binary Summary Data, by Host deletion."), iRowsAffected); #elseif USE_SOURCE_ASNMTAP - */ printf("| %-66s %08d |\n", _("Table: Binary Summary Data, by Plugin deletion."), iRowsAffected); #endif --- 313,318 ---- *************** *** 352,359 **** if (config_get_value_as_boolean(CONFIG_ITEM_ID_DO_REPORT)) { #ifdef USE_SOURCE_NAGIOS - /* printf("| %-66s %08d |\n", _("Table: Binary Summary Data, by Service deletion."), iRowsAffected); #elseif USE_SOURCE_ASNMTAP - */ printf("| %-66s %08d |\n", _("Table: Binary Summary Data, by Unique Key deletion."), iRowsAffected); #endif --- 337,342 ---- *************** *** 396,403 **** if (config_get_value_as_boolean(CONFIG_ITEM_ID_DO_REPORT)) { #ifdef USE_SOURCE_NAGIOS - /* printf("| %-66s %08d |\n", _("Table: Binary Summary Header, by Host deletion"), iRowsAffected); #elseif USE_SOURCE_ASNMTAP - */ printf("| %-66s %08d |\n", _("Table: Binary Summary Header, by Plugin deletion"), iRowsAffected); #endif --- 379,384 ---- *************** *** 422,429 **** if (config_get_value_as_boolean(CONFIG_ITEM_ID_DO_REPORT)) { #ifdef USE_SOURCE_NAGIOS - /* printf("| %-66s %08d |\n", _("Table: Binary Summary Header, by Service deletion"), iRowsAffected); #elseif USE_SOURCE_ASNMTAP - */ printf("| %-66s %08d |\n", _("Table: Binary Summary Header, by Unique Key deletion"), iRowsAffected); #endif --- 403,408 ---- *************** *** 469,476 **** if (config_get_value_as_boolean(CONFIG_ITEM_ID_DO_REPORT)) { #ifdef USE_SOURCE_NAGIOS - /* printf("| %-66s %08d |\n", _("Table: Raw Summary Data, by Host deletion."), iRowsAffected); #elseif USE_SOURCE_ASNMTAP - */ printf("| %-66s %08d |\n", _("Table: Raw Summary Data, by Plugin deletion."), iRowsAffected); #endif --- 448,453 ---- *************** *** 494,501 **** if (config_get_value_as_boolean(CONFIG_ITEM_ID_DO_REPORT)) { #ifdef USE_SOURCE_NAGIOS - /* printf("| %-66s %08d |\n", _("Table: Raw Summary Data, by Service deletion."), iRowsAffected); #elseif USE_SOURCE_ASNMTAP - */ printf("| %-66s %08d |\n", _("Table: Raw Summary Data, by Unique Key deletion."), iRowsAffected); #endif --- 471,476 ---- *************** *** 521,528 **** if (config_get_value_as_boolean(CONFIG_ITEM_ID_DO_REPORT)) { #ifdef USE_SOURCE_NAGIOS - /* printf("| %-66s %08d |\n", _("Table: Raw Summary Header, by Host deletion."), iRowsAffected); #elseif USE_SOURCE_ASNMTAP - */ printf("| %-66s %08d |\n", _("Table: Raw Summary Header, by Plugin deletion."), iRowsAffected); #endif --- 496,501 ---- *************** *** 547,554 **** if (config_get_value_as_boolean(CONFIG_ITEM_ID_DO_REPORT)) { #ifdef USE_SOURCE_NAGIOS - /* printf("| %-66s %08d |\n", _("Table: Raw Summary Header, by Service deletion."), iRowsAffected); #elseif USE_SOURCE_ASNMTAP - */ printf("| %-66s %08d |\n", _("Table: Raw Summary Header, by Unique Key deletion."), iRowsAffected); #endif --- 520,525 ---- *************** *** 576,583 **** if (config_get_value_as_boolean(CONFIG_ITEM_ID_DO_REPORT)) { #ifdef USE_SOURCE_NAGIOS - /* printf("| %-66s %08d |\n", _("Table: Raw Data, by Host deletion."), iRowsAffected); #elseif USE_SOURCE_ASNMTAP - */ printf("| %-66s %08d |\n", _("Table: Raw Data, by Plugin deletion."), iRowsAffected); #endif --- 547,552 ---- *************** *** 602,609 **** if (config_get_value_as_boolean(CONFIG_ITEM_ID_DO_REPORT)) { #ifdef USE_SOURCE_NAGIOS - /* printf("| %-66s %08d |\n", _("Table: Raw Data, by Service deletion."), iRowsAffected); #elseif USE_SOURCE_ASNMTAP - */ printf("| %-66s %08d |\n", _("Table: Raw Data, by Unique Key deletion."), iRowsAffected); #endif --- 571,576 ---- *************** *** 630,637 **** if (config_get_value_as_boolean(CONFIG_ITEM_ID_DO_REPORT)) { #ifdef USE_SOURCE_NAGIOS - /* printf("| %-66s %08d |\n", _("Table: Binary Data, by Host deletion."), iRowsAffected); #elseif USE_SOURCE_ASNMTAP - */ printf("| %-66s %08d |\n", _("Table: Binary Data, by Plugin deletion."), iRowsAffected); #endif --- 597,602 ---- *************** *** 657,664 **** if (config_get_value_as_boolean(CONFIG_ITEM_ID_DO_REPORT)) { #ifdef USE_SOURCE_NAGIOS - /* printf("| %-66s %08d |\n", _("Table: Binary Data, by Service deletion"), iRowsAffected); #elseif USE_SOURCE_ASNMTAP - */ printf("| %-66s %08d |\n", _("Table: Binary Data, by Unique Keys deletion"), iRowsAffected); #endif --- 622,627 ---- *************** *** 706,713 **** if (config_get_value_as_boolean(CONFIG_ITEM_ID_DO_REPORT)) { #ifdef USE_SOURCE_NAGIOS - /* printf("| %-66s %08d |\n", _("Table: Metrics, by Host deletion."), iRowsAffected); #elseif USE_SOURCE_ASNMTAP - */ printf("| %-66s %08d |\n", _("Table: Metrics, by Plugin deletion."), iRowsAffected); #endif --- 669,674 ---- *************** *** 732,739 **** if (config_get_value_as_boolean(CONFIG_ITEM_ID_DO_REPORT)) { #ifdef USE_SOURCE_NAGIOS - /* printf("| %-66s %08d |\n", _("Table: Metrics, by Service deletion."), iRowsAffected); #elseif USE_SOURCE_ASNMTAP - */ printf("| %-66s %08d |\n", _("Table: Metrics, by Unique Key deletion."), iRowsAffected); #endif --- 693,698 ---- *************** *** 775,782 **** if (config_get_value_as_boolean(CONFIG_ITEM_ID_DO_REPORT)) { #ifdef USE_SOURCE_NAGIOS - /* printf("| %-66s %08d |\n", _("Table: Services, by Host deletion."), iRowsAffected); #elseif USE_SOURCE_ASNMTAP - */ printf("| %-66s %08d |\n", _("Table: Unique Keys, by Plugin deletion."), iRowsAffected); #endif --- 734,739 ---- *************** *** 798,805 **** if (config_get_value_as_boolean(CONFIG_ITEM_ID_DO_REPORT)) { #ifdef USE_SOURCE_NAGIOS - /* printf("| %-66s %08d |\n", _("Table: Services, by Service deletion."), iRowsAffected); #elseif USE_SOURCE_ASNMTAP - */ printf("| %-66s %08d |\n", _("Table: Unique Keys, by Service deletion."), iRowsAffected); #endif --- 755,760 ---- *************** *** 823,830 **** if (config_get_value_as_boolean(CONFIG_ITEM_ID_DO_REPORT)) { #ifdef USE_SOURCE_NAGIOS - /* printf("| %-66s %08d |\n", _("Table: Host, by Host deletion."), iRowsAffected); #elseif USE_SOURCE_ASNMTAP - */ printf("| %-66s %08d |\n", _("Table: Plugin, by Plugin deletion."), iRowsAffected); #endif --- 778,783 ---- *************** *** 865,868 **** --- 818,822 ---- iDeleted += iDelete; + g_string_printf(s_SQL, "DELETE FROM perfdata_service_bin WHERE ctime < NOW() - INTERVAL %d DAY", iDeleteDaysOld); *************** *** 871,874 **** --- 825,829 ---- iDeleted += iDelete; + if (config_get_value_as_boolean(CONFIG_ITEM_ID_DO_REPORT)) { printf(_(" %7d Records deleted. |\n"), iDelete); *************** *** 974,981 **** #ifdef USE_SOURCE_NAGIOS - /* printf(_("| Service | Policy | Deleted |\n")); #elseif USE_SOURCE_ASNMTAP - */ printf(_("| Unique Key | Policy | Deleted |\n")); #endif --- 929,934 ---- |
