From 78f4be67b27b33f354ca8027622d4d72cf814795 Mon Sep 17 00:00:00 2001 From: zarzuelo Date: Thu, 15 May 2014 12:02:21 +0000 Subject: [PATCH] 2014-05-15 Sergio Martin * include/help/en/help_ipam.php: Fix bad translations on ipam english help * extensions/realtime_graphs/ajax.php: Little improvement on pending pandora packages for realtime graphs git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9938 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 8 ++++++++ pandora_console/extensions/realtime_graphs/ajax.php | 2 +- pandora_console/include/help/en/help_ipam.php | 10 +++++----- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 3c041b40a0..7b4f492112 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,11 @@ +2014-05-15 Sergio Martin + + * include/help/en/help_ipam.php: Fix bad translations + on ipam english help + + * extensions/realtime_graphs/ajax.php: Little improvement + on pending pandora packages for realtime graphs + 2014-05-14 Sergio Martin * extensions/realtime_graphs/ajax.php diff --git a/pandora_console/extensions/realtime_graphs/ajax.php b/pandora_console/extensions/realtime_graphs/ajax.php index e5881cbfed..e5121feaf4 100644 --- a/pandora_console/extensions/realtime_graphs/ajax.php +++ b/pandora_console/extensions/realtime_graphs/ajax.php @@ -25,7 +25,7 @@ switch($graph) { $data = exec("top -bn 2 -d 0.01 | grep '^Cpu' | tail -n 1 | awk '{ print $2+$4+$6 }'"); break; case 'pending_packets': - $data = exec("ls /var/spool/pandora/data_in/ | wc -l"); + $data = exec("ls /var/spool/pandora/data_in/*.data | wc -l"); break; case 'disk_io_wait': $data = exec("vmstat 1 3 | tail -1 | awk '{ print $16 }'"); diff --git a/pandora_console/include/help/en/help_ipam.php b/pandora_console/include/help/en/help_ipam.php index ffc36c8e39..dfb2c82f18 100644 --- a/pandora_console/include/help/en/help_ipam.php +++ b/pandora_console/include/help/en/help_ipam.php @@ -29,22 +29,22 @@ Addresses will be shown as icons, large or small. This icons will render the fol Unresponsive host -No agent assigned

Events disabled +No assigned agent

Disabled events -With assigned agent

Events disabled +With assigned agent

Disabled events -No agent assigned

Events activated +No assigned agent

Activated events -With assigned agent

Events activated +With assigned agent

Activated events @@ -67,7 +67,7 @@ Each IP address have in the bottom right position a link to edit it (with admini When you click on the main icon, a modal window will be opened showing all the IP information, including associated agent and OS, setup for that IP and other information, like creation date, last user edition or last time it was checked by server. In this view you can also do a manual, realtime check to see if that IP respond to ping. Note that this ping is done by the console, instead the regular check, done by the recon server. -

Vista de edición

+

Edition view

If you have enought permission, you will have access to setup view, where IP address are shown as a list. You can filter to show only the IP's you are interested into, make changes and update all at once.

Some fields, are automatically filled by the recon script, like hostname, if it have a Pandora FMS agent and the operating system. You can mark that fields as "manual" and edit them.