mirror of
https://github.com/pandorafms/pandorafms.git
synced 2025-07-30 09:15:15 +02:00
Merge branch 'ent-7098-Solucion-para-mostar-datos-de-estado-warning' into 'develop'
new report histogram See merge request artica/pandorafms!3875
This commit is contained in:
commit
1f64b598c8
@ -343,6 +343,7 @@ switch ($action) {
|
|||||||
$failover_type = $item['failover_type'];
|
$failover_type = $item['failover_type'];
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case 'histogram_data':
|
||||||
case 'module_histogram_graph':
|
case 'module_histogram_graph':
|
||||||
$description = $item['description'];
|
$description = $item['description'];
|
||||||
$period = $item['period'];
|
$period = $item['period'];
|
||||||
@ -550,9 +551,18 @@ switch ($action) {
|
|||||||
|
|
||||||
|
|
||||||
$show_summary_group = $style['show_summary_group'];
|
$show_summary_group = $style['show_summary_group'];
|
||||||
$filter_event_severity = json_decode($style['filter_event_severity'], true);
|
$filter_event_severity = json_decode(
|
||||||
$filter_event_status = json_decode($style['filter_event_status'], true);
|
$style['filter_event_severity'],
|
||||||
$filter_event_type = json_decode($style['filter_event_type'], true);
|
true
|
||||||
|
);
|
||||||
|
$filter_event_status = json_decode(
|
||||||
|
$style['filter_event_status'],
|
||||||
|
true
|
||||||
|
);
|
||||||
|
$filter_event_type = json_decode(
|
||||||
|
$style['filter_event_type'],
|
||||||
|
true
|
||||||
|
);
|
||||||
|
|
||||||
$event_graph_by_user_validator = $style['event_graph_by_user_validator'];
|
$event_graph_by_user_validator = $style['event_graph_by_user_validator'];
|
||||||
$event_graph_by_criticity = $style['event_graph_by_criticity'];
|
$event_graph_by_criticity = $style['event_graph_by_criticity'];
|
||||||
@ -561,7 +571,6 @@ switch ($action) {
|
|||||||
|
|
||||||
$filter_search = $style['event_filter_search'];
|
$filter_search = $style['event_filter_search'];
|
||||||
$filter_exclude = $style['event_filter_exclude'];
|
$filter_exclude = $style['event_filter_exclude'];
|
||||||
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 'event_report_group':
|
case 'event_report_group':
|
||||||
@ -799,6 +808,7 @@ switch ($action) {
|
|||||||
case 'database_serialized':
|
case 'database_serialized':
|
||||||
case 'last_value':
|
case 'last_value':
|
||||||
case 'monitor_report':
|
case 'monitor_report':
|
||||||
|
case 'histogram_data':
|
||||||
case 'min_value':
|
case 'min_value':
|
||||||
case 'max_value':
|
case 'max_value':
|
||||||
case 'avg_value':
|
case 'avg_value':
|
||||||
@ -4136,6 +4146,7 @@ $(document).ready (function () {
|
|||||||
case 'max_value':
|
case 'max_value':
|
||||||
case 'min_value':
|
case 'min_value':
|
||||||
case 'monitor_report':
|
case 'monitor_report':
|
||||||
|
case 'histogram_data':
|
||||||
case 'database_serialized':
|
case 'database_serialized':
|
||||||
case 'last_value':
|
case 'last_value':
|
||||||
case 'sumatory':
|
case 'sumatory':
|
||||||
@ -4189,6 +4200,7 @@ $(document).ready (function () {
|
|||||||
case 'prediction_date':
|
case 'prediction_date':
|
||||||
case 'projection_graph':
|
case 'projection_graph':
|
||||||
case 'monitor_report':
|
case 'monitor_report':
|
||||||
|
case 'histogram_data':
|
||||||
case 'module_histogram_graph':
|
case 'module_histogram_graph':
|
||||||
case 'avg_value':
|
case 'avg_value':
|
||||||
case 'max_value':
|
case 'max_value':
|
||||||
@ -4274,6 +4286,7 @@ $(document).ready (function () {
|
|||||||
case 'max_value':
|
case 'max_value':
|
||||||
case 'min_value':
|
case 'min_value':
|
||||||
case 'monitor_report':
|
case 'monitor_report':
|
||||||
|
case 'histogram_data':
|
||||||
case 'database_serialized':
|
case 'database_serialized':
|
||||||
case 'last_value':
|
case 'last_value':
|
||||||
case 'sumatory':
|
case 'sumatory':
|
||||||
@ -4322,6 +4335,7 @@ $(document).ready (function () {
|
|||||||
case 'prediction_date':
|
case 'prediction_date':
|
||||||
case 'projection_graph':
|
case 'projection_graph':
|
||||||
case 'monitor_report':
|
case 'monitor_report':
|
||||||
|
case 'histogram_data':
|
||||||
case 'module_histogram_graph':
|
case 'module_histogram_graph':
|
||||||
case 'avg_value':
|
case 'avg_value':
|
||||||
case 'max_value':
|
case 'max_value':
|
||||||
@ -5337,6 +5351,7 @@ function chooseType() {
|
|||||||
$("#row_summary").show();
|
$("#row_summary").show();
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case 'histogram_data':
|
||||||
case 'module_histogram_graph':
|
case 'module_histogram_graph':
|
||||||
$("#row_description").show();
|
$("#row_description").show();
|
||||||
$("#row_period").show();
|
$("#row_period").show();
|
||||||
|
@ -2061,6 +2061,7 @@ switch ($action) {
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
case 'module_histogram_graph':
|
case 'module_histogram_graph':
|
||||||
|
case 'histogram_data':
|
||||||
case 'agent_configuration':
|
case 'agent_configuration':
|
||||||
case 'alert_report_agent':
|
case 'alert_report_agent':
|
||||||
case 'alert_report_module':
|
case 'alert_report_module':
|
||||||
@ -2694,6 +2695,7 @@ switch ($action) {
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
case 'module_histogram_graph':
|
case 'module_histogram_graph':
|
||||||
|
case 'histogram_data':
|
||||||
case 'agent_configuration':
|
case 'agent_configuration':
|
||||||
case 'alert_report_agent':
|
case 'alert_report_agent':
|
||||||
case 'alert_report_module':
|
case 'alert_report_module':
|
||||||
|
@ -842,6 +842,7 @@ function reporting_make_reporting_data(
|
|||||||
);
|
);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case 'histogram_data':
|
||||||
case 'module_histogram_graph':
|
case 'module_histogram_graph':
|
||||||
$report['contents'][] = reporting_module_histogram_graph(
|
$report['contents'][] = reporting_module_histogram_graph(
|
||||||
$report,
|
$report,
|
||||||
@ -13624,7 +13625,7 @@ function reporting_module_histogram_graph($report, $content, $pdf=0)
|
|||||||
|
|
||||||
$urlImage = ui_get_full_url(false, true, false, false);
|
$urlImage = ui_get_full_url(false, true, false, false);
|
||||||
|
|
||||||
$return['type'] = 'module_histogram_graph';
|
$return['type'] = $content['type'];
|
||||||
|
|
||||||
$ttl = 1;
|
$ttl = 1;
|
||||||
if ($pdf) {
|
if ($pdf) {
|
||||||
|
@ -43,6 +43,21 @@ require_once $config['homedir'].'/include/functions_ui.php';
|
|||||||
require_once $config['homedir'].'/include/functions_netflow.php';
|
require_once $config['homedir'].'/include/functions_netflow.php';
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Header function.
|
||||||
|
*
|
||||||
|
* @param object $table Table.
|
||||||
|
* @param boolean $mini Mini.
|
||||||
|
* @param string $title Title.
|
||||||
|
* @param string $subtitle Subtitle.
|
||||||
|
* @param integer $period Period.
|
||||||
|
* @param string $date Date.
|
||||||
|
* @param string $from From.
|
||||||
|
* @param string $to To.
|
||||||
|
* @param string $label Label.
|
||||||
|
*
|
||||||
|
* @return void
|
||||||
|
*/
|
||||||
function reporting_html_header(
|
function reporting_html_header(
|
||||||
&$table,
|
&$table,
|
||||||
$mini,
|
$mini,
|
||||||
@ -411,6 +426,10 @@ function reporting_html_print_report($report, $mini=false, $report_info=1)
|
|||||||
$mini
|
$mini
|
||||||
);
|
);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case 'histogram_data':
|
||||||
|
reporting_enterprise_html_histogram_data($table, $item, $mini);
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($item['type'] == 'agent_module') {
|
if ($item['type'] == 'agent_module') {
|
||||||
|
@ -754,6 +754,10 @@ function reports_get_report_types($template=false, $not_editor=false)
|
|||||||
'optgroup' => __('Modules'),
|
'optgroup' => __('Modules'),
|
||||||
'name' => __('Last value'),
|
'name' => __('Last value'),
|
||||||
];
|
];
|
||||||
|
$types['histogram_data'] = [
|
||||||
|
'optgroup' => __('Modules'),
|
||||||
|
'name' => __('Histogram'),
|
||||||
|
];
|
||||||
|
|
||||||
$types['general'] = [
|
$types['general'] = [
|
||||||
'optgroup' => __('Grouped'),
|
'optgroup' => __('Grouped'),
|
||||||
|
Loading…
x
Reference in New Issue
Block a user