diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 66ac8f5666..6e5f6075dc 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,9 @@ +2011-08-17 Juan Manuel Ramon + + * pandoradb.oracle.sql: Added columns 'module_action_threshold' and + 'last_execution' on 'talert_template_module_actions' table. + * include/functions_agents.php: Correct bad sintax query. + 2011-08-17 Dario Rodriguez * images/networkmap/so_vmware.png: Added icon of VMware for networkamps diff --git a/pandora_console/include/functions_agents.php b/pandora_console/include/functions_agents.php index 8e5f8f98bc..0dcdbcd93e 100644 --- a/pandora_console/include/functions_agents.php +++ b/pandora_console/include/functions_agents.php @@ -1035,15 +1035,7 @@ function agents_get_modules ($id_agent = null, $details = false, $filter = false } if (empty ($details)) { - switch ($config['dbtype']){ - case "mysql": - case "postgresql": - $details = "nombre"; - break; - case "oracle": - $details = "nombre"; - break; - } + $details = "nombre"; } else { if ($config['dbtype'] == 'oracle'){ diff --git a/pandora_console/pandoradb.oracle.sql b/pandora_console/pandoradb.oracle.sql index 9995025c73..33d9be70d7 100644 --- a/pandora_console/pandoradb.oracle.sql +++ b/pandora_console/pandoradb.oracle.sql @@ -353,7 +353,9 @@ CREATE TABLE talert_template_module_actions ( id_alert_template_module NUMBER(10, 0) NOT NULL REFERENCES talert_template_modules(id) ON DELETE CASCADE, id_alert_action NUMBER(10, 0) NOT NULL REFERENCES talert_actions(id) ON DELETE CASCADE, fires_min NUMBER(10, 0) default 0 NOT NULL, - fires_max NUMBER(10, 0) default 0 NOT NULL + fires_max NUMBER(10, 0) default 0 NOT NULL, + module_action_threshold NUMBER(10, 0) default 0 NOT NULL, + last_execution NUMBER(18, 0) default 0 NOT NULL ); CREATE SEQUENCE talert_template_modu_actions_s INCREMENT BY 1 START WITH 1;