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

Fixed problem with strict acl

This commit is contained in:
Arturo Gonzalez 2016-03-01 15:49:29 +01:00
parent 2479852e39
commit 68b8570db0
1 changed files with 130 additions and 187 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

317
pandora_console/include/functions_groupview.php
View File

@ -247,96 +247,55 @@ function groupview_get_all_data ($id_user = false, $user_strict = false, $acltag
$list["_server_sanity_"] = format_numeric (100 - $list["_module_sanity_"], 1); $list["_server_sanity_"] = format_numeric (100 - $list["_module_sanity_"], 1);
} }
else { else if (!$user_strict) {
if ($user_strict) { foreach ($list_groups as $group) {
$fields = array ('tagente.id_agente','tagente.id_grupo','tagente.id_os','tagente.ultimo_contacto','tagente.intervalo','tagente.comentarios description','tagente.quiet', $agent_not_init = agents_get_agents(array (
'tagente.normal_count','tagente.warning_count','tagente.critical_count','tagente.unknown_count','tagente.notinit_count','tagente.total_count','tagente.fired_count'); 'disabled' => 0,
'id_grupo' => $group['id_grupo'],
$acltags = tags_get_user_module_and_tags ($config['id_user'], 'AR', $strict_user); 'status' => AGENT_STATUS_NOT_INIT),
array ('COUNT(*) as total'), 'AR', false);
$total_agents = tags_get_all_user_agents (false, $config['id_user'], $acltags, $count_filter, $fields, false, $strict_user, true); $list[$group['id_grupo']]['_agents_not_init_'] = isset ($agent_not_init[0]['total']) ? $agent_not_init[0]['total'] : 0;
$total_agents = count($total_agents); $agent_unknown = agents_get_agents(array (
$agents = tags_get_all_user_agents (false, $config['id_user'], $acltags, $filter, $fields, false, $strict_user, true); 'disabled' => 0,
foreach ($agents as $agent) { 'id_grupo' => $group['id_grupo'],
$list[$agent['id_grupo']]['_monitors_ok_'] += (int)$agent['normal_count']; 'status' => AGENT_STATUS_UNKNOWN),
$list[$agent['id_grupo']]['_monitors_critical_'] += (int)$agent['critical_count']; array ('COUNT(*) as total'), 'AR', false);
$list[$agent['id_grupo']]['_monitors_warning_'] += (int)$agent['warning_count']; $list[$group['id_grupo']]['_agents_unknown_'] = isset ($agent_unknown[0]['total']) ? $agent_unknown[0]['total'] : 0;
$list[$agent['id_grupo']]['_monitors_unknown_'] += (int)$agent['unknown_count']; $agent_total = agents_get_agents(array (
$list[$agent['id_grupo']]['_monitors_not_init_'] += (int)$agent['notinit_count']; 'disabled' => 0,
$list[$agent['id_grupo']]['_monitors_alerts_fired_'] += (int)$agent['fired_count']; 'id_grupo' => $group['id_grupo']),
$list[$agent['id_grupo']]['_total_agents_'] += 1; array ('COUNT(*) as total'), 'AR', false);
if (($agent['normal_count'] == 0) && ($agent['critical_count'] == 0) && $list[$group['id_grupo']]['_total_agents_'] = isset ($agent_total[0]['total']) ? $agent_total[0]['total'] : 0;
($agent['warning_count'] == 0) && ($agent['unknown_count'] != 0)) { $list[$group['id_grupo']]["_monitor_not_normal_"] = $list[$group['id_grupo']]["_monitor_checks_"] - $list[$group['id_grupo']]["_monitors_ok_"];
$list[$agent['id_grupo']]['_agents_unknown_'] += 1; $list[$group['id_grupo']]['_monitors_alerts_fired_'] = groupview_monitor_fired_alerts ($group['id_grupo'], $user_strict,array($group['id_grupo']));
} $result_list = db_get_all_rows_sql("SELECT COUNT(*) as contado, estado
if (($agent['normal_count'] == 0) && ($agent['critical_count'] == 0) && FROM tagente_estado tae INNER JOIN tagente ta
($agent['warning_count'] == 0) && ($agent['unknown_count'] == 0)) { ON tae.id_agente = ta.id_agente
$list[$agent['id_grupo']]['_agents_not_init_'] += 1; AND ta.disabled = 0
} AND ta.id_grupo = " . $group['id_grupo'] . "
} INNER JOIN tagente_modulo tam
} ON tae.id_agente_modulo = tam.id_agente_modulo
else { AND tam.disabled = 0
foreach ($list_groups as $group) { WHERE tae.utimestamp > 0
$agent_not_init = agents_get_agents(array ( GROUP BY estado");
'disabled' => 0, if ($result_list) {
'id_grupo' => $group['id_grupo'], foreach ($result_list as $result) {
'status' => AGENT_STATUS_NOT_INIT), switch ($result['estado']) {
array ('COUNT(*) as total'), 'AR', false); case AGENT_MODULE_STATUS_CRITICAL_BAD:
$list[$group['id_grupo']]['_agents_not_init_'] = isset ($agent_not_init[0]['total']) ? $agent_not_init[0]['total'] : 0; $list[$group['id_grupo']]['_monitors_critical_'] = (int)$result['contado'];
$agent_unknown = agents_get_agents(array ( break;
'disabled' => 0, case AGENT_MODULE_STATUS_WARNING_ALERT:
'id_grupo' => $group['id_grupo'], break;
'status' => AGENT_STATUS_UNKNOWN), case AGENT_MODULE_STATUS_WARNING:
array ('COUNT(*) as total'), 'AR', false); $list[$group['id_grupo']]['_monitors_warning_'] = (int)$result['contado'];
$list[$group['id_grupo']]['_agents_unknown_'] = isset ($agent_unknown[0]['total']) ? $agent_unknown[0]['total'] : 0; break;
$agent_total = agents_get_agents(array ( case AGENT_MODULE_STATUS_UNKNOWN:
'disabled' => 0, $list[$group['id_grupo']]['_monitors_unknown_'] = (int)$result['contado'];
'id_grupo' => $group['id_grupo']), break;
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_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,array($group['id_grupo']));
$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
AND ta.disabled = 0
AND ta.id_grupo = " . $group['id_grupo'] . "
INNER JOIN tagente_modulo tam
ON tae.id_agente_modulo = tam.id_agente_modulo
AND tam.disabled = 0
WHERE tae.utimestamp > 0
GROUP BY estado");
if ($result_list) {
foreach ($result_list as $result) {
switch ($result['estado']) {
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;
}
} }
} }
$result_normal = db_get_row_sql("SELECT COUNT(*) as contado }
FROM tagente_estado tae INNER JOIN tagente ta $result_normal = db_get_row_sql("SELECT COUNT(*) as contado
ON tae.id_agente = ta.id_agente
AND ta.disabled = 0
AND ta.id_grupo = " . $group['id_grupo'] . "
INNER JOIN tagente_modulo tam
ON tae.id_agente_modulo = tam.id_agente_modulo
AND tam.disabled = 0
WHERE tae.estado = 0
AND (tae.utimestamp > 0 OR tam.id_tipo_modulo IN(21,22,23,100))
GROUP BY estado");
$list[$group['id_grupo']]['_monitors_ok_'] = isset ($result_normal['contado']) ? $result_normal['contado'] : 0;
$result_not_init = db_get_row_sql("SELECT COUNT(*) as contado
FROM tagente_estado tae INNER JOIN tagente ta FROM tagente_estado tae INNER JOIN tagente ta
ON tae.id_agente = ta.id_agente ON tae.id_agente = ta.id_agente
AND ta.disabled = 0 AND ta.disabled = 0
@ -344,13 +303,26 @@ function groupview_get_all_data ($id_user = false, $user_strict = false, $acltag
INNER JOIN tagente_modulo tam INNER JOIN tagente_modulo tam
ON tae.id_agente_modulo = tam.id_agente_modulo ON tae.id_agente_modulo = tam.id_agente_modulo
AND tam.disabled = 0 AND tam.disabled = 0
WHERE tae.utimestamp = 0 WHERE tae.estado = 0
AND tae.estado IN (".AGENT_MODULE_STATUS_NO_DATA.",".AGENT_MODULE_STATUS_NOT_INIT." ) AND (tae.utimestamp > 0 OR tam.id_tipo_modulo IN(21,22,23,100))
AND tam.id_tipo_modulo NOT IN (21,22,23,100)
GROUP BY estado"); GROUP BY estado");
$list[$group['id_grupo']]['_monitors_not_init_'] = isset ($result_not_init['contado']) ? $result_not_init['contado'] : 0; $list[$group['id_grupo']]['_monitors_ok_'] = isset ($result_normal['contado']) ? $result_normal['contado'] : 0;
}
$result_not_init = db_get_row_sql("SELECT COUNT(*) as contado
FROM tagente_estado tae INNER JOIN tagente ta
ON tae.id_agente = ta.id_agente
AND ta.disabled = 0
AND ta.id_grupo = " . $group['id_grupo'] . "
INNER JOIN tagente_modulo tam
ON tae.id_agente_modulo = tam.id_agente_modulo
AND tam.disabled = 0
WHERE tae.utimestamp = 0
AND tae.estado IN (".AGENT_MODULE_STATUS_NO_DATA.",".AGENT_MODULE_STATUS_NOT_INIT." )
AND tam.id_tipo_modulo NOT IN (21,22,23,100)
GROUP BY estado");
$list[$group['id_grupo']]['_monitors_not_init_'] = isset ($result_not_init['contado']) ? $result_not_init['contado'] : 0;
} }
if ($user_strict) { if ($user_strict) {
$i = 1; $i = 1;
foreach ($user_tags as $group_id => $tag_name) { foreach ($user_tags as $group_id => $tag_name) {
@ -883,57 +855,57 @@ function groupview_get_data ($id_user = false, $user_strict = false, $acltags, $
$list["_server_sanity_"] = format_numeric (100 - $list["_module_sanity_"], 1); $list["_server_sanity_"] = format_numeric (100 - $list["_module_sanity_"], 1);
} }
else { else if (!$user_strict) {
if ($user_strict) { foreach ($list_groups as $group) {
$fields = array ('tagente.id_agente','tagente.id_grupo','tagente.id_os','tagente.ultimo_contacto','tagente.intervalo','tagente.comentarios description','tagente.quiet', $agent_not_init = agents_get_agents(array (
'tagente.normal_count','tagente.warning_count','tagente.critical_count','tagente.unknown_count','tagente.notinit_count','tagente.total_count','tagente.fired_count'); 'disabled' => 0,
'id_grupo' => $group['id_grupo'],
$acltags = tags_get_user_module_and_tags ($config['id_user'], 'AR', $strict_user); 'status' => AGENT_STATUS_NOT_INIT),
array ('COUNT(*) as total'), 'AR', false);
$total_agents = tags_get_all_user_agents (false, $config['id_user'], $acltags, $count_filter, $fields, false, $strict_user, true); $list[$group['id_grupo']]['_agents_not_init_'] = isset ($agent_not_init[0]['total']) ? $agent_not_init[0]['total'] : 0;
$total_agents = count($total_agents); $agent_unknown = agents_get_agents(array (
$agents = tags_get_all_user_agents (false, $config['id_user'], $acltags, $filter, $fields, false, $strict_user, true); 'disabled' => 0,
foreach ($agents as $agent) { 'id_grupo' => $group['id_grupo'],
$list[$agent['id_grupo']]['_monitors_ok_'] += (int)$agent['normal_count']; 'status' => AGENT_STATUS_UNKNOWN),
$list[$agent['id_grupo']]['_monitors_critical_'] += (int)$agent['critical_count']; array ('COUNT(*) as total'), 'AR', false);
$list[$agent['id_grupo']]['_monitors_warning_'] += (int)$agent['warning_count']; $list[$group['id_grupo']]['_agents_unknown_'] = isset ($agent_unknown[0]['total']) ? $agent_unknown[0]['total'] : 0;
$list[$agent['id_grupo']]['_monitors_unknown_'] += (int)$agent['unknown_count']; $agent_total = agents_get_agents(array (
$list[$agent['id_grupo']]['_monitors_not_init_'] += (int)$agent['notinit_count']; 'disabled' => 0,
$list[$agent['id_grupo']]['_monitors_alerts_fired_'] += (int)$agent['fired_count']; 'id_grupo' => $group['id_grupo']),
$list[$agent['id_grupo']]['_total_agents_'] += 1; array ('COUNT(*) as total'), 'AR', false);
if (($agent['normal_count'] == 0) && ($agent['critical_count'] == 0) && $list[$group['id_grupo']]['_total_agents_'] = isset ($agent_total[0]['total']) ? $agent_total[0]['total'] : 0;
($agent['warning_count'] == 0) && ($agent['unknown_count'] != 0)) { $list[$group['id_grupo']]["_monitor_not_normal_"] = $list[$group['id_grupo']]["_monitor_checks_"] - $list[$group['id_grupo']]["_monitors_ok_"];
$list[$agent['id_grupo']]['_agents_unknown_'] += 1; $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']);
if (($agent['normal_count'] == 0) && ($agent['critical_count'] == 0) && $result_list = db_get_all_rows_sql("SELECT COUNT(*) as contado, estado
($agent['warning_count'] == 0) && ($agent['unknown_count'] == 0)) { FROM tagente_estado tae INNER JOIN tagente ta
$list[$agent['id_grupo']]['_agents_not_init_'] += 1; ON tae.id_agente = ta.id_agente
AND ta.disabled = 0
AND ta.id_grupo = " . $group['id_grupo'] . "
INNER JOIN tagente_modulo tam
ON tae.id_agente_modulo = tam.id_agente_modulo
AND tam.disabled = 0
WHERE tae.utimestamp > 0
GROUP BY estado");
if ($result_list) {
foreach ($result_list as $result) {
switch ($result['estado']) {
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;
}
} }
} }
}
else { $result_normal = db_get_row_sql("SELECT COUNT(*) as contado
foreach ($list_groups as $group) {
$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_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']]['_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
FROM tagente_estado tae INNER JOIN tagente ta FROM tagente_estado tae INNER JOIN tagente ta
ON tae.id_agente = ta.id_agente ON tae.id_agente = ta.id_agente
AND ta.disabled = 0 AND ta.disabled = 0
@ -941,53 +913,24 @@ function groupview_get_data ($id_user = false, $user_strict = false, $acltags, $
INNER JOIN tagente_modulo tam INNER JOIN tagente_modulo tam
ON tae.id_agente_modulo = tam.id_agente_modulo ON tae.id_agente_modulo = tam.id_agente_modulo
AND tam.disabled = 0 AND tam.disabled = 0
WHERE tae.utimestamp > 0 WHERE tae.estado = 0
AND (tae.utimestamp > 0 OR tam.id_tipo_modulo IN(21,22,23,100))
GROUP BY estado"); GROUP BY estado");
if ($result_list) { $list[$group['id_grupo']]['_monitors_ok_'] = isset ($result_normal['contado']) ? $result_normal['contado'] : 0;
foreach ($result_list as $result) {
switch ($result['estado']) {
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;
}
}
}
$result_normal = db_get_row_sql("SELECT COUNT(*) as contado $result_not_init = db_get_row_sql("SELECT COUNT(*) as contado
FROM tagente_estado tae INNER JOIN tagente ta FROM tagente_estado tae INNER JOIN tagente ta
ON tae.id_agente = ta.id_agente ON tae.id_agente = ta.id_agente
AND ta.disabled = 0 AND ta.disabled = 0
AND ta.id_grupo = " . $group['id_grupo'] . " AND ta.id_grupo = " . $group['id_grupo'] . "
INNER JOIN tagente_modulo tam INNER JOIN tagente_modulo tam
ON tae.id_agente_modulo = tam.id_agente_modulo ON tae.id_agente_modulo = tam.id_agente_modulo
AND tam.disabled = 0 AND tam.disabled = 0
WHERE tae.estado = 0 WHERE tae.utimestamp = 0 AND
AND (tae.utimestamp > 0 OR tam.id_tipo_modulo IN(21,22,23,100)) tae.estado IN (".AGENT_MODULE_STATUS_NO_DATA.",".AGENT_MODULE_STATUS_NOT_INIT." )
GROUP BY estado"); AND tam.id_tipo_modulo NOT IN (21,22,23,100)
$list[$group['id_grupo']]['_monitors_ok_'] = isset ($result_normal['contado']) ? $result_normal['contado'] : 0; GROUP BY estado");
$list[$group['id_grupo']]['_monitors_not_init_'] = isset ($result_not_init['contado']) ? $result_not_init['contado'] : 0;
$result_not_init = db_get_row_sql("SELECT COUNT(*) as contado
FROM tagente_estado tae INNER JOIN tagente ta
ON tae.id_agente = ta.id_agente
AND ta.disabled = 0
AND ta.id_grupo = " . $group['id_grupo'] . "
INNER JOIN tagente_modulo tam
ON tae.id_agente_modulo = tam.id_agente_modulo
AND tam.disabled = 0
WHERE tae.utimestamp = 0 AND
tae.estado IN (".AGENT_MODULE_STATUS_NO_DATA.",".AGENT_MODULE_STATUS_NOT_INIT." )
AND tam.id_tipo_modulo NOT IN (21,22,23,100)
GROUP BY estado");
$list[$group['id_grupo']]['_monitors_not_init_'] = isset ($result_not_init['contado']) ? $result_not_init['contado'] : 0;
}
} }
} }