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

fixed errors label report

This commit is contained in:
Daniel Barbero Martin 2019-05-23 17:52:28 +02:00
parent ae11ea18c9
commit 1386a44e07
2 changed files with 33 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pandora_console/godmode/reporting/reporting_builder.item_editor.php
View File

@ -3878,7 +3878,6 @@ function chooseType() {
switch (type) {
case 'event_report_agent':
case 'simple_graph':
case 'agent_configuration':
case 'event_report_module':
case 'alert_report_agent':
case 'alert_report_module':

42
pandora_console/include/functions_reporting.php
View File

@ -1914,6 +1914,11 @@ function reporting_event_report_module(
$return['title'] = $content['name'];
$return['subtitle'] = agents_get_alias($content['id_agent']).' - '.io_safe_output(modules_get_agentmodule_name($content['id_agent_module']));
$return['label'] = (isset($content['style']['label'])) ? $content['style']['label'] : '';
if ($return['label'] != '') {
$return['label'] = reporting_label_macro($content, $return['label']);
}
if (is_metaconsole()) {
metaconsole_restore_db();
}
@ -1921,7 +1926,6 @@ function reporting_event_report_module(
$return['description'] = $content['description'];
$return['show_extended_events'] = $content['show_extended_events'];
$return['date'] = reporting_get_date_text($report, $content);
$return['label'] = (isset($content['style']['label'])) ? $content['style']['label'] : '';
$event_filter = $content['style'];
$return['show_summary_group'] = $event_filter['show_summary_group'];
@ -2777,12 +2781,6 @@ function reporting_event_report_agent(
$return['description'] = $content['description'];
$return['date'] = reporting_get_date_text($report, $content);
$label = (isset($content['style']['label'])) ? $content['style']['label'] : '';
if ($label != '') {
$label = reporting_label_macro($content, $label);
}
$return['label'] = $label;
$return['show_summary_group'] = $content['style']['show_summary_group'];
$return['show_extended_events'] = $content['show_extended_events'];
@ -2842,6 +2840,12 @@ function reporting_event_report_agent(
$metaconsole_dbtable = false;
}
$label = (isset($content['style']['label'])) ? $content['style']['label'] : '';
if ($label != '') {
$label = reporting_label_macro($content, $label);
}
$return['label'] = $label;
if ($event_graph_by_user_validator) {
$data_graph = events_get_count_events_validated_by_user(
['id_agent' => $content['id_agent']],
@ -2958,7 +2962,11 @@ function reporting_historical_data($report, $content)
$return['subtitle'] = $agent_name.' - '.$module_name;
$return['description'] = $content['description'];
$return['date'] = reporting_get_date_text($report, $content);
$return['label'] = (isset($content['style']['label'])) ? $content['style']['label'] : '';
if ($return['label'] != '') {
$return['label'] = reporting_label_macro($content, $return['label']);
}
$return['keys'] = [
__('Date'),
@ -3034,7 +3042,6 @@ function reporting_database_serialized($report, $content)
$return['subtitle'] = $agent_name.' - '.$module_name;
$return['description'] = $content['description'];
$return['date'] = reporting_get_date_text($report, $content);
$return['label'] = (isset($content['style']['label'])) ? $content['style']['label'] : '';
$keys = [];
if (isset($content['header_definition']) && ($content['header_definition'] != '')) {
@ -3060,6 +3067,11 @@ function reporting_database_serialized($report, $content)
metaconsole_connect($server);
}
$return['label'] = (isset($content['style']['label'])) ? $content['style']['label'] : '';
if ($return['label'] != '') {
$return['label'] = reporting_label_macro($content, $return['label']);
}
$datelimit = ($report['datetime'] - $content['period']);
$search_in_history_db = db_search_in_history_db($datelimit);
@ -3606,7 +3618,12 @@ function reporting_alert_report_agent($report, $content)
$return['subtitle'] = $agent_name;
$return['description'] = $content['description'];
$return['date'] = reporting_get_date_text($report, $content);
$return['label'] = (isset($content['style']['label'])) ? $content['style']['label'] : '';
if ($return['label'] != '') {
$return['label'] = reporting_label_macro($content, $return['label']);
}
$module_list = agents_get_modules($content['id_agent']);
$data = [];
@ -3738,6 +3755,9 @@ function reporting_alert_report_module($report, $content)
$return['description'] = $content['description'];
$return['date'] = reporting_get_date_text($report, $content);
$return['label'] = (isset($content['style']['label'])) ? $content['style']['label'] : '';
if ($return['label'] != '') {
$return['label'] = reporting_label_macro($content, $return['label']);
}
$data_row = [];
@ -3940,7 +3960,6 @@ function reporting_monitor_report($report, $content)
$return['subtitle'] = $agent_name.' - '.$module_name;
$return['description'] = $content['description'];
$return['date'] = reporting_get_date_text($report, $content);
$return['label'] = (isset($content['style']['label'])) ? $content['style']['label'] : '';
if ($config['metaconsole']) {
$id_meta = metaconsole_get_id_server($content['server_name']);
@ -3949,6 +3968,11 @@ function reporting_monitor_report($report, $content)
metaconsole_connect($server);
}
$return['label'] = (isset($content['style']['label'])) ? $content['style']['label'] : '';
if ($return['label'] != '') {
$return['label'] = reporting_label_macro($content, $return['label']);
}
$module_name = io_safe_output(
modules_get_agentmodule_name($content['id_agent_module'])
);