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

2008-11-14 Evi Vanoost <vanooste@rcbi.rochester.edu> 

* operation/reporting/reporting_xml.php: Fixed bug #2268220

        * operation/events/events.php: Centered some columns

git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@1245 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
guruevi 2008-11-14 16:15:58 +00:00
parent 22cbfd7fc3
commit 51cdd352c0
3 changed files with 27 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/ChangeLog
View File

@ -1,3 +1,9 @@
2008-11-14 Evi Vanoost <vanooste@rcbi.rochester.edu>
* operation/reporting/reporting_xml.php: Fixed bug #2268220
* operation/events/events.php: Centered some columns
2008-11-14 Evi Vanoost <vanooste@rcbi.rochester.edu>
* operation/incidents/incident_detail.php, incident.php: Update ACL's

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

@ -232,33 +232,34 @@ $table->head = array ();
$table->data = array ();
$table->head[0] = '';
$table->align[0] = 'center';
$table->head[1] = __('Type');
$table->headclass[1] = 'f9';
$table->align[1] = 'center';
$table->head[2] = __('Event name');
//$table->headclass[2] = 'f9';
$table->head[3] = __('Agent name');
//$table->headclass[3] = 'f9';
$table->align[3] = 'center';
$table->head[4] = __('Source');
//$table->headclass[4] = 'f9';
$table->align[4] = 'center';
$table->head[5] = __('Group');
//$table->headclass[5] = 'f9';
$table->align[5] = 'center';
$table->head[6] = __('User ID');
//$table->headclass[6] = 'f9';
$table->align[6] = 'center';
$table->head[7] = __('Timestamp');
//$table->headclass[7] = 'f9';
$table->align[7] = 'center';
$table->head[8] = __('Action');
//$table->headclass[8] = 'f9';
$table->align[8] = 'center';
$table->head[9] = print_checkbox ("allbox", "1", false, true);
//$table->headclass[9] = 'p10';
$table->align[9] = 'center';
//Arrange data. We already did ACL's in the query
foreach ($result as $row) {

24
pandora_console/operation/reporting/reporting_xml.php
View File

@ -121,6 +121,7 @@ if ($report['private'] && ($report['id_user'] != $config['id_user'] && ! dame_ad
}
header ('Content-type: application/xml; charset="utf-8"', true);
echo '<?xml version="1.0" encoding="UTF-8" ?>';
$date = (string) get_parameter ('date', date ('Y-m-j'));
@ -185,7 +186,7 @@ foreach ($contents as $content) {
array_push ($weights, $content2["weight"]);
}
$data["objdata"]["img"] = 'reporting/fgraph.php?tipo=combined&amp;id='.implode (',', $modules).'&amp;weight_l='.implode (',', $weights).'&amp;height=230&amp;width=720&amp;period='.$content['period'].'&amp;date='.$datetime.'&amp;stacked='.$graph["stacked"].'&amp;pure=1"';
$data["objdata"]["img"] = 'reporting/fgraph.php?tipo=combined&amp;id='.implode (',', $modules).'&amp;weight_l='.implode (',', $weights).'&amp;height=230&amp;width=720&amp;period='.$content['period'].'&amp;date='.$datetime.'&amp;stacked='.$graph["stacked"].'&amp;pure=1';
break;
case 3:
case 'SLA':
@ -200,23 +201,22 @@ foreach ($contents as $content) {
$data["objdata"]["sla"] = array ();
$sla_failed = false;
foreach ($slas as $sla) {
$sla = array ();
$sla["agent"] .= dame_nombre_agente_agentemodulo ($sla['id_agent_module']);
$sla["module"] .= dame_nombre_modulo_agentemodulo ($sla['id_agent_module']);
$sla["max"] .= $sla['sla_max'];
$sla["min"] .= $sla['sla_min'];
$sla_data = array ();
$sla_data["agent"] = dame_nombre_agente_agentemodulo ($sla['id_agent_module']);
$sla_data["module"] = dame_nombre_modulo_agentemodulo ($sla['id_agent_module']);
$sla_data["max"] = $sla['sla_max'];
$sla_data["min"] = $sla['sla_min'];
$sla_value = get_agent_module_sla ($sla['id_agent_module'], $content['period'],
$sla['sla_min'], $sla['sla_max'], $datetime);
$sla_value = get_agent_module_sla ($sla['id_agent_module'], $content['period'], $sla['sla_min'], $sla['sla_max'], $datetime);
if ($sla_value === false) {
$sla["error"] .= __('Unknown');
$sla_data["error"] = __('Unknown');
} else {
if ($sla_value < $sla['sla_limit']) {
$sla["failed"] = "true";
$sla_data["failed"] = true;
}
$sla["value"] = format_numeric ($sla_value);
$sla_data["value"] = format_numeric ($sla_value);
}
array_push ($data["objdata"]["sla"], $sla);
array_push ($data["objdata"]["sla"], $sla_data);
}
break;