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

2011-08-16 Juan Manuel Ramon <juanmanuel.ramon@artica.es> 

* pandoradb.oracle.sql
        include/functions_agents.php
        include/functions_networkmap.php: Removed several mistakes in
Pandora
        console over Oracle.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4744 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
juanmanuelr 2011-08-16 16:32:20 +00:00
parent 2a09f720f8
commit aaab854dd9
4 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_console/ChangeLog
View File

@ -1,3 +1,10 @@
2011-08-16 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* pandoradb.oracle.sql
include/functions_agents.php
include/functions_networkmap.php: Removed several mistakes in Pandora
console over Oracle.
2011-08-16 Ramon Novoa <rnovoa@artica.es>
* include/functions_servers.php: Renamed enterprise ICMP and SNMP

24
pandora_console/include/functions_agents.php
View File

@ -1041,25 +1041,33 @@ function agents_get_modules ($id_agent = null, $details = false, $filter = false
$details = "nombre";
break;
case "oracle":
$details = "dbms_lob.substr(nombre,4000,1) as nombre";
$details = "nombre";
break;
}
}
else {
if ($config['dbtype'] == 'oracle'){
$details_new = array();
foreach ($details as $detail){
if ($detail == 'nombre')
$details_new[] = 'dbms_lob.substr(nombre,4000,1) as nombre';
$details_new = array();
if (is_array($details)){
foreach ($details as $detail){
if ($detail == 'nombre')
$details_new[] = 'dbms_lob.substr(nombre,4000,1) as nombre';
else
$details_new[] = $detail;
}
}
else{
if ($details == 'nombre')
$details_new = 'dbms_lob.substr(nombre,4000,1) as nombre';
else
$details_new[] = $detail;
$details_new = $details;
}
$details = io_safe_input ($details_new);
$details = io_safe_input ($details);
}
else
$details = io_safe_input ($details);
}
switch ($config["dbtype"]) {
case "mysql":
case "postgresql":

2
pandora_console/include/functions_networkmap.php
View File

@ -291,7 +291,6 @@ function networkmap_generate_dot_groups ($pandora_name, $group = 0, $simple = 0,
unset ($nodes[$node_id]);
continue;
}
switch($node['type']){
case 'group':
$graph .= networkmap_create_group_node ($node , $simple, $font_size)."\n\t\t";
@ -304,7 +303,6 @@ function networkmap_generate_dot_groups ($pandora_name, $group = 0, $simple = 0,
break;
}
}
// Define edges
foreach ($parents as $node => $parent_id) {
// Verify that the parent is in the graph

2
pandora_console/pandoradb.oracle.sql
View File

@ -486,7 +486,7 @@ CREATE TABLE tevento (
id_alert_am NUMBER(10, 0) default 0 NOT NULL,
criticity NUMBER(10, 0) default 0 NOT NULL,
user_comment CLOB,
tags CLOB NOT NULL,
tags CLOB,
CONSTRAINT tevento_event_type_cons CHECK (event_type IN ('unknown','alert_fired','alert_recovered','alert_ceased','alert_manual_validation','recon_host_detected','system','error','new_agent','going_up_warning','going_up_critical','going_down_warning','going_down_normal','going_down_critical','going_up_normal', 'configuration_change'))
);
CREATE INDEX tevento_id_1_idx ON tevento(id_agente, id_evento);