diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index d1e6299c1f..e6412abe05 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,20 @@ +2013-03-01 Mario Pulido + + * images/help/service1.png: New file for help. + + * godmode/tag/tag.php, + godmode/agentes/agent_manager.php + godmode/agentes/module_manager_editor_common.php: New hint help. + + * include/help/en/help_tags_config.php, + include/help/en/help_agent_server.php, + include/help/en/help_module_definition.php, + include/help/en/help_view_services.php, + include/help/es/help_module_definition.php, + include/help/es/help_tags_config.php, + include/help/es/help_agent_server.php: New and improved help files. + + 2013-03-01 Miguel de Dios * extras/pandoradb_migrate_4.0.x_to_5.0.mysql.sql: fixed bad diff --git a/pandora_console/godmode/agentes/agent_manager.php b/pandora_console/godmode/agentes/agent_manager.php index bffb0a30f7..01ec324bac 100644 --- a/pandora_console/godmode/agentes/agent_manager.php +++ b/pandora_console/godmode/agentes/agent_manager.php @@ -221,7 +221,7 @@ if ($new_agent) { $server_name = reset(array_keys(servers_get_names())); } $table->data[6][1] = html_print_select (servers_get_names (), - 'server_name', $server_name, '', __('None'), 0, true); + 'server_name', $server_name, '', __('None'), 0, true). ' ' . ui_print_help_icon ('agent_server', true); // Description $table->data[7][0] = __('Description'); @@ -410,4 +410,4 @@ $(document).ready (function () { $("select#id_os").pandoraSelectOS (); }); /* ]]> */ - \ No newline at end of file + diff --git a/pandora_console/godmode/agentes/module_manager_editor_common.php b/pandora_console/godmode/agentes/module_manager_editor_common.php index c68cef114c..ac4636a920 100644 --- a/pandora_console/godmode/agentes/module_manager_editor_common.php +++ b/pandora_console/godmode/agentes/module_manager_editor_common.php @@ -308,9 +308,9 @@ $table_advanced->data[2][4] = html_print_input_text ('post_process', $table_advanced->data[3][0] = __('Min. Value'); $table_advanced->colspan[3][1] = 2; -$table_advanced->data[3][1] = html_print_input_text ('min', $min, '', 5, 15, true, $disabledBecauseInPolicy); +$table_advanced->data[3][1] = html_print_input_text ('min', $min, '', 5, 15, true, $disabledBecauseInPolicy). ' ' . ui_print_help_tip (__('Any value below this number is discarted.'), true); $table_advanced->data[3][3] = __('Max. Value'); -$table_advanced->data[3][4] = html_print_input_text ('max', $max, '', 5, 15, true, $disabledBecauseInPolicy); +$table_advanced->data[3][4] = html_print_input_text ('max', $max, '', 5, 15, true, $disabledBecauseInPolicy). ' ' . ui_print_help_tip (__('Any value over this number is discarted.'), true); $table_advanced->data[4][0] = __('Export target'); // Default text message for export target select and disabled option @@ -391,12 +391,10 @@ $table_advanced->data[11][1] = html_print_extended_select_for_cron ($hour, $minu $table_advanced->colspan[11][1] = 4; $table_advanced->data[12][0] = __('Timeout'); -$table_advanced->data[12][1] = html_print_input_text ('max_timeout', - $max_timeout, '', 5, 10, true); +$table_advanced->data[12][1] = html_print_input_text ('max_timeout', $max_timeout, '', 5, 10, true). ' ' . ui_print_help_tip (__('Seconds that agent will wait for the execution of the module.'), true); $table_advanced->data[12][2] = ''; $table_advanced->data[12][3] = __('Retries'); -$table_advanced->data[12][4] = html_print_input_text ('max_retries', - $max_retries, '', 5, 10, true); +$table_advanced->data[12][4] = html_print_input_text ('max_retries', $max_retries, '', 5, 10, true). ' ' . ui_print_help_tip (__('Number of retries that the module will attempt to run.'), true); if (check_acl ($config['id_user'], 0, "PM")) { $table_advanced->data[13][0] = __('Category'); diff --git a/pandora_console/godmode/tag/tag.php b/pandora_console/godmode/tag/tag.php index 80e2ca379b..27282cf755 100644 --- a/pandora_console/godmode/tag/tag.php +++ b/pandora_console/godmode/tag/tag.php @@ -78,7 +78,7 @@ if (defined('METACONSOLE')) { else { // Header - ui_print_page_header (__('Tags configuration'), "images/setup.png", false, "", true, $buttons); + ui_print_page_header (__('Tags configuration'), "images/setup.png", false, "tags_config", true, $buttons); } @@ -205,4 +205,4 @@ ui_require_jquery_file ('cluetip'); return false; }); /* ]]> */ - \ No newline at end of file + diff --git a/pandora_console/images/help/service1.png b/pandora_console/images/help/service1.png new file mode 100644 index 0000000000..81fd56356d Binary files /dev/null and b/pandora_console/images/help/service1.png differ diff --git a/pandora_console/include/help/en/help_agent_server.php b/pandora_console/include/help/en/help_agent_server.php new file mode 100644 index 0000000000..e333149629 --- /dev/null +++ b/pandora_console/include/help/en/help_agent_server.php @@ -0,0 +1,27 @@ + + +

Server field

+ +In the field "server" there is a combo where you can choose the server that will do the checking. +Configuration at Servers +

+In Servers there are two modes of work: +

+ + +
+The differences between them, and the importance that they have to work in HA mode, consist on that when there are several servers from the same kind( e.g: Network Servers).When a server falls, the first master server that could, will be in charge of the network modules of the down server that are waiting to be executed. The non-master servers does not do this. +

+This option is configured in the file /etc/pandora/pandora_server.conf through the master 1 token. +

+master 1 +

 +Being the value 1 to active it and 0 to deactivate it. diff --git a/pandora_console/include/help/en/help_module_definition.php b/pandora_console/include/help/en/help_module_definition.php index 0c6d3cb7a4..8173a8093b 100644 --- a/pandora_console/include/help/en/help_module_definition.php +++ b/pandora_console/include/help/en/help_module_definition.php @@ -4,9 +4,12 @@ */ ?>

Module definition

- +

There are two modes for an agent: +

diff --git a/pandora_console/include/help/en/help_tags_config.php b/pandora_console/include/help/en/help_tags_config.php new file mode 100644 index 0000000000..b4c3aecfad --- /dev/null +++ b/pandora_console/include/help/en/help_tags_config.php @@ -0,0 +1,19 @@ + +

Tags in Pandora FMS

+ +The access to the modules can be configurated with a Tags system. A tags are configurated on the system, and be assigned to the choosed modules. In this way the access of the user can be limited to the modules with certain tags. +

+ +The Tags access doesnt replace the group access. Just complement it. +

+ Form fields. +

+ Name: Tag name
+ Description: Tag description
+ Url: Extern link to add more extra information to the tag
+ Email: Email address used in alerts associated to the tag +
diff --git a/pandora_console/include/help/en/help_view_services.php b/pandora_console/include/help/en/help_view_services.php index 262beed05b..1b8a8d05c2 100644 --- a/pandora_console/include/help/en/help_view_services.php +++ b/pandora_console/include/help/en/help_view_services.php @@ -1,8 +1,21 @@ -

View Services

-

This is the view of the list of the services with their status

+?> + +

Creating a new service

+ +The service represents an association of agent modules and their value is calculated in real time. Because of that first of all you need to have all your devices that make a service monitored and with their module's values normalized to three status: Normal, Warning and Critical. You can learn more about them in their wiki sections: Monitoring with Pandora FMS and Monitoring with policies. +

+When you have all the devices monitored you can make group of them with the service. Inside each service you can add all modules you need to monitor the service. For example if you want to monitor the online shop service you need a module that monitors the content, another which monitors the comunication status and so on. + +

+ +To create a new service just click on botton Create. +

+ + '550px')); ?> +

+At this moment we have a service created without items, so we have to add items to the service. To add a new item click on the oragne tool an the right top of Service Management tab and after in the botton Create. Then the form below will appear. In this form you must select a module of an agent to add. Also you must fill the fields related to the weight of this module inside the service for Normal, Warning and Critical status. The heavier a module the more important is within the service. diff --git a/pandora_console/include/help/es/help_agent_server.php b/pandora_console/include/help/es/help_agent_server.php new file mode 100644 index 0000000000..4d04d6901f --- /dev/null +++ b/pandora_console/include/help/es/help_agent_server.php @@ -0,0 +1,26 @@ + +

Campo servidor

+ +En el campo “server” hay un combo donde se elige el servidor que realizará los chequeos. +Configuración en los servidores +

+En los servidores existen dos modos de trabajo: +

+ + +
+La diferencia entre ellos, y la importancia que tienen para trabajar en modo HA consiste en que cuando existen varios servidores del mismo tipo, p.e: Network Servers, cuando un servidor cae, el primer servidor maestro que pueda, se hará cargo de los módulos de red pendientes de ejecutar del servidor caído. Los servidores no-maestros no realizan esta acción. +

+Esta opcion se configura en el fichero /etc/pandora/pandora_server.conf por medio del token de configuracion +

+master 1 +

 +Teniendo el valor 1 para activarlo y 0 para desactivarlo. diff --git a/pandora_console/include/help/es/help_module_definition.php b/pandora_console/include/help/es/help_module_definition.php index 1354902d68..e31ac65d6c 100644 --- a/pandora_console/include/help/es/help_module_definition.php +++ b/pandora_console/include/help/es/help_module_definition.php @@ -9,6 +9,7 @@ Existen dos modos para un agente:

diff --git a/pandora_console/include/help/es/help_tags_config.php b/pandora_console/include/help/es/help_tags_config.php new file mode 100644 index 0000000000..46a12a47db --- /dev/null +++ b/pandora_console/include/help/es/help_tags_config.php @@ -0,0 +1,18 @@ + +

Tags en Pandora FMS

+ +El acceso a los módulos se puede configurar con un sistema de Etiquetas o Tags. Se configuran unos tags en el sistema, se asignan a los módulos que se quiera. De esta forma se puede limitar el acceso a un usuario a los módulos con determinados tags. +

+El acceso por Tags no sustituye el acceso por grupos. Lo complementa. +

+Campos del formulario. +

+ Name: nombre del tag + Description: descripción del tag. + Url: Link externo para aportar información extra al tag + Email: Dirección de correo electrónico utilizada en alertas asociadas al tag +