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

Changed histogram of events in tactical view to metaconsole, tiquet: #2029

This commit is contained in:
m-lopez-f 2015-03-25 16:14:47 +01:00
parent 00ae340c87
commit c7fa8710ec
1 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pandora_console/include/functions_reporting.php
View File

@ -8405,6 +8405,8 @@ function reporting_get_event_histogram ($events) {
global $config; global $config;
include_once ('../../include/graphs/functions_gd.php'); include_once ('../../include/graphs/functions_gd.php');
$max_value = count($events); $max_value = count($events);
if (defined("METACONSOLE"))
$max_value = SECONDS_1HOUR;
$ttl = 1; $ttl = 1;
$urlImage = ui_get_full_url(false, true, false, false); $urlImage = ui_get_full_url(false, true, false, false);
@ -8418,6 +8420,10 @@ function reporting_get_event_histogram ($events) {
EVENT_CRIT_MAJOR => COL_MAJOR, EVENT_CRIT_MAJOR => COL_MAJOR,
EVENT_CRIT_CRITICAL => COL_CRITICAL EVENT_CRIT_CRITICAL => COL_CRITICAL
); );
if(defined("METACONSOLE")){
$full_legend = array();
$cont = 0;
}
foreach ($events as $data) { foreach ($events as $data) {
@ -8450,11 +8456,22 @@ function reporting_get_event_histogram ($events) {
$color = EVENT_CRIT_WARNING_OR_CRITICAL; $color = EVENT_CRIT_WARNING_OR_CRITICAL;
break; break;
} }
if(defined("METACONSOLE")){
$full_legend[$cont] = $data['timestamp'];
$graph_data[] = array(
'data' => $color,
'utimestamp' => $data['utimestamp'] - get_system_time ()
);
$cont++;
}
else{
$graph_data[] = array( $graph_data[] = array(
'data' => $color, 'data' => $color,
'utimestamp' => 1 'utimestamp' => 1
); );
} }
}
$table->width = '100%'; $table->width = '100%';
$table->data = array (); $table->data = array ();
@ -8464,7 +8481,11 @@ function reporting_get_event_histogram ($events) {
$table->data[0][0] = "" ; $table->data[0][0] = "" ;
if (!empty($graph_data)) { if (!empty($graph_data)) {
if (defined("METACONSOLE"))
$slicebar = flot_slicesbar_graph($graph_data, $max_value, "100%", 35, $full_legend, $colors, $config['fontpath'], $config['round_corner'], $urlImage);
else
$slicebar = slicesbar_graph($graph_data, $max_value, 700, 25, $colors, $config['fontpath'], $config['round_corner'], $urlImage, $ttl); $slicebar = slicesbar_graph($graph_data, $max_value, 700, 25, $colors, $config['fontpath'], $config['round_corner'], $urlImage, $ttl);
$table->data[0][0] = $slicebar; $table->data[0][0] = $slicebar;
} else { } else {
$table->data[0][0] = __('No events'); $table->data[0][0] = __('No events');