diff --git a/pandora_console/include/ajax/events.php b/pandora_console/include/ajax/events.php index 9cd93a08e6..c05db832d7 100644 --- a/pandora_console/include/ajax/events.php +++ b/pandora_console/include/ajax/events.php @@ -36,6 +36,7 @@ $get_response_description = (bool) get_parameter ('get_response_description'); $get_event_name = (bool) get_parameter ('get_event_name'); $meta = get_parameter ('meta', 0); $history = get_parameter ('history', 0); +$table_events = get_parameter('table_events', 0); if ($get_event_name) { $event_id = get_parameter ('event_id'); @@ -297,7 +298,7 @@ if ($get_extended_event) { $tabs .= "
  • ".html_print_image('images/zoom.png',true).__('Details')."
  • "; $tabs .= "
  • ".html_print_image('images/custom_field_col.png',true).__('Agent fields')."
  • "; $tabs .= "
  • ".html_print_image('images/pencil.png',true).__('Comments')."
  • "; - + if (!$readonly && (tags_checks_event_acl($config["id_user"], $event["id_grupo"], "EM", $event['clean_tags'], $childrens_ids)) || (tags_checks_event_acl($config["id_user"], $event["id_grupo"], "EW", $event['clean_tags'],$childrens_ids))) { $tabs .= "
  • ".html_print_image('images/event_responses_col.png',true).__('Responses')."
  • "; @@ -494,4 +495,20 @@ if ($get_events_details) { echo $out; } + +if ($table_events) { + require_once ("include/functions_events.php"); + require_once ("include/functions_graph.php"); + + $id_agente = (int)get_parameter('id_agente', 0); + + // Fix: for tag functionality groups have to be all user_groups (propagate ACL funct!) + $groups = users_get_groups($config["id_user"]); + + $tags_condition = tags_get_acl_tags($config['id_user'], + array_keys($groups), 'ER', 'event_condition', 'AND'); + + events_print_event_table ("estado <> 1 $tags_condition", 10, '100%', + false, $id_agente); +} ?> diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php index ad7f055a5e..9f3bcb8853 100644 --- a/pandora_console/include/functions_reporting.php +++ b/pandora_console/include/functions_reporting.php @@ -7752,6 +7752,13 @@ function reporting_tiny_stats ($counts_info, $return = false, $type = 'agent', $ // Depend the type of object, the stats will refer agents, modules... switch ($type) { + case 'modules': + $template_title['total_count'] = __('%d Total modules'); + $template_title['normal_count'] = __('%d Normal modules'); + $template_title['critical_count'] = __('%d Critical modules'); + $template_title['warning_count'] = __('%d Warning modules'); + $template_title['unknown_count'] = __('%d Unknown modules'); + break; case 'agent': $template_title['total_count'] = __('%d Total modules'); $template_title['normal_count'] = __('%d Normal modules'); @@ -7807,9 +7814,11 @@ function reporting_tiny_stats ($counts_info, $return = false, $type = 'agent', $ 'title' => sprintf($template_title['not_init_count'], $not_init_count)); } - if (isset($counts_info['fired_count'])) { - $fired_count = $counts_info['fired_count']; - $stats[] = array('name' => 'fired_count', 'count' => $fired_count, 'title' => sprintf($template_title['fired_count'], $fired_count)); + if (isset($template_title['fired_count'])) { + if (isset($counts_info['fired_count'])) { + $fired_count = $counts_info['fired_count']; + $stats[] = array('name' => 'fired_count', 'count' => $fired_count, 'title' => sprintf($template_title['fired_count'], $fired_count)); + } } $uniq_id = uniqid(); diff --git a/pandora_console/operation/agentes/estado_generalagente.php b/pandora_console/operation/agentes/estado_generalagente.php old mode 100644 new mode 100755 index 9ec92dfb75..5d2b9a82dd --- a/pandora_console/operation/agentes/estado_generalagente.php +++ b/pandora_console/operation/agentes/estado_generalagente.php @@ -69,7 +69,8 @@ $table_agent->styleTable = 'padding:0px;'; $table_agent->data = array(); $data = array(); -$agent_name = ui_print_agent_name ($agent["id_agente"], true, 500, "font-size: medium;", true); +$agent_name = ui_print_agent_name ($agent["id_agente"], true, 500, + "font-size: medium;", true); if ($agent['disabled']) { $agent_name = "" . $agent_name . "" . ui_print_help_tip(__('Disabled'), true); @@ -209,7 +210,7 @@ $table_contact->data[] = $data; $data[0] = '' . __('Next contact') . ''; $progress = agents_get_next_contact($id_agente); -$data[1] = progress_bar($progress, 200, 20); +$data[1] = progress_bar($progress, 200, 20, '', 1, false, "#666666"); if ($progress > 100) { $data[1] .= clippy_context_help("agent_out_of_limits"); diff --git a/pandora_console/operation/agentes/estado_monitores.php b/pandora_console/operation/agentes/estado_monitores.php old mode 100644 new mode 100755 index 85698fea76..85cdf61575 --- a/pandora_console/operation/agentes/estado_monitores.php +++ b/pandora_console/operation/agentes/estado_monitores.php @@ -724,7 +724,7 @@ foreach ($modules as $module) { echo "

    "; ui_print_help_tip(__('For to view the list modules paginated, set in setup visuals.')); -echo __('Full list of monitors'); +echo __('Full list of monitors') . ' ' . reporting_tiny_stats ($agent, true, 'modules'); $modules_not_init = agents_monitor_notinit($id_agente); if (!empty($modules_not_init)) { echo clippy_context_help("modules_not_init"); diff --git a/pandora_console/operation/agentes/status_events.php b/pandora_console/operation/agentes/status_events.php old mode 100644 new mode 100755 index 7c2f4008f6..d6862fbd56 --- a/pandora_console/operation/agentes/status_events.php +++ b/pandora_console/operation/agentes/status_events.php @@ -17,20 +17,41 @@ // Load global vars check_login(); -if (!isset($id_agente)){ +if (!isset($id_agente)) { require ("general/noaccess.php"); exit; } require_once ("include/functions_events.php"); -echo "

    ".__('Latest events for this agent')."

    "; - -// Fix: for tag functionality groups have to be all user_groups (propagate ACL funct!) -$groups = users_get_groups($config["id_user"]); - -$tags_condition = tags_get_acl_tags($config['id_user'], array_keys($groups), 'ER', 'event_condition', 'AND'); - -events_print_event_table ("estado <> 1 $tags_condition", 10, '100%', false, $id_agente); +ui_toggle( + "
    " . + html_print_image('images/spinner.gif', true) . + "
    ", + __('Latest events for this agent'), + __('Latest events for this agent'), + false); ?> +