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

Revert "Fixed problems of count agents and modules in group view. Tiquet: #3028,#3297"

Browse Source 
This reverts commit de680746e40294072b0ec5b07cce9540bec30e48.
This commit is contained in:
m-lopez-f 2016-01-29 14:24:38 +01:00
parent de680746e4
commit e381542ed5
3 changed files with 112 additions and 229 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

305
pandora_console/include/functions_groupview.php
View File

@ -14,9 +14,8 @@
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details. // GNU General Public License for more details.
include_once ("include/functions_groups.php");
include_once ($config['homedir'] . "/include/functions_groups.php"); include_once ("include/functions_tags.php");
include_once ($config['homedir'] . "/include/functions_tags.php");
function groupview_get_all_data ($id_user = false, $user_strict = false, $acltags, $returnAllGroup = false, $agent_filter = array(), $module_filter = array()) { function groupview_get_all_data ($id_user = false, $user_strict = false, $acltags, $returnAllGroup = false, $agent_filter = array(), $module_filter = array()) {
global $config; global $config;
@ -139,7 +138,7 @@ function groupview_get_all_data ($id_user = false, $user_strict = false, $acltag
$list[$group['id_grupo']]["_monitor_checks_"] = $list[$group['id_grupo']]["_monitors_not_init_"] + $list[$group['id_grupo']]["_monitors_unknown_"] + $list[$group['id_grupo']]["_monitors_warning_"] + $list[$group['id_grupo']]["_monitors_critical_"] + $list[$group['id_grupo']]["_monitors_ok_"]; $list[$group['id_grupo']]["_monitor_checks_"] = $list[$group['id_grupo']]["_monitors_not_init_"] + $list[$group['id_grupo']]["_monitors_unknown_"] + $list[$group['id_grupo']]["_monitors_warning_"] + $list[$group['id_grupo']]["_monitors_critical_"] + $list[$group['id_grupo']]["_monitors_ok_"];
// Calculate not_normal monitors // Calculate not_normal monitors
$list[$group['id_grupo']]["_monitor_not_normal_"] = $list[$group['id_grupo']]["_monitor_checks_"] - $list[$group['id_grupo']]["_monitors_ok_"]; $list[$group['id_grupo']]["_monitor_not_normal_"] = $list["_monitor_checks_"] - $list["_monitors_ok_"];
$total_agents = $list[$group['id_grupo']]['_total_agents_']; $total_agents = $list[$group['id_grupo']]['_total_agents_'];
@ -153,8 +152,6 @@ function groupview_get_all_data ($id_user = false, $user_strict = false, $acltag
disabled disabled
FROM tmetaconsole_agent FROM tmetaconsole_agent
WHERE id_grupo = " . $group['id_grupo'] ); WHERE id_grupo = " . $group['id_grupo'] );
$list[$group['id_grupo']]['_agents_unknown_'] = 0;
$list[$group['id_grupo']]['_agents_not_init_'] = 0;
foreach ($agents as $agent) { foreach ($agents as $agent) {
if (($agent['critical_count'] == 0) && ($agent['warning_count'] == 0) && ($group_agents['disabled'] == 0) && ($agent['normal_count'] == 0)) { if (($agent['critical_count'] == 0) && ($agent['warning_count'] == 0) && ($group_agents['disabled'] == 0) && ($agent['normal_count'] == 0)) {
if ($agent['unknown_count'] > 0) { if ($agent['unknown_count'] > 0) {
@ -238,93 +235,55 @@ function groupview_get_all_data ($id_user = false, $user_strict = false, $acltag
} }
else { else {
foreach ($list_groups as $group) { foreach ($list_groups as $group) {
//~ $group_agents = db_get_row_sql("SELECT SUM(warning_count) AS _monitors_warning_, $group_agents = db_get_row_sql("SELECT SUM(warning_count) AS _monitors_warning_,
//~ SUM(critical_count) AS _monitors_critical_, SUM(critical_count) AS _monitors_critical_,
//~ SUM(normal_count) AS _monitors_ok_, SUM(normal_count) AS _monitors_ok_,
//~ SUM(unknown_count) AS _monitors_unknown_, SUM(unknown_count) AS _monitors_unknown_,
//~ SUM(notinit_count) AS _monitors_not_init_, SUM(notinit_count) AS _monitors_not_init_,
//~ SUM(fired_count) AS _monitors_alerts_fired_, SUM(fired_count) AS _monitors_alerts_fired_,
//~ COUNT(*) AS _total_agents_, id_grupo, intervalo, COUNT(*) AS _total_agents_, id_grupo, intervalo,
//~ ultimo_contacto, disabled ultimo_contacto, disabled
//~ FROM tagente WHERE id_grupo = " . $group['id_grupo'] . " AND disabled = 0 GROUP BY id_grupo"); FROM tagente WHERE id_grupo = " . $group['id_grupo'] . " AND disabled = 0 GROUP BY id_grupo");
//~ $list[$group['id_grupo']]['_monitors_critical_'] = (int)$group_agents['_monitors_critical_']; $list[$group['id_grupo']]['_monitors_critical_'] = (int)$group_agents['_monitors_critical_'];
//~ $list[$group['id_grupo']]['_monitors_warning_'] = (int)$group_agents['_monitors_warning_']; $list[$group['id_grupo']]['_monitors_warning_'] = (int)$group_agents['_monitors_warning_'];
//~ $list[$group['id_grupo']]['_monitors_unknown_'] = (int)$group_agents['_monitors_unknown_']; $list[$group['id_grupo']]['_monitors_unknown_'] = (int)$group_agents['_monitors_unknown_'];
//~ $list[$group['id_grupo']]['_monitors_not_init_'] = (int)$group_agents['_monitors_not_init_']; $list[$group['id_grupo']]['_monitors_not_init_'] = (int)$group_agents['_monitors_not_init_'];
//~ $list[$group['id_grupo']]['_monitors_ok_'] = (int)$group_agents['_monitors_ok_']; $list[$group['id_grupo']]['_monitors_ok_'] = (int)$group_agents['_monitors_ok_'];
$agent_not_init = agents_get_agents(array (
'disabled' => 0, $list[$group['id_grupo']]['_monitors_alerts_fired_'] = (int)$group_agents['_monitors_alerts_fired_'];
'id_grupo' => $group['id_grupo'],
'status' => AGENT_STATUS_NOT_INIT), $list[$group['id_grupo']]['_total_agents_'] = (int)$group_agents['_total_agents_'];
array ('COUNT(*) as total'), 'AR', false);
$list[$group['id_grupo']]['_agents_not_init_'] = isset ($agent_not_init[0]['total']) ? $agent_not_init[0]['total'] : 0; $list[$group['id_grupo']]["_monitor_checks_"] = $list[$group['id_grupo']]["_monitors_not_init_"] + $list[$group['id_grupo']]["_monitors_unknown_"] + $list[$group['id_grupo']]["_monitors_warning_"] + $list[$group['id_grupo']]["_monitors_critical_"] + $list[$group['id_grupo']]["_monitors_ok_"];
$agent_unknown = agents_get_agents(array (
'disabled' => 0, // Calculate not_normal monitors
'id_grupo' => $group['id_grupo'], $list[$group['id_grupo']]["_monitor_not_normal_"] = $list["_monitor_checks_"] - $list["_monitors_ok_"];
'status' => AGENT_STATUS_UNKNOWN),
array ('COUNT(*) as total'), 'AR', false); $total_agents = $list[$group['id_grupo']]['_total_agents_'];
$list[$group['id_grupo']]['_agents_unknown_'] = isset ($agent_unknown[0]['total']) ? $agent_unknown[0]['total'] : 0;
$agent_total = agents_get_agents(array ( if (($group['id_grupo'] != 0) && ($total_agents > 0)) {
'disabled' => 0, $agents = db_get_all_rows_sql("SELECT warning_count,
'id_grupo' => $group['id_grupo']), critical_count,
array ('COUNT(*) as total'), 'AR', false); normal_count,
$list[$group['id_grupo']]['_total_agents_'] = isset ($agent_total[0]['total']) ? $agent_total[0]['total'] : 0; unknown_count,
//~ notinit_count,
//~ $list[$group['id_grupo']]['_monitors_alerts_fired_'] = (int)$group_agents['_monitors_alerts_fired_']; fired_count,
disabled
//~ $list[$group['id_grupo']]['_total_agents_'] = (int)$group_agents['_total_agents_']; FROM tagente
WHERE id_grupo = " . $group['id_grupo'] );
//~ $list[$group['id_grupo']]["_monitor_checks_"] = $list[$group['id_grupo']]["_monitors_not_init_"] + $list[$group['id_grupo']]["_monitors_unknown_"] + $list[$group['id_grupo']]["_monitors_warning_"] + $list[$group['id_grupo']]["_monitors_critical_"] + $list[$group['id_grupo']]["_monitors_ok_"]; foreach ($agents as $agent) {
if (($agent['critical_count'] == 0) && ($agent['warning_count'] == 0) && ($group_agents['disabled'] == 0) && ($agent['normal_count'] == 0)) {
//~ // Calculate not_normal monitors if ($agent['unknown_count'] > 0) {
//~ $list[$group['id_grupo']]["_monitor_not_normal_"] = $list[$group['id_grupo']]["_monitor_checks_"] - $list[$group['id_grupo']]["_monitors_ok_"]; $list[$group['id_grupo']]['_agents_unknown_'] += 1;
$result_list = db_get_all_rows_sql("SELECT COUNT(*) as contado, estado }
FROM tagente_estado tae INNER JOIN tagente ta }
ON tae.id_agente = ta.id_agente if (($agent['critical_count'] == 0) && ($agent['warning_count'] == 0) && ($group_agents['disabled'] == 0) && ($agent['normal_count'] == 0) && ($agent['unknown_count'] == 0)) {
AND ta.disabled = 0 if ($agent['notinit_count'] > 0) {
AND ta.id_grupo = " . $group['id_grupo'] . " $list[$group['id_grupo']]['_agents_not_init_'] += 1;
INNER JOIN tagente_modulo tam }
ON tae.id_agente_modulo = tam.id_agente_modulo }
AND tam.disabled = 0
GROUP BY estado");
foreach ($result_list as $result) {
switch ($result['estado']) {
case AGENT_MODULE_STATUS_CRITICAL_ALERT:
break;
case AGENT_MODULE_STATUS_CRITICAL_BAD:
$list[$group['id_grupo']]['_monitors_critical_'] += (int)$result['contado'];
break;
case AGENT_MODULE_STATUS_WARNING_ALERT:
break;
case AGENT_MODULE_STATUS_WARNING:
$list[$group['id_grupo']]['_monitors_warning_'] += (int)$result['contado'];
break;
case AGENT_MODULE_STATUS_UNKNOWN:
$list[$group['id_grupo']]['_monitors_unknown_'] += (int)$result['contado'];
break;
case AGENT_MODULE_STATUS_NO_DATA:
case AGENT_MODULE_STATUS_NOT_INIT:
$list[$group['id_grupo']]['_monitors_not_init_'] += (int)$result['contado'];
break;
case AGENT_MODULE_STATUS_NORMAL_ALERT:
break;
case AGENT_MODULE_STATUS_NORMAL:
$list[$group['id_grupo']]['_monitors_ok_'] += (int)$result['contado'];
break;
} }
} }
$list[$group['id_grupo']]["_monitor_checks_"] = $list[$group['id_grupo']]["_monitors_not_init_"] +
$list[$group['id_grupo']]["_monitors_unknown_"] +
$list[$group['id_grupo']]["_monitors_warning_"] +
$list[$group['id_grupo']]["_monitors_critical_"] +
$list[$group['id_grupo']]["_monitors_ok_"];
//~
// Calculate not_normal monitors
$list[$group['id_grupo']]["_monitor_not_normal_"] = $list[$group['id_grupo']]["_monitor_checks_"] - $list[$group['id_grupo']]["_monitors_ok_"];
$list[$group['id_grupo']]['_monitors_alerts_fired_'] = groupview_monitor_fired_alerts ($group['id_grupo'], $user_strict,$group['id_grupo']);
} }
} }
@ -704,13 +663,12 @@ function groupview_get_data ($id_user = false, $user_strict = false, $acltags, $
$list[$group['id_grupo']]['_total_agents_'] = (int)$group_agents['_total_agents_']; $list[$group['id_grupo']]['_total_agents_'] = (int)$group_agents['_total_agents_'];
$list[$group['id_grupo']]["_monitor_checks_"] = $list[$group['id_grupo']]["_monitors_not_init_"] + $list[$group['id_grupo']]["_monitors_unknown_"] + $list[$group['id_grupo']]["_monitors_warning_"] + $list[$group['id_grupo']]["_monitors_critical_"] + $list[$group['id_grupo']]["_monitors_ok_"]; $list[$group['id_grupo']]["_monitor_checks_"] = $list[$group['id_grupo']]["_monitors_not_init_"] + $list[$group['id_grupo']]["_monitors_unknown_"] + $list[$group['id_grupo']]["_monitors_warning_"] + $list[$group['id_grupo']]["_monitors_critical_"] + $list[$group['id_grupo']]["_monitors_ok_"];
$list[$group['id_grupo']]["_iconImg_"] = $group['icon'];
// Calculate not_normal monitors // Calculate not_normal monitors
$list[$group['id_grupo']]["_monitor_not_normal_"] = $list[$group['id_grupo']]["_monitor_checks_"] - $list[$group['id_grupo']]["_monitors_ok_"]; $list[$group['id_grupo']]["_monitor_not_normal_"] = $list["_monitor_checks_"] - $list["_monitors_ok_"];
$total_agents = $list[$group['id_grupo']]['_total_agents_']; $total_agents = $list[$group['id_grupo']]['_total_agents_'];
$list[$group['id_grupo']]['_agents_unknown_'] = 0;
$list[$group['id_grupo']]['_agents_not_init_'] = 0;
if (($group['id_grupo'] != 0) && ($total_agents > 0)) { if (($group['id_grupo'] != 0) && ($total_agents > 0)) {
$agents = db_get_all_rows_sql("SELECT warning_count, $agents = db_get_all_rows_sql("SELECT warning_count,
critical_count, critical_count,
@ -721,7 +679,6 @@ function groupview_get_data ($id_user = false, $user_strict = false, $acltags, $
disabled disabled
FROM tmetaconsole_agent FROM tmetaconsole_agent
WHERE id_grupo = " . $group['id_grupo'] ); WHERE id_grupo = " . $group['id_grupo'] );
foreach ($agents as $agent) { foreach ($agents as $agent) {
if (($agent['critical_count'] == 0) && ($agent['warning_count'] == 0) && ($group_agents['disabled'] == 0) && ($agent['normal_count'] == 0)) { if (($agent['critical_count'] == 0) && ($agent['warning_count'] == 0) && ($group_agents['disabled'] == 0) && ($agent['normal_count'] == 0)) {
if ($agent['unknown_count'] > 0) { if ($agent['unknown_count'] > 0) {
@ -805,118 +762,57 @@ function groupview_get_data ($id_user = false, $user_strict = false, $acltags, $
} }
else { else {
foreach ($list_groups as $group) { foreach ($list_groups as $group) {
//~ $group_agents = db_get_row_sql("SELECT SUM(warning_count) AS _monitors_warning_, $group_agents = db_get_row_sql("SELECT SUM(warning_count) AS _monitors_warning_,
//~ SUM(critical_count) AS _monitors_critical_, SUM(critical_count) AS _monitors_critical_,
//~ SUM(normal_count) AS _monitors_ok_, SUM(normal_count) AS _monitors_ok_,
//~ SUM(unknown_count) AS _monitors_unknown_, SUM(unknown_count) AS _monitors_unknown_,
//~ SUM(notinit_count) AS _monitors_not_init_, SUM(notinit_count) AS _monitors_not_init_,
//~ SUM(fired_count) AS _monitors_alerts_fired_, SUM(fired_count) AS _monitors_alerts_fired_,
//~ COUNT(*) AS _total_agents_, id_grupo, intervalo, COUNT(*) AS _total_agents_, id_grupo, intervalo,
//~ ultimo_contacto, disabled ultimo_contacto, disabled
//~ FROM tagente WHERE id_grupo = " . $group['id_grupo'] . " AND disabled = 0 GROUP BY id_grupo"); FROM tagente WHERE id_grupo = " . $group['id_grupo'] . " AND disabled = 0 GROUP BY id_grupo");
//~ $list[$group['id_grupo']]['_monitors_critical_'] = (int)$group_agents['_monitors_critical_']; $list[$group['id_grupo']]['_monitors_critical_'] = (int)$group_agents['_monitors_critical_'];
//~ $list[$group['id_grupo']]['_monitors_warning_'] = (int)$group_agents['_monitors_warning_']; $list[$group['id_grupo']]['_monitors_warning_'] = (int)$group_agents['_monitors_warning_'];
//~ $list[$group['id_grupo']]['_monitors_unknown_'] = (int)$group_agents['_monitors_unknown_']; $list[$group['id_grupo']]['_monitors_unknown_'] = (int)$group_agents['_monitors_unknown_'];
//~ $list[$group['id_grupo']]['_monitors_not_init_'] = (int)$group_agents['_monitors_not_init_']; $list[$group['id_grupo']]['_monitors_not_init_'] = (int)$group_agents['_monitors_not_init_'];
//~ $list[$group['id_grupo']]['_monitors_ok_'] = (int)$group_agents['_monitors_ok_']; $list[$group['id_grupo']]['_monitors_ok_'] = (int)$group_agents['_monitors_ok_'];
//~
//~ $list[$group['id_grupo']]['_monitors_alerts_fired_'] = (int)$group_agents['_monitors_alerts_fired_']; $list[$group['id_grupo']]['_monitors_alerts_fired_'] = (int)$group_agents['_monitors_alerts_fired_'];
//~
//~ $list[$group['id_grupo']]['_total_agents_'] = (int)$group_agents['_total_agents_']; $list[$group['id_grupo']]['_total_agents_'] = (int)$group_agents['_total_agents_'];
//~
//~ $list[$group['id_grupo']]["_monitor_checks_"] = $list[$group['id_grupo']]["_monitors_not_init_"] + $list[$group['id_grupo']]["_monitors_unknown_"] + $list[$group['id_grupo']]["_monitors_warning_"] + $list[$group['id_grupo']]["_monitors_critical_"] + $list[$group['id_grupo']]["_monitors_ok_"]; $list[$group['id_grupo']]["_monitor_checks_"] = $list[$group['id_grupo']]["_monitors_not_init_"] + $list[$group['id_grupo']]["_monitors_unknown_"] + $list[$group['id_grupo']]["_monitors_warning_"] + $list[$group['id_grupo']]["_monitors_critical_"] + $list[$group['id_grupo']]["_monitors_ok_"];
//~
//~ // Calculate not_normal monitors // Calculate not_normal monitors
//~ $list[$group['id_grupo']]["_monitor_not_normal_"] = $list[$group['id_grupo']]["_monitor_checks_"] - $list[$group['id_grupo']]["_monitors_ok_"]; $list[$group['id_grupo']]["_monitor_not_normal_"] = $list["_monitor_checks_"] - $list["_monitors_ok_"];
//~
//~ $agent_not_init = agents_get_agents(array ( $total_agents = $list[$group['id_grupo']]['_total_agents_'];
//~ 'disabled' => 0,
//~ 'id_grupo' => $group['id_grupo'], if (($group['id_grupo'] != 0) && ($total_agents > 0)) {
//~ 'status' => AGENT_STATUS_NOT_INIT), $agents = db_get_all_rows_sql("SELECT warning_count,
//~ array ('COUNT(*) as total'), 'AR', false); critical_count,
//~ $list[$group['id_grupo']]['_agents_not_init_'] = isset ($agent_not_init[0]['total']) ? $agent_not_init[0]['total'] : 0; normal_count,
//~ $agent_unknown = agents_get_agents(array ( unknown_count,
//~ 'disabled' => 0, notinit_count,
//~ 'id_grupo' => $group['id_grupo'], fired_count,
//~ 'status' => AGENT_STATUS_UNKNOWN), disabled
//~ array ('COUNT(*) as total'), 'AR', false); FROM tagente
//~ $list[$group['id_grupo']]['_agents_unknown_'] = isset ($agent_unknown[0]['total']) ? $agent_unknown[0]['total'] : 0; WHERE id_grupo = " . $group['id_grupo'] );
$result_list = db_get_all_rows_sql("SELECT COUNT(*) as contado, estado foreach ($agents as $agent) {
FROM tagente_estado tae INNER JOIN tagente ta if (($agent['critical_count'] == 0) && ($agent['warning_count'] == 0) && ($group_agents['disabled'] == 0) && ($agent['normal_count'] == 0)) {
ON tae.id_agente = ta.id_agente if ($agent['unknown_count'] > 0) {
AND ta.disabled = 0 $list[$group['id_grupo']]['_agents_unknown_'] += 1;
AND ta.id_grupo = " . $group['id_grupo'] . " }
INNER JOIN tagente_modulo tam }
ON tae.id_agente_modulo = tam.id_agente_modulo if (($agent['critical_count'] == 0) && ($agent['warning_count'] == 0) && ($group_agents['disabled'] == 0) && ($agent['normal_count'] == 0) && ($agent['unknown_count'] == 0)) {
AND tam.disabled = 0 if ($agent['notinit_count'] > 0) {
GROUP BY estado"); $list[$group['id_grupo']]['_agents_not_init_'] += 1;
}
if ($result_list) {
foreach ($result_list as $result) {
switch ($result['estado']) {
case AGENT_MODULE_STATUS_CRITICAL_ALERT:
break;
case AGENT_MODULE_STATUS_CRITICAL_BAD:
$list[$group['id_grupo']]['_monitors_critical_'] += (int)$result['contado'];
break;
case AGENT_MODULE_STATUS_WARNING_ALERT:
break;
case AGENT_MODULE_STATUS_WARNING:
$list[$group['id_grupo']]['_monitors_warning_'] += (int)$result['contado'];
break;
case AGENT_MODULE_STATUS_UNKNOWN:
$list[$group['id_grupo']]['_monitors_unknown_'] += (int)$result['contado'];
break;
case AGENT_MODULE_STATUS_NO_DATA:
case AGENT_MODULE_STATUS_NOT_INIT:
$list[$group['id_grupo']]['_monitors_not_init_'] += (int)$result['contado'];
break;
case AGENT_MODULE_STATUS_NORMAL_ALERT:
break;
case AGENT_MODULE_STATUS_NORMAL:
$list[$group['id_grupo']]['_monitors_ok_'] += (int)$result['contado'];
break;
} }
} }
$agent_not_init = agents_get_agents(array (
'disabled' => 0,
'id_grupo' => $group['id_grupo'],
'status' => AGENT_STATUS_NOT_INIT),
array ('COUNT(*) as total'), 'AR', false);
$list[$group['id_grupo']]['_agents_not_init_'] = isset ($agent_not_init[0]['total']) ? $agent_not_init[0]['total'] : 0;
$agent_unknown = agents_get_agents(array (
'disabled' => 0,
'id_grupo' => $group['id_grupo'],
'status' => AGENT_STATUS_UNKNOWN),
array ('COUNT(*) as total'), 'AR', false);
$list[$group['id_grupo']]['_agents_unknown_'] = isset ($agent_unknown[0]['total']) ? $agent_unknown[0]['total'] : 0;
$agent_total = agents_get_agents(array (
'disabled' => 0,
'id_grupo' => $group['id_grupo']),
array ('COUNT(*) as total'), 'AR', false);
$list[$group['id_grupo']]['_total_agents_'] = isset ($agent_total[0]['total']) ? $agent_total[0]['total'] : 0;
$list[$group['id_grupo']]["_monitor_checks_"] = $list[$group['id_grupo']]["_monitors_not_init_"] +
$list[$group['id_grupo']]["_monitors_unknown_"] +
$list[$group['id_grupo']]["_monitors_warning_"] +
$list[$group['id_grupo']]["_monitors_critical_"] +
$list[$group['id_grupo']]["_monitors_ok_"];
//~
// Calculate not_normal monitors
$list[$group['id_grupo']]["_monitor_not_normal_"] = $list[$group['id_grupo']]["_monitor_checks_"] - $list[$group['id_grupo']]["_monitors_ok_"];
$list[$group['id_grupo']]['_monitors_alerts_fired_'] = groupview_monitor_fired_alerts ($group['id_grupo'], $user_strict,$group['id_grupo']);
}
else {
$list[$group['id_grupo']]['_agents_not_init_'] = 0;
$list[$group['id_grupo']]['_agents_unknown_'] = 0;
$list[$group['id_grupo']]['_total_agents_'] = 0;
$list[$group['id_grupo']]["_monitor_checks_"] = 0;
$list[$group['id_grupo']]["_monitor_not_normal_"] = 0;
$list[$group['id_grupo']]['_monitors_alerts_fired_'] = 0;
} }
} }
} }
if ($user_strict) { if ($user_strict) {
@ -977,7 +873,6 @@ function groupview_order_groups_for_parents ($view_groups) {
} }
// Build the group hierarchy // Build the group hierarchy
foreach ($groups as $id => $group) { foreach ($groups as $id => $group) {
$groups[$id]['have_parent'] = false;
if (!isset($groups[$id]['parent'])) if (!isset($groups[$id]['parent']))
continue; continue;
$parent = $groups[$id]['parent']; $parent = $groups[$id]['parent'];

33
pandora_console/operation/agentes/group_view.php
View File

@ -69,16 +69,6 @@ $strict_user = db_get_value('strict_acl', 'tusuario', 'id_user', $config['id_use
$all_data = groupview_status_modules_agents ($config['id_user'], $strict_user, 'AR', $strict_user); $all_data = groupview_status_modules_agents ($config['id_user'], $strict_user, 'AR', $strict_user);
$total_agentes = 0;
$monitor_ok = 0;
$monitor_warning = 0;
$monitor_critical = 0;
$monitor_unknown = 0;
$monitor_not_init = 0;
$agents_unknown = 0;
$agents_notinit = 0;
$all_alerts_fired = 0;
foreach ($all_data as $group_all_data) { foreach ($all_data as $group_all_data) {
$total_agentes += $group_all_data["_total_agents_"]; $total_agentes += $group_all_data["_total_agents_"];
$monitor_ok += $group_all_data["_monitors_ok_"]; $monitor_ok += $group_all_data["_monitors_ok_"];
@ -86,9 +76,10 @@ foreach ($all_data as $group_all_data) {
$monitor_critical += $group_all_data["_monitors_critical_"]; $monitor_critical += $group_all_data["_monitors_critical_"];
$monitor_unknown += $group_all_data["_monitors_unknown_"]; $monitor_unknown += $group_all_data["_monitors_unknown_"];
$monitor_not_init += $group_all_data["_monitors_not_init_"]; $monitor_not_init += $group_all_data["_monitors_not_init_"];
$agents_unknown += $group_all_data["_agents_unknown_"]; $agents_unknown += $group_all_data["_agents_unknown_"];
$agents_notinit += $group_all_data["_agents_not_init_"]; $agents_notinit += $group_all_data["_agents_not_init_"];
$all_alerts_fired += $group_all_data["_monitors_alerts_fired_"]; $all_alerts_fired += $group_all_data["_monitors_alerts_fired_"];
} }
@ -163,9 +154,7 @@ if (!empty($result_groups)) {
echo "<th width='10%' style='min-width: 60px;text-align:center;'>" . __("Critical") . "</th>"; echo "<th width='10%' style='min-width: 60px;text-align:center;'>" . __("Critical") . "</th>";
echo "<th width='10%' style='min-width: 60px;text-align:center;'>" . __("Alert fired") . "</th>"; echo "<th width='10%' style='min-width: 60px;text-align:center;'>" . __("Alert fired") . "</th>";
echo "</tr>"; echo "</tr>";
$result_groups = array_slice($result_groups, $offset, $config['block_size']); $result_groups = array_slice($result_groups, $offset, $config['block_size']);
foreach ($result_groups as $data) { foreach ($result_groups as $data) {
$groups_id = $data["_id_"]; $groups_id = $data["_id_"];
@ -254,7 +243,7 @@ if (!empty($result_groups)) {
$agent_counter = agents_get_group_agents($groups_id); $agent_counter = agents_get_group_agents($groups_id);
echo $link . count($agent_counter) . "</a>"; echo $link . count($agent_counter) . "</a>";
} }
if ($data["_total_agents_"] > 0 && $data["_id_"] != 0) { if ($data["_total_agents_"] > 0) {
echo $link . $data["_total_agents_"] . "</a>"; echo $link . $data["_total_agents_"] . "</a>";
} }
echo "</td>"; echo "</td>";
@ -271,7 +260,7 @@ if (!empty($result_groups)) {
if (($data["_id_"] == 0) && ($agents_unknown != 0)) { if (($data["_id_"] == 0) && ($agents_unknown != 0)) {
echo $link . $agents_unknown . "</a>"; echo $link . $agents_unknown . "</a>";
} }
if ($data["_agents_unknown_"] > 0 && ($data["_id_"] != 0)) { if ($data["_agents_unknown_"] > 0) {
echo $link . $data["_agents_unknown_"] . "</a>"; echo $link . $data["_agents_unknown_"] . "</a>";
} }
echo "</td>"; echo "</td>";
@ -288,7 +277,7 @@ if (!empty($result_groups)) {
if (($data["_id_"] == 0) && ($agents_notinit != 0)) { if (($data["_id_"] == 0) && ($agents_notinit != 0)) {
echo $link . $agents_notinit . "</a>"; echo $link . $agents_notinit . "</a>";
} }
if ($data["_agents_not_init_"] > 0 && ($data["_id_"] != 0)) { if ($data["_agents_not_init_"] > 0) {
echo $link . $data["_agents_not_init_"] . "</a>"; echo $link . $data["_agents_not_init_"] . "</a>";
} }
echo "</td>"; echo "</td>";
@ -305,7 +294,7 @@ if (!empty($result_groups)) {
if (($data["_id_"] == 0) && ($monitor_unknown != 0)) { if (($data["_id_"] == 0) && ($monitor_unknown != 0)) {
echo $link . $monitor_unknown . "</a>"; echo $link . $monitor_unknown . "</a>";
} }
if ($data["_monitors_unknown_"] > 0 && ($data["_id_"] != 0)) { if ($data["_monitors_unknown_"] > 0) {
echo $link . $data["_monitors_unknown_"] . "</a>"; echo $link . $data["_monitors_unknown_"] . "</a>";
} }
echo "</td>"; echo "</td>";
@ -322,7 +311,7 @@ if (!empty($result_groups)) {
if (($data["_id_"] == 0) && ($monitor_not_init != 0)) { if (($data["_id_"] == 0) && ($monitor_not_init != 0)) {
echo $link . $monitor_not_init . "</a>"; echo $link . $monitor_not_init . "</a>";
} }
if ($data["_monitors_not_init_"] > 0 && ($data["_id_"] != 0)) { if ($data["_monitors_not_init_"] > 0) {
echo $link . $data["_monitors_not_init_"] . "</a>"; echo $link . $data["_monitors_not_init_"] . "</a>";
} }
echo "</td>"; echo "</td>";
@ -339,7 +328,7 @@ if (!empty($result_groups)) {
if (($data["_id_"] == 0) && ($monitor_ok != 0)) { if (($data["_id_"] == 0) && ($monitor_ok != 0)) {
echo $link . $monitor_ok . "</a>"; echo $link . $monitor_ok . "</a>";
} }
if ($data["_monitors_ok_"] > 0 && ($data["_id_"] != 0)) { if ($data["_monitors_ok_"] > 0) {
echo $link . $data["_monitors_ok_"] . "</a>"; echo $link . $data["_monitors_ok_"] . "</a>";
} }
echo "</td>"; echo "</td>";
@ -356,7 +345,7 @@ if (!empty($result_groups)) {
if (($data["_id_"] == 0) && ($monitor_warning != 0)) { if (($data["_id_"] == 0) && ($monitor_warning != 0)) {
echo $link . $monitor_warning . "</a>"; echo $link . $monitor_warning . "</a>";
} }
if ($data["_monitors_warning_"] > 0 && ($data["_id_"] != 0)) { if ($data["_monitors_warning_"] > 0) {
echo $link . $data["_monitors_warning_"] . "</a>"; echo $link . $data["_monitors_warning_"] . "</a>";
} }
echo "</td>"; echo "</td>";
@ -373,7 +362,7 @@ if (!empty($result_groups)) {
if (($data["_id_"] == 0) && ($monitor_critical != 0)) { if (($data["_id_"] == 0) && ($monitor_critical != 0)) {
echo $link . $monitor_critical . "</a>"; echo $link . $monitor_critical . "</a>";
} }
if ($data["_monitors_critical_"] > 0 && ($data["_id_"] != 0)) { if ($data["_monitors_critical_"] > 0) {
echo $link . $data["_monitors_critical_"] . "</a>"; echo $link . $data["_monitors_critical_"] . "</a>";
} }
echo "</td>"; echo "</td>";
@ -390,7 +379,7 @@ if (!empty($result_groups)) {
if (($data["_id_"] == 0) && ($all_alerts_fired != 0)) { if (($data["_id_"] == 0) && ($all_alerts_fired != 0)) {
echo $link . $all_alerts_fired . "</a>"; echo $link . $all_alerts_fired . "</a>";
} }
if ($data["_monitors_alerts_fired_"] > 0 && ($data["_id_"] != 0)) { if ($data["_monitors_alerts_fired_"] > 0) {
echo $link . $data["_monitors_alerts_fired_"] . "</a>"; echo $link . $data["_monitors_alerts_fired_"] . "</a>";
} }
echo '</td>'; echo '</td>';

3
pandora_console/operation/agentes/status_monitor.php
View File

@ -186,8 +186,7 @@ elseif ($status == AGENT_MODULE_STATUS_UNKNOWN) { //Unknown
$sql_conditions .= " AND tagente_estado.estado = 3 AND tagente_estado.utimestamp <> 0"; $sql_conditions .= " AND tagente_estado.estado = 3 AND tagente_estado.utimestamp <> 0";
} }
elseif ($status == AGENT_MODULE_STATUS_NOT_INIT) { //Not init elseif ($status == AGENT_MODULE_STATUS_NOT_INIT) { //Not init
$sql_conditions .= " AND tagente_estado.utimestamp = 0 AND $sql_conditions .= " AND tagente_estado.utimestamp = 0
tagente_estado.estado IN (".AGENT_MODULE_STATUS_NO_DATA.",".AGENT_MODULE_STATUS_NOT_INIT." )
AND tagente_modulo.id_tipo_modulo NOT IN (21,22,23,100)"; AND tagente_modulo.id_tipo_modulo NOT IN (21,22,23,100)";
} }