tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-31 01:35:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-9427-#14100-Acceder-por-vista-táctica-a-alertas-lanzadas-pierde-filtro' into 'develop'

Browse Source 
Ent 9427 #14100 acceder por vista táctica a alertas lanzadas pierde filtro

https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/9427

See merge request artica/pandorafms!5077
This commit is contained in:
Jimmy Olano 2022-09-01 21:41:11 +00:00
commit 608f48f416
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pandora_console/include/functions_reporting.php
View File

@ -2448,8 +2448,8 @@ function reporting_event_report_module(
/** /**
* Generate agents inventory report. * Generate agents inventory report.
* *
* @param array $report Report info. * @param array $report Report info.
* @param array $content Content info. * @param array $content Content info.
* *
* @return array * @return array
*/ */
@ -2647,8 +2647,8 @@ function reporting_agents_inventory($report, $content)
/** /**
* Generate modules inventory report. * Generate modules inventory report.
* *
* @param array $report Report info. * @param array $report Report info.
* @param array $content Content info. * @param array $content Content info.
* *
* @return array * @return array
*/ */
@ -11621,7 +11621,7 @@ function reporting_get_stats_alerts($data, $links=false)
{ {
global $config; global $config;
// Link URLS // Link URLS.
$mobile = false; $mobile = false;
if (isset($data['mobile'])) { if (isset($data['mobile'])) {
if ($data['mobile']) { if ($data['mobile']) {
@ -11637,14 +11637,14 @@ function reporting_get_stats_alerts($data, $links=false)
$urls = []; $urls = [];
if ($links) { if ($links) {
$urls['monitor_alerts'] = 'index.php?sec=estado&sec2=operation/agentes/alerts_status&pure='.$config['pure']; $urls['monitor_alerts'] = 'index.php?sec=estado&sec2=operation/agentes/alerts_status&pure='.$config['pure'];
$urls['monitor_alerts_fired'] = 'index.php?sec=estado&sec2=operation/agentes/alerts_status&filter=fired&pure='.$config['pure']; $urls['monitor_alerts_fired'] = 'index.php?sec=estado&sec2=operation/agentes/alerts_status&disabled=fired&pure='.$config['pure'];
} else { } else {
$urls['monitor_alerts'] = $config['homeurl'].'index.php?sec=estado&sec2=operation/agentes/alerts_status&refr=60'; $urls['monitor_alerts'] = $config['homeurl'].'index.php?sec=estado&sec2=operation/agentes/alerts_status&refr=60';
$urls['monitor_alerts_fired'] = $config['homeurl'].'index.php?sec=estado&sec2=operation/agentes/alerts_status&refr=60&filter=fired'; $urls['monitor_alerts_fired'] = $config['homeurl'].'index.php?sec=estado&sec2=operation/agentes/alerts_status&refr=60&disabled=fired';
} }
} }
// Alerts table // Alerts table.
$table_al = html_get_predefined_table(); $table_al = html_get_predefined_table();
$tdata = []; $tdata = [];
@ -11683,7 +11683,7 @@ function reporting_get_stats_alerts($data, $links=false)
$output = '<fieldset class="databox tactical_set"> $output = '<fieldset class="databox tactical_set">
<legend>'.__('Defined and fired alerts').'</legend>'.html_print_table($table_al, true).'</fieldset>'; <legend>'.__('Defined and fired alerts').'</legend>'.html_print_table($table_al, true).'</fieldset>';
} else { } else {
// Remove the defined alerts cause with the new cache table is difficult to retrieve them // Remove the defined alerts cause with the new cache table is difficult to retrieve them.
unset($table_al->data[0][0], $table_al->data[0][1]); unset($table_al->data[0][0], $table_al->data[0][1]);
$table_al->class = 'tactical_view'; $table_al->class = 'tactical_view';