From be51309f1c1d4de286ad7b4ef0c2ebab9c655d37 Mon Sep 17 00:00:00 2001 From: juanmanuelr Date: Wed, 18 May 2011 10:25:03 +0000 Subject: [PATCH] 2011-05-18 Juan Manuel Ramon * include/functions_graph.php operation/events/events.php: Changed the way to include flash graph include. * pandoradb.oracle.sql: Changed datatype on max_value field of talert_templates table. * pandoradb.data.oracle.sql: Fixes errors in Oracle installation. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4366 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 9 +++++++++ pandora_console/include/functions_graph.php | 4 +++- pandora_console/operation/events/events.php | 2 +- pandora_console/pandoradb.data.oracle.sql | 16 ++++++++-------- pandora_console/pandoradb.oracle.sql | 2 +- 5 files changed, 22 insertions(+), 11 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index ce657b9db8..7227cb1939 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,12 @@ +2011-05-18 Juan Manuel Ramon + + * include/functions_graph.php + operation/events/events.php: Changed the way to include flash + graph include. + * pandoradb.oracle.sql: Changed datatype on max_value field of + talert_templates table. + * pandoradb.data.oracle.sql: Fixes errors in Oracle installation. + 2011-05-18 Juan Manuel Ramon * operation/events/events.php: Added functions_graph.php include in this diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php index 368953a99d..0ff8f55dec 100755 --- a/pandora_console/include/functions_graph.php +++ b/pandora_console/include/functions_graph.php @@ -1239,7 +1239,9 @@ function grafico_eventos_grupo2 ($width = 300, $height = 200, $url = "") { } $loop++; } - + if ($config['flash_charts']){ + include_flash_chart_script(); + } return pie3d_graph($config['flash_charts'], $data, $width, $height, __('Other'), '', $config['homedir'] . "/images/logo_vertical_water.png", $config['fontpath'], $config['font_size']); diff --git a/pandora_console/operation/events/events.php b/pandora_console/operation/events/events.php index 675439bf26..aedcfb4073 100644 --- a/pandora_console/operation/events/events.php +++ b/pandora_console/operation/events/events.php @@ -21,7 +21,7 @@ require_once ("include/functions_alerts.php"); //Alerts processing functions require_once ($config['homedir'].'/include/functions_agents.php'); //Agents functions require_once ($config['homedir'].'/include/functions_users.php'); //Users functions require_once ($config['homedir'].'/include/functions_graph.php'); -include_flash_chart_script(); + check_login (); if (! check_acl ($config["id_user"], 0, "IR")) { diff --git a/pandora_console/pandoradb.data.oracle.sql b/pandora_console/pandoradb.data.oracle.sql index 9597ff4544..41c18bc911 100644 --- a/pandora_console/pandoradb.data.oracle.sql +++ b/pandora_console/pandoradb.data.oracle.sql @@ -129,14 +129,14 @@ END;; -- BEGIN LOCK TABLE tgrupo IN EXCLUSIVE MODE; -INSERT INTO tgrupo (id_grupo, nombre, icon, parent, propagate, disabled, custom_id) VALUES (2,'Servers','server_database',0,0,0,'',0); -INSERT INTO tgrupo (id_grupo, nombre, icon, parent, propagate, disabled, custom_id) VALUES (4,'Firewalls','firewall',0,0,0,'',0); -INSERT INTO tgrupo (id_grupo, nombre, icon, parent, propagate, disabled, custom_id) VALUES (8,'Databases','database_gear',0,0,0,'',0); -INSERT INTO tgrupo (id_grupo, nombre, icon, parent, propagate, disabled, custom_id) VALUES (9,'Network','transmit',0,0,0,'',0); -INSERT INTO tgrupo (id_grupo, nombre, icon, parent, propagate, disabled, custom_id) VALUES (10,'Unknown','world',0,0,0,'',0); -INSERT INTO tgrupo (id_grupo, nombre, icon, parent, propagate, disabled, custom_id) VALUES (11,'Workstations','computer',0,0,0,'',0); -INSERT INTO tgrupo (id_grupo, nombre, icon, parent, propagate, disabled, custom_id) VALUES (12,'Applications','applications',0,0,0,'',0); -INSERT INTO tgrupo (id_grupo, nombre, icon, parent, propagate, disabled, custom_id) VALUES (13,'Web','world',0,0,0,'',0); +INSERT INTO tgrupo (id_grupo, nombre, icon, parent, propagate, disabled, custom_id, id_skin) VALUES (2,'Servers','server_database',0,0,0,'',0); +INSERT INTO tgrupo (id_grupo, nombre, icon, parent, propagate, disabled, custom_id, id_skin) VALUES (4,'Firewalls','firewall',0,0,0,'',0); +INSERT INTO tgrupo (id_grupo, nombre, icon, parent, propagate, disabled, custom_id, id_skin) VALUES (8,'Databases','database_gear',0,0,0,'',0); +INSERT INTO tgrupo (id_grupo, nombre, icon, parent, propagate, disabled, custom_id, id_skin) VALUES (9,'Network','transmit',0,0,0,'',0); +INSERT INTO tgrupo (id_grupo, nombre, icon, parent, propagate, disabled, custom_id, id_skin) VALUES (10,'Unknown','world',0,0,0,'',0); +INSERT INTO tgrupo (id_grupo, nombre, icon, parent, propagate, disabled, custom_id, id_skin) VALUES (11,'Workstations','computer',0,0,0,'',0); +INSERT INTO tgrupo (id_grupo, nombre, icon, parent, propagate, disabled, custom_id, id_skin) VALUES (12,'Applications','applications',0,0,0,'',0); +INSERT INTO tgrupo (id_grupo, nombre, icon, parent, propagate, disabled, custom_id, id_skin) VALUES (13,'Web','world',0,0,0,'',0); COMMIT; END;; diff --git a/pandora_console/pandoradb.oracle.sql b/pandora_console/pandoradb.oracle.sql index a98de05e0c..197bb87bbc 100644 --- a/pandora_console/pandoradb.oracle.sql +++ b/pandora_console/pandoradb.oracle.sql @@ -288,7 +288,7 @@ CREATE TABLE talert_templates ( type VARCHAR2(50), value VARCHAR2(255) default '', matches_value NUMBER(5, 0) default 0, - max_value BINARY_DOUBLE default NULL, + max_value DOUBLE PRECISION default NULL, min_value DOUBLE PRECISION default NULL, time_threshold NUMBER(10, 0) default 0 NOT NULL, max_alerts NUMBER(10, 0) default 1 NOT NULL,