diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php index 68e23b2a63..e82365bf89 100644 --- a/pandora_console/include/functions_events.php +++ b/pandora_console/include/functions_events.php @@ -3161,7 +3161,7 @@ function events_get_agent( } else { return events_get_events_no_grouped( $sql_where, - (is_metaconsole() && $id_server) ? true : false, + (is_metaconsole() === true && $id_server === false) ? true : false, $history ); } @@ -5337,16 +5337,22 @@ function events_get_count_events_by_agent( $tagente = 'tagente'; $tevento = 'tevento'; + $field_type = 'ta.id_agente'; + if ($dbmeta === true) { + $tagente = 'tmetaconsole_agent'; + $tevento = 'tmetaconsole_event'; + $field_type = 'ta.id_tagente'; + } $sql = sprintf( - 'SELECT + 'SELECT ta.id_agente, ta.alias as agent_name, count(*) as count FROM %s te %s INNER JOIN %s ta - ON te.id_agente = ta.id_agente + ON te.id_agente = %s INNER JOIN tgrupo tg ON (te.id_grupo = tg.id_grupo AND tg.id_grupo IN (%s)) OR (tg.id_grupo = tasg.id_group AND tasg.id_group IN (%s)) @@ -5355,6 +5361,7 @@ function events_get_count_events_by_agent( $tevento, events_get_secondary_groups_left_join($tevento), $tagente, + $field_type, implode(',', $id_group), implode(',', $id_group), $datelimit, @@ -5412,6 +5419,9 @@ function events_get_count_events_validated_by_user( ) { global $config; $tevento = 'tevento'; + if ($dbmeta === true) { + $tevento = 'tmetaconsole_event'; + } // Group. $tgroup_join = ''; @@ -5434,6 +5444,7 @@ function events_get_count_events_validated_by_user( ); } + $sql_filter = ''; if (!empty($filter['id_agent'])) { $sql_filter .= sprintf(' AND id_agente = %d ', $filter['id_agent']); } @@ -5608,6 +5619,9 @@ function events_get_count_events_by_criticity( global $config; $tevento = 'tevento'; + if ($dbmeta === true) { + $tevento = 'tmetaconsole_event'; + } $sql_filter = ''; $tgroup_join = ''; @@ -5795,6 +5809,9 @@ function events_get_count_events_validated( ) { global $config; $tevento = 'tevento'; + if ($dbmeta === true) { + $tevento = 'tmetaconsole_event'; + } // Group. $sql_filter = ''; diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php index e0700c93e0..58feb5a9b4 100755 --- a/pandora_console/include/functions_reporting.php +++ b/pandora_console/include/functions_reporting.php @@ -1828,9 +1828,8 @@ function reporting_event_report_group( $content['name'] = __('Event Report Group'); } - if ($config['metaconsole']) { + if (is_metaconsole() === true && empty($content['server_name']) === false) { $id_meta = metaconsole_get_id_server($content['server_name']); - $server = metaconsole_get_connection_by_id($id_meta); metaconsole_connect($server); } @@ -1924,7 +1923,7 @@ function reporting_event_report_group( $filter_event_filter_exclude ); - if (empty($data)) { + if (empty($data) === true) { $return['failed'] = __('No events'); } else { $return['data'] = array_reverse($data); @@ -1952,10 +1951,9 @@ function reporting_event_report_group( $return['chart']['by_criticity'] = null; $return['chart']['validated_vs_unvalidated'] = null; $server_name = $content['server_name']; - if (is_metaconsole() && $server_name != '') { + $metaconsole_dbtable = false; + if (is_metaconsole() === true && empty($server_name) === true) { $metaconsole_dbtable = true; - } else { - $metaconsole_dbtable = false; } if ($event_graph_by_agent) { @@ -2065,11 +2063,11 @@ function reporting_event_report_group( ); } - if ($config['metaconsole']) { + if (is_metaconsole() === true) { metaconsole_restore_db(); } - // total_events. + // Total events. if ($return['data'] != '') { $return['total_events'] = count($return['data']); } else {