List:Commits« Previous MessageNext Message »
From:john.russell Date:November 18 2010 11:19pm
Subject:svn commit - mysqldoc@docsrva: r23844 - trunk/dynamic-docs/command-optvars
View as plain text  
Author: jrussell
Date: 2010-11-19 00:19:09 +0100 (Fri, 19 Nov 2010)
New Revision: 23844

Log:
Copied over latest mysql-monitor-agent options info,
with additions for 2.2 and 2.3.


Modified:
   trunk/dynamic-docs/command-optvars/mysql-monitor-agent.xml


Modified: trunk/dynamic-docs/command-optvars/mysql-monitor-agent.xml
===================================================================
--- trunk/dynamic-docs/command-optvars/mysql-monitor-agent.xml	2010-11-18 23:02:13 UTC (rev 23843)
+++ trunk/dynamic-docs/command-optvars/mysql-monitor-agent.xml	2010-11-18 23:19:09 UTC (rev 23844)
Changed blocks: 59, Lines Added: 672, Lines Deleted: 15; 27447 bytes

@@ -15,8 +15,10 @@
 
   <versionlist>
 
+    <validversion ver="2.0"/>
     <validversion ver="2.1"/>
-    <validversion ver="2.0"/>
+    <validversion ver="2.2"/>
+    <validversion ver="2.3"/>
 
   </versionlist>
 

@@ -39,6 +41,7 @@
       <introduced version="2.0.0"/>
       <manual version="2.0"/>
       <manual version="2.1"/>
+      <manual version="2.2"/>
     </versions>
 
   </mysqloption>

@@ -61,6 +64,8 @@
       <introduced version="2.0.0"/>
       <manual version="2.0"/>
       <manual version="2.1"/>
+      <manual version="2.2"/>
+      <manual version="2.3"/>
     </versions>
 
   </mysqloption>

@@ -83,6 +88,8 @@
       <introduced version="2.0.0"/>
       <manual version="2.0"/>
       <manual version="2.1"/>
+      <manual version="2.2"/>
+      <manual version="2.3"/>
     </versions>
 
   </mysqloption>

@@ -105,6 +112,8 @@
       <introduced version="2.0.0"/>
       <manual version="2.0"/>
       <manual version="2.1"/>
+      <manual version="2.2"/>
+      <manual version="2.3"/>
     </versions>
 
   </mysqloption>

@@ -127,6 +136,8 @@
       <introduced version="2.0.0"/>
       <manual version="2.0"/>
       <manual version="2.1"/>
+      <manual version="2.2"/>
+      <manual version="2.3"/>
     </versions>
 
   </mysqloption>

@@ -149,6 +160,8 @@
       <introduced version="2.0.0"/>
       <manual version="2.0"/>
       <manual version="2.1"/>
+      <manual version="2.2"/>
+      <manual version="2.3"/>
     </versions>
 
   </mysqloption>

@@ -160,7 +173,7 @@
     <name>admin-address</name>
 
     <shortdescription>
-      Defines the listening address and poirt for the admin module
+      Defines the listening address and port for the admin module
     </shortdescription>
 
     <types>

@@ -176,6 +189,8 @@
       <introduced version="2.0.0"/>
       <manual version="2.0"/>
       <manual version="2.1"/>
+      <manual version="2.2"/>
+      <manual version="2.3"/>
     </versions>
 
   </mysqloption>

@@ -203,6 +218,8 @@
       <introduced version="2.0.0"/>
       <manual version="2.0"/>
       <manual version="2.1"/>
+      <manual version="2.2"/>
+      <manual version="2.3"/>
     </versions>
 
   </mysqloption>

@@ -230,6 +247,8 @@
       <introduced version="2.0.0"/>
       <manual version="2.0"/>
       <manual version="2.1"/>
+      <manual version="2.2"/>
+      <manual version="2.3"/>
     </versions>
 
   </mysqloption>

@@ -245,8 +264,8 @@
     </shortdescription>
 
     <types>
-      <optype class="cmdline" format="--admin-lua-script=file_name"/>
-      <optype class="mycnf" format="admin-lua-script=file_name"/>
+      <optype class="cmdline" format="--admin-lua-script"/>
+      <optype class="mycnf" format="admin-lua-script"/>
     </types>
 
     <values vartype="filename" platform="all">

@@ -257,6 +276,8 @@
       <introduced version="2.0.0"/>
       <manual version="2.0"/>
       <manual version="2.1"/>
+      <manual version="2.2"/>
+      <manual version="2.3"/>
     </versions>
 
   </mysqloption>

@@ -289,6 +310,8 @@
       <introduced version="2.0.0"/>
       <manual version="2.0"/>
       <manual version="2.1"/>
+      <manual version="2.2"/>
+      <manual version="2.3"/>
     </versions>
 
   </mysqloption>

@@ -300,7 +323,7 @@
     <name>proxy-read-only-backend-addresses</name>
 
     <shortdescription>
-      Address:port of the remote MySQL server (read only)
+      Address:port of the remote MySQL server (read-only)
     </shortdescription>
 
     <types>

@@ -315,6 +338,8 @@
       <introduced version="2.0.0"/>
       <manual version="2.0"/>
       <manual version="2.1"/>
+      <manual version="2.2"/>
+      <manual version="2.3"/>
     </versions>
 
   </mysqloption>

@@ -343,6 +368,8 @@
       <introduced version="2.0.0"/>
       <manual version="2.0"/>
       <manual version="2.1"/>
+      <manual version="2.2"/>
+      <manual version="2.3"/>
     </versions>
 
   </mysqloption>

@@ -366,6 +393,8 @@
       <introduced version="2.0.0"/>
       <manual version="2.0"/>
       <manual version="2.1"/>
+      <manual version="2.2"/>
+      <manual version="2.3"/>
     </versions>
 
   </mysqloption>

@@ -390,6 +419,8 @@
       <introduced version="2.0.0"/>
       <manual version="2.0"/>
       <manual version="2.1"/>
+      <manual version="2.2"/>
+      <manual version="2.3"/>
     </versions>
 
   </mysqloption>

@@ -416,6 +447,8 @@
       <introduced version="2.0.0"/>
       <manual version="2.0"/>
       <manual version="2.1"/>
+      <manual version="2.2"/>
+      <manual version="2.3"/>
     </versions>
 
   </mysqloption>

@@ -439,6 +472,8 @@
       <introduced version="2.0.0"/>
       <manual version="2.0"/>
       <manual version="2.1"/>
+      <manual version="2.2"/>
+      <manual version="2.3"/>
     </versions>
 
   </mysqloption>

@@ -463,6 +498,8 @@
       <introduced version="2.0.0"/>
       <manual version="2.0"/>
       <manual version="2.1"/>
+      <manual version="2.2"/>
+      <manual version="2.3"/>
     </versions>
 
   </mysqloption>

@@ -487,6 +524,8 @@
       <introduced version="2.0.0"/>
       <manual version="2.0"/>
       <manual version="2.1"/>
+      <manual version="2.2"/>
+      <manual version="2.3"/>
     </versions>
 
   </mysqloption>

@@ -510,6 +549,8 @@
       <introduced version="2.0.0"/>
       <manual version="2.0"/>
       <manual version="2.1"/>
+      <manual version="2.2"/>
+      <manual version="2.3"/>
     </versions>
 
   </mysqloption>

@@ -533,6 +574,8 @@
       <introduced version="2.0.0"/>
       <manual version="2.0"/>
       <manual version="2.1"/>
+      <manual version="2.2"/>
+      <manual version="2.3"/>
     </versions>
 
   </mysqloption>

@@ -558,6 +601,8 @@
       <introduced version="2.0.0"/>
       <manual version="2.0"/>
       <manual version="2.1"/>
+      <manual version="2.2"/>
+      <manual version="2.3"/>
     </versions>
 
   </mysqloption>

@@ -583,6 +628,8 @@
       <introduced version="2.0.0"/>
       <manual version="2.0"/>
       <manual version="2.1"/>
+      <manual version="2.2"/>
+      <manual version="2.3"/>
     </versions>
 
   </mysqloption>

@@ -594,12 +641,12 @@
     <name>pid-file</name>
 
     <shortdescription>
-      File in which to store the process ID (when in daemon mode)
+      PID file to store the process ID (when in daemon mode)
     </shortdescription>
 
     <types>
-      <optype class="cmdline" format="--pid-file=file_name"/>
-      <optype class="mycnf" format="pid-file=file_name"/>
+      <optype class="cmdline" format="--pid-file"/>
+      <optype class="mycnf" format="pid-file"/>
     </types>
 
     <values vartype="filename" platform="all"></values>

@@ -608,6 +655,8 @@
       <introduced version="2.0.0"/>
       <manual version="2.0"/>
       <manual version="2.1"/>
+      <manual version="2.2"/>
+      <manual version="2.3"/>
     </versions>
 
   </mysqloption>

@@ -633,6 +682,8 @@
       <introduced version="2.0.0"/>
       <manual version="2.0"/>
       <manual version="2.1"/>
+      <manual version="2.2"/>
+      <manual version="2.3"/>
     </versions>
 
   </mysqloption>

@@ -658,6 +709,8 @@
       <introduced version="2.0.0"/>
       <manual version="2.0"/>
       <manual version="2.1"/>
+      <manual version="2.2"/>
+      <manual version="2.3"/>
     </versions>
 
   </mysqloption>

@@ -678,17 +731,21 @@
     </types>
 
     <values vartype="enumeration" platform="all">
-      <choice value="error"/>
-      <choice value="warning"/>
-      <choice value="info"/>
-      <choice value="message"/>
-      <choice value="debug"/>
+      <value default="critical"/>
+      <choice value="error">Show error messages</choice>
+      <choice value="warning">Show only warning messages</choice>
+      <choice value="info">Show informational messages</choice>
+      <choice value="message">Show information about agent and basic processing</choice>
+      <choice value="critical">Show critical messages highlighting agent problems</choice>
+      <choice value="debug">Show detailed information, including info provided to server </choice>
     </values>
 
     <versions>
       <introduced version="2.0.0"/>
       <manual version="2.0"/>
       <manual version="2.1"/>
+      <manual version="2.2"/>
+      <manual version="2.3"/>
     </versions>
 
   </mysqloption>

@@ -714,6 +771,8 @@
       <introduced version="2.0.0"/>
       <manual version="2.0"/>
       <manual version="2.1"/>
+      <manual version="2.2"/>
+      <manual version="2.3"/>
     </versions>
 
   </mysqloption>

@@ -737,6 +796,8 @@
       <introduced version="2.0.0"/>
       <manual version="2.0"/>
       <manual version="2.1"/>
+      <manual version="2.2"/>
+      <manual version="2.3"/>
     </versions>
 
   </mysqloption>

@@ -760,6 +821,8 @@
       <introduced version="2.0.0"/>
       <manual version="2.0"/>
       <manual version="2.1"/>
+      <manual version="2.2"/>
+      <manual version="2.3"/>
     </versions>
 
   </mysqloption>

@@ -783,6 +846,8 @@
       <introduced version="2.0.0"/>
       <manual version="2.0"/>
       <manual version="2.1"/>
+      <manual version="2.2"/>
+      <manual version="2.3"/>
     </versions>
 
   </mysqloption>

@@ -808,6 +873,8 @@
       <introduced version="2.0.0"/>
       <manual version="2.0"/>
       <manual version="2.1"/>
+      <manual version="2.2"/>
+      <manual version="2.3"/>
     </versions>
 
   </mysqloption>

@@ -856,6 +923,8 @@
       <introduced version="2.0.0"/>
       <manual version="2.0"/>
       <manual version="2.1"/>
+      <manual version="2.2"/>
+      <manual version="2.3"/>
     </versions>
 
   </mysqloption>

@@ -881,6 +950,8 @@
       <introduced version="2.0.0"/>
       <manual version="2.0"/>
       <manual version="2.1"/>
+      <manual version="2.2"/>
+      <manual version="2.3"/>
     </versions>
 
   </mysqloption>

@@ -908,6 +979,8 @@
       <introduced version="2.0.0"/>
       <manual version="2.0"/>
       <manual version="2.1"/>
+      <manual version="2.2"/>
+      <manual version="2.3"/>
     </versions>
 
   </mysqloption>

@@ -933,6 +1006,8 @@
       <introduced version="2.0.0"/>
       <manual version="2.0"/>
       <manual version="2.1"/>
+      <manual version="2.2"/>
+      <manual version="2.3"/>
     </versions>
 
   </mysqloption>

@@ -948,8 +1023,8 @@
     </shortdescription>
 
     <types>
-      <optype class="cmdline" format="--monitor-lua-script=file_name"/>
-      <optype class="mycnf" format="monitor-lua-script=file_name"/>
+      <optype class="cmdline" format="--monitor-lua-script"/>
+      <optype class="mycnf" format="monitor-lua-script"/>
     </types>
 
     <values vartype="string" platform="all"></values>

@@ -958,6 +1033,8 @@
       <introduced version="2.0.0"/>
       <manual version="2.0"/>
       <manual version="2.1"/>
+      <manual version="2.2"/>
+      <manual version="2.3"/>
     </versions>
 
   </mysqloption>

@@ -986,6 +1063,8 @@
       <introduced version="2.0.0"/>
       <manual version="2.0"/>
       <manual version="2.1"/>
+      <manual version="2.2"/>
+      <manual version="2.3"/>
     </versions>
 
   </mysqloption>

@@ -1015,10 +1094,123 @@
       <introduced version="2.0.0"/>
       <manual version="2.0"/>
       <manual version="2.1"/>
+      <manual version="2.2"/>
+      <manual version="2.3"/>
     </versions>
 
   </mysqloption>
 
+  <mysqloption id="agent-connect-timeout" section="agent">
+
+    <xrefto id="option_mysql-monitor-agent_agent-connect-timeout"/>
+
+    <name>agent-collector-plugins</name>
+
+    <shortdescription>
+      The timeout for the agent to connect to the MySQL server
+    </shortdescription>
+
+    <types>
+      <optype class="cmdline" format="--agent-connect-timeout"/>
+      <optype class="mycnf" format="agent-connect-timeout"/>
+    </types>
+
+    <values vartype="numeric" platform="all">
+      <value default="10"/>
+    </values>
+
+    <versions>
+      <introduced version="2.2.2"/>
+      <manual version="2.2"/>
+      <manual version="2.3"/>
+    </versions>
+
+  </mysqloption>
+
+  <mysqloption id="agent-DNS-cachetimeout" section="agent">
+
+    <xrefto id="option_mysql-monitor-agent_agent-DNS-cachetimeout"/>
+
+    <name>agent-DNS-cachetimeout</name>
+
+    <shortdescription>
+      The timeout for cache operations
+    </shortdescription>
+
+    <types>
+      <optype class="cmdline" format="--agent-DNS-cachetimeout"/>
+      <optype class="mycnf" format="agent-DNS-cachetimeout"/>
+    </types>
+
+    <values vartype="numeric" platform="all">
+      <value default="0"/>
+      <choice value="-1">Never timeout</choice>
+      <choice value="0">Don't cache</choice>
+    </values>
+
+    <versions>
+      <introduced version="2.2.0"/>
+      <manual version="2.2"/>
+      <manual version="2.3"/>
+    </versions>
+
+  </mysqloption>
+
+  <mysqloption id="agent-report-network-fs" section="agent">
+
+    <xrefto id="option_mysql-monitor-agent_agent-report-network-fs"/>
+
+    <name>agent-report-network-fs</name>
+
+    <shortdescription>
+      Enable data collection for networked filesystems
+    </shortdescription>
+
+    <types>
+      <optype class="cmdline" format="--agent-report-network-fs"/>
+      <optype class="mycnf" format="agent-report-network-fs"/>
+    </types>
+
+    <values vartype="boolean" platform="all">
+      <value default="off"/>
+    </values>
+
+    <versions>
+      <introduced version="2.2.0"/>
+      <manual version="2.2"/>
+      <manual version="2.3"/>
+    </versions>
+
+  </mysqloption>
+
+  <mysqloption id="agent-net-timeout" section="agent">
+
+    <xrefto id="option_mysql-monitor-agent_agent-net-timeout"/>
+
+    <name>agent-net-plugins</name>
+
+    <shortdescription>
+      The timeout for the agent for established connections to the MySQL
+      server
+    </shortdescription>
+
+    <types>
+      <optype class="cmdline" format="--agent-net-timeout"/>
+      <optype class="mycnf" format="agent-net-timeout"/>
+    </types>
+
+    <values vartype="numeric" platform="all">
+      <value default="10"/>
+    </values>
+
+    <versions>
+      <introduced version="2.2.2"/>
+      <manual version="2.2"/>
+      <manual version="2.3"/>
+    </versions>
+
+  </mysqloption>
+
   <mysqloption id="agent-generate-uuid" section="agent">
 
     <xrefto id="option_mysql-monitor-agent_agent-generate-uuid"/>

@@ -1038,6 +1230,8 @@
       <introduced version="2.0.0"/>
       <manual version="2.0"/>
       <manual version="2.1"/>
+      <manual version="2.2"/>
+      <manual version="2.3"/>
     </versions>
 
   </mysqloption>

@@ -1065,6 +1259,8 @@
       <introduced version="2.0.0"/>
       <manual version="2.0"/>
       <manual version="2.1"/>
+      <manual version="2.2"/>
+      <manual version="2.3"/>
     </versions>
 
   </mysqloption>

@@ -1088,6 +1284,8 @@
       <introduced version="2.0.0"/>
       <manual version="2.0"/>
       <manual version="2.1"/>
+      <manual version="2.2"/>
+      <manual version="2.3"/>
     </versions>
 
   </mysqloption>

@@ -1111,6 +1309,8 @@
       <introduced version="2.0.0"/>
       <manual version="2.0"/>
       <manual version="2.1"/>
+      <manual version="2.2"/>
+      <manual version="2.3"/>
     </versions>
 
   </mysqloption>

@@ -1134,6 +1334,8 @@
       <introduced version="2.0.0"/>
       <manual version="2.0"/>
       <manual version="2.1"/>
+      <manual version="2.2"/>
+      <manual version="2.3"/>
     </versions>
 
   </mysqloption>

@@ -1157,6 +1359,8 @@
       <introduced version="2.0.0"/>
       <manual version="2.0"/>
       <manual version="2.1"/>
+      <manual version="2.2"/>
+      <manual version="2.3"/>
     </versions>
 
   </mysqloption>

@@ -1180,6 +1384,8 @@
       <introduced version="2.0.0"/>
       <manual version="2.0"/>
       <manual version="2.1"/>
+      <manual version="2.2"/>
+      <manual version="2.3"/>
     </versions>
 
   </mysqloption>

@@ -1203,6 +1409,8 @@
       <introduced version="2.0.0"/>
       <manual version="2.0"/>
       <manual version="2.1"/>
+      <manual version="2.2"/>
+      <manual version="2.3"/>
     </versions>
 
   </mysqloption>

@@ -1226,6 +1434,8 @@
       <introduced version="2.0.0"/>
       <manual version="2.0"/>
       <manual version="2.1"/>
+      <manual version="2.2"/>
+      <manual version="2.3"/>
     </versions>
 
   </mysqloption>

@@ -1249,6 +1459,8 @@
       <introduced version="2.0.0"/>
       <manual version="2.0"/>
       <manual version="2.1"/>
+      <manual version="2.2"/>
+      <manual version="2.3"/>
     </versions>
 
   </mysqloption>

@@ -1274,6 +1486,8 @@
       <introduced version="2.0.0"/>
       <manual version="2.0"/>
       <manual version="2.1"/>
+      <manual version="2.2"/>
+      <manual version="2.3"/>
     </versions>
 
   </mysqloption>

@@ -1289,6 +1503,8 @@
       intervals)
     </shortdescription>
 
+    <seealso xref="option_mysql-monitor-agent_agent-report-offset"/>
+
     <types>
       <optype class="cmdline" format="--agent-force-uncorking"/>
       <optype class="mycnf" format="agent-force-uncorking"/>

@@ -1297,6 +1513,8 @@
     <versions>
       <introduced version="2.1.0"/>
       <manual version="2.1"/>
+      <manual version="2.2"/>
+      <manual version="2.3"/>
     </versions>
 
   </mysqloption>

@@ -1323,8 +1541,447 @@
     <versions>
       <introduced version="2.1.0"/>
       <manual version="2.1"/>
+      <manual version="2.2"/>
+      <manual version="2.3"/>
     </versions>
 
   </mysqloption>
 
+  <mysqloption id="verbose-shutdown" section="application">
+
+    <xrefto id="option_mysql-monitor-agent_verbose-shutdown"/>
+
+    <name>verbose-shutdown</name>
+
+    <shortdescription>
+      Report shutdown in the logs regardless of log level
+    </shortdescription>
+
+    <types>
+      <optype class="cmdline" format="--verbose-shutdown"/>
+      <optype class="mycnf" format="verbose-shutdown"/>
+    </types>
+
+    <values vartype="boolean" platform="all">
+      <value default="off"/>
+    </values>
+
+    <versions>
+      <introduced version="2.2.0"/>
+      <manual version="2.2"/>
+      <manual version="2.3"/>
+    </versions>
+
+  </mysqloption>
+
+  <mysqloption id="agent-report-offset" section="agent">
+
+    <xrefto id="option_mysql-monitor-agent_agent-report-offset"/>
+
+    <name>agent-report-offset</name>
+
+    <shortdescription>
+      Set the second after the minute when the data is sent to the
+      server
+    </shortdescription>
+
+    <seealso xref="option_mysql-monitor-agent_agent-force-uncorking"/>
+
+    <types>
+      <optype class="cmdline" format="--agent-report-offset"/>
+      <optype class="mycnf" format="agent-report-offset"/>
+    </types>
+
+    <values vartype="numeric" platform="all">
+      <value default="random"/>
+    </values>
+
+    <versions>
+      <introduced version="2.2.0"/>
+      <manual version="2.2"/>
+      <manual version="2.3"/>
+    </versions>
+
+  </mysqloption>
+
+  <mysqloption id="agent-backlog-timeout" section="agent">
+
+    <xrefto id="option_mysql-monitor-agent_agent-backlog-timeout"/>
+
+    <name>agent-backlog-timeout</name>
+
+    <shortdescription>
+      Maximum time in seconds that the Set the second after the minute
+      when the data is sent to the server
+    </shortdescription>
+
+    <types>
+      <optype class="cmdline" format="--agent-backlog-timeout"/>
+      <optype class="mycnf" format="agent-backlog-timeout"/>
+    </types>
+
+    <values vartype="numeric" platform="all"></values>
+
+    <versions>
+      <introduced version="2.2.0"/>
+      <manual version="2.2"/>
+      <manual version="2.3"/>
+    </versions>
+
+  </mysqloption>
+
+  <mysqloption id="mysqld-instance-dir" section="agent">
+
+    <xrefto id="option_mysql-monitor-agent_mysqld-instance-dir"/>
+
+    <name>mysqld-instance-dir</name>
+
+    <shortdescription>
+      Location of the MySQL instance configuration (mysql.cnf/mysql.ini)
+      files
+    </shortdescription>
+
+    <types>
+      <optype class="cmdline" format="--mysqld-instance-dir"/>
+      <optype class="mycnf" format="mysqld-instance-dir"/>
+    </types>
+
+    <values vartype="string" platform="all"></values>
+
+    <versions>
+      <introduced version="2.2.0"/>
+      <manual version="2.2"/>
+      <manual version="2.3"/>
+    </versions>
+
+  </mysqloption>
+
+  <mysqloption id="agent-mgmt-username" section="agent">
+
+    <xrefto id="option_mysql-monitor-agent_agent-mgmt-username"/>
+
+    <name>agent-mgmt-username</name>
+
+    <shortdescription>
+      User name with the management server
+    </shortdescription>
+
+    <types>
+      <optype class="cmdline" format="--agent-mgmt-username"/>
+      <optype class="mycnf" format="agent-mgmt-username"/>
+    </types>
+
+    <values vartype="string" platform="all"></values>
+
+    <versions>
+      <introduced version="2.2.0"/>
+      <manual version="2.2"/>
+      <manual version="2.3"/>
+    </versions>
+
+  </mysqloption>
+
+  <mysqloption id="agent-mgmt-password" section="agent">
+
+    <xrefto id="option_mysql-monitor-agent_agent-mgmt-password"/>
+
+    <name>agent-mgmt-password</name>
+
+    <shortdescription>
+      Password for the management server
+    </shortdescription>
+
+    <types>
+      <optype class="cmdline" format="--agent-mgmt-password"/>
+      <optype class="mycnf" format="agent-mgmt-password"/>
+    </types>
+
+    <values vartype="string" platform="all"></values>
+
+    <versions>
+      <introduced version="2.2.0"/>
+      <manual version="2.2"/>
+      <manual version="2.3"/>
+    </versions>
+
+  </mysqloption>
+
+  <mysqloption id="agent-IP-version" section="agent">
+
+    <xrefto id="option_mysql-monitor-agent_agent-IP-version"/>
+
+    <name>agent-IP-version</name>
+
+    <shortdescription>
+      IP version (4 or 6) to force
+    </shortdescription>
+
+    <types>
+      <optype class="cmdline" format="--agent-IP-version"/>
+      <optype class="mycnf" format="agent-IP-version"/>
+    </types>
+
+    <values vartype="numeric" platform="all">
+      <value default="any"/>
+      <choice value="4"/>
+      <choice value="6"/>
+    </values>
+
+    <versions>
+      <introduced version="2.2.0"/>
+      <manual version="2.2"/>
+      <manual version="2.3"/>
+    </versions>
+
+  </mysqloption>
+
+  <mysqloption id="aggr-flush-interval" section="aggr">
+
+    <xrefto id="option_mysql-monitor-agent_aggr-flush-interval"/>
+
+    <name>aggr-flush-interval</name>
+
+    <shortdescription>
+      The interval in seconds between flushes of query data to the &merlin_server;.
+    </shortdescription>
+
+    <types>
+      <optype class="cmdline" format="--aggr-flush-interval"/>
+      <optype class="mycnf" format="aggr-flush-interval"/>
+    </types>
+
+    <values vartype="numeric" platform="all">
+      <value default="60"/>
+    </values>
+
+    <versions>
+      <introduced version="2.3.0"/>
+      <manual version="2.3"/>
+    </versions>
+
+  </mysqloption>
+
+  <mysqloption id="agent-master-uuid-discovery" section="agent">
+
+    <xrefto id="option_mysql-monitor-agent_agent-master-uuid-discovery"/>
+
+    <name>agent-master-uuid-discovery</name>
+
+    <shortdescription>
+      Disable the use of the master_uuid for topology discovery
+    </shortdescription>
+
+    <types>
+      <optype class="cmdline" format="--agent-master-uuid-discovery"/>
+      <optype class="mycnf" format="agent-master-uuid-discovery"/>
+    </types>
+
+    <values vartype="boolean" platform="all">
+      <value default="true"/>
+    </values>
+
+    <versions>
+      <introduced version="2.2.1"/>
+      <manual version="2.2"/>
+      <manual version="2.3"/>
+    </versions>
+
+  </mysqloption>
+
+  <mysqloption id="aggr-address" section="aggr">
+
+    <xrefto id="option_mysql-monitor-agent_aggr-address"/>
+
+    <name>aggr-address</name>
+
+    <shortdescription>
+      Listening address:port combination
+    </shortdescription>
+
+    <types>
+      <optype class="cmdline" format="--aggr-address"/>
+      <optype class="mycnf" format="addr-address"/>
+    </types>
+
+    <values vartype="string" platform="all">
+      <value default="*:14000"/>
+    </values>
+
+    <versions>
+      <introduced version="2.3.0"/>
+      <manual version="2.3"/>
+    </versions>
+
+  </mysqloption>
+
+  <mysqloption id="aggr-lua-script" section="aggr">
+
+    <xrefto id="option_mysql-monitor-agent_aggr-lua-script"/>
+
+    <name>aggr-lua-script</name>
+
+    <shortdescription>
+      Path to the Lua script
+    </shortdescription>
+
+    <types>
+      <optype class="cmdline" format="--aggr-lua-script"/>
+      <optype class="mycnf" format="aggr-lua-script"/>
+    </types>
+
+    <values vartype="string" platform="all"></values>
+
+    <versions>
+      <introduced version="2.3.0"/>
+      <manual version="2.3"/>
+    </versions>
+
+  </mysqloption>
+
+  <mysqloption id="aggr-mem-baseurl" section="aggr">
+
+    <xrefto id="option_mysql-monitor-agent_aggr-mem-baseurl"/>
+
+    <name>aggr-mem-baseurl</name>
+
+    <shortdescription>
+      Base URL of the server
+    </shortdescription>
+
+    <types>
+      <optype class="cmdline" format="--aggr-mem-baseurl"/>
+      <optype class="mycnf" format="aggr-mem-baseurl"/>
+    </types>
+
+    <values vartype="string" platform="all"></values>
+
+    <versions>
+      <introduced version="2.3.0"/>
+      <manual version="2.3"/>
+    </versions>
+
+  </mysqloption>
+
+  <mysqloption id="aggr-tet-mode" section="aggr">
+
+    <xrefto id="option_mysql-monitor-agent_aggr-test-mode"/>
+
+    <name>aggr-test-mode</name>
+
+    <shortdescription>
+      Start the aggregator in test mode
+    </shortdescription>
+
+    <types>
+      <optype class="cmdline" format="--aggr-test-mode"/>
+      <optype class="mycnf" format="aggr-test-mode"/>
+    </types>
+
+    <values vartype="string" platform="all"></values>
+
+    <versions>
+      <introduced version="2.3.0"/>
+      <manual version="2.3"/>
+    </versions>
+
+  </mysqloption>
+
+  <mysqloption id="aggr-ssl-address" section="aggr">
+
+    <xrefto id="option_mysql-monitor-agent_aggr-ssl-address"/>
+
+    <name>aggr-ssl-address</name>
+
+    <shortdescription>
+      Listening port:address combination for SSL connections
+    </shortdescription>
+
+    <types>
+      <optype class="cmdline" format="--aggr-ssl-address"/>
+      <optype class="mycnf" format="aggr-ssl-address"/>
+    </types>
+
+    <values vartype="string" platform="all">
+      <value default="*:14001"/>
+    </values>
+
+    <versions>
+      <introduced version="2.3.0"/>
+      <manual version="2.3"/>
+    </versions>
+
+  </mysqloption>
+
+  <mysqloption id="aggr-ssl-cert-file" section="aggr">
+
+    <xrefto id="option_mysql-monitor-agent_aggr-ssl-cert-file"/>
+
+    <name>aggr-ssl-cert-file</name>
+
+    <shortdescription>
+      Server certificate (PEM)
+    </shortdescription>
+
+    <types>
+      <optype class="cmdline" format="--aggr-ssl-cert-file"/>
+      <optype class="mycnf" format="aggr-ssl-cert-file"/>
+    </types>
+
+    <values vartype="string" platform="all"></values>
+
+    <versions>
+      <introduced version="2.3.0"/>
+      <manual version="2.3"/>
+    </versions>
+
+  </mysqloption>
+
+  <mysqloption id="aggr-ssl-ca-file" section="aggr">
+
+    <xrefto id="option_mysql-monitor-agent_aggr-ssl-ca-file"/>
+
+    <name>aggr-ssl-ca-file</name>
+
+    <shortdescription>
+      CA certificate file
+    </shortdescription>
+
+    <types>
+      <optype class="cmdline" format="--aggr-ssl-ca-file"/>
+      <optype class="mycnf" format="aggr-ssl-ca-file"/>
+    </types>
+
+    <values vartype="string" platform="all"></values>
+
+    <versions>
+      <introduced version="2.3.0"/>
+      <manual version="2.3"/>
+    </versions>
+
+  </mysqloption>
+
+  <mysqloption id="aggr-ssl-ciphers" section="aggr">
+
+    <xrefto id="option_mysql-monitor-agent_aggr-ssl-ciphers"/>
+
+    <name>aggr-ssl-ciphers</name>
+
+    <shortdescription>
+      Supported ciphers for SSL
+    </shortdescription>
+
+    <types>
+      <optype class="cmdline" format="--aggr-ssl-ciphers"/>
+      <optype class="mycnf" format="aggr-ssl-ciphers"/>
+    </types>
+
+    <values vartype="string" platform="all"></values>
+
+    <versions>
+      <introduced version="2.3.0"/>
+      <manual version="2.3"/>
+    </versions>
+
+  </mysqloption>
+
 </mysqloptions>


Thread
svn commit - mysqldoc@docsrva: r23844 - trunk/dynamic-docs/command-optvarsjohn.russell19 Nov