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

2010-11-10 Sergio Martin <sergio.martin@artica.es> 

* include/functions_reporting.php
	include/functions.php
	operation/reporting/reporting_xml.php
	godmode/reporting/reporting_builder.item_editor.php: Added the
	simple baseline graph to the html and xml report exports



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3563 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2010-11-10 11:17:29 +00:00
parent 3be767f187
commit 62c33abaf0
5 changed files with 38 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pandora_console/ChangeLog
View File

@ -1,3 +1,11 @@
2010-11-10 Sergio Martin <sergio.martin@artica.es>
* include/functions_reporting.php
include/functions.php
operation/reporting/reporting_xml.php
godmode/reporting/reporting_builder.item_editor.php: Added the
simple baseline graph to the html and xml report exports
2010-11-08 Sancho Lerena <slerena@artica.es>
* pandora_console.spec: Updated version/build.

2
pandora_console/godmode/reporting/reporting_builder.item_editor.php
View File

@ -62,6 +62,7 @@ switch ($action) {
$idAgentModule = $item['id_agent_module'];
$idAgent = get_db_value_filter('id_agente', 'tagente_modulo', array('id_agente_modulo' => $idAgentModule));
break;
case 'simple_baseline_graph':
case 'simple_graph':
$description = $item['description'];
$idAgentModule = $item['id_agent_module'];
@ -600,6 +601,7 @@ function chooseType() {
$("#row_group").css('display', '');
break;
case 'simple_graph':
case 'simple_baseline_graph':
$("#row_description").css('display', '');
$("#row_agent").css('display', '');
$("#row_module").css('display', '');

1
pandora_console/include/functions.php
View File

@ -620,6 +620,7 @@ function get_alert_times ($row2) {
function get_report_types () {
$types = array ();
$types['simple_graph'] = __('Simple graph');
$types['simple_baseline_graph'] = __('Simple baseline graph');
$types['custom_graph'] = __('Custom graph');
$types['SLA'] = __('S.L.A.');
$types['monitor_report'] = __('Monitor report');

23
pandora_console/include/functions_reporting.php
View File

@ -1661,6 +1661,29 @@ function render_report_html_item ($content, $table, $report, $mini = false) {
array_push ($table->data, $data);
break;
case 'simple_baseline_graph':
//RUNNING
$table->colspan[1][0] = 4;
$data = array ();
$data[0] = $sizh.__('Simple baseline graph').$sizhfin;
$data[1] = $sizh.$agent_name.' - '.$module_name.$sizhfin;
$data[2] = $sizh.human_time_description ($content['period']).$sizhfin;
array_push ($table->data, $data);
// Put description at the end of the module (if exists)
if ($content["description"] != ""){
$table->colspan[2][0] = 4;
$data_desc = array();
$data_desc[0] = $content["description"];
array_push ($table->data, $data_desc);
}
$data = array ();
$data[0] = '<img src="include/fgraph.php?tipo=sparse&id='.$content['id_agent_module'].'&height='.$sizgraph_h.'&width='.$sizgraph_w.'&period='.$content['period'].'&date='.$report["datetime"].'&avg_only=1&baseline=1&pure=1" border="0" alt="">';
array_push ($table->data, $data);
break;
case 2:
case 'custom_graph':

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

@ -180,6 +180,10 @@ foreach ($contents as $content) {
$data["title"] = __('Simple graph');
$data["objdata"]["img"] = 'include/fgraph.php?PHPSESSID='.$session_id.'&amp;tipo=sparse&amp;id='.$content['id_agent_module'].'&amp;height=230&amp;width=720&amp;period='.$content['period'].'&amp;date='.$datetime.'&amp;avg_only=1&amp;pure=1';
break;
case 'simple_baseline_graph':
$data["title"] = __('Simple baseline graph');
$data["objdata"]["img"] = 'include/fgraph.php?PHPSESSID='.$session_id.'&amp;tipo=sparse&amp;id='.$content['id_agent_module'].'&amp;height=230&amp;width=720&amp;period='.$content['period'].'&amp;date='.$datetime.'&amp;avg_only=1&amp;baseline=1&amp;pure=1';
break;
case 2:
case 'custom_graph':
$graph = get_db_row ("tgraph", "id_graph", $content['id_gs']);