From 4437c369953cbd7548ca4008abe549085fbac6c9 Mon Sep 17 00:00:00 2001 From: Junichi Satoh Date: Wed, 4 Nov 2015 13:53:13 +0900 Subject: [PATCH] Added a new alert and plugin macro, _id_group_. --- pandora_console/include/help/en/help_alert_config.php | 1 + pandora_console/include/help/en/help_alert_macros.php | 1 + pandora_console/include/help/en/help_plugin_macros.php | 1 + pandora_console/include/help/ja/help_alert_config.php | 1 + pandora_console/include/help/ja/help_alert_macros.php | 1 + pandora_console/include/help/ja/help_plugin_macros.php | 1 + pandora_server/lib/PandoraFMS/Core.pm | 1 + pandora_server/lib/PandoraFMS/PluginServer.pm | 1 + 8 files changed, 8 insertions(+) diff --git a/pandora_console/include/help/en/help_alert_config.php b/pandora_console/include/help/en/help_alert_config.php index fec2f835f3..bedc89c335 100644 --- a/pandora_console/include/help/en/help_alert_config.php +++ b/pandora_console/include/help/en/help_alert_config.php @@ -50,6 +50,7 @@ Besides the defined module macros, the following macros are available:
  • _event_text_severity_ : (Only event alerts) Text event (who fire the alert) severity (Maintenance, Informational, Normal Minor, Warning, Major, Critical).
  • _event_id_ : (Only event alerts) Id of the event that fired the alert.
  • _id_agent_ : Id of agent, useful to build direct URL to redirect to a Pandora FMS console webpage.
    • +
  • _id_group_ : Id of agent group.
  • _id_alert_ : Numerical ID of the alert (unique), used to correlate on third party software
  • _policy_ : Name of the policy the module belongs to (if applies).
  • _interval_ : Execution interval of the module.
    • diff --git a/pandora_console/include/help/en/help_alert_macros.php b/pandora_console/include/help/en/help_alert_macros.php index 93460ad554..d8ce3f4fe5 100644 --- a/pandora_console/include/help/en/help_alert_macros.php +++ b/pandora_console/include/help/en/help_alert_macros.php @@ -43,6 +43,7 @@ Besides the defined module macros, the following macros are available:
  • _event_text_severity_: (Only event alerts) Text event (who fire the alert) severity (Maintenance, Informational, Normal Minor, Warning, Major, Critical).
  • _event_id_: (Only event alerts) Id of the event that fired the alert.
  • _id_agent_: Id of agent, useful to build direct URL to redirect to a Pandora FMS console webpage.
    • +
  • _id_group_ : Id of agent group.
  • _id_alert_: Numerical ID of the alert (unique), used to correlate on third party software.
  • _policy_: Name of the policy the module belongs to (if applies).
  • _interval_: Execution interval of the module
    • diff --git a/pandora_console/include/help/en/help_plugin_macros.php b/pandora_console/include/help/en/help_plugin_macros.php index eec73e948c..3772c97ca5 100644 --- a/pandora_console/include/help/en/help_plugin_macros.php +++ b/pandora_console/include/help/en/help_plugin_macros.php @@ -18,6 +18,7 @@ The following macros are available:
  • _moduledescription_ : Description of the module.
  • _modulestatus_ : Status of the module.
  • _id_agent_ : Id of agent, useful to build direct URL to redirect to a Pandora FMS console webpage.
    • +
  • _id_group_ : Id of agent group.
  • _policy_ : Name of the policy the module belongs to (if applies).
  • _interval_ : Execution interval of the module.
    • diff --git a/pandora_console/include/help/ja/help_alert_config.php b/pandora_console/include/help/ja/help_alert_config.php index 8f4e9de4d6..ae4fcd469f 100644 --- a/pandora_console/include/help/ja/help_alert_config.php +++ b/pandora_console/include/help/ja/help_alert_config.php @@ -49,6 +49,7 @@ email アクションを設定するには、_field1_ (送信先アドレス)、
  • _event_text_severity_ : (イベントアラートのみ) イベント(アラートの発生元)のテキストでの重要度 (Maintenance, Informational, Normal Minor, Warning, Major, Critical)
  • _event_id_ : (イベントアラートのみ) アラート発生元のイベントID
  • _id_agent_ : エージェントのID / Webコンソールへのリンクを生成するのに便利です
    • +
  • _id_group_ : エージェントグループのID
  • _id_alert_ : アラートの(ユニークな)ID / 他のソフトウエアパッケージとの連携に利用できます
  • _policy_ : モジュールが属するポリシー名 (存在する場合)
  • _interval_ : モジュールの実行間隔
    • diff --git a/pandora_console/include/help/ja/help_alert_macros.php b/pandora_console/include/help/ja/help_alert_macros.php index 2fe02781e4..15b892651c 100644 --- a/pandora_console/include/help/ja/help_alert_macros.php +++ b/pandora_console/include/help/ja/help_alert_macros.php @@ -43,6 +43,7 @@
  • _event_text_severity_ : (イベントアラートのみ) イベント(アラートの発生元)のテキストでの重要度 (Maintenance, Informational, Normal Minor, Warning, Major, Critical)
  • _event_id_ : (イベントアラートのみ) アラート発生元のイベントID
  • _id_agent_ : エージェントのID / Webコンソールへのリンクを生成するのに便利です
    • +
  • _id_group_ : エージェントグループのID
  • _id_alert_ : アラートの(ユニークな)ID / 他のソフトウエアパッケージとの連携に利用できます
  • _policy_ : モジュールが属するポリシー名 (存在する場合)
  • _interval_ : モジュールの実行間隔
    • diff --git a/pandora_console/include/help/ja/help_plugin_macros.php b/pandora_console/include/help/ja/help_plugin_macros.php index 794a43e629..daaf6a6d1c 100644 --- a/pandora_console/include/help/ja/help_plugin_macros.php +++ b/pandora_console/include/help/ja/help_plugin_macros.php @@ -19,6 +19,7 @@
  • _moduledescription_ : モジュールの説明。
  • _modulestatus_ : モジュールの状態。
  • _id_agent_ : エージェントのID / Webコンソールへのリンクを生成するのに便利です。
    • +
  • _id_group_ : エージェントグループのID
  • _policy_ : モジュールが属するポリシー名。(存在する場合)
  • _interval_ : モジュールの実行間隔。
    • diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm index 666680caf3..05736f6531 100644 --- a/pandora_server/lib/PandoraFMS/Core.pm +++ b/pandora_server/lib/PandoraFMS/Core.pm @@ -934,6 +934,7 @@ sub pandora_execute_action ($$$$$$$$$;$) { _modulestatus_ => undef, _moduletags_ => undef, _id_agent_ => (defined ($module)) ? $module->{'id_agente'} : '', + _id_group_ => (defined ($group)) ? $group->{'id_grupo'} : '', _id_alert_ => (defined ($alert->{'id_template_module'})) ? $alert->{'id_template_module'} : '', _interval_ => (defined ($module) && $module->{'module_interval'} != 0) ? $module->{'module_interval'} : (defined ($agent)) ? $agent->{'intervalo'} : '', _target_ip_ => (defined ($module)) ? $module->{'ip_target'} : '', diff --git a/pandora_server/lib/PandoraFMS/PluginServer.pm b/pandora_server/lib/PandoraFMS/PluginServer.pm index 6d8763dc63..9f18e971aa 100644 --- a/pandora_server/lib/PandoraFMS/PluginServer.pm +++ b/pandora_server/lib/PandoraFMS/PluginServer.pm @@ -226,6 +226,7 @@ sub data_consumer ($$) { _modulestatus_ => undef, _moduletags_ => undef, _id_agent_ => (defined ($module)) ? $module->{'id_agente'} : '', + _id_group_ => (defined ($group)) ? $group->{'id_grupo'} : '', _interval_ => (defined ($module) && $module->{'module_interval'} != 0) ? $module->{'module_interval'} : (defined ($agent)) ? $agent->{'intervalo'} : '', _target_ip_ => (defined ($module)) ? $module->{'ip_target'} : '', _target_port_ => (defined ($module)) ? $module->{'tcp_port'} : '',