From b2d2d7f3a999dd9a140053d059333ad84ef844c9 Mon Sep 17 00:00:00 2001 From: Ramon Novoa Date: Fri, 8 Jul 2011 11:21:49 +0000 Subject: [PATCH] 2011-07-08 Ramon Novoa * pandoradb_data.sql, include/functions_config.php, pandoradb.data.postgreSQL.sql, pandoradb.data.oracle.sql, godmode/setup/performance.php: Added support for unknown module deletion. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4537 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 10 +++++++++- pandora_console/godmode/setup/performance.php | 3 +++ pandora_console/include/functions_config.php | 1 + pandora_console/pandoradb.data.oracle.sql | 1 + pandora_console/pandoradb.data.postgreSQL.sql | 1 + pandora_console/pandoradb_data.sql | 1 + 6 files changed, 16 insertions(+), 1 deletion(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 349b1e929e..abf2483a7f 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,12 @@ +2011-07-08 Ramon Novoa + + * pandoradb_data.sql, + include/functions_config.php, + pandoradb.data.postgreSQL.sql, + pandoradb.data.oracle.sql, + godmode/setup/performance.php: Added support for unknown module + deletion. + 2011-07-08 Sergio Martin * pandoradb.sql @@ -104,7 +113,6 @@ pandoradb.data.oracle.sql: Default skin applied to all groups by default. ->>>>>>> .r4523 2011-07-06 Juan Manuel Ramon * include/styles/pandora.css diff --git a/pandora_console/godmode/setup/performance.php b/pandora_console/godmode/setup/performance.php index 052ba91620..8d93e73044 100644 --- a/pandora_console/godmode/setup/performance.php +++ b/pandora_console/godmode/setup/performance.php @@ -88,6 +88,9 @@ $table->data[14][0] = __('Use agent access graph') . ui_print_help_icon("agent_a $table->data[14][1] = __('Yes').' '.html_print_radio_button ('agentaccess', 1, '', $config["agentaccess"], true).'  '; $table->data[14][1] .= __('No').' '.html_print_radio_button ('agentaccess', 0, '', $config["agentaccess"], true); +$table->data[15][0] = __('Max. days before delete unknown modules'); +$table->data[15][1] = html_print_input_text ('days_delete_unknown', $config["days_delete_unknown"], '', 5, 5, true); + echo '
'; html_print_input_hidden ('update_config', 1); html_print_table ($table); diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php index 42d060dc42..25d6633439 100644 --- a/pandora_console/include/functions_config.php +++ b/pandora_console/include/functions_config.php @@ -146,6 +146,7 @@ function config_update_config () { config_update_value ('remote_config', (string) get_parameter ('remote_config', $config["remote_config"])); config_update_value ('block_size', (int) get_parameter ('block_size', $config["block_size"])); config_update_value ('days_purge', (int) get_parameter ('days_purge', $config["days_purge"])); + config_update_value ('days_delete_unknown', (int) get_parameter ('days_delete_unknown', $config["days_delete_unknown"])); config_update_value ('days_compact', (int) get_parameter ('days_compact', $config["days_compact"])); config_update_value ('graph_res', (int) get_parameter ('graph_res', $config["graph_res"])); config_update_value ('step_compact', (int) get_parameter ('step_compact', $config["step_compact"])); diff --git a/pandora_console/pandoradb.data.oracle.sql b/pandora_console/pandoradb.data.oracle.sql index 2753b6c167..758ae16e61 100644 --- a/pandora_console/pandoradb.data.oracle.sql +++ b/pandora_console/pandoradb.data.oracle.sql @@ -47,6 +47,7 @@ LOCK TABLE tconfig IN EXCLUSIVE MODE; INSERT INTO tconfig (token, value) VALUES ('language','en_GB'); INSERT INTO tconfig (token, value) VALUES ('block_size','20'); INSERT INTO tconfig (token, value) VALUES ('days_purge','60'); +INSERT INTO tconfig (token, value) VALUES ('days_delete_unknown','0'); INSERT INTO tconfig (token, value) VALUES ('days_compact','15'); INSERT INTO tconfig (token, value) VALUES ('graph_res','5'); INSERT INTO tconfig (token, value) VALUES ('step_compact','1'); diff --git a/pandora_console/pandoradb.data.postgreSQL.sql b/pandora_console/pandoradb.data.postgreSQL.sql index 37fa09befd..3d0d87b6a7 100644 --- a/pandora_console/pandoradb.data.postgreSQL.sql +++ b/pandora_console/pandoradb.data.postgreSQL.sql @@ -44,6 +44,7 @@ INSERT INTO "tconfig" ("token", "value") VALUES ('language','en_GB'), ('block_size','20'), ('days_purge','60'), +('days_delete_unknown','0'), ('days_compact','15'), ('graph_res','5'), ('step_compact','1'), diff --git a/pandora_console/pandoradb_data.sql b/pandora_console/pandoradb_data.sql index 4e1527b196..629d3fa5b6 100644 --- a/pandora_console/pandoradb_data.sql +++ b/pandora_console/pandoradb_data.sql @@ -43,6 +43,7 @@ INSERT INTO `tconfig` (`token`, `value`) VALUES ('language','en_GB'), ('block_size','20'), ('days_purge','60'), +('days_delete_unknown','0'), ('days_compact','15'), ('graph_res','5'), ('step_compact','1'),