tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removed unwanted git merge traces (sorry)

This commit is contained in:
fermin831 2018-02-06 12:06:21 +01:00
parent 378186cadf
commit d625652f9a
3 changed files with 0 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pandora_console/include/help/en/help_module_definition.php
View File

@ -4,7 +4,6 @@
*/
?>
<h1>Module definition</h1>
<<<<<<< HEAD
<p>Agents can be configured from the console in three working modes:</p>
<ul>
<li>
@ -18,15 +17,4 @@
<li>
<b>Autodisable mode:</b> Similar to learning mode, in this mode, also, if all modules pass to unknown state the agent will be automatically disabled, going to be enabled again if it receives new information.
</li>
=======
<p>
There are three modes for an agent:
</p>
<ul>
<li><i>Learning mode:</i> All the modules sent by the agent are accepted. If modules are not defined, they will be automatically defined by the system. It is recommended to activate the agents in this mode and change it once the user is familiar with Pandora FMS.<br>From version 4.0.3, in this mode, Pandora console collect all the configuration specified by the agent configuration file the first time and thereafter any changes should be made through console, will not catch changes in config file.</li>
<br>
<li><i>Normal mode:</i> The modules in this mode must be configured manually. The self definition of the modules is not allowed in this mode.</li>
<br>
<li><i>Autodisable mode:</i> It behaves exactly the same as an agent in learning mode: when the first XML reaches it, the first agent is created and, on each report, if there are new modules they can also be added automatically. Nevertheless, when all modules from an agent that are in autodisable mode are also marked as unknown, the agent is automatically disabled. In any case, if the agent reports again, it gets enabled again on its own.</li>
>>>>>>> develop
</ul>

13
pandora_console/include/help/es/help_module_definition.php
View File

@ -4,7 +4,6 @@
*/
?>
<h1>Definición de módulo</h1>
<<<<<<< HEAD
<p>Los agentes pueden configurarse desde la consola en tres modos de trabajo:</p>
<ul>
<li>
@ -18,16 +17,4 @@
<li>
<b>Modo autodeshabilitado:</b> Similar al modo aprendizaje, en este modo, además, si todos los módulos pasan a estado desconocido el agente se deshabilitará automáticamente, pasando a habilitarse de nuevo si recibe nueva información.
</li>
=======
<p>
Existen tres modos para un agente:
</p>
<ul>
<li><i>Modo aprendizaje:</i>Si el XML recibido del agente software contiene nuevos módulos, éstos serán automáticamente creados. Este es el comportamiento por defecto.</li>
<br>
<li><i>Modo normal:</i>No se crearán nuevos módulos que lleguen en el XML si no han sido declarados previamente en la consola.</li>
<br>
<li><i>Modo auto deshabilitado:</i>Similar al modo aprendizaje, en este modo, además, si todos los módulos pasan a estado desconocido el agente se deshabilitará automáticamente, pasando a habilitarse de nuevo si recibe nueva información.</li>
>>>>>>> develop
</ul>

6
pandora_console/include/help/ja/help_module_definition.php
View File

@ -10,7 +10,6 @@
<b>Learning mode:</b> If the XML received from the software agent contains new modules, they will be automatically created. This is the default behavior.
</li>
<br>
<<<<<<< HEAD
<li>
<b>Normal mode:</b> No new modules will be created that arrive in XML if they have not been previously declared in the console.
</li>
@ -18,9 +17,4 @@
<li>
<b>Autodisable mode:</b> Similar to learning mode, in this mode, also, if all modules pass to unknown state the agent will be automatically disabled, going to be enabled again if it receives new information.
</li>
=======
<li><i>通常モード:</i> このモードでは、モジュール設定を手動で実施する必要があります。自動設定は行われません。</li>
<br>
<li><i>Autodisable mode:</i> In terms of creating agents and modules it behaves exactly the same as an agent in learning mode: when the first XML reaches it, the first agent is created and, on each report, if there are new modules they can also be added automatically. Nevertheless, when all modules from an agent that are in autodisable mode are also marked as unknown, the agent is automatically disabled. In any case, if the agent reports again, it gets enabled again on its own.</li>
>>>>>>> develop
</ul>