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

Manual (by hand) cherry pick of commit c7fa8710ec

This commit is contained in:
mdtrooper 2015-03-26 19:39:11 +01:00
parent 6d07408af8
commit 99247f7286
1 changed files with 35 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
pandora_console/include/functions_reporting_html.php
View File

@ -7099,10 +7099,14 @@ function reporting_get_event_histogram ($events) {
global $config;
include_once ('../../include/graphs/functions_gd.php');
$max_value = count($events);
if (defined("METACONSOLE"))
$max_value = SECONDS_1HOUR;
$ttl = 1;
$urlImage = ui_get_full_url(false, true, false, false);
$colors = array(
EVENT_CRIT_MAINTENANCE => COL_MAINTENANCE,
EVENT_CRIT_INFORMATIONAL => COL_INFORMATIONAL,
@ -7113,6 +7117,11 @@ function reporting_get_event_histogram ($events) {
EVENT_CRIT_CRITICAL => COL_CRITICAL
);
if (defined("METACONSOLE")) {
$full_legend = array();
$cont = 0;
}
foreach ($events as $data) {
switch ($data['criticity']) {
@ -7144,12 +7153,23 @@ function reporting_get_event_histogram ($events) {
$color = EVENT_CRIT_WARNING_OR_CRITICAL;
break;
}
$graph_data[] = array(
'data' => $color,
'utimestamp' => 1
);
if (defined("METACONSOLE")) {
$full_legend[$cont] = $data['timestamp'];
$graph_data[] = array(
'data' => $color,
'utimestamp' => $data['utimestamp'] - get_system_time ()
);
$cont++;
}
else {
$graph_data[] = array(
'data' => $color,
'utimestamp' => 1
);
}
}
$table->width = '100%';
$table->data = array ();
$table->size = array ();
@ -7158,13 +7178,18 @@ function reporting_get_event_histogram ($events) {
$table->data[0][0] = "" ;
if (!empty($graph_data)) {
$slicebar = slicesbar_graph($graph_data, $max_value, 700, 25, $colors, $config['fontpath'], $config['round_corner'], $urlImage, $ttl);
if (defined("METACONSOLE"))
$slicebar = flot_slicesbar_graph($graph_data, $max_value, "100%", 35, $full_legend, $colors, $config['fontpath'], $config['round_corner'], $urlI
else
$slicebar = slicesbar_graph($graph_data, $max_value, 700, 25, $colors, $config['fontpath'], $config['round_corner'], $urlImage, $ttl);
$table->data[0][0] = $slicebar;
} else {
}
else {
$table->data[0][0] = __('No events');
}
if(!defined('METACONSOLE')){
if (!defined('METACONSOLE')) {
$event_graph = '<fieldset class="databox tactical_set">
<legend>' .
__('Events info (1hr)') .