diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 20e5ab0552..3bd5e36480 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,23 @@ +2012-10-23 Ramon Novoa + + * include/functions_cron.php: Added to repository. Cron related + functions. + + * include/functions_html.php, pandoradb.sql, + pandoradb.postgreSQL.sql, pandoradb.oracle.sql, + extras/pandoradb_migrate_4.0.x_to_5.0.mysql.sql, + extras/pandoradb_migrate_4.0.x_to_5.0.oracle.sql, + extras/pandoradb_migrate_4.0.x_to_5.0.postgreSQL.sql, + godmode/agentes/module_manager_editor_common.php, + godmode/agentes/configurar_agente.php, + godmode/agentes/module_manager_editor.php: Added support for remote + cron modules. + + * godmode/netflow/nf_item_list.php, + godmode/netflow/nf_report_item.php, + operation/netflow/nf_view.php, + include/functions_netflow.php: Added a description to report items. + 2012-10-16 Vanessa Gil * include/functions_events.php diff --git a/pandora_console/extras/pandoradb_migrate_4.0.x_to_5.0.mysql.sql b/pandora_console/extras/pandoradb_migrate_4.0.x_to_5.0.mysql.sql index d853182627..5c78d9dbea 100644 --- a/pandora_console/extras/pandoradb_migrate_4.0.x_to_5.0.mysql.sql +++ b/pandora_console/extras/pandoradb_migrate_4.0.x_to_5.0.mysql.sql @@ -35,6 +35,7 @@ CREATE TABLE IF NOT EXISTS `tnetflow_report_content` ( `id_rc` INTEGER UNSIGNED NOT NULL AUTO_INCREMENT, `id_report` INTEGER UNSIGNED NOT NULL default 0, `id_filter` INTEGER UNSIGNED NOT NULL default 0, + `description` TEXT NOT NULL, `date` bigint(20) NOT NULL default '0', `period` int(11) NOT NULL default 0, `max` int (11) NOT NULL default 0, @@ -152,6 +153,7 @@ ALTER TABLE `tagente_modulo` ADD COLUMN `warning_instructions` TEXT NOT NULL DEF ALTER TABLE `tagente_modulo` ADD COLUMN `unknown_instructions` TEXT NOT NULL DEFAULT ''; ALTER TABLE `tagente_modulo` ADD COLUMN `critical_inverse` tinyint(1) unsigned default '0'; ALTER TABLE `tagente_modulo` ADD COLUMN `warning_inverse` tinyint(1) unsigned default '0'; +ALTER TABLE `tagente_modulo` ADD COLUMN `cron_interval` varchar(100) default ''; ------------------------------------------------------------------------ -- Table `tnetwork_component` diff --git a/pandora_console/extras/pandoradb_migrate_4.0.x_to_5.0.oracle.sql b/pandora_console/extras/pandoradb_migrate_4.0.x_to_5.0.oracle.sql index 0f682fae00..d2d01723e8 100644 --- a/pandora_console/extras/pandoradb_migrate_4.0.x_to_5.0.oracle.sql +++ b/pandora_console/extras/pandoradb_migrate_4.0.x_to_5.0.oracle.sql @@ -57,6 +57,7 @@ CREATE TABLE tnetflow_report_content ( id_rc NUMBER(10, 0) NOT NULL PRIMARY KEY, id_report NUMBER(10, 0) NOT NULL REFERENCES tnetflow_report(id_report) ON DELETE CASCADE, id_filter NUMBER(10,0) NOT NULL REFERENCES tnetflow_filter(id_sg) ON DELETE CASCADE, + description CLOB default '', "date" NUMBER(20, 0) default 0 NOT NULL, period NUMBER(11, 0) default 0 NOT NULL, max NUMBER(11, 0) default 0 NOT NULL, @@ -299,6 +300,7 @@ ALTER TABLE tagente_modulo ADD (wizard_level VARCHAR2(100) default 'nowizard' NO ALTER TABLE tagente_modulo ADD CONSTRAINT t_agente_modulo_wizard_level_cons CHECK (wizard_level IN ('basic','advanced','custom','nowizard')); ALTER TABLE tagente_modulo ADD (macros CLOB default ''); ALTER TABLE tagente_modulo ADD (quiet NUMBER(5, 0) default 0 NOT NULL); +ALTER TABLE tagente_modulo ADD (cron_interval VARCHAR2(100) DEFAULT ''); -- ----------------------------------------------------- -- Table `tplugin` diff --git a/pandora_console/extras/pandoradb_migrate_4.0.x_to_5.0.postgreSQL.sql b/pandora_console/extras/pandoradb_migrate_4.0.x_to_5.0.postgreSQL.sql index 69f88e8800..828ad0d3b2 100644 --- a/pandora_console/extras/pandoradb_migrate_4.0.x_to_5.0.postgreSQL.sql +++ b/pandora_console/extras/pandoradb_migrate_4.0.x_to_5.0.postgreSQL.sql @@ -53,6 +53,7 @@ CREATE TABLE "tnetflow_report_content" ( "id_rc" SERIAL NOT NULL PRIMARY KEY, "id_report" INTEGER NOT NULL default 0 REFERENCES tnetflow_report("id_report") ON DELETE CASCADE, "id_filter" INTEGER NOT NULL default 0 REFERENCES tnetflow_filter("id_sg") ON DELETE CASCADE, + "description" TEXT, "date" BIGINT NOT NULL default 0, "period" INTEGER NOT NULL default 0, "max" INTEGER NOT NULL default 0, @@ -174,6 +175,7 @@ ALTER TABLE "tagente_modulo" ADD COLUMN "warning_instructions" text default ''; ALTER TABLE "tagente_modulo" ADD COLUMN "unknown_instructions" text default ''; ALTER TABLE "tagente_modulo" ADD COLUMN "critical_inverse" SMALLINT NOT NULL default 0; ALTER TABLE "tagente_modulo" ADD COLUMN "warning_inverse" SMALLINT NOT NULL default 0; +ALTER TABLE "tagente_modulo" ADD COLUMN "cron_interval" varchar(100) default ''; -- ----------------------------------------------------- -- Table `tevent_filter` diff --git a/pandora_console/godmode/agentes/configurar_agente.php b/pandora_console/godmode/agentes/configurar_agente.php index 74c1cc79a2..e8da17dcbb 100644 --- a/pandora_console/godmode/agentes/configurar_agente.php +++ b/pandora_console/godmode/agentes/configurar_agente.php @@ -21,6 +21,7 @@ enterprise_include ('godmode/agentes/configurar_agente.php'); enterprise_include ('include/functions_policies.php'); enterprise_include ('include/functions_modules.php'); include_once($config['homedir'] . "/include/functions_agents.php"); +include_once($config['homedir'] . "/include/functions_cron.php"); ui_require_javascript_file('encode_decode_base64'); check_login (); @@ -788,6 +789,13 @@ if ($update_module || $create_module) { $critical_inverse = (int) get_parameter('critical_inverse'); $warning_inverse = (int) get_parameter('warning_inverse'); + $hour = get_parameter('hour'); + $minute = get_parameter('minute'); + $mday = get_parameter('mday'); + $month = get_parameter('month'); + $wday = get_parameter('wday'); + $cron_interval = "$minute $hour $mday $month $wday"; + if ($prediction_module != 3) { unset($serialize_ops); enterprise_hook('modules_delete_synthetic_operations', array($id_agent_module)); @@ -851,7 +859,8 @@ if ($update_module) { 'warning_instructions' => $warning_instructions, 'unknown_instructions' => $unknown_instructions, 'critical_inverse' => $critical_inverse, - 'warning_inverse' => $warning_inverse); + 'warning_inverse' => $warning_inverse, + 'cron_interval' => $cron_interval); if ($prediction_module == 3 && $serialize_ops == '') { $result = false; @@ -890,6 +899,10 @@ if ($update_module) { if ($prediction_module == 3) { enterprise_hook('modules_create_synthetic_operations', array($id_agent_module, $serialize_ops)); } + + // Update the module interval + cron_update_module_interval ($id_agent_module, $cron_interval); + ui_print_success_message(__('Module successfully updated')); $id_agent_module = false; $edit_module = false; @@ -965,7 +978,8 @@ if ($create_module) { 'warning_instructions' => $warning_instructions, 'unknown_instructions' => $unknown_instructions, 'critical_inverse' => $critical_inverse, - 'warning_inverse' => $warning_inverse); + 'warning_inverse' => $warning_inverse, + 'cron_interval' => $cron_interval); if ($prediction_module == 3 && $serialize_ops == '') { $id_agent_module = false; @@ -1000,6 +1014,9 @@ if ($create_module) { enterprise_hook('modules_create_synthetic_operations', array($id_agent_module, $serialize_ops)); } + // Update the module interval + cron_update_module_interval ($id_agent_module, $cron_interval); + ui_print_success_message(__('Module added successfully')); $id_agent_module = false; $edit_module = false; diff --git a/pandora_console/godmode/agentes/module_manager_editor.php b/pandora_console/godmode/agentes/module_manager_editor.php index f92750c436..82e6335ce6 100644 --- a/pandora_console/godmode/agentes/module_manager_editor.php +++ b/pandora_console/godmode/agentes/module_manager_editor.php @@ -208,7 +208,21 @@ if ($id_agent_module) { $critical_inverse = $module['critical_inverse']; $warning_inverse = $module['warning_inverse']; - + + $cron_interval = explode (" ", $module['cron_interval']); + if (isset ($cron_interval[4])) { + $minute = $cron_interval[0]; + $hour = $cron_interval[1]; + $mday = $cron_interval[2]; + $month = $cron_interval[3]; + $wday = $cron_interval[4]; + } else { + $minute = '*'; + $hour = '*'; + $mday = '*'; + $month = '*'; + $wday = '*'; + } } else { if (!isset ($moduletype)) { @@ -268,6 +282,13 @@ else { $critical_inverse = ''; $warning_inverse = ''; + + $cron_interval = '* * * * *'; + $hour = '*'; + $minute = '*'; + $mday = '*'; + $month = '*'; + $wday = '*'; } } diff --git a/pandora_console/godmode/agentes/module_manager_editor_common.php b/pandora_console/godmode/agentes/module_manager_editor_common.php index 05caeaf170..48dc9899e7 100644 --- a/pandora_console/godmode/agentes/module_manager_editor_common.php +++ b/pandora_console/godmode/agentes/module_manager_editor_common.php @@ -369,6 +369,10 @@ $table_advanced->data[10][0] = __('Unknown instructions'). ui_print_help_tip(__( $table_advanced->data[10][1] = html_print_textarea ('unknown_instructions', 2, 65, $unknown_instructions, '', true); $table_advanced->colspan[10][1] = 4; +$table_advanced->data[11][0] = __('Cron') . ui_print_help_tip (__('If cron is set the module interval is ignored and the module runs on the specified date and time'), true); +$table_advanced->data[11][1] = html_print_extended_select_for_cron ($hour, $minute, $mday, $month, $wday, true); +$table_advanced->colspan[11][1] = 4; + ?>