tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2011-05-18 Juan Manuel Ramon <juanmanuel.ramon@artica.es> 

* 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
This commit is contained in:
juanmanuelr 2011-05-18 10:25:03 +00:00
parent 228648f5e1
commit be51309f1c
5 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pandora_console/ChangeLog
View File

@ -1,3 +1,12 @@
2011-05-18 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* 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 <juanmanuel.ramon@artica.es>
* operation/events/events.php: Added functions_graph.php include in this

4
pandora_console/include/functions_graph.php
View File

@ -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']);

2
pandora_console/operation/events/events.php
View File

@ -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")) {

16
pandora_console/pandoradb.data.oracle.sql
View File

@ -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;;

2
pandora_console/pandoradb.oracle.sql
View File

@ -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,