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

Change some code for the CSV reports. 

(cherry picked from commit 4f5d798e63)
This commit is contained in:
mdtrooper 2015-12-29 12:11:48 +01:00
parent f6d6316e9e
commit 0fd9496e37
1 changed files with 37 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
pandora_console/include/functions_reporting.php
View File

@ -834,7 +834,7 @@ function reporting_event_top_n($report, $content, $type = 'dinamic',
$top_n_value = $content['top_n_value']; $top_n_value = $content['top_n_value'];
$show_graph = $content['show_graph']; $show_graph = $content['show_graph'];
$return['top_n'] = $content['top_n_value'];
if (empty($content['subitems'])) { if (empty($content['subitems'])) {
//Get all the related data //Get all the related data
@ -1590,44 +1590,53 @@ function reporting_exception($report, $content, $type = 'dinamic',
switch ($exception_condition) { switch ($exception_condition) {
case REPORT_EXCEPTION_CONDITION_EVERYTHING: case REPORT_EXCEPTION_CONDITION_EVERYTHING:
$return['subtitle'] = __('Exception - Everything'); $return['subtitle'] = __('Exception - Everything');
$return['subtype'] = __('Everything');
break; break;
case REPORT_EXCEPTION_CONDITION_GE: case REPORT_EXCEPTION_CONDITION_GE:
$return['subtitle'] = $return['subtitle'] =
sprintf(__('Exception - Modules over or equal to %s'), sprintf(__('Exception - Modules over or equal to %s'),
$formated_exception_value); $formated_exception_value);
$return['subtype'] = __('Modules over or equal to %s');
break; break;
case REPORT_EXCEPTION_CONDITION_LE: case REPORT_EXCEPTION_CONDITION_LE:
$return['subtitle'] = $return['subtitle'] =
sprintf(__('Exception - Modules under or equal to %s'), sprintf(__('Exception - Modules under or equal to %s'),
$formated_exception_value); $formated_exception_value);
$return['subtype'] = __('Modules under or equal to %s');
break; break;
case REPORT_EXCEPTION_CONDITION_L: case REPORT_EXCEPTION_CONDITION_L:
$return['subtitle'] = $return['subtitle'] =
sprintf(__('Exception - Modules under %s'), sprintf(__('Exception - Modules under %s'),
$formated_exception_value); $formated_exception_value);
$return['subtype'] = __('Modules under %s');
break; break;
case REPORT_EXCEPTION_CONDITION_G: case REPORT_EXCEPTION_CONDITION_G:
$return['subtitle'] = $return['subtitle'] =
sprintf(__('Exception - Modules over %s'), sprintf(__('Exception - Modules over %s'),
$formated_exception_value); $formated_exception_value);
$return['subtype'] = __('Modules over %s');
break; break;
case REPORT_EXCEPTION_CONDITION_E: case REPORT_EXCEPTION_CONDITION_E:
$return['subtitle'] = $return['subtitle'] =
sprintf(__('Exception - Equal to %s'), sprintf(__('Exception - Equal to %s'),
$formated_exception_value); $formated_exception_value);
$return['subtype'] = __('Equal to %s');
break; break;
case REPORT_EXCEPTION_CONDITION_NE: case REPORT_EXCEPTION_CONDITION_NE:
$return['subtitle'] = $return['subtitle'] =
sprintf(__('Exception - Not equal to %s'), sprintf(__('Exception - Not equal to %s'),
$formated_exception_value); $formated_exception_value);
$return['subtype'] = __('Not equal to %s');
break; break;
case REPORT_EXCEPTION_CONDITION_OK: case REPORT_EXCEPTION_CONDITION_OK:
$return['subtitle'] = $return['subtitle'] =
__('Exception - Modules at normal status'); __('Exception - Modules at normal status');
$return['subtype'] = __('Modules at normal status');
break; break;
case REPORT_EXCEPTION_CONDITION_NOT_OK: case REPORT_EXCEPTION_CONDITION_NOT_OK:
$return['subtitle'] = $return['subtitle'] =
__('Exception - Modules at critical or warning status'); __('Exception - Modules at critical or warning status');
$return['subtype'] = __('Modules at critical or warning status');
break; break;
} }
$return["description"] = $content["description"]; $return["description"] = $content["description"];
@ -2218,6 +2227,16 @@ function reporting_database_serialized($report, $content) {
$return['keys'] = $keys; $return['keys'] = $keys;
$module_name = io_safe_output(
modules_get_agentmodule_name($content['id_agent_module']));
$agent_name = io_safe_output(
modules_get_agentmodule_agent_name ($content['id_agent_module']));
$return['agent_name'] = $agent_name;
$return['module_name'] = $module_name;
$datelimit = $report["datetime"] - $content['period']; $datelimit = $report["datetime"] - $content['period'];
$search_in_history_db = db_search_in_history_db($datelimit); $search_in_history_db = db_search_in_history_db($datelimit);
@ -3199,6 +3218,18 @@ function reporting_projection_graph($report, $content,
$return["description"] = $content["description"]; $return["description"] = $content["description"];
$return["date"] = reporting_get_date_text($report, $content); $return["date"] = reporting_get_date_text($report, $content);
$module_name = io_safe_output(
modules_get_agentmodule_name($content['id_agent_module']));
$agent_name = io_safe_output(
modules_get_agentmodule_agent_name ($content['id_agent_module']));
$return['agent_name'] = $agent_name;
$return['module_name'] = $module_name;
set_time_limit(500); set_time_limit(500);
$output_projection = forecast_projection_graph( $output_projection = forecast_projection_graph(
@ -3246,6 +3277,11 @@ function reporting_projection_graph($report, $content,
); );
break; break;
case 'data': case 'data':
$return['data'] = forecast_projection_graph(
$content['id_agent_module'],
$content['period'],
$content['top_n_value'],
false, false, true);
break; break;
} }