diff --git a/pandora_console/include/help/en/help_alert_macros.php b/pandora_console/include/help/en/help_alert_macros.php index 544fd5ec36..a5b7bd0767 100644 --- a/pandora_console/include/help/en/help_alert_macros.php +++ b/pandora_console/include/help/en/help_alert_macros.php @@ -61,6 +61,7 @@ Besides the defined module macros, the following macros are available:
  • _moduletags_: URLs associated to the module’s tags.
  • _alert_critical_instructions_: Instructions for CRITICAL status contained in the module.
  • _alert_warning_instructions_: Instructions for WARNING status contained in the module.
  • +
  • _alert_unknown_instructions_: Instructions for UNKNOWN status contained in the module.
  • _modulegraph_nh_: (>=6.0) (Only for alerts that use the command eMail) Returns an image encoded in base64 of a module’s graph with a period of n hours (eg. _modulegraph_24h_). A correct setup of the connection between the server and the console's API is required. diff --git a/pandora_console/include/help/es/help_alert_macros.php b/pandora_console/include/help/es/help_alert_macros.php index 335d583d5a..cc3f8b784e 100644 --- a/pandora_console/include/help/es/help_alert_macros.php +++ b/pandora_console/include/help/es/help_alert_macros.php @@ -61,6 +61,7 @@ Además de las macros de módulo definidas, las siguientes macros están disponi
  • _moduletags_: URLs asociadas a los tags de módulos.
  • _alert_critical_instructions_: Instrucciones contenidas en el módulo para un estado CRITICAL.
  • _alert_warning_instructions_: Instrucciones contenidas en el módulo para un estado WARNING.
  • +
  • _alert_unknown_instructions_: Instrucciones contenidas en el módulo para un estado UNKNOWN.
  • _modulegraph_nh_: (>=6.0) (Solo para alertas que usen el comando eMail) Devuelve una imagen codificada en base64 de una gráfica del módulo con un período de n horas (eg. _modulegraph_24h_). Requiere de una configuración correcta de la conexión del servidor a la consola vía api, diff --git a/pandora_console/include/help/ja/help_alert_macros.php b/pandora_console/include/help/ja/help_alert_macros.php index cd1e2534cf..fed10ff383 100644 --- a/pandora_console/include/help/ja/help_alert_macros.php +++ b/pandora_console/include/help/ja/help_alert_macros.php @@ -60,6 +60,7 @@
  • _moduletags_ : モジュールタグに関連付けられた URL。
  • _alert_critical_instructions_: モジュールの障害状態時手順。
  • _alert_warning_instructions_: モジュールの警告状態時手順。
  • +
  • _alert_unknown_instructions_: Instructions for UNKNOWN status contained in the module.
  • _modulegraph_nh_: (>=6.0) (eMailコマンドを使うアラートのみ) n で示す期間の base64 でエンコードされたモジュールグラフを返します。(例: _modulegraph_24h_) サーバとコンソールの API の設定が正しくできている必要があります。この設定は、サーバの設定ファイルで行います。
  • diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm index 2cf45b6f8a..543ae4e264 100644 --- a/pandora_server/lib/PandoraFMS/Core.pm +++ b/pandora_server/lib/PandoraFMS/Core.pm @@ -560,6 +560,7 @@ sub pandora_process_alert ($$$$$$$$;$) { $alert->{'critical_instructions'} = $critical_instructions; $alert->{'warning_instructions'} = $warning_instructions; + $alert->{'unknown_instructions'} = $unknown_instructions; # Generate an event if ($table eq 'tevent_alert') { @@ -769,6 +770,7 @@ sub pandora_execute_alert ($$$$$$$$$;$) { $alert->{'critical_instructions'} = $critical_instructions; $alert->{'warning_instructions'} = $warning_instructions; + $alert->{'unknown_instructions'} = $unknown_instructions; # Execute actions my $event_generated = 0; @@ -995,6 +997,7 @@ sub pandora_execute_action ($$$$$$$$$;$) { _alert_text_severity_ => get_priority_name($alert->{'priority'}), _alert_critical_instructions_ => $alert->{'critical_instructions'}, _alert_warning_instructions_ => $alert->{'warning_instructions'}, + _alert_unknown_instructions_ => $alert->{'unknown_instructions'}, _groupcontact_ => (defined ($group)) ? $group->{'contact'} : '', _groupcustomid_ => (defined ($group)) ? $group->{'custom_id'} : '', _groupother_ => (defined ($group)) ? $group->{'other'} : '',