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

Added _alert_unkown_instructions_ macro

This commit is contained in:
fermin831 2017-03-17 11:23:28 +01:00
parent b8f6e045a9
commit 1d5afbb36a
4 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,6 +60,7 @@ Besides the defined module macros, the following macros are available:
<li>_moduletags_: URLs associated to the module’s tags.</li> <li>_moduletags_: URLs associated to the module’s tags.</li>
<li>_alert_critical_instructions_: Instructions for CRITICAL status contained in the module.</li> <li>_alert_critical_instructions_: Instructions for CRITICAL status contained in the module.</li>
<li>_alert_warning_instructions_: Instructions for WARNING status contained in the module.</li> <li>_alert_warning_instructions_: Instructions for WARNING status contained in the module.</li>
<li>_alert_unknown_instructions_: Instructions for UNKNOWN status contained in the module.</li>
<li>_modulegraph_<i>n</i>h_: (>=6.0) (Only for alerts that use the command <i>eMail</i>) <li>_modulegraph_<i>n</i>h_: (>=6.0) (Only for alerts that use the command <i>eMail</i>)
Returns an image encoded in base64 of a module’s graph with a period of <i>n</i> hours (eg. _modulegraph_24h_). Returns an image encoded in base64 of a module’s graph with a period of <i>n</i> hours (eg. _modulegraph_24h_).
A correct setup of the connection between the server and the console's API is required. A correct setup of the connection between the server and the console's API is required.

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

@ -60,6 +60,7 @@ Además de las macros de módulo definidas, las siguientes macros están disponi
<li>_moduletags_: URLs asociadas a los tags de módulos.</li> <li>_moduletags_: URLs asociadas a los tags de módulos.</li>
<li>_alert_critical_instructions_: Instrucciones contenidas en el módulo para un estado CRITICAL.</li> <li>_alert_critical_instructions_: Instrucciones contenidas en el módulo para un estado CRITICAL.</li>
<li>_alert_warning_instructions_: Instrucciones contenidas en el módulo para un estado WARNING.</li> <li>_alert_warning_instructions_: Instrucciones contenidas en el módulo para un estado WARNING.</li>
<li>_alert_unknown_instructions_: Instrucciones contenidas en el módulo para un estado UNKNOWN.</li>
<li>_modulegraph_<i>n</i>h_: (>=6.0) (Solo para alertas que usen el comando <i>eMail</i>) <li>_modulegraph_<i>n</i>h_: (>=6.0) (Solo para alertas que usen el comando <i>eMail</i>)
Devuelve una imagen codificada en base64 de una gráfica del módulo con un período de <i>n</i> horas (eg. _modulegraph_24h_). Devuelve una imagen codificada en base64 de una gráfica del módulo con un período de <i>n</i> horas (eg. _modulegraph_24h_).
Requiere de una configuración correcta de la conexión del servidor a la consola vía api, Requiere de una configuración correcta de la conexión del servidor a la consola vía api,

1
pandora_console/include/help/ja/help_alert_macros.php
View File

@ -59,6 +59,7 @@
<li>_moduletags_ : モジュールタグに関連付けられた URL。</li> <li>_moduletags_ : モジュールタグに関連付けられた URL。</li>
<li>_alert_critical_instructions_: モジュールの障害状態時手順。</li> <li>_alert_critical_instructions_: モジュールの障害状態時手順。</li>
<li>_alert_warning_instructions_: モジュールの警告状態時手順。</li> <li>_alert_warning_instructions_: モジュールの警告状態時手順。</li>
<li>_alert_unknown_instructions_: Instructions for UNKNOWN status contained in the module.</li>
<li>_modulegraph_<i>n</i>h_: (>=6.0) (<i>eMail</i>コマンドを使うアラートのみ) <li>_modulegraph_<i>n</i>h_: (>=6.0) (<i>eMail</i>コマンドを使うアラートのみ)
n で示す期間の base64 でエンコードされたモジュールグラフを返します。(例: _modulegraph_24h_) サーバとコンソールの API の設定が正しくできている必要があります。この設定は、サーバの設定ファイルで行います。 </li> n で示す期間の base64 でエンコードされたモジュールグラフを返します。(例: _modulegraph_24h_) サーバとコンソールの API の設定が正しくできている必要があります。この設定は、サーバの設定ファイルで行います。 </li>
</ul> </ul>

3
pandora_server/lib/PandoraFMS/Core.pm
View File

@ -560,6 +560,7 @@ sub pandora_process_alert ($$$$$$$$;$) {
$alert->{'critical_instructions'} = $critical_instructions; $alert->{'critical_instructions'} = $critical_instructions;
$alert->{'warning_instructions'} = $warning_instructions; $alert->{'warning_instructions'} = $warning_instructions;
$alert->{'unknown_instructions'} = $unknown_instructions;
# Generate an event # Generate an event
if ($table eq 'tevent_alert') { if ($table eq 'tevent_alert') {
@ -769,6 +770,7 @@ sub pandora_execute_alert ($$$$$$$$$;$) {
$alert->{'critical_instructions'} = $critical_instructions; $alert->{'critical_instructions'} = $critical_instructions;
$alert->{'warning_instructions'} = $warning_instructions; $alert->{'warning_instructions'} = $warning_instructions;
$alert->{'unknown_instructions'} = $unknown_instructions;
# Execute actions # Execute actions
my $event_generated = 0; my $event_generated = 0;
@ -994,6 +996,7 @@ sub pandora_execute_action ($$$$$$$$$;$) {
_alert_text_severity_ => get_priority_name($alert->{'priority'}), _alert_text_severity_ => get_priority_name($alert->{'priority'}),
_alert_critical_instructions_ => $alert->{'critical_instructions'}, _alert_critical_instructions_ => $alert->{'critical_instructions'},
_alert_warning_instructions_ => $alert->{'warning_instructions'}, _alert_warning_instructions_ => $alert->{'warning_instructions'},
_alert_unknown_instructions_ => $alert->{'unknown_instructions'},
_groupcontact_ => (defined ($group)) ? $group->{'contact'} : '', _groupcontact_ => (defined ($group)) ? $group->{'contact'} : '',
_groupcustomid_ => (defined ($group)) ? $group->{'custom_id'} : '', _groupcustomid_ => (defined ($group)) ? $group->{'custom_id'} : '',
_groupother_ => (defined ($group)) ? $group->{'other'} : '', _groupother_ => (defined ($group)) ? $group->{'other'} : '',