Merge branch '2.3' into 2.4

system-test/mariadbmonitor/mysqlmon_failover_readonly.cnf

@@ -0,0 +1,62 @@
+[maxscale]
+threads=###threads###
+
+[MariaDB-Monitor]
+type=monitor
+module=mysqlmon
+servers=server1, server2, server3
+user=maxskysql
+password=skysql
+monitor_interval=2000
+auto_failover=true
+auto_rejoin=true
+enforce_read_only_slaves=1
+replication_user=repl
+replication_password=repl
+backend_connect_timeout=5
+backend_read_timeout=5
+backend_write_timeout=5
+failcount=1
+
+[RW-Split-Router]
+type=service
+router= readwritesplit
+servers=server1, server2, server3
+user=maxskysql
+password=skysql
+transaction_replay=1
+delayed_retry_timeout=30
+
+[RW-Split-Listener]
+type=listener
+service=RW-Split-Router
+protocol=MySQLClient
+port=4006
+
+[CLI]
+type=service
+router=cli
+
+[CLI-Listener]
+type=listener
+service=CLI
+protocol=maxscaled
+socket=default
+
+[server1]
+type=server
+address=###node_server_IP_1###
+port=###node_server_port_1###
+protocol=MySQLBackend
+
+[server2]
+type=server
+address=###node_server_IP_2###
+port=###node_server_port_2###
+protocol=MySQLBackend
+
+[server3]
+type=server
+address=###node_server_IP_3###
+port=###node_server_port_3###
+protocol=MySQLBackend