From 611b0be5a931f5f32d7fde31dfcdd9a29c0cc1c3 Mon Sep 17 00:00:00 2001 From: aloriel Date: Fri, 30 Jan 2009 08:29:31 +0000 Subject: [PATCH] 2009-01-30 Jorge Gonzalez * include/help/en/help_alert-matches.php, include/help/en/help_serverlag.php, include/help/en/help_time_stamp-comparation.php, include/help/en/help_timesource.php: Modified help files. * include/help/es/help_alert-matches.php, include/help/es/help_serverlag.php, include/help/es/help_time_stamp-comparation.php, include/help/es/help_timesource.php: Added Spanish help files. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@1412 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 12 +++++++ .../include/help/en/help_alert-matches.php | 2 ++ .../include/help/en/help_serverlag.php | 3 +- .../help/en/help_time_stamp-comparation.php | 2 ++ .../include/help/en/help_timesource.php | 23 +++++++----- .../include/help/es/help_alert-matches.php | 5 +++ .../include/help/es/help_serverlag.php | 3 ++ .../help/es/help_time_stamp-comparation.php | 5 +++ .../include/help/es/help_timesource.php | 35 +++++++++++++++++++ 9 files changed, 81 insertions(+), 9 deletions(-) create mode 100644 pandora_console/include/help/es/help_alert-matches.php create mode 100644 pandora_console/include/help/es/help_serverlag.php create mode 100644 pandora_console/include/help/es/help_time_stamp-comparation.php create mode 100644 pandora_console/include/help/es/help_timesource.php diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 83766f8b75..a6499a286e 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,15 @@ +2009-01-30 Jorge Gonzalez + + * include/help/en/help_alert-matches.php, + include/help/en/help_serverlag.php, + include/help/en/help_time_stamp-comparation.php, + include/help/en/help_timesource.php: Modified help files. + + * include/help/es/help_alert-matches.php, + include/help/es/help_serverlag.php, + include/help/es/help_time_stamp-comparation.php, + include/help/es/help_timesource.php: Added Spanish help files. + 2009-01-29 Esteban Sanchez * include/auth/mysql.php: Style correction on switch statements. diff --git a/pandora_console/include/help/en/help_alert-matches.php b/pandora_console/include/help/en/help_alert-matches.php index 76e8e0474e..f173b777bd 100755 --- a/pandora_console/include/help/en/help_alert-matches.php +++ b/pandora_console/include/help/en/help_alert-matches.php @@ -1,3 +1,5 @@

Matches of the alert

+

Defines the number of alerts that must occur before executing the action. It is a fine-tunning parameter. +

\ No newline at end of file diff --git a/pandora_console/include/help/en/help_serverlag.php b/pandora_console/include/help/en/help_serverlag.php index cf1f833915..5641d849c0 100644 --- a/pandora_console/include/help/en/help_serverlag.php +++ b/pandora_console/include/help/en/help_serverlag.php @@ -1,2 +1,3 @@

Server Lag

-

Server lag has 2 values. The first value (usually the larger one) shows how much seconds the modules are in the queue for that server, the second value show how many modules are in the queue.

\ No newline at end of file + +

Server lag has 2 values. The first value (usually the larger one) shows how much seconds the modules are in the queue for that server, the second value show how many modules are in the queue.

diff --git a/pandora_console/include/help/en/help_time_stamp-comparation.php b/pandora_console/include/help/en/help_time_stamp-comparation.php index 18705c1178..32cf5d0718 100644 --- a/pandora_console/include/help/en/help_time_stamp-comparation.php +++ b/pandora_console/include/help/en/help_time_stamp-comparation.php @@ -1,3 +1,5 @@

Timestamp or time comparation

+

It defines what time of date/time is used, the system timestamp or a comparation with the database. Useful when you have the database in other system different than where the Web console is. +

\ No newline at end of file diff --git a/pandora_console/include/help/en/help_timesource.php b/pandora_console/include/help/en/help_timesource.php index e309906e63..71a6fdca3c 100644 --- a/pandora_console/include/help/en/help_timesource.php +++ b/pandora_console/include/help/en/help_timesource.php @@ -1,22 +1,29 @@ -

+

Origen de tiempo

+ +

What source to use for the time. This can be (for now) either the local system (System) or database (Database).

+

+

This is useful when your database is not on the same system as your webserver or your Pandora FMS servers. In that case any time difference will miscalculate the time differences and timestamps. You should use NTP to sync all your pandora servers and your MySQL server. By using these preferences you don't have to sync your webserver but it's still recommended. -

-Feel free to implement more sources (eg: ntp, ldap, $_SERVER...) -

-Note: The database query will be cached the first time it's called so the time will always be the same on a page load throughout while System time is returned whenever the function is called which might differ slightly (especially near the ending of a second).

-

+

+Feel free to implement more sources (eg: ntp, ldap, $_SERVER...). +

+

+Note: The database query will be cached the first time it's called so the time will always be the same on a page load throughout, while System time is returned whenever the function is called, which might differ slightly (especially near the ending of a second). +

+

These examples are all returning Unixtime
-
+ +

+

"timestamp"); ?> diff --git a/pandora_console/include/help/es/help_alert-matches.php b/pandora_console/include/help/es/help_alert-matches.php new file mode 100644 index 0000000000..8c41d45c55 --- /dev/null +++ b/pandora_console/include/help/es/help_alert-matches.php @@ -0,0 +1,5 @@ +

Coincidencias de la alerta

+ +

+Define el número de alertas que deben ocurrir antes de ejecutar la acción. Es un parámetro de ajuste fino. +

diff --git a/pandora_console/include/help/es/help_serverlag.php b/pandora_console/include/help/es/help_serverlag.php new file mode 100644 index 0000000000..4ea3a015c1 --- /dev/null +++ b/pandora_console/include/help/es/help_serverlag.php @@ -0,0 +1,3 @@ +

Retardo del servidor

+ +

El retardo del servidor tiene dos valores. El primer valor (generalmente el más largo) muestra los segundos que los módulos están en la cola para ese servidor, el segundo valor muestra el número de módulos en la cola.

diff --git a/pandora_console/include/help/es/help_time_stamp-comparation.php b/pandora_console/include/help/es/help_time_stamp-comparation.php new file mode 100644 index 0000000000..8d92f89212 --- /dev/null +++ b/pandora_console/include/help/es/help_time_stamp-comparation.php @@ -0,0 +1,5 @@ +

Marca de tiempo o comparación de hora

+ +

+Define qué fecha/hora se usa, la marca de tiempo del sistema o una comparación con la base de datos. Útil cuando la base de datos está en otro sistema diferente de donde se encuentra la consola Web. +

\ No newline at end of file diff --git a/pandora_console/include/help/es/help_timesource.php b/pandora_console/include/help/es/help_timesource.php new file mode 100644 index 0000000000..69d1598318 --- /dev/null +++ b/pandora_console/include/help/es/help_timesource.php @@ -0,0 +1,35 @@ +

Origen de tiempo

+ +

+Qué origen de tiempo usar. Esto puede ser (por el momento) el sistema local («Sistema») o la base de datos («Base de datos»). +

+

+Esto es útil cuando su base de datos no está en el mismo sistema que su servidor Web o los servidores de su Pandora FMS. +En ese caso cualquier diferencia de tiempo calculará de forma errónea las diferencias de tiempo y marcas de tiempo. +Debería usar NTP para sincronizar todos sus servidores de Pandora FMS y su servidor de MySQL. +Usando estas preferencias no tendrá que sincronizar su servidor web, aún así se recomienda. +

+

+Implemente más orígenes si lo ve necesario (ej. ntp, ldap, $_SERVER...). +

+

+Nota: La consulta a la base de datos se cacheará la primera vez que se haga, de tal forma que la hora será siempre la misma en la carga de página, mientras que la hora del sistema se devuelve siempre que se llame a la función, lo que puede diferir (especialmene al final de un segundo). +

+

+Estos ejemplos devuevent todos el tiempo Unix: + +

+

+ "timestamp"); +?> +Hora actual del sistema: +
+Hora actual de la base de datos: +
+Hora de su navegador: +

\ No newline at end of file