diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 0d36e607a0..d28d92ada4 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,12 @@ +2009-04-24 Esteban Sánchez + + * extras/pandoradb_migrate_v2.x_to_v3.0.sql: Removed local components table + + * godmode/servers/manage_recontask_form.php: Added "any" option to + operating system combo. + + * godmode/snmpconsole/snmp_alert.php: Changed alert templates with actions. + 2009-04-23 Jorge Gonzalez * include/functions_reporting.php, diff --git a/pandora_console/extras/pandoradb_migrate_v2.x_to_v3.0.sql b/pandora_console/extras/pandoradb_migrate_v2.x_to_v3.0.sql index 91ffa6ad39..f4df163edc 100644 --- a/pandora_console/extras/pandoradb_migrate_v2.x_to_v3.0.sql +++ b/pandora_console/extras/pandoradb_migrate_v2.x_to_v3.0.sql @@ -261,24 +261,6 @@ CREATE TABLE IF NOT EXISTS `talert_compound_actions` ( ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8; -CREATE TABLE IF NOT EXISTS `tlocal_component` ( - `id` int(10) unsigned NOT NULL auto_increment, - `name` varchar(80) NOT NULL, - `data` mediumtext NOT NULL, - `description` varchar(250) default NULL, - `id_os` int(10) unsigned default '0', - `os_version` varchar(100) default '', - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; - - -CREATE TABLE IF NOT EXISTS `tlocal_component_group` ( - `id` int(10) unsigned NOT NULL auto_increment, - `name` varchar(200) NOT NULL default '', - `parent` mediumint(8) unsigned NOT NULL default '0', - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; - ALTER TABLE tplugin ADD `plugin_type` int(2) UNSIGNED NOT NULL default 0; ALTER TABLE treport_content ADD `description` mediumtext; diff --git a/pandora_console/godmode/servers/manage_recontask_form.php b/pandora_console/godmode/servers/manage_recontask_form.php index 7971df7e82..1a0acc808f 100644 --- a/pandora_console/godmode/servers/manage_recontask_form.php +++ b/pandora_console/godmode/servers/manage_recontask_form.php @@ -98,7 +98,7 @@ $table->data[4][1] = print_select_from_sql ('SELECT id_np, name FROM tnetwork_pr // OS $table->data[5][0] = __('OS'); $table->data[5][1] = print_select_from_sql ('SELECT id_os, name FROM tconfig_os ORDER BY name', - "id_os", $id_os, '', '', '', true); + "id_os", $id_os, '', __('Any'), -1, true); // Group $table->data[6][0] = __('Group'); diff --git a/pandora_console/godmode/snmpconsole/snmp_alert.php b/pandora_console/godmode/snmpconsole/snmp_alert.php index 798c486cc6..691562474b 100644 --- a/pandora_console/godmode/snmpconsole/snmp_alert.php +++ b/pandora_console/godmode/snmpconsole/snmp_alert.php @@ -145,10 +145,10 @@ if (isset ($_GET["update_alert"])) { echo ''; // Alert type (e-mail, event etc.) - echo ''; // Alert trigger (OID, custom_value) @@ -251,6 +252,9 @@ if (isset ($_GET["update_alert"])) { echo "
'.__('Alert type').''; + echo '
'.__('Alert action').''; $fields = array (); - $result = get_db_all_rows_in_table ("talert_templates", "name"); + $result = get_db_all_rows_in_table ('talert_actions', "name"); if ($result === false) { $result = array (); } @@ -157,7 +157,8 @@ if (isset ($_GET["update_alert"])) { $fields[$row["id"]] = $row["name"]; } - print_select ($fields, "alert_type", $alert_type, '', '', '0', false, false, false); + print_select_from_sql ('SELECT id, name FROM talert_actions ORDER BY name', + "alert_type", $alert_type, '', '', 0, false, false, false); echo '
"; } else { echo "

".__('Alert Overview')."

"; + + require_once ('include/functions_alerts.php'); + //Overview $result = get_db_all_rows_in_table ("talert_snmp"); if ($result === false) { @@ -267,7 +271,7 @@ if (isset ($_GET["update_alert"])) { $table->class= "databox"; $table->align = array (); - $table->head[0] = __('Alert type'); + $table->head[0] = __('Alert action'); $table->head[1] = __('Alert trigger'); $table->align[1] = 'center'; @@ -296,7 +300,7 @@ if (isset ($_GET["update_alert"])) { foreach ($result as $row) { $data = array (); - $data[0] = get_alert_type ($row["id_alert"]); + $data[0] = get_alert_action_name ($row["id_alert"]); $data[1] = __('N/A'); $data[2] = __('N/A'); $data[3] = __('N/A');