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

Fixed problems with count agents and modules in group view. Tiquets: #3289, #3297 

(cherry picked from commit 64dd3e99ad)
This commit is contained in:
m-lopez-f 2016-02-01 11:36:26 +01:00
parent 619ed96bfb
commit 9227636655
1 changed files with 126 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

220
pandora_console/include/functions_groupview.php
View File

@ -105,6 +105,12 @@ function groupview_get_all_data ($id_user = false, $user_strict = false, $acltag
$list[$group['id_grupo']]['_monitors_unknown_'] = 0; $list[$group['id_grupo']]['_monitors_unknown_'] = 0;
$list[$group['id_grupo']]['_monitors_not_init_'] = 0; $list[$group['id_grupo']]['_monitors_not_init_'] = 0;
$list[$group['id_grupo']]['_monitors_ok_'] = 0; $list[$group['id_grupo']]['_monitors_ok_'] = 0;
$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 ($list_groups == false) { if ($list_groups == false) {
$list_groups = array(); $list_groups = array();
@ -138,7 +144,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["_monitor_checks_"] - $list["_monitors_ok_"]; $list[$group['id_grupo']]["_monitor_not_normal_"] = $list[$group['id_grupo']]["_monitor_checks_"] - $list[$group['id_grupo']]["_monitors_ok_"];
$total_agents = $list[$group['id_grupo']]['_total_agents_']; $total_agents = $list[$group['id_grupo']]['_total_agents_'];
@ -235,52 +241,62 @@ 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_, $agent_not_init = agents_get_agents(array (
SUM(critical_count) AS _monitors_critical_, 'disabled' => 0,
SUM(normal_count) AS _monitors_ok_, 'id_grupo' => $group['id_grupo'],
SUM(unknown_count) AS _monitors_unknown_, 'status' => AGENT_STATUS_NOT_INIT),
SUM(notinit_count) AS _monitors_not_init_, array ('COUNT(*) as total'), 'AR', false);
SUM(fired_count) AS _monitors_alerts_fired_, $list[$group['id_grupo']]['_agents_not_init_'] = isset ($agent_not_init[0]['total']) ? $agent_not_init[0]['total'] : 0;
COUNT(*) AS _total_agents_, id_grupo, intervalo, $agent_unknown = agents_get_agents(array (
ultimo_contacto, disabled 'disabled' => 0,
FROM tagente WHERE id_grupo = " . $group['id_grupo'] . " AND disabled = 0 GROUP BY id_grupo"); 'id_grupo' => $group['id_grupo'],
$list[$group['id_grupo']]['_monitors_critical_'] = (int)$group_agents['_monitors_critical_']; 'status' => AGENT_STATUS_UNKNOWN),
$list[$group['id_grupo']]['_monitors_warning_'] = (int)$group_agents['_monitors_warning_']; array ('COUNT(*) as total'), 'AR', false);
$list[$group['id_grupo']]['_monitors_unknown_'] = (int)$group_agents['_monitors_unknown_']; $list[$group['id_grupo']]['_agents_unknown_'] = isset ($agent_unknown[0]['total']) ? $agent_unknown[0]['total'] : 0;
$list[$group['id_grupo']]['_monitors_not_init_'] = (int)$group_agents['_monitors_not_init_']; $agent_total = agents_get_agents(array (
$list[$group['id_grupo']]['_monitors_ok_'] = (int)$group_agents['_monitors_ok_']; 'disabled' => 0,
'id_grupo' => $group['id_grupo']),
$list[$group['id_grupo']]['_monitors_alerts_fired_'] = (int)$group_agents['_monitors_alerts_fired_']; 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']]['_total_agents_'] = (int)$group_agents['_total_agents_']; $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[$group['id_grupo']]["_monitor_checks_"] - $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']]['_monitors_alerts_fired_'] = groupview_monitor_fired_alerts ($group['id_grupo'], $user_strict,$group['id_grupo']);
$result_list = db_get_all_rows_sql("SELECT COUNT(*) as contado, estado
// Calculate not_normal monitors FROM tagente_estado tae INNER JOIN tagente ta
$list[$group['id_grupo']]["_monitor_not_normal_"] = $list["_monitor_checks_"] - $list["_monitors_ok_"]; ON tae.id_agente = ta.id_agente
AND ta.disabled = 0
$total_agents = $list[$group['id_grupo']]['_total_agents_']; AND ta.id_grupo = " . $group['id_grupo'] . "
INNER JOIN tagente_modulo tam
if (($group['id_grupo'] != 0) && ($total_agents > 0)) { ON tae.id_agente_modulo = tam.id_agente_modulo
$agents = db_get_all_rows_sql("SELECT warning_count, AND tam.disabled = 0
critical_count, GROUP BY estado");
normal_count, if ($result_list) {
unknown_count, foreach ($result_list as $result) {
notinit_count, switch ($result['estado']) {
fired_count, case AGENT_MODULE_STATUS_CRITICAL_ALERT:
disabled
FROM tagente break;
WHERE id_grupo = " . $group['id_grupo'] ); case AGENT_MODULE_STATUS_CRITICAL_BAD:
foreach ($agents as $agent) { $list[$group['id_grupo']]['_monitors_critical_'] += (int)$result['contado'];
if (($agent['critical_count'] == 0) && ($agent['warning_count'] == 0) && ($group_agents['disabled'] == 0) && ($agent['normal_count'] == 0)) { break;
if ($agent['unknown_count'] > 0) { case AGENT_MODULE_STATUS_WARNING_ALERT:
$list[$group['id_grupo']]['_agents_unknown_'] += 1; break;
} case AGENT_MODULE_STATUS_WARNING:
} $list[$group['id_grupo']]['_monitors_warning_'] += (int)$result['contado'];
if (($agent['critical_count'] == 0) && ($agent['warning_count'] == 0) && ($group_agents['disabled'] == 0) && ($agent['normal_count'] == 0) && ($agent['unknown_count'] == 0)) { break;
if ($agent['notinit_count'] > 0) { case AGENT_MODULE_STATUS_UNKNOWN:
$list[$group['id_grupo']]['_agents_not_init_'] += 1; $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;
} }
} }
} }
@ -639,6 +655,12 @@ function groupview_get_data ($id_user = false, $user_strict = false, $acltags, $
$list[$group['id_grupo']]['_monitors_unknown_'] = 0; $list[$group['id_grupo']]['_monitors_unknown_'] = 0;
$list[$group['id_grupo']]['_monitors_not_init_'] = 0; $list[$group['id_grupo']]['_monitors_not_init_'] = 0;
$list[$group['id_grupo']]['_monitors_ok_'] = 0; $list[$group['id_grupo']]['_monitors_ok_'] = 0;
$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 ($list_groups == false) { if ($list_groups == false) {
@ -771,53 +793,62 @@ function groupview_get_data ($id_user = false, $user_strict = false, $acltags, $
if (!$user_strict) { if (!$user_strict) {
foreach ($list_groups as $group) { foreach ($list_groups as $group) {
$group_agents = db_get_row_sql("SELECT SUM(warning_count) AS _monitors_warning_, $agent_not_init = agents_get_agents(array (
SUM(critical_count) AS _monitors_critical_, 'disabled' => 0,
SUM(normal_count) AS _monitors_ok_, 'id_grupo' => $group['id_grupo'],
SUM(unknown_count) AS _monitors_unknown_, 'status' => AGENT_STATUS_NOT_INIT),
SUM(notinit_count) AS _monitors_not_init_, array ('COUNT(*) as total'), 'AR', false);
SUM(fired_count) AS _monitors_alerts_fired_, $list[$group['id_grupo']]['_agents_not_init_'] = isset ($agent_not_init[0]['total']) ? $agent_not_init[0]['total'] : 0;
COUNT(*) AS _total_agents_, id_grupo, intervalo, $agent_unknown = agents_get_agents(array (
ultimo_contacto, disabled 'disabled' => 0,
FROM tagente WHERE id_grupo = " . $group['id_grupo'] . " AND disabled = 0 GROUP BY id_grupo"); 'id_grupo' => $group['id_grupo'],
$list[$group['id_grupo']]['_monitors_critical_'] = (int)$group_agents['_monitors_critical_']; 'status' => AGENT_STATUS_UNKNOWN),
$list[$group['id_grupo']]['_monitors_warning_'] = (int)$group_agents['_monitors_warning_']; array ('COUNT(*) as total'), 'AR', false);
$list[$group['id_grupo']]['_monitors_unknown_'] = (int)$group_agents['_monitors_unknown_']; $list[$group['id_grupo']]['_agents_unknown_'] = isset ($agent_unknown[0]['total']) ? $agent_unknown[0]['total'] : 0;
$list[$group['id_grupo']]['_monitors_not_init_'] = (int)$group_agents['_monitors_not_init_']; $agent_total = agents_get_agents(array (
$list[$group['id_grupo']]['_monitors_ok_'] = (int)$group_agents['_monitors_ok_']; 'disabled' => 0,
'id_grupo' => $group['id_grupo']),
$list[$group['id_grupo']]['_monitors_alerts_fired_'] = (int)$group_agents['_monitors_alerts_fired_']; 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']]['_total_agents_'] = (int)$group_agents['_total_agents_']; $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[$group['id_grupo']]["_monitor_checks_"] - $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']]['_monitors_alerts_fired_'] = groupview_monitor_fired_alerts ($group['id_grupo'], $user_strict,$group['id_grupo']);
$result_list = db_get_all_rows_sql("SELECT COUNT(*) as contado, estado
// Calculate not_normal monitors FROM tagente_estado tae INNER JOIN tagente ta
$list[$group['id_grupo']]["_monitor_not_normal_"] = $list["_monitor_checks_"] - $list["_monitors_ok_"]; ON tae.id_agente = ta.id_agente
$list[$group['id_grupo']]["_iconImg_"] = html_print_image ("images/".$group['icon'].".png", true, array ("style" => 'vertical-align: middle;')); AND ta.disabled = 0
AND ta.id_grupo = " . $group['id_grupo'] . "
$total_agents = $list[$group['id_grupo']]['_total_agents_']; INNER JOIN tagente_modulo tam
ON tae.id_agente_modulo = tam.id_agente_modulo
if (($group['id_grupo'] != 0) && ($total_agents > 0)) { AND tam.disabled = 0
$agents = db_get_all_rows_sql("SELECT warning_count, GROUP BY estado");
critical_count, if ($result_list) {
normal_count, foreach ($result_list as $result) {
unknown_count, switch ($result['estado']) {
notinit_count, case AGENT_MODULE_STATUS_CRITICAL_ALERT:
fired_count,
disabled break;
FROM tagente case AGENT_MODULE_STATUS_CRITICAL_BAD:
WHERE id_grupo = " . $group['id_grupo'] ); $list[$group['id_grupo']]['_monitors_critical_'] += (int)$result['contado'];
foreach ($agents as $agent) { break;
if (($agent['critical_count'] == 0) && ($agent['warning_count'] == 0) && ($group_agents['disabled'] == 0) && ($agent['normal_count'] == 0)) { case AGENT_MODULE_STATUS_WARNING_ALERT:
if ($agent['unknown_count'] > 0) { break;
$list[$group['id_grupo']]['_agents_unknown_'] += 1; case AGENT_MODULE_STATUS_WARNING:
} $list[$group['id_grupo']]['_monitors_warning_'] += (int)$result['contado'];
} break;
if (($agent['critical_count'] == 0) && ($agent['warning_count'] == 0) && ($group_agents['disabled'] == 0) && ($agent['normal_count'] == 0) && ($agent['unknown_count'] == 0)) { case AGENT_MODULE_STATUS_UNKNOWN:
if ($agent['notinit_count'] > 0) { $list[$group['id_grupo']]['_monitors_unknown_'] += (int)$result['contado'];
$list[$group['id_grupo']]['_agents_not_init_'] += 1; 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;
} }
} }
} }
@ -871,6 +902,7 @@ 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'];