From f167bc5f02e75288b5aadf8e48aca63aa7b20030 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= <markus.makela@mariadb.com>
Date: Thu, 11 Jan 2018 21:35:59 +0200
Subject: [PATCH] Update example configuration

Updated links and module names in the configuration. Also changed object
names so that they don't produce warnings. Removed redundant parameters
and tuned default monitor_interval to a slightly more reasonable 2000
milliseconds. Enabled automatic thread number configuration.
---
 server/maxscale.cnf.template | 51 ++++++++++++++++++------------------
 1 file changed, 25 insertions(+), 26 deletions(-)

diff --git a/server/maxscale.cnf.template b/server/maxscale.cnf.template
index 30688089b..09af2fc2e 100644
--- a/server/maxscale.cnf.template
+++ b/server/maxscale.cnf.template
@@ -1,39 +1,39 @@
-# MaxScale documentation on GitHub:
-# https://github.com/mariadb-corporation/MaxScale/blob/2.1/Documentation/Documentation-Contents.md
+# MaxScale documentation:
+# https://mariadb.com/kb/en/mariadb-enterprise/mariadb-maxscale-22/
 
 # Global parameters
 #
 # Complete list of configuration options:
-# https://github.com/mariadb-corporation/MaxScale/blob/2.1/Documentation/Getting-Started/Configuration-Guide.md
+# https://mariadb.com/kb/en/mariadb-enterprise/mariadb-maxscale-22-mariadb-maxscale-configuration-usage-scenarios/
 
 [maxscale]
-threads=1
+threads=auto
 
 # Server definitions
 #
 # Set the address of the server to the network
-# address of a MySQL server.
+# address of a MariaDB server.
 #
 
 [server1]
 type=server
 address=127.0.0.1
 port=3306
-protocol=MySQLBackend
+protocol=MariaDBBackend
 
 # Monitor for the servers
 #
 # This will keep MaxScale aware of the state of the servers.
-# MySQL Monitor documentation:
-# https://github.com/mariadb-corporation/MaxScale/blob/2.1/Documentation/Monitors/MySQL-Monitor.md
+# MariaDB Monitor documentation:
+# https://mariadb.com/kb/en/mariadb-enterprise/mariadb-maxscale-22-mariadb-monitor/
 
-[MySQL Monitor]
+[MariaDB-Monitor]
 type=monitor
-module=mysqlmon
+module=mariadbmon
 servers=server1
 user=myuser
 passwd=mypwd
-monitor_interval=10000
+monitor_interval=2000
 
 # Service definitions
 #
@@ -42,9 +42,9 @@ monitor_interval=10000
 #
 
 # ReadConnRoute documentation:
-# https://github.com/mariadb-corporation/MaxScale/blob/2.1/Documentation/Routers/ReadConnRoute.md
+# https://mariadb.com/kb/en/mariadb-enterprise/mariadb-maxscale-22-readconnroute/
 
-[Read-Only Service]
+[Read-Only-Service]
 type=service
 router=readconnroute
 servers=server1
@@ -53,21 +53,20 @@ passwd=mypwd
 router_options=slave
 
 # ReadWriteSplit documentation:
-# https://github.com/mariadb-corporation/MaxScale/blob/2.1/Documentation/Routers/ReadWriteSplit.md
+# https://mariadb.com/kb/en/mariadb-enterprise/mariadb-maxscale-22-readwritesplit/
 
-[Read-Write Service]
+[Read-Write-Service]
 type=service
 router=readwritesplit
 servers=server1
 user=myuser
 passwd=mypwd
-max_slave_connections=100%
 
 # This service enables the use of the MaxAdmin interface
 # MaxScale administration guide:
-# https://github.com/mariadb-corporation/MaxScale/blob/2.1/Documentation/Reference/MaxAdmin.md
+# https://mariadb.com/kb/en/mariadb-enterprise/mariadb-maxscale-22-maxadmin-admin-interface/
 
-[MaxAdmin Service]
+[MaxAdmin-Service]
 type=service
 router=cli
 
@@ -77,20 +76,20 @@ router=cli
 # services will listen on.
 #
 
-[Read-Only Listener]
+[Read-Only-Listener]
 type=listener
-service=Read-Only Service
-protocol=MySQLClient
+service=Read-Only-Service
+protocol=MariaDBClient
 port=4008
 
-[Read-Write Listener]
+[Read-Write-Listener]
 type=listener
-service=Read-Write Service
-protocol=MySQLClient
+service=Read-Write-Service
+protocol=MariaDBClient
 port=4006
 
-[MaxAdmin Listener]
+[MaxAdmin-Listener]
 type=listener
-service=MaxAdmin Service
+service=MaxAdmin-Service
 protocol=maxscaled
 socket=default