XMLRPC sync improvements

- Fix CARP/HA sync option
- Add enable/disable checkbox per replication target
- Add protocol/port selection
- Some cleanups and description tweaks

1 files changed, 54 insertions, 54 deletions

diff --git a/config/checkmk-agent/checkmk_sync.xml b/config/checkmk-agent/checkmk_sync.xml
index 1165152c..c08d280f 100644
--- a/config/checkmk-agent/checkmk_sync.xml
+++ b/config/checkmk-agent/checkmk_sync.xml
@@ -42,16 +42,16 @@
 	]]>
 	</copyright>
 	<name>checkmksync</name>
-	<version>0.1.4</version>
+	<version>0.1.6</version>
 	<title>check_mk Agent: Sync</title>
 	<include_file>/usr/local/pkg/checkmk.inc</include_file>
 	<tabs>
 		<tab>
-			<text>Config</text>
+			<text>Settings</text>
 			<url>/pkg_edit.php?xml=checkmk.xml</url>
 		</tab>
 		<tab>
-			<text>XMLRPC Sync</text>
+			<text>Sync</text>
 			<url>/pkg_edit.php?xml=checkmk_sync.xml</url>
 			<active/>
 		</tab>
@@ -59,88 +59,91 @@
 	<fields>
 		<field>
 			<type>listtopic</type>
-			<fieldname>temp</fieldname>
-			<name>Enable check_mk configuration sync</name>
+			<name>XMLRPC Sync</name>
 		</field>
 		<field>
-			<fielddescr>Sync Option</fielddescr>
+			<fielddescr>Enable Sync</fielddescr>
 			<fieldname>synconchanges</fieldname>
-			<description>Automatically sync check_mk configuration changes.</description>
+			<description>
+				<![CDATA[
+				Select a sync method for check_mk agent.<br/><br/>
+				<strong>Important:</strong> While using "Sync to host(s) defined below", only sync from host A to B, A to C but <strong>do not</strong> enable XMLRPC sync <b>to</b> A.
+				This will result in a loop!
+				]]>
+			</description>
 			<type>select</type>
 			<required/>
-			<default_value>auto</default_value>
+			<default_value>disabled</default_value>
 			<options>
-				<option>
-					<name>Sync to configured system backup server</name>
-					<value>auto</value>
-				</option>
-				<option>
-					<name>Sync to host(s) defined below</name>
-					<value>manual</value>
-				</option>
-				<option>
-					<name>Do not sync this package configuration</name>
-					<value>disabled</value>
-				</option>
+				<option><name>Sync to configured system backup server</name><value>auto</value></option>
+				<option><name>Sync to host(s) defined below</name><value>manual</value></option>
+				<option><name>Do not sync this package configuration</name><value>disabled</value></option>
 			</options>
 		</field>
 		<field>
 			<fielddescr>Sync Timeout</fielddescr>
 			<fieldname>synctimeout</fieldname>
-			<description>Select sync max wait time</description>
+			<description>XMLRPC timeout in seconds.</description>
 			<type>select</type>
 			<required/>
 			<default_value>250</default_value>
 			<options>
-				<option>
-					<name>250 seconds (Default)</name>
-					<value>250</value>
-				</option>
-				<option>
-					<name>120 seconds</name>
-					<value>120</value>
-				</option>
-				<option>
-					<name>90 seconds</name>
-					<value>90</value>
-				</option>
-				<option>
-					<name>60 seconds</name>
-					<value>60</value>
-				</option>
-				<option>
-					<name>30 seconds</name>
-					<value>30</value>
-				</option>
+				<option><name>250 seconds (Default)</name><value>250</value></option>
+				<option><name>120 seconds</name><value>120</value></option>
+				<option><name>90 seconds</name><value>90</value></option>
+				<option><name>60 seconds</name><value>60</value></option>
+				<option><name>30 seconds</name><value>30</value></option>
 			</options>
 		</field>
 		<field>
-			<fielddescr>Remote Servers</fielddescr>
+			<fielddescr>Replication Targets</fielddescr>
 			<fieldname>none</fieldname>
 			<type>rowhelper</type>
 			<rowhelper>
 				<rowhelperfield>
-					<fielddescr>IP Address</fielddescr>
+					<fielddescr>Enable</fielddescr>
+					<fieldname>syncdestinenable</fieldname>
+					<description><![CDATA[Enable this host as a replication target]]></description>
+					<type>checkbox</type>
+				</rowhelperfield>
+				<rowhelperfield>
+					<fielddescr>Protocol</fielddescr>
+					<fieldname>syncprotocol</fieldname>
+					<description><![CDATA[Choose the protocol used to sync with the destination host (HTTP or HTTPS).]]></description>
+					<type>select</type>
+					<default_value>HTTP</default_value>
+					<options>
+						<option><name>HTTP</name><value>http</value></option>
+						<option><name>HTTPS</name><value>https</value></option>
+					</options>
+				</rowhelperfield>
+				<rowhelperfield>
+					<fielddescr>IP Address/Hostname</fielddescr>
 					<fieldname>ipaddress</fieldname>
-					<description>IP Address of remote server</description>
+					<description><![CDATA[IP address or hostname of the destination host.]]></description>
 					<type>input</type>
-					<size>20</size>
-					<required/>
+					<size>40</size>
+				</rowhelperfield>
+				<rowhelperfield>
+					<fielddescr>Port</fielddescr>
+					<fieldname>syncport</fieldname>
+					<description><![CDATA[Choose the sync port of the destination host.]]></description>
+					<type>input</type>
+					<size>3</size>
 				</rowhelperfield>
 				<rowhelperfield>
-					<fielddescr>Username</fielddescr>
+					<fielddescr>Username (admin)</fielddescr>
 					<fieldname>username</fieldname>
-					<description>Username on remote server</description>
+					<description><![CDATA[Enter the username account for administration.]]></description>
 					<type>input</type>
 					<size>20</size>
 				</rowhelperfield>
 				<rowhelperfield>
-					<fielddescr>Password</fielddescr>
+					<fielddescr>Admin Password</fielddescr>
 					<fieldname>password</fieldname>
-					<description>Password for remote server</description>
+					<description><![CDATA[Password of the user "admin" on the destination host.]]></description>
 					<type>password</type>
 					<size>20</size>
-					<required/>
 				</rowhelperfield>
 			</rowhelper>
 		</field>
@@ -148,7 +151,4 @@
 	<custom_php_resync_config_command>
 		checkmk_sync_on_changes();
 	</custom_php_resync_config_command>
-	<custom_php_command_before_form>
-		unset($_POST['temp']);
-	</custom_php_command_before_form>
 </packagegui>