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

2011-12-13 Sergio Martin <sergio.martin@artica.es> 

* include/functions_graph.php: Fixed a bug of the
	NO DATA images in the pdf graph reports

	* include/styles/pandora.css
	include/functions_reporting.php: Added styles to the 
	group report



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5248 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2011-12-13 09:13:28 +00:00
parent 7d5c264e5e
commit 6e333e3e22
4 changed files with 146 additions and 35 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-12-13 Sergio Martin <sergio.martin@artica.es>
* include/functions_graph.php: Fixed a bug of the
NO DATA images in the pdf graph reports
* include/styles/pandora.css
include/functions_reporting.php: Added styles to the
group report
2011-12-12 Sergio Martin <sergio.martin@artica.es>
* include/functions_graph.php: Fixed some notices of the graphs

8
pandora_console/include/functions_graph.php
View File

@ -758,7 +758,7 @@ function graphic_combined_module ($module_list, $weight_list, $period, $width, $
case GRAPH_AREA:
$color = null;
return area_graph($flash_charts, $graph_values, $width, $height,
$color, $module_name_list, $long_index, "images/image_problem.opaque.png",
$color, $module_name_list, $long_index, $homeurl."images/image_problem.opaque.png",
"", "", $homeurl, $config['homedir'] . "/images/logo_vertical_water.png",
$config['fontpath'], $config['font_size'], "", $ttl);
break;
@ -766,21 +766,21 @@ function graphic_combined_module ($module_list, $weight_list, $period, $width, $
case GRAPH_STACKED_AREA:
$color = null;
return stacked_area_graph($flash_charts, $graph_values, $width, $height,
$color, $module_name_list, $long_index, "images/image_problem.opaque.png",
$color, $module_name_list, $long_index, $homeurl."images/image_problem.opaque.png",
"", "", $config['homedir'] . "/images/logo_vertical_water.png",
$config['fontpath'], $config['font_size'], "", $ttl, $homeurl);
break;
case GRAPH_LINE:
$color = null;
return line_graph($flash_charts, $graph_values, $width, $height,
$color, $module_name_list, $long_index, "images/image_problem.opaque.png",
$color, $module_name_list, $long_index, $homeurl."images/image_problem.opaque.png",
"", "", $config['homedir'] . "/images/logo_vertical_water.png",
$config['fontpath'], $config['font_size'], "", $ttl, $homeurl);
break;
case GRAPH_STACKED_LINE:
$color = null;
return stacked_line_graph($flash_charts, $graph_values, $width, $height,
$color, $module_name_list, $long_index, "images/image_problem.opaque.png",
$color, $module_name_list, $long_index, $homeurl."images/image_problem.opaque.png",
"", "", $config['homedir'] . "/images/logo_vertical_water.png",
$config['fontpath'], $config['font_size'], "", $ttl, $homeurl);
break;

91
pandora_console/include/functions_reporting.php
View File

@ -3026,48 +3026,77 @@ function reporting_render_report_html_item ($content, $table, $report, $mini = f
case 'group_report':
$group_name = groups_get_name($content['id_group']);
$group_stats = reporting_get_group_stats($content['id_group']);
$data = array ();
// Get events of the last 8 hours
$events = events_get_group_events ($content['id_group'], 28800, $report['datetime']);
$data = array ();
$table->colspan[0][0] = 7;
$table->colspan[1][3] = 4;
$table->colspan[3][3] = 4;
$table->colspan[4][2] = 5;
$table->colspan[1][1] = 3;
$table->colspan[1][4] = 3;
$table->colspan[2][1] = 3;
$table->colspan[2][4] = 3;
$table->colspan[5][1] = 3;
$table->colspan[5][4] = 3;
$table->colspan[6][1] = 3;
$table->colspan[6][4] = 3;
$table->colspan[7][1] = 6;
$table->colspan[8][1] = 6;
$data[0] = $sizh. __('Group report').': "'.$group_name.'"' . $sizhfin;
array_push ($table->data, $data);
$data = array();
$data[0] = '<b>'.__('Agents').'</b>';
$data[1] = __('Total').' ('.$group_stats['total_agents'].')';
$data[2] = __('Unknown').' ('.$group_stats['agents_unknown'].')';
$data[3] = '';
array_push ($table->data, $data);
$data = array();
$data[0] = '<b>'.__('Monitors').'</b>';
$data[1] = __('Total').' ('.$group_stats['monitor_checks'].')';
$data[2] = __('Normal').' ('.$group_stats['monitor_ok'].')';
$data[3] = __('Critical').' ('.$group_stats['monitor_critical'].')';
$data[4] = __('Warning').' ('.$group_stats['monitor_warning'].')';
$data[5] = __('Unknown').' ('.$group_stats['monitor_unknown'].')';
$data[6] = __('Not init').' ('.$group_stats['monitor_not_init'].')';
array_push ($table->data, $data);
$data = array();
$data[0] = '<b>'.__('Alerts').'</b>';
$data[1] = __('Total').' ('.$group_stats['monitor_alerts'].')';
$data[2] = __('Fired').' ('.$group_stats['monitor_alerts_fired'].')';
$data[3] = '';
$data[0] = '';
$data[1] = "<div class='cellBold cellCenter'>".__('Total')."</div>";
$data[4] = "<div class='cellBold cellCenter'>".__('Unknown')."</div>";
array_push ($table->data, $data);
// Get events of the last 8 hours
$events = events_get_group_events ($content['id_group'], 28800, $report["datetime"]);
$data = array();
$data[0] = "<div class='cellBold'>".__('Agents')."</div>";
$data[1] = "<div class='cellBold cellCenter cellWhite cellBorder1 cellBig'>".$group_stats['total_agents']."</div>";
$data[4] = "<div class='cellBold cellCenter cellUnknown cellBorder1 cellBig'>".$group_stats['agents_unknown']."</div>";
array_push ($table->data, $data);
$data = array();
$data[0] = '<b>'.__('Events').'</b>';
$data[1] = __('Last 8 hours events').' ('.count($events).')';
$data[2] = '';
$data[0] = '';
$data[1] = "<div class='cellBold cellCenter'>".__('Total')."</div>";
$data[2] = "<div class='cellBold cellCenter'>".__('Normal')."</div>";
$data[3] = "<div class='cellBold cellCenter'>".__('Critical')."</div>";
$data[4] = "<div class='cellBold cellCenter'>".__('Warning')."</div>";
$data[5] = "<div class='cellBold cellCenter'>".__('Unknown')."</div>";
$data[6] = "<div class='cellBold cellCenter'>".__('Not init')."</div>";
array_push ($table->data, $data);
$data = array();
$data[0] = "<div class='cellBold'>".__('Monitors')."</div>";
$data[1] = "<div class='cellBold cellCenter cellWhite cellBorder1 cellBig'>".$group_stats['monitor_checks']."</div>";
$data[2] = "<div class='cellBold cellCenter cellNormal cellBorder1 cellBig'>".$group_stats['monitor_ok']."</div>";
$data[3] = "<div class='cellBold cellCenter cellCritical cellBorder1 cellBig'>".$group_stats['monitor_critical']."</div>";
$data[4] = "<div class='cellBold cellCenter cellWarning cellBorder1 cellBig'>".$group_stats['monitor_warning']."</div>";
$data[5] = "<div class='cellBold cellCenter cellUnknown cellBorder1 cellBig'>".$group_stats['monitor_unknown']."</div>";
$data[6] = "<div class='cellBold cellCenter cellNotInit cellBorder1 cellBig'>".$group_stats['monitor_not_init']."</div>";
array_push ($table->data, $data);
$data = array();
$data[0] = '';
$data[1] = "<div class='cellBold cellCenter'>".__('Defined')."</div>";
$data[4] = "<div class='cellBold cellCenter'>".__('Fired')."</div>";
array_push ($table->data, $data);
$data = array();
$data[0] = "<div class='cellBold'>".__('Alerts')."</div>";
$data[1] = "<div class='cellBold cellCenter cellWhite cellBorder1 cellBig'>".$group_stats['monitor_alerts']."</div>";
$data[4] = "<div class='cellBold cellCenter cellAlert cellBorder1 cellBig'>".$group_stats['monitor_alerts_fired']."</div>";
array_push ($table->data, $data);
$data = array();
$data[0] = '';
$data[1] = "<div class='cellBold cellCenter'>".__('Last 8 hours')."</div>";
array_push ($table->data, $data);
$data = array();
$data[0] = "<div class='cellBold'>".__('Events')."</div>";
$data[1] = "<div class='cellBold cellCenter cellWhite cellBorder1 cellBig'>".count($events)."</div>";
array_push ($table->data, $data);
break;

73
pandora_console/include/styles/pandora.css
View File

@ -1314,3 +1314,76 @@ tfoot.scwFoot {
color: #FFA500 !important;
}
/* Cells divs to set individual styles with the table objects */
div.cellBold {
width:100%;
height:100%;
font-weight: bold;
}
div.cellCenter {
width:100%;
height:100%;
text-align:center;
}
div.cellWhite {
width:100%;
height:100%;
background: #fff;
color: #000;
}
div.cellNormal {
width:100%;
height:100%;
background: #008e00;
color: #fff;
}
div.cellCritical {
width:100%;
height:100%;
background: #cc0000;
color: #fff;
}
div.cellWarning {
width:100%;
height:100%;
background: #fce94f;
color: #000;
}
div.cellUnknown {
width:100%;
height:100%;
background: #babdb6;
color: #000;
}
div.cellNotInit {
width:100%;
height:100%;
background: #729fcf;
color: #000;
}
div.cellAlert {
width:100%;
height:100%;
background: #ffa300;
color: #000;
}
div.cellBorder1 {
width:100%;
height:100%;
border: 1px solid black;
}
div.cellBig {
width:100%;
height:100%;
font-size: 18px;
}