From ed88f536202882e55af6eea64eb964ef0e4804d9 Mon Sep 17 00:00:00 2001
From: Nozomi Anzai <anzai@sraoss.co.jp>
Date: Fri, 29 Jan 2016 13:27:43 +0900
Subject: [PATCH] Add a new parameter "wd_monitoring_interfaces_list"

---
 common.php                | 1 +
 definePgpoolConfParam.php | 6 ++++++
 lang/en.lang.php          | 1 +
 lang/ja.lang.php          | 1 +
 templates/pgconfig.tpl    | 3 +++
 5 files changed, 12 insertions(+)

diff --git a/common.php b/common.php
index 25ac2ed..08b3eb6 100644
--- a/common.php
+++ b/common.php
@@ -493,6 +493,7 @@ function paramExists($param)
         case 'sr_check_database':
         case 'wd_de_escalation_command':
         case 'wd_ipc_socket_dir':
+        case 'wd_monitoring_interfaces_list':
         case 'wd_priority':
             $add_version = 3.5;
             break;
diff --git a/definePgpoolConfParam.php b/definePgpoolConfParam.php
index 4df51fd..e293370 100644
--- a/definePgpoolConfParam.php
+++ b/definePgpoolConfParam.php
@@ -796,6 +796,12 @@ $pgpoolConfigParam[$key]['default'] = '';
 $pgpoolConfigParam[$key]['regexp'] = $anyelse;
 $pgpoolConfigParam[$key]['parent'] = array('use_watchdog' => 'on');
 
+$key = 'wd_monitoring_interfaces_list';
+$pgpoolConfigParam[$key]['type'] = 'C';
+$pgpoolConfigParam[$key]['default'] = '';
+$pgpoolConfigParam[$key]['regexp'] = $anyelse;
+$pgpoolConfigParam[$key]['parent'] = array('use_watchdog' => 'on');
+
 # Life checking pgpool-II
 
 # (Common)
diff --git a/lang/en.lang.php b/lang/en.lang.php
index 1ed79a8..4ac5f52 100644
--- a/lang/en.lang.php
+++ b/lang/en.lang.php
@@ -187,6 +187,7 @@ $message = array(
     'descWd_lifecheck_query' => 'Actual query to check pgpool-II',
     'descWd_lifecheck_password' => 'The user name to check pgpool-II',
     'descWd_lifecheck_user' => 'The password of the user to check pgpool-II',
+    'descWd_monitoring_interfaces_list' => 'The list of network device names whose network link state watchdog process monitors',
     'descWd_port' => 'The port number on which pgpool-II works',
     'descWd_priority' => 'Elevate the local watchdog node priority in the elections '.
                          'to select master watchdog node',
diff --git a/lang/ja.lang.php b/lang/ja.lang.php
index 7ed7daa..67fb8de 100644
--- a/lang/ja.lang.php
+++ b/lang/ja.lang.php
@@ -172,6 +172,7 @@ $message = array(
     'descWd_lifecheck_query' => '死活監視で実行するクエリ',
     'descWd_lifecheck_password' => '死活監視を行なうユーザのパスワード',
     'descWd_lifecheck_user' => '死活監視を行なうユーザ',
+    'descWd_monitoring_interfaces_list' => 'ネットワークリンクの状態を監視するネットワークデバイス名のリスト',
     'descWd_port' => 'watchdog プロセスが相互監視を受信するためのポート番号',
     'descWd_priority' => '自身の watchdog ノードがリーダに選ばれる優先度',
     'descWhite_function_list' => 'データベースに書き込みを行なわないカンマ区切りの関数のリスト',
diff --git a/templates/pgconfig.tpl b/templates/pgconfig.tpl
index 3fe850c..3a60b34 100644
--- a/templates/pgconfig.tpl
+++ b/templates/pgconfig.tpl
@@ -573,6 +573,9 @@
             {if paramExists('wd_de_escalation_command')}
                 {custom_tr_pgconfig param='wd_de_escalation_command'}
             {/if}
+            {if paramExists('wd_monitoring_interfaces_list')}
+                {custom_tr_pgconfig param='wd_monitoring_interfaces_list'}
+            {/if}
           </tbody>
 
           <tbody id="tb_watchdog_use_watchdog_on_lifecheck_common">
-- 
2.39.5