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

Added code to manage timestamps in fullscale mode

This commit is contained in:
Arturo Gonzalez 2017-06-12 13:33:41 +02:00
parent ff30396595
commit 00ac431216
1 changed files with 145 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

195
pandora_console/include/functions_graph.php
View File

@ -350,15 +350,9 @@ function grafico_modulo_sparse_data_chart (&$chart, &$chart_data_extra, &$long_i
}
elseif ($period < SECONDS_1MONTH) {
$time_format = "M \nd H\h";
if ($fullscale) {
$time_format = "M \nd H:i";
}
}
elseif ($period < SECONDS_6MONTHS) {
$time_format = "M \nd H\h";
if ($fullscale) {
$time_format = "M \nd H:i";
}
}
else {
$time_format = "M Y";
@ -377,15 +371,9 @@ function grafico_modulo_sparse_data_chart (&$chart, &$chart_data_extra, &$long_i
}
elseif ($period < SECONDS_1MONTH) {
$time_format = "M d H\h";
if ($fullscale) {
$time_format = "M d H:i";
}
}
elseif ($period < SECONDS_6MONTHS) {
$time_format = "M d H\h";
if ($fullscale) {
$time_format = "M d H:i";
}
}
else {
$time_format = "M Y";
@ -396,8 +384,10 @@ function grafico_modulo_sparse_data_chart (&$chart, &$chart_data_extra, &$long_i
$long_index[$timestamp_short] = date(
html_entity_decode($config['date_format'], ENT_QUOTES, "UTF-8"), $timestamp);
if (!$projection) {
if (!$fullscale) {
$timestamp = $timestamp_short;
}
}
// Data
if ($show_events) {
@ -575,20 +565,12 @@ function grafico_modulo_sparse_data ($agent_module_id, $period, $show_events,
// Get module data
if ($fullscale) {
$uncompress_data = db_uncompress_module_data((int)$agent_module_id, $datelimit, $date);
$new_data = array();
$index = 0;
foreach ($uncompress_data as $key => $u_data) {
foreach ($u_data['data'] as $key2 => $u_data2) {
if ($u_data2['datos'] != "") {
$new_data[$index]['datos'] = $u_data2['datos'];
$new_data[$index]['utimestamp'] = $u_data2['utimestamp'];
$index++;
}
}
}
$data = $new_data;
$data = db_get_all_rows_filter ('tagente_datos',
array ('id_agente_modulo' => (int)$agent_module_id,
"utimestamp > $datelimit",
"utimestamp < $date",
'order' => 'utimestamp ASC'),
array ('datos', 'utimestamp'), 'AND', true);
}
else {
$data = db_get_all_rows_filter ('tagente_datos',
@ -683,9 +665,11 @@ function grafico_modulo_sparse_data ($agent_module_id, $period, $show_events,
}
if ($fullscale) {
if (count($data) > $resolution) {
$resolution = count($data); //Number of points of the graph
$interval = (int) ($period / $resolution);
}
}
// Calculate chart data
grafico_modulo_sparse_data_chart ($chart, $chart_data_extra, $long_index,
@ -695,6 +679,60 @@ function grafico_modulo_sparse_data ($agent_module_id, $period, $show_events,
$baseline_data, $events, $series_suffix, $start_unknown,
$percentil, $fullscale);
if ($fullscale) {
if (!$flash_chart) {
// Set the title and time format
if ($period <= SECONDS_6HOURS) {
$time_format = 'H:i:s';
}
elseif ($period < SECONDS_1DAY) {
$time_format = 'H:i';
}
elseif ($period < SECONDS_15DAYS) {
$time_format = "M \nd H:i";
}
elseif ($period < SECONDS_1MONTH) {
$time_format = "M \nd H\h";
}
elseif ($period < SECONDS_6MONTHS) {
$time_format = "M \nd H\h";
}
else {
$time_format = "M Y";
}
}
else {
// Set the title and time format
if ($period <= SECONDS_6HOURS) {
$time_format = 'H:i:s';
}
elseif ($period < SECONDS_1DAY) {
$time_format = 'H:i';
}
elseif ($period < SECONDS_15DAYS) {
$time_format = "M d H:i";
}
elseif ($period < SECONDS_1MONTH) {
$time_format = "M d H\h";
}
elseif ($period < SECONDS_6MONTHS) {
$time_format = "M d H\h";
}
else {
$time_format = "M Y";
}
}
$new_chart = array();
foreach ($chart as $c_timestamp => $c_data) {
$timestamp_short = date($time_format, $c_timestamp);
$new_chart[$timestamp_short] = $c_data;
}
$chart = $new_chart;
}
// Return chart data and don't draw
if ($return_data == 1) {
return $chart;
@ -3673,6 +3711,21 @@ function grafico_modulo_boolean_data ($agent_module_id, $period, $show_events,
}
}
if ($fullscale) {
// Get module data
$data = db_get_all_rows_filter ('tagente_datos',
array ('id_agente_modulo' => $agent_module_id,
"utimestamp > $datelimit",
"utimestamp < $date",
'order' => 'utimestamp ASC'),
array ('datos', 'utimestamp'), 'AND', true);
if (count($data) > $resolution) {
$resolution = count($data); //Number of points of the graph
$interval = (int) ($period / $resolution);
}
}
else {
// Get module data
$data = db_get_all_rows_filter ('tagente_datos',
array ('id_agente_modulo' => $agent_module_id,
@ -3680,32 +3733,12 @@ function grafico_modulo_boolean_data ($agent_module_id, $period, $show_events,
"utimestamp < $date",
'order' => 'utimestamp ASC'),
array ('datos', 'utimestamp'), 'AND', $search_in_history_db);
}
if ($data === false) {
$data = array ();
}
if ($fullscale) {
$all_data = db_uncompress_module_data($agent_module_id, $datelimit, $date);
$new_uncompress_data = array();
$index = 0;
foreach ($all_data as $uncompress_data) {
foreach ($uncompress_data['data'] as $mod_data) {
if ($mod_data['datos'] != "") {
$new_uncompress_data[$index]['datos'] = $mod_data['datos'];
$new_uncompress_data[$index]['utimestamp'] = $mod_data['utimestamp'];
$index++;
}
}
}
$new_uncompress_data[$index - 1]['id_agente_modulo'] = $agent_module_id;
$data = $new_uncompress_data;
$resolution = count($data); //Number of points of the graph
$interval = (int) ($period / $resolution);
}
// Uncompressed module data
if ($uncompressed_module) {
$min_necessary = 1;
@ -3851,15 +3884,9 @@ function grafico_modulo_boolean_data ($agent_module_id, $period, $show_events,
}
elseif ($period < SECONDS_1MONTH) {
$time_format = 'M d H\h';
if ($fullscale) {
$time_format = 'M d H:i';
}
}
else {
$time_format = 'M d H\h';
if ($fullscale) {
$time_format = 'M d H:i';
}
}
$timestamp_short = date($time_format, $timestamp);
@ -3967,18 +3994,12 @@ function grafico_modulo_boolean_data ($agent_module_id, $period, $show_events,
}
elseif ($period < SECONDS_1MONTH) {
$time_format = 'M d H\h';
if ($fullscale) {
$time_format = 'M d H:i';
}
}
elseif ($period < SECONDS_6MONTHS) {
$time_format = "M d H\h";
}
else {
$time_format = 'M d H\h';
if ($fullscale) {
$time_format = 'M d H:i';
}
}
// Flash chart
@ -4088,6 +4109,60 @@ function grafico_modulo_boolean ($agent_module_id, $period, $show_events,
grafico_modulo_boolean_data ($agent_module_id, $period, $show_events,
$unit_name, $show_alerts, $avg_only, $date, '', '', $show_unknown, $fullscale);
if ($fullscale) {
if (!$flash_chart) {
// Set the title and time format
if ($period <= SECONDS_6HOURS) {
$time_format = 'H:i:s';
}
elseif ($period < SECONDS_1DAY) {
$time_format = 'H:i';
}
elseif ($period < SECONDS_15DAYS) {
$time_format = "M \nd H:i";
}
elseif ($period < SECONDS_1MONTH) {
$time_format = "M \nd H\h";
}
elseif ($period < SECONDS_6MONTHS) {
$time_format = "M \nd H\h";
}
else {
$time_format = "M Y";
}
}
else {
// Set the title and time format
if ($period <= SECONDS_6HOURS) {
$time_format = 'H:i:s';
}
elseif ($period < SECONDS_1DAY) {
$time_format = 'H:i';
}
elseif ($period < SECONDS_15DAYS) {
$time_format = "M d H:i";
}
elseif ($period < SECONDS_1MONTH) {
$time_format = "M d H\h";
}
elseif ($period < SECONDS_6MONTHS) {
$time_format = "M d H\h";
}
else {
$time_format = "M Y";
}
}
$new_chart = array();
foreach ($chart as $c_timestamp => $c_data) {
$timestamp_short = date($time_format, $c_timestamp);
$new_chart[$timestamp_short] = $c_data;
}
$chart = $new_chart;
}
if ($compare === 'overlapped') {
$i = 0;
foreach($chart as $k => $v) {