fixed errors in policies metaconsole
This commit is contained in:
parent
fb73a0b8b2
commit
3985316a9b
|
@ -831,22 +831,39 @@ function ui_format_alert_row ($alert, $agent = true, $url = '', $agent_style = f
|
||||||
$description = io_safe_output($template['name']);
|
$description = io_safe_output($template['name']);
|
||||||
|
|
||||||
$data = array ();
|
$data = array ();
|
||||||
|
|
||||||
if (!defined('METACONSOLE')) {
|
if ($isFunctionPolicies !== ENTERPRISE_NOT_HOOK) {
|
||||||
if ($isFunctionPolicies !== ENTERPRISE_NOT_HOOK) {
|
if(is_metaconsole()){
|
||||||
$policyInfo = policies_is_alert_in_policy2($alert['id'], false);
|
$node = metaconsole_get_connection_by_id($alert['server_data']['id']);
|
||||||
if ($policyInfo === false)
|
if (metaconsole_load_external_db($node) !== NOERR) {
|
||||||
$data[$index['policy']] = '';
|
// Restore the default connection.
|
||||||
else {
|
metaconsole_restore_db();
|
||||||
$img = 'images/policies.png';
|
$errors++;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$policyInfo = policies_is_alert_in_policy2($alert['id'], false);
|
||||||
|
if ($policyInfo === false)
|
||||||
|
$data[$index['policy']] = '';
|
||||||
|
else {
|
||||||
|
$img = 'images/policies.png';
|
||||||
|
if(!is_metaconsole()){
|
||||||
$data[$index['policy']] = '<a href="?sec=gmodules&sec2=enterprise/godmode/policies/policies&id=' . $policyInfo['id'] . '">' .
|
$data[$index['policy']] = '<a href="?sec=gmodules&sec2=enterprise/godmode/policies/policies&id=' . $policyInfo['id'] . '">' .
|
||||||
html_print_image($img,true, array('title' => $policyInfo['name'])) .
|
html_print_image($img,true, array('title' => $policyInfo['name'])) .
|
||||||
'</a>';
|
'</a>';
|
||||||
|
}else{
|
||||||
|
$data[$index['policy']] = '<a href="?sec=gmodules&sec2=advanced/policymanager&id=' . $policyInfo['id'] . '">' .
|
||||||
|
html_print_image($img,true, array('title' => $policyInfo['name'])) .
|
||||||
|
'</a>';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if(is_metaconsole()){
|
||||||
|
metaconsole_restore_db();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Standby
|
// Standby
|
||||||
$data[$index['standby']] = '';
|
$data[$index['standby']] = '';
|
||||||
if (isset ($alert["standby"]) && $alert["standby"] == 1) {
|
if (isset ($alert["standby"]) && $alert["standby"] == 1) {
|
||||||
|
@ -881,8 +898,8 @@ function ui_format_alert_row ($alert, $agent = true, $url = '', $agent_style = f
|
||||||
$agent_name = false;
|
$agent_name = false;
|
||||||
$id_agent = modules_get_agentmodule_agent ($alert["id_agent_module"]);
|
$id_agent = modules_get_agentmodule_agent ($alert["id_agent_module"]);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (defined('METACONSOLE') && !can_user_access_node ()) {
|
if (defined('METACONSOLE') || !can_user_access_node ()) {
|
||||||
$data[$index['agent_name']] = ui_print_truncate_text($agent_name, 'agent_small', false, true, false, '[…]', 'font-size:7.5pt;');
|
$data[$index['agent_name']] = ui_print_truncate_text($agent_name, 'agent_small', false, true, false, '[…]', 'font-size:7.5pt;');
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
@ -893,7 +910,7 @@ function ui_format_alert_row ($alert, $agent = true, $url = '', $agent_style = f
|
||||||
$data[$index['agent_name']] .= '<a href="index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente='.$id_agent.'"> <span style="font-size: 7pt;font-weight:bold" title ="' . $agente['nombre']. '">'.$agente["alias"].'</span></a>';
|
$data[$index['agent_name']] .= '<a href="index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente='.$id_agent.'"> <span style="font-size: 7pt;font-weight:bold" title ="' . $agente['nombre']. '">'.$agente["alias"].'</span></a>';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$data[$index['module_name']] =
|
$data[$index['module_name']] =
|
||||||
ui_print_truncate_text (isset($alert['agent_module_name']) ? $alert['agent_module_name'] : modules_get_agentmodule_name ($alert["id_agent_module"]), 'module_small', false, true, true, '[…]', 'font-size: 7.2pt');
|
ui_print_truncate_text (isset($alert['agent_module_name']) ? $alert['agent_module_name'] : modules_get_agentmodule_name ($alert["id_agent_module"]), 'module_small', false, true, true, '[…]', 'font-size: 7.2pt');
|
||||||
}
|
}
|
||||||
|
|
|
@ -449,11 +449,9 @@ $table->align = array ();
|
||||||
|
|
||||||
if ($isFunctionPolicies !== ENTERPRISE_NOT_HOOK) {
|
if ($isFunctionPolicies !== ENTERPRISE_NOT_HOOK) {
|
||||||
if ($print_agent) {
|
if ($print_agent) {
|
||||||
if (!is_metaconsole()) {
|
|
||||||
$table->head[0] = "<span title='" . __('Policy') . "'>" .
|
$table->head[0] = "<span title='" . __('Policy') . "'>" . __('P.') . "</span>";
|
||||||
__('P.') . "</span>";
|
|
||||||
}
|
|
||||||
|
|
||||||
$table->head[1] = "<span title='" . __('Standby') . "'>" .
|
$table->head[1] = "<span title='" . __('Standby') . "'>" .
|
||||||
__('S.') . "</span>";
|
__('S.') . "</span>";
|
||||||
|
|
||||||
|
@ -496,10 +494,8 @@ if ($isFunctionPolicies !== ENTERPRISE_NOT_HOOK) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
if (!is_metaconsole()) {
|
$table->head[0] = "<span title='" . __('Policy') . "'>" . __('P.') . "</span>";
|
||||||
$table->head[0] = "<span title='" . __('Policy') . "'>" . __('P.') . "</span>";
|
|
||||||
}
|
|
||||||
|
|
||||||
$table->head[1] = "<span title='" . __('Standby') . "'>" . __('S.') . "</span>";
|
$table->head[1] = "<span title='" . __('Standby') . "'>" . __('S.') . "</span>";
|
||||||
|
|
||||||
if (!is_metaconsole()) {
|
if (!is_metaconsole()) {
|
||||||
|
|
|
@ -977,17 +977,17 @@ if (!empty($result)) {
|
||||||
$table->head[2] = __('Data Type');
|
$table->head[2] = __('Data Type');
|
||||||
$table->head[2] .= ' <a href="index.php?sec=view&sec2=operation/agentes/status_monitor&datatype='.$datatype . '&moduletype='.$moduletype . '&refr=' . $refr . '&modulegroup='.$modulegroup . '&offset=' . $offset . '&ag_group=' . $ag_group . '&ag_freestring=' . $ag_freestring . '&ag_modulename=' . $ag_modulename . '&status=' . $status . $ag_custom_fields_params . '&sort_field=type&sort=up">' . html_print_image('images/sort_up.png', true, array('style' => $selectTypeUp, 'alt' => 'up')) . '</a>' .
|
$table->head[2] .= ' <a href="index.php?sec=view&sec2=operation/agentes/status_monitor&datatype='.$datatype . '&moduletype='.$moduletype . '&refr=' . $refr . '&modulegroup='.$modulegroup . '&offset=' . $offset . '&ag_group=' . $ag_group . '&ag_freestring=' . $ag_freestring . '&ag_modulename=' . $ag_modulename . '&status=' . $status . $ag_custom_fields_params . '&sort_field=type&sort=up">' . html_print_image('images/sort_up.png', true, array('style' => $selectTypeUp, 'alt' => 'up')) . '</a>' .
|
||||||
'<a href="index.php?sec=view&sec2=operation/agentes/status_monitor&datatype='.$datatype . '&moduletype='.$moduletype . '&refr=' . $refr . '&modulegroup='.$modulegroup . '&offset=' . $offset . '&ag_group=' . $ag_group . '&ag_freestring=' . $ag_freestring . '&ag_modulename=' . $ag_modulename . '&status=' . $status . $ag_custom_fields_params . '&sort_field=type&sort=down">' . html_print_image('images/sort_down.png', true, array('style' => $selectTypeDown, 'alt' => 'down')) . '</a>';
|
'<a href="index.php?sec=view&sec2=operation/agentes/status_monitor&datatype='.$datatype . '&moduletype='.$moduletype . '&refr=' . $refr . '&modulegroup='.$modulegroup . '&offset=' . $offset . '&ag_group=' . $ag_group . '&ag_freestring=' . $ag_freestring . '&ag_modulename=' . $ag_modulename . '&status=' . $status . $ag_custom_fields_params . '&sort_field=type&sort=down">' . html_print_image('images/sort_down.png', true, array('style' => $selectTypeDown, 'alt' => 'down')) . '</a>';
|
||||||
|
|
||||||
$table->align[2] = 'left';
|
$table->align[2] = 'left';
|
||||||
|
|
||||||
$table->head[3] = __('Module name');
|
$table->head[3] = __('Module name');
|
||||||
$table->head[3] .= ' <a href="index.php?sec=view&sec2=operation/agentes/status_monitor&datatype='.$datatype . '&moduletype='.$moduletype . '&refr=' . $refr . '&modulegroup='.$modulegroup . '&offset=' . $offset . '&ag_group=' . $ag_group . '&ag_freestring=' . $ag_freestring . '&ag_modulename=' . $ag_modulename . '&status=' . $status . $ag_custom_fields_params . '&sort_field=module_name&sort=up">' . html_print_image('images/sort_up.png', true, array('style' => $selectModuleNameUp, 'alt' => 'up')) . '</a>' .
|
$table->head[3] .= ' <a href="index.php?sec=view&sec2=operation/agentes/status_monitor&datatype='.$datatype . '&moduletype='.$moduletype . '&refr=' . $refr . '&modulegroup='.$modulegroup . '&offset=' . $offset . '&ag_group=' . $ag_group . '&ag_freestring=' . $ag_freestring . '&ag_modulename=' . $ag_modulename . '&status=' . $status . $ag_custom_fields_params . '&sort_field=module_name&sort=up">' . html_print_image('images/sort_up.png', true, array('style' => $selectModuleNameUp, 'alt' => 'up')) . '</a>' .
|
||||||
'<a href="index.php?sec=view&sec2=operation/agentes/status_monitor&datatype='.$datatype . '&moduletype='.$moduletype . '&refr=' . $refr . '&modulegroup='.$modulegroup . '&offset=' . $offset . '&ag_group=' . $ag_group . '&ag_freestring=' . $ag_freestring . '&ag_modulename=' . $ag_modulename . '&status=' . $status . $ag_custom_fields_params . '&sort_field=module_name&sort=down">' . html_print_image('images/sort_down.png', true, array('style' => $selectModuleNameDown, 'alt' => 'down')) . '</a>';
|
'<a href="index.php?sec=view&sec2=operation/agentes/status_monitor&datatype='.$datatype . '&moduletype='.$moduletype . '&refr=' . $refr . '&modulegroup='.$modulegroup . '&offset=' . $offset . '&ag_group=' . $ag_group . '&ag_freestring=' . $ag_freestring . '&ag_modulename=' . $ag_modulename . '&status=' . $status . $ag_custom_fields_params . '&sort_field=module_name&sort=down">' . html_print_image('images/sort_down.png', true, array('style' => $selectModuleNameDown, 'alt' => 'down')) . '</a>';
|
||||||
|
|
||||||
$table->head[4] = __('Server type');
|
$table->head[4] = __('Server type');
|
||||||
$table->head[4] .= ' <a href="index.php?sec=view&sec2=operation/agentes/status_monitor&datatype='.$datatype . '&moduletype='.$moduletype . '&refr=' . $refr . '&modulegroup='.$modulegroup . '&offset=' . $offset . '&ag_group=' . $ag_group . '&ag_freestring=' . $ag_freestring . '&ag_modulename=' . $ag_modulename . '&status=' . $status . $ag_custom_fields_params . '&sort_field=moduletype&sort=up">' . html_print_image('images/sort_up.png', true, array('style' => $selectModuleNameUp, 'alt' => 'up')) . '</a>' .
|
$table->head[4] .= ' <a href="index.php?sec=view&sec2=operation/agentes/status_monitor&datatype='.$datatype . '&moduletype='.$moduletype . '&refr=' . $refr . '&modulegroup='.$modulegroup . '&offset=' . $offset . '&ag_group=' . $ag_group . '&ag_freestring=' . $ag_freestring . '&ag_modulename=' . $ag_modulename . '&status=' . $status . $ag_custom_fields_params . '&sort_field=moduletype&sort=up">' . html_print_image('images/sort_up.png', true, array('style' => $selectModuleNameUp, 'alt' => 'up')) . '</a>' .
|
||||||
'<a href="index.php?sec=view&sec2=operation/agentes/status_monitor&datatype='.$datatype . '&moduletype='.$moduletype . '&refr=' . $refr . '&modulegroup='.$modulegroup . '&offset=' . $offset . '&ag_group=' . $ag_group . '&ag_freestring=' . $ag_freestring . '&ag_modulename=' . $ag_modulename . '&status=' . $status . $ag_custom_fields_params . '&sort_field=moduletype&sort=down">' . html_print_image('images/sort_down.png', true, array('style' => $selectModuleNameDown, 'alt' => 'down')) . '</a>';
|
'<a href="index.php?sec=view&sec2=operation/agentes/status_monitor&datatype='.$datatype . '&moduletype='.$moduletype . '&refr=' . $refr . '&modulegroup='.$modulegroup . '&offset=' . $offset . '&ag_group=' . $ag_group . '&ag_freestring=' . $ag_freestring . '&ag_modulename=' . $ag_modulename . '&status=' . $status . $ag_custom_fields_params . '&sort_field=moduletype&sort=down">' . html_print_image('images/sort_down.png', true, array('style' => $selectModuleNameDown, 'alt' => 'down')) . '</a>';
|
||||||
|
|
||||||
$table->head[5] = __('Interval');
|
$table->head[5] = __('Interval');
|
||||||
$table->head[5] .= ' <a href="index.php?sec=view&sec2=operation/agentes/status_monitor&datatype='.$datatype . '&moduletype='.$moduletype . '&refr=' . $refr . '&modulegroup='.$modulegroup . '&offset=' . $offset . '&ag_group=' . $ag_group . '&ag_freestring=' . $ag_freestring . '&ag_modulename=' . $ag_modulename . '&status=' . $status . $ag_custom_fields_params . '&sort_field=interval&sort=up">' . html_print_image('images/sort_up.png', true, array('style' => $selectIntervalUp, 'alt' => 'up')) . '</a>' .
|
$table->head[5] .= ' <a href="index.php?sec=view&sec2=operation/agentes/status_monitor&datatype='.$datatype . '&moduletype='.$moduletype . '&refr=' . $refr . '&modulegroup='.$modulegroup . '&offset=' . $offset . '&ag_group=' . $ag_group . '&ag_freestring=' . $ag_freestring . '&ag_modulename=' . $ag_modulename . '&status=' . $status . $ag_custom_fields_params . '&sort_field=interval&sort=up">' . html_print_image('images/sort_up.png', true, array('style' => $selectIntervalUp, 'alt' => 'up')) . '</a>' .
|
||||||
'<a href="index.php?sec=view&sec2=operation/agentes/status_monitor&datatype='.$datatype . '&moduletype='.$moduletype . '&refr=' . $refr . '&modulegroup='.$modulegroup . '&offset=' . $offset . '&ag_group=' . $ag_group . '&ag_freestring=' . $ag_freestring . '&ag_modulename=' . $ag_modulename . '&status=' . $status . $ag_custom_fields_params . '&sort_field=interval&sort=down">' . html_print_image('images/sort_down.png', true, array('style' => $selectIntervalDown, 'alt' => 'down')) . '</a>';
|
'<a href="index.php?sec=view&sec2=operation/agentes/status_monitor&datatype='.$datatype . '&moduletype='.$moduletype . '&refr=' . $refr . '&modulegroup='.$modulegroup . '&offset=' . $offset . '&ag_group=' . $ag_group . '&ag_freestring=' . $ag_freestring . '&ag_modulename=' . $ag_modulename . '&status=' . $status . $ag_custom_fields_params . '&sort_field=interval&sort=down">' . html_print_image('images/sort_down.png', true, array('style' => $selectIntervalDown, 'alt' => 'down')) . '</a>';
|
||||||
|
@ -1024,36 +1024,47 @@ if (!empty($result)) {
|
||||||
//Avoid unset, null and false value
|
//Avoid unset, null and false value
|
||||||
if (empty($row['server_name']))
|
if (empty($row['server_name']))
|
||||||
$row['server_name'] = "";
|
$row['server_name'] = "";
|
||||||
|
|
||||||
$is_web_content_string = (bool)db_get_value_filter('id_agente_modulo',
|
$is_web_content_string = (bool)db_get_value_filter('id_agente_modulo',
|
||||||
'tagente_modulo',
|
'tagente_modulo',
|
||||||
array('id_agente_modulo' => $row['id_agente_modulo'],
|
array('id_agente_modulo' => $row['id_agente_modulo'],
|
||||||
'id_tipo_modulo' => $id_type_web_content_string));
|
'id_tipo_modulo' => $id_type_web_content_string));
|
||||||
|
|
||||||
//Fixed the goliat sends the strings from web
|
//Fixed the goliat sends the strings from web
|
||||||
//without HTML entities
|
//without HTML entities
|
||||||
if ($is_web_content_string) {
|
if ($is_web_content_string) {
|
||||||
$row['datos'] = io_safe_input($row['datos']);
|
$row['datos'] = io_safe_input($row['datos']);
|
||||||
}
|
}
|
||||||
|
|
||||||
//Fixed the data from Selenium Plugin
|
//Fixed the data from Selenium Plugin
|
||||||
if ($row['datos'] != strip_tags($row['datos'])) {
|
if ($row['datos'] != strip_tags($row['datos'])) {
|
||||||
$row['datos'] = io_safe_input($row['datos']);
|
$row['datos'] = io_safe_input($row['datos']);
|
||||||
}
|
}
|
||||||
|
|
||||||
$data = array ();
|
$data = array ();
|
||||||
if ($isFunctionPolicies !== ENTERPRISE_NOT_HOOK) {
|
if ($isFunctionPolicies !== ENTERPRISE_NOT_HOOK) {
|
||||||
|
if(is_metaconsole()){
|
||||||
|
$node = metaconsole_get_connection_by_id($row['server_id']);
|
||||||
|
if (metaconsole_load_external_db($node) !== NOERR) {
|
||||||
|
// Restore the default connection.
|
||||||
|
metaconsole_restore_db();
|
||||||
|
$errors++;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
$policyInfo = policies_info_module_policy($row['id_agente_modulo']);
|
$policyInfo = policies_info_module_policy($row['id_agente_modulo']);
|
||||||
|
|
||||||
if ($policyInfo === false)
|
if ($policyInfo === false)
|
||||||
$data[0] = '';
|
$data[0] = '';
|
||||||
else {
|
else {
|
||||||
$linked = policies_is_module_linked($row['id_agente_modulo']);
|
$linked = policies_is_module_linked($row['id_agente_modulo']);
|
||||||
|
|
||||||
$adopt = false;
|
$adopt = false;
|
||||||
if (policies_is_module_adopt($row['id_agente_modulo'])) {
|
if (policies_is_module_adopt($row['id_agente_modulo'])) {
|
||||||
$adopt = true;
|
$adopt = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($linked) {
|
if ($linked) {
|
||||||
if ($adopt) {
|
if ($adopt) {
|
||||||
$img = 'images/policies_brick.png';
|
$img = 'images/policies_brick.png';
|
||||||
|
@ -1074,15 +1085,25 @@ if (!empty($result)) {
|
||||||
$title = __('(Unlinked) ') . $policyInfo['name_policy'];
|
$title = __('(Unlinked) ') . $policyInfo['name_policy'];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if(is_metaconsole()){
|
||||||
$data[0] = '<a href="?sec=gmodules&sec2=enterprise/godmode/policies/policies&id=' . $policyInfo['id_policy'] . '">' .
|
$data[0] = '<a href="?sec=gmodules&sec2=advanced/policymanager&id=' . $policyInfo['id_policy'] . '">' .
|
||||||
html_print_image($img,true, array('title' => $title)) .
|
html_print_image($img,true, array('title' => $title)) .
|
||||||
'</a>';
|
'</a>';
|
||||||
|
}
|
||||||
|
else{
|
||||||
|
$data[0] = '<a href="?sec=gmodules&sec2=enterprise/godmode/policies/policies&id=' . $policyInfo['id_policy'] . '">' .
|
||||||
|
html_print_image($img,true, array('title' => $title)) .
|
||||||
|
'</a>';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if(is_metaconsole()){
|
||||||
|
metaconsole_restore_db();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$agent_alias = !empty($row['agent_alias']) ? $row['agent_alias'] : $row['agent_name'];
|
$agent_alias = !empty($row['agent_alias']) ? $row['agent_alias'] : $row['agent_name'];
|
||||||
|
|
||||||
// TODO: Calculate hash access before to use it more simply like other sections. I.E. Events view
|
// TODO: Calculate hash access before to use it more simply like other sections. I.E. Events view
|
||||||
if (defined('METACONSOLE')) {
|
if (defined('METACONSOLE')) {
|
||||||
$agent_link = '<a href="'.
|
$agent_link = '<a href="'.
|
||||||
|
|
Loading…
Reference in New Issue