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

2012-05-09 Sergio Martin <sergio.martin@artica.es> 

* include/help/en/help_alert_macros.php
	include/help/es/help_alert_macros.php
	include/functions.php
	include/functions_agents.php: Fixing some missing or wrong macros
	into help and added Minor and Major severities to alerts 
	and clean some code



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6276 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2012-05-09 16:05:16 +00:00
parent 5f3c0c15d5
commit 957d8c679e
5 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pandora_console/ChangeLog
View File

@ -1,3 +1,12 @@
2012-05-09 Sergio Martin <sergio.martin@artica.es>
* include/help/en/help_alert_macros.php
include/help/es/help_alert_macros.php
include/functions.php
include/functions_agents.php: Fixing some missing or wrong macros
into help and added Minor and Major severities to alerts
and clean some code
2012-05-08 Sancho Lerena <slerena@artica.es>
* operation/agentes/datos_agente.php: Fixed search, was

8
pandora_console/include/functions.php
View File

@ -661,6 +661,12 @@ function get_alert_priority ($priority = 0) {
case 4:
return __('Critical');
break;
case 5:
return __('Minor');
break;
case 6:
return __('Major');
break;
}
return '';
}
@ -835,7 +841,9 @@ function get_priorities () {
$priorities[0] = __('Maintenance');
$priorities[1] = __('Informational');
$priorities[2] = __('Normal');
$priorities[5] = __('Minor');
$priorities[3] = __('Warning');
$priorities[6] = __('Major');
$priorities[4] = __('Critical');
if (isset($config['text_char_long'])) {

6
pandora_console/include/functions_agents.php
View File

@ -192,12 +192,6 @@ function agents_get_alerts_simple ($id_agent = false, $filter = '', $options = f
$selectText = 'COUNT(talert_template_modules.id) AS count';
}
if(is_array($id_agent)) {
$extra_sql = enterprise_hook('policies_get_modules_sql_condition', array(reset($id_agent), 't3.', false));
}
else {
$extra_sql = '';
}
$extra_sql = enterprise_hook('policies_get_modules_sql_condition', array(reset($id_agent), 't3.', false));
if ($extra_sql === ENTERPRISE_NOT_HOOK) {

2
pandora_console/include/help/en/help_alert_macros.php
View File

@ -24,7 +24,7 @@ The following macros are available:
<li>_modulegroup_ : Module group name.</li>
<li>_moduledescription_ : Description of the module who fired the alert </li>
<li>_alert_name_ : Alert name </li>
<li>_alert_priority_ : Numerical alert priorityu </li>
<li>_alert_priority_ : Numerical alert priority </li>
<li>_id_agent_ : Id of agent, useful to build direct URL to redirect to a Pandora FMS console webpage.</li>
<li>_id_alert_ : Numerical ID of the alert (unique), used to correlate on third party software</li>
<li>_policy_ : Name of the policy the module belongs to (if applies).</li>

7
pandora_console/include/help/es/help_alert_macros.php
View File

@ -20,12 +20,17 @@ Las siguientes macros están disponibles:
<li>_alert_threshold_: Umbral de la alerta.</li>
<li>_alert_times_fired_: Número de veces que se ha disparado la alerta.</li>
<li>_module_: Nombre del módulo</li>
<li>_modulegroup_ : Nombre del grupo del módulo.</li>
<li>_moduledescription_: Descripcion del modulo.</li>
<li>_alert_name_: Nombre de la alerta.</li>
<li>_alert_priority_: Prioridad de la alerta.</li>
<li>_alert_priority_: Prioridad numérica de la alerta.</li>
<li>_id_agent_: ID del agente, util para construir URL de acceso a la consola de Pandora.</li>
<li>_id_alert_: ID de la alerta, util para correlar la alerta en herramientas de terceros.</li>
<li>_policy_: Nombre de la política a la que pertenece el módulo (si aplica).</li>
<li>_interval_ : Intervalo de la ejecución del módulo. </li>
<li>_target_ip_ : Dirección IP del objetivo del módulo.</li>
<li>_target_port_ : Puerto del objetivo del módulo.</li>
<li>_plugin_parameters_ : Parámetros del Plug-in del módulo.</li>
</ul>
<p>