From b5138aecdb7469e8344bbe3f892aa28a1e8fa404 Mon Sep 17 00:00:00 2001 From: juanmanuelr Date: Wed, 14 Sep 2011 14:44:55 +0000 Subject: [PATCH] 2011-09-14 Juan Manuel Ramon * include/help/en/help_gis_tab.php include/help/en/help_local_component.php include/help/en/help_component_groups.php include/help/en/help_collection_tab.php include/help/en/help_inventory_tab.php include/help/en/help_snmp_explorer.php include/help/en/help_collections.php include/help/en/help_template_tab.php include/help/en/help_service_management_edit.php include/help/es/help_service_elements_management.php include/help/es/help_gis_tab.php include/help/es/help_view_services_detail.php include/help/es/help_component_groups.php include/help/es/help_collection_tab.php include/help/es/help_inventory_tab.php include/help/es/help_snmp_explorer.php include/help/es/help_collections.php include/help/es/help_template_tab.php include/help/es/help_service_management_edit.php include/help/es/help_view_services.php include/help/es/help_services_management.php: Added new contextual helps. * include/help/en/help_service_elements_management.php include/help/en/help_view_services_detail.php include/help/en/help_services_management.php: Modified contextual helps. * include/help/en/help_service_elements_management.php include/help/en/help_view_services_detail.php include/help/en/help_services_management.php godmode/agentes/planned_downtime.php godmode/agentes/agent_manager.php godmode/modules/manage_network_components.php: Added contextual helps. * godmode/modules/manage_nc_groups.php: Fixed delete action over component groups when they have child components groups. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4952 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 38 +++++++++++++++++++ .../godmode/agentes/agent_manager.php | 2 +- .../godmode/agentes/configurar_agente.php | 15 +++++--- .../godmode/agentes/planned_downtime.php | 7 ++-- .../godmode/modules/manage_nc_groups.php | 15 +++++--- .../modules/manage_network_components.php | 4 +- .../include/help/en/help_collection_tab.php | 8 ++++ .../include/help/en/help_collections.php | 10 +++++ .../include/help/en/help_component_groups.php | 9 +++++ .../include/help/en/help_gis_tab.php | 15 ++++++++ .../include/help/en/help_inventory_tab.php | 8 ++++ .../include/help/en/help_local_component.php | 9 +++++ .../en/help_service_elements_management.php | 1 + .../help/en/help_service_management_edit.php | 9 +++++ .../help/en/help_services_management.php | 1 + .../include/help/en/help_snmp_explorer.php | 10 +++++ .../include/help/en/help_template_tab.php | 9 +++++ .../help/en/help_view_services_detail.php | 11 ++++-- .../include/help/es/help_collection_tab.php | 9 +++++ .../include/help/es/help_collections.php | 11 ++++++ .../include/help/es/help_component_groups.php | 10 +++++ .../include/help/es/help_gis_tab.php | 14 +++++++ .../include/help/es/help_inventory_tab.php | 8 ++++ .../es/help_service_elements_management.php | 9 +++++ .../help/es/help_service_management_edit.php | 9 +++++ .../help/es/help_services_management.php | 9 +++++ .../include/help/es/help_snmp_explorer.php | 12 ++++++ .../include/help/es/help_template_tab.php | 8 ++++ .../include/help/es/help_view_services.php | 9 +++++ .../help/es/help_view_services_detail.php | 11 ++++++ 30 files changed, 280 insertions(+), 20 deletions(-) create mode 100644 pandora_console/include/help/en/help_collection_tab.php create mode 100644 pandora_console/include/help/en/help_collections.php create mode 100644 pandora_console/include/help/en/help_component_groups.php create mode 100644 pandora_console/include/help/en/help_gis_tab.php create mode 100644 pandora_console/include/help/en/help_inventory_tab.php create mode 100644 pandora_console/include/help/en/help_local_component.php create mode 100644 pandora_console/include/help/en/help_service_management_edit.php create mode 100644 pandora_console/include/help/en/help_snmp_explorer.php create mode 100644 pandora_console/include/help/en/help_template_tab.php create mode 100644 pandora_console/include/help/es/help_collection_tab.php create mode 100644 pandora_console/include/help/es/help_collections.php create mode 100644 pandora_console/include/help/es/help_component_groups.php create mode 100644 pandora_console/include/help/es/help_gis_tab.php create mode 100644 pandora_console/include/help/es/help_inventory_tab.php create mode 100644 pandora_console/include/help/es/help_service_elements_management.php create mode 100644 pandora_console/include/help/es/help_service_management_edit.php create mode 100644 pandora_console/include/help/es/help_services_management.php create mode 100644 pandora_console/include/help/es/help_snmp_explorer.php create mode 100644 pandora_console/include/help/es/help_template_tab.php create mode 100644 pandora_console/include/help/es/help_view_services.php create mode 100644 pandora_console/include/help/es/help_view_services_detail.php diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index b0d67468a6..a6902251fa 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,41 @@ +2011-09-14 Juan Manuel Ramon + + * include/help/en/help_gis_tab.php + include/help/en/help_local_component.php + include/help/en/help_component_groups.php + include/help/en/help_collection_tab.php + include/help/en/help_inventory_tab.php + include/help/en/help_snmp_explorer.php + include/help/en/help_collections.php + include/help/en/help_template_tab.php + include/help/en/help_service_management_edit.php + include/help/es/help_service_elements_management.php + include/help/es/help_gis_tab.php + include/help/es/help_view_services_detail.php + include/help/es/help_component_groups.php + include/help/es/help_collection_tab.php + include/help/es/help_inventory_tab.php + include/help/es/help_snmp_explorer.php + include/help/es/help_collections.php + include/help/es/help_template_tab.php + include/help/es/help_service_management_edit.php + include/help/es/help_view_services.php + include/help/es/help_services_management.php: Added new contextual helps. + + * include/help/en/help_service_elements_management.php + include/help/en/help_view_services_detail.php + include/help/en/help_services_management.php: Modified contextual helps. + + * include/help/en/help_service_elements_management.php + include/help/en/help_view_services_detail.php + include/help/en/help_services_management.php + godmode/agentes/planned_downtime.php + godmode/agentes/agent_manager.php + godmode/modules/manage_network_components.php: Added contextual helps. + + * godmode/modules/manage_nc_groups.php: Fixed delete action over component groups when they + have child components groups. + 2011-09-08 Miguel de Dios * include/functions_api.php: fixed output of api without html entities. diff --git a/pandora_console/godmode/agentes/agent_manager.php b/pandora_console/godmode/agentes/agent_manager.php index 1949af9c78..f6d3bf1573 100644 --- a/pandora_console/godmode/agentes/agent_manager.php +++ b/pandora_console/godmode/agentes/agent_manager.php @@ -274,7 +274,7 @@ $arraySelectIcon = array(); foreach ($listIcons as $index => $value) $arraySelectIcon[$index] = $index; $path = 'images/gis_map/icons/'; //TODO set better method the path -$table->data[4][0] = __('Agent icon'); +$table->data[4][0] = __('Agent icon') . ui_print_help_tip(__('Agent icon for GIS Maps.'), true); if($icon_path == '') { $display_icons = 'none'; // Hack to show no icon. Use any given image to fix not found image errors diff --git a/pandora_console/godmode/agentes/configurar_agente.php b/pandora_console/godmode/agentes/configurar_agente.php index 74920409c7..bc8aa24889 100644 --- a/pandora_console/godmode/agentes/configurar_agente.php +++ b/pandora_console/godmode/agentes/configurar_agente.php @@ -321,24 +321,29 @@ if ($id_agente) { $tab_description = '- '. __('Setup'); break; case "collection": - $tab_description = '- ' . __('Collection'); + $tab_description = '- ' . __('Collection') . ui_print_help_icon('collection_tab', true); break; case "inventory": - $tab_description = '- ' . __('Inventory'); + $tab_description = '- ' . __('Inventory') . ui_print_help_icon('inventory_tab', true); break; case "module": $tab_description = '- '. __('Modules'); break; case "alert": - $tab_description = '- ' . __('Alert'); + $tab_description = '- ' . __('Alert') . ui_print_help_icon('manage_alert_list', true); break; case "template": - $tab_description = '- ' . __('Templates'); + $tab_description = '- ' . __('Templates') . ui_print_help_icon('template_tab', true); break; case "gis": - $tab_description = '- ' . __('Gis'); + $tab_description = '- ' . __('Gis') . ui_print_help_icon('gis_tab', true); break; case "extension": + $id_extension = get_parameter('id_extension', ''); + switch ($id_extension){ + case "snmp_explorer": + $tab_description = '- ' . __('SNMP explorer') . ui_print_help_icon('snmp_explorer', true); + } break; default: diff --git a/pandora_console/godmode/agentes/planned_downtime.php b/pandora_console/godmode/agentes/planned_downtime.php index 14d3ea9ac9..b94b0bd603 100644 --- a/pandora_console/godmode/agentes/planned_downtime.php +++ b/pandora_console/godmode/agentes/planned_downtime.php @@ -54,7 +54,7 @@ $groups = users_get_groups (); $only_alerts = (bool) get_parameter ('only_alerts', 0); // Header -ui_print_page_header (__("Planned Downtime"), "images/god1.png", false, "", true, ""); +ui_print_page_header (__("Planned Downtime") . ui_print_help_icon ('planned_downtime', true), "images/god1.png", false, "", true, ""); // INSERT A NEW DOWNTIME_AGENT ASSOCIATION if ($insert_downtime_agent == 1){ @@ -231,7 +231,6 @@ if ($create_downtime || $update_downtime) { } //Editor form - echo '

'.__('Planned Downtime Form').' '.ui_print_help_icon ('planned_downtime', true).'

'; html_print_table ($table); html_print_input_hidden ('id_agent', $id_agent); @@ -252,7 +251,7 @@ if ($create_downtime || $update_downtime) { echo ""; // Show available agents to include into downtime - echo '

'.__('Available agents').':

'; + echo '

'.__('Available agents').':

'; $filter_group = get_parameter("filter_group", 0); @@ -300,7 +299,7 @@ if ($create_downtime || $update_downtime) { echo ""; //Start Overview of existing planned downtime - echo '

'.__('Agents planned for this downtime').':

'; + echo '

'.__('Agents planned for this downtime').':

'; $sql = sprintf ("SELECT tagente.nombre, tplanned_downtime_agents.id, tagente.id_os, tagente.id_agente, tagente.id_grupo, diff --git a/pandora_console/godmode/modules/manage_nc_groups.php b/pandora_console/godmode/modules/manage_nc_groups.php index 17d07f0b41..021323c93c 100644 --- a/pandora_console/godmode/modules/manage_nc_groups.php +++ b/pandora_console/godmode/modules/manage_nc_groups.php @@ -26,7 +26,7 @@ if (! check_acl ($config['id_user'], 0, "PM")) { } // Header -ui_print_page_header (__('Module management').' » '. __('Component group management'), "", false, "", true); +ui_print_page_header (__('Module management').' » '. __('Component group management'), "", false, "component_groups", true); require_once ('include/functions_network_components.php'); @@ -76,8 +76,11 @@ if ($update) { if ($delete) { $result = db_process_sql_delete ('tnetwork_component_group', array ('id_sg' => $id)); + + $result1 = db_process_sql_update('tnetwork_component_group', array('parent' => 0), array('parent' => $id)); + - if ($result !== false) $result = true; + if (($result !== false) and ($result1 !== false)) $result = true; else $result = false; ui_print_result_message ($result, @@ -93,8 +96,10 @@ if ($multiple_delete) { foreach ($ids as $id) { $result = db_process_sql_delete ('tnetwork_component_group', array ('id_sg' => $id)); - - if ($result === false) { + + $result1 = db_process_sql_update('tnetwork_component_group', array('parent' => 0), array('parent' => $id)); + + if (($result === false) or ($result1 === false)) { db_process_sql_rollback(); break; } @@ -201,4 +206,4 @@ function check_all_checkboxes() { $(".check_delete").attr('checked', false); } } - \ No newline at end of file + diff --git a/pandora_console/godmode/modules/manage_network_components.php b/pandora_console/godmode/modules/manage_network_components.php index 05141aa957..84e1718635 100644 --- a/pandora_console/godmode/modules/manage_network_components.php +++ b/pandora_console/godmode/modules/manage_network_components.php @@ -26,7 +26,7 @@ if (! check_acl ($config['id_user'], 0, "PM")) { } // Header -ui_print_page_header (__('Module management').' » '.__('Network component management'), "", false, "", true); +ui_print_page_header (__('Module management').' » '.__('Network component management'), "", false, "network_component", true); require_once ('include/functions_network_components.php'); @@ -417,4 +417,4 @@ function check_all_checkboxes() { $(".check_delete").attr('checked', false); } } - \ No newline at end of file + diff --git a/pandora_console/include/help/en/help_collection_tab.php b/pandora_console/include/help/en/help_collection_tab.php new file mode 100644 index 0000000000..57867fa20c --- /dev/null +++ b/pandora_console/include/help/en/help_collection_tab.php @@ -0,0 +1,8 @@ + + +

Agent's collections

+ +

A collection is group of files (executables or scripts) that are copied to a specific agent directory. With this you can transfer remotely software to agent's machine in a easy way.

diff --git a/pandora_console/include/help/en/help_collections.php b/pandora_console/include/help/en/help_collections.php new file mode 100644 index 0000000000..382ed0d498 --- /dev/null +++ b/pandora_console/include/help/en/help_collections.php @@ -0,0 +1,10 @@ + + +

Collections

+ +

+A collection is group of files (executables or scripts) that are copied to a specific agent directory. With this you can transfer remotely software to agent's machine in a easy way. +

diff --git a/pandora_console/include/help/en/help_component_groups.php b/pandora_console/include/help/en/help_component_groups.php new file mode 100644 index 0000000000..08d807d975 --- /dev/null +++ b/pandora_console/include/help/en/help_component_groups.php @@ -0,0 +1,9 @@ + + +

Component groups

+ +

Components are generic modules that you can apply repeatly to agents like a template. With this view you can create groups for this components.

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

Agent GIS view

+ +

+This page allow users to view agent's GIS data in a graphical way. +

+ +

+With GIS you can see positional data of agents inside interactive maps. It is also possible to update agent position (longitude, latitude, altitude). +

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

+Inventory allow you to have a complete list of devices of the monitored servers. With this you can have information of CPU, RAM memory, patches, software, etc. of your servers. +

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

Local Component

+ +

Local Components are elements that can be applied to agents like templates. With Pandora FMS Enterprise, this can be applied authomatically and remotely with policies or one by one.

diff --git a/pandora_console/include/help/en/help_service_elements_management.php b/pandora_console/include/help/en/help_service_elements_management.php index 5fe431a211..ee86c73bfa 100644 --- a/pandora_console/include/help/en/help_service_elements_management.php +++ b/pandora_console/include/help/en/help_service_elements_management.php @@ -5,3 +5,4 @@ ?>

Manage Service Elements

+

This view shows modules inside the current service.

diff --git a/pandora_console/include/help/en/help_service_management_edit.php b/pandora_console/include/help/en/help_service_management_edit.php new file mode 100644 index 0000000000..0634cf8252 --- /dev/null +++ b/pandora_console/include/help/en/help_service_management_edit.php @@ -0,0 +1,9 @@ + + +

Service edit

+ +

This view show configuration form in order to edit services.

diff --git a/pandora_console/include/help/en/help_services_management.php b/pandora_console/include/help/en/help_services_management.php index 7107d71b32..c3acc181bb 100644 --- a/pandora_console/include/help/en/help_services_management.php +++ b/pandora_console/include/help/en/help_services_management.php @@ -5,3 +5,4 @@ ?>

Manage Services

+

This view list all services available to be managed. Also shows critical and warning value, group, etc. of the service.

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

SNMP explorer

+ +

+SNMP explorer is an extension that allow users to do a SNMP Walk in an easy way. SNMP Walk do a serie of getnexts commands automatically in order to retrieve information of the target machine. +

+ diff --git a/pandora_console/include/help/en/help_template_tab.php b/pandora_console/include/help/en/help_template_tab.php new file mode 100644 index 0000000000..55d7d587ba --- /dev/null +++ b/pandora_console/include/help/en/help_template_tab.php @@ -0,0 +1,9 @@ + + +

+Module template are an agrupation which contain network check modules. This templates can be applied directly to agents, avoiding add modules one by one. +

+ diff --git a/pandora_console/include/help/en/help_view_services_detail.php b/pandora_console/include/help/en/help_view_services_detail.php index 423c4de71e..10f64d2518 100644 --- a/pandora_console/include/help/en/help_view_services_detail.php +++ b/pandora_console/include/help/en/help_view_services_detail.php @@ -1,6 +1,11 @@ +

View Service Detail

+ +

+This view shows service general parameters like critical and warning values or service status. Also shows the complete list of modules of the service. +

+ diff --git a/pandora_console/include/help/es/help_collection_tab.php b/pandora_console/include/help/es/help_collection_tab.php new file mode 100644 index 0000000000..13a777fd0a --- /dev/null +++ b/pandora_console/include/help/es/help_collection_tab.php @@ -0,0 +1,9 @@ + + +

Colecciones del agente

+ +

Una coleccion es un grupo de ficheros (ejecutables o scripts) que son copiados a la maquina del agente en un diretorio especifico. Con esto se puede transferir remotamente software a la maquina del agente de una manera sencilla.

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

Collections

+ +

+A collection is group of files (executables or scripts) that are copied to a specific agent directory. With this you can transfer remotely software to agent's machine in a easy way. +

+ diff --git a/pandora_console/include/help/es/help_component_groups.php b/pandora_console/include/help/es/help_component_groups.php new file mode 100644 index 0000000000..a2df1528f7 --- /dev/null +++ b/pandora_console/include/help/es/help_component_groups.php @@ -0,0 +1,10 @@ + + +

Grupos de componentes

+ +

Un componente es un modulo generico que puede aplicarse a agentes de forma repetida como si fuera una plantilla. Con esta vista puedes crear grupos para estos componentes.

+ diff --git a/pandora_console/include/help/es/help_gis_tab.php b/pandora_console/include/help/es/help_gis_tab.php new file mode 100644 index 0000000000..7968c7403e --- /dev/null +++ b/pandora_console/include/help/es/help_gis_tab.php @@ -0,0 +1,14 @@ + +

Agent GIS view

+ +

+Esta vista permite a los usuarios ver la informacion GIS del agente de una manera grafica. +

+ +

+Con GIS se puede ver la informacion posicional del agente dentro de mapas interactivos. Ademas, es posible actualizar la informacion posicional del agente (longitud, latitud, altitud). +

+ diff --git a/pandora_console/include/help/es/help_inventory_tab.php b/pandora_console/include/help/es/help_inventory_tab.php new file mode 100644 index 0000000000..075131fcbd --- /dev/null +++ b/pandora_console/include/help/es/help_inventory_tab.php @@ -0,0 +1,8 @@ + + +

El inventario te permite tener una lista completa de todos los dispositivos de los servidores monitorizados. Con esto se puede tener informacion de CPU, memoria RAM, parches, software, etc. de tus servidores. +

+ diff --git a/pandora_console/include/help/es/help_service_elements_management.php b/pandora_console/include/help/es/help_service_elements_management.php new file mode 100644 index 0000000000..9f3d6c1f33 --- /dev/null +++ b/pandora_console/include/help/es/help_service_elements_management.php @@ -0,0 +1,9 @@ + +

Gestion de elementos de servicio

+ +

Esta vista muestra los modulos dentro del servicio actual.

+ diff --git a/pandora_console/include/help/es/help_service_management_edit.php b/pandora_console/include/help/es/help_service_management_edit.php new file mode 100644 index 0000000000..e1ce822559 --- /dev/null +++ b/pandora_console/include/help/es/help_service_management_edit.php @@ -0,0 +1,9 @@ + + +

Edición de servicios

+ +

Esta vista muestra el formulario de configuracion para editar servicios.

diff --git a/pandora_console/include/help/es/help_services_management.php b/pandora_console/include/help/es/help_services_management.php new file mode 100644 index 0000000000..d0edb2ffc7 --- /dev/null +++ b/pandora_console/include/help/es/help_services_management.php @@ -0,0 +1,9 @@ + +

Gestion de servicios

+ +

Esta vista muestra todos los servicios disponibles para ser administrados. Tambien muestra los valores de estado critico, aviso, grupo, etc. de los servicios.

+ diff --git a/pandora_console/include/help/es/help_snmp_explorer.php b/pandora_console/include/help/es/help_snmp_explorer.php new file mode 100644 index 0000000000..14682b63a4 --- /dev/null +++ b/pandora_console/include/help/es/help_snmp_explorer.php @@ -0,0 +1,12 @@ + + +

SNMP Explorer

+ +

+SNMP explorer es una extension que permite de una forma facil usar el comando SNMP Walk a los usuarios. SNMP Walk realiza una serie de comandos getnexts para poder recuperar informacion de la maquina objetivo de manera automatica. +

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

+Las plantillas de modulos son agrupaciones de modulos de comprobaciones de red. Las plantillas pueden aplicarse directamente a los agentes, evitando tener que añrlos uno a uno. +

diff --git a/pandora_console/include/help/es/help_view_services.php b/pandora_console/include/help/es/help_view_services.php new file mode 100644 index 0000000000..26749c8d15 --- /dev/null +++ b/pandora_console/include/help/es/help_view_services.php @@ -0,0 +1,9 @@ + +

Vista de servicios

+ +

Esta es la vista de servicios con sus estados.

+ diff --git a/pandora_console/include/help/es/help_view_services_detail.php b/pandora_console/include/help/es/help_view_services_detail.php new file mode 100644 index 0000000000..b191605477 --- /dev/null +++ b/pandora_console/include/help/es/help_view_services_detail.php @@ -0,0 +1,11 @@ + + +

Vista de detalle de servicio

+ +

+Esta vista muestra parametros generales del servicio como los valores de estado critico o aviso y el estado de este. Tambien se muestra un lista completa de los modulos del agente. +

+