From bbe57a58cb3e9eccf9a9dd93b75783cab9ac3e59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= Date: Tue, 13 Mar 2018 21:37:55 +0200 Subject: [PATCH] Move server creation into a mini-tutorial Combined the redundant documentation into a single document. --- .../Tutorials/Configuring-Galera-Monitor.md | 26 +---------------- .../Tutorials/Configuring-MariaDB-Monitor.md | 29 ++----------------- .../Tutorials/Configuring-Servers.md | 27 +++++++++++++++++ .../Tutorials/Connection-Routing-Tutorial.md | 9 ++++-- .../Read-Write-Splitting-Tutorial.md | 11 +++++-- 5 files changed, 46 insertions(+), 56 deletions(-) create mode 100644 Documentation/Tutorials/Configuring-Servers.md diff --git a/Documentation/Tutorials/Configuring-Galera-Monitor.md b/Documentation/Tutorials/Configuring-Galera-Monitor.md index 226ec4f1c..d401658c7 100644 --- a/Documentation/Tutorials/Configuring-Galera-Monitor.md +++ b/Documentation/Tutorials/Configuring-Galera-Monitor.md @@ -2,33 +2,9 @@ This document describes how to configure a Galera cluster monitor. -## Configuring the Servers - -The first step is to define the servers that make up the cluster. These servers will be used by the services and are monitored by the monitor. - -``` -[dbserv1] -type=server -address=192.168.2.1 -port=3306 -protocol=MariaDBBackend - -[dbserv2] -type=server -address=192.168.2.2 -port=3306 -protocol=MariaDBBackend - -[dbserv3] -type=server -address=192.168.2.3 -port=3306 -protocol=MariaDBBackend -``` - ## Configuring the Monitor -The next step is to define the monitor that monitors the servers. +Define the monitor that monitors the servers. ``` [Galera-Monitor] diff --git a/Documentation/Tutorials/Configuring-MariaDB-Monitor.md b/Documentation/Tutorials/Configuring-MariaDB-Monitor.md index f6fd0e581..15c3a15fb 100644 --- a/Documentation/Tutorials/Configuring-MariaDB-Monitor.md +++ b/Documentation/Tutorials/Configuring-MariaDB-Monitor.md @@ -1,34 +1,11 @@ # Configuring the MariaDB Monitor -This document describes how to configure a MariaDB master-slave cluster monitor to be used with MaxScale. - -## Configuring the Servers - -The first step is to define the servers that make up the cluster. These servers will be used by the services and are monitored by the monitor. - -``` -[dbserv1] -type=server -address=192.168.2.1 -port=3306 -protocol=MariaDBBackend - -[dbserv2] -type=server -address=192.168.2.2 -port=3306 -protocol=MariaDBBackend - -[dbserv3] -type=server -address=192.168.2.3 -port=3306 -protocol=MariaDBBackend -``` +This document describes how to configure a MariaDB master-slave cluster monitor +to be used with MaxScale. ## Configuring the Monitor -The next step is to define the monitor that monitors the servers. +Define the monitor that monitors the servers. ``` [Replication-Monitor] diff --git a/Documentation/Tutorials/Configuring-Servers.md b/Documentation/Tutorials/Configuring-Servers.md new file mode 100644 index 000000000..8c7f8c06c --- /dev/null +++ b/Documentation/Tutorials/Configuring-Servers.md @@ -0,0 +1,27 @@ +# Configuring Servers + +The first step is to define the servers that make up the cluster. These servers +will be used by the services and are monitored by the monitor. + +``` +[dbserv1] +type=server +address=192.168.2.1 +port=3306 +protocol=MariaDBBackend + +[dbserv2] +type=server +address=192.168.2.2 +port=3306 +protocol=MariaDBBackend + +[dbserv3] +type=server +address=192.168.2.3 +port=3306 +protocol=MariaDBBackend +``` + +The `address` and `port` parameters tell where the server is located. The +`protocol` should always be set to `MariaDBBackend`. diff --git a/Documentation/Tutorials/Connection-Routing-Tutorial.md b/Documentation/Tutorials/Connection-Routing-Tutorial.md index ec4632339..1c080c1ff 100644 --- a/Documentation/Tutorials/Connection-Routing-Tutorial.md +++ b/Documentation/Tutorials/Connection-Routing-Tutorial.md @@ -107,10 +107,15 @@ to bind to a particular network interface when the host machine has multiple network interfaces. The default behavior is to listen on all network interfaces (the IPv6 address `::`). +## Configuring Servers + +Read the [Configuring Servers](Configuring-Servers.md) mini-tutorial to see how +the servers are configured. + ## Configuring the Monitor and Servers -The next step is the configuration of the monitor and the servers that the -service uses. This depends on the type of cluster you use with MaxScale. +The next step is the configuration of the monitor. This depends on the type of +cluster you use with MaxScale. For master-slave clusters read the [Configuring MariaDB Monitor](Configuring-MariaDB-Monitor.md) diff --git a/Documentation/Tutorials/Read-Write-Splitting-Tutorial.md b/Documentation/Tutorials/Read-Write-Splitting-Tutorial.md index b2d778b48..570ffa4d3 100644 --- a/Documentation/Tutorials/Read-Write-Splitting-Tutorial.md +++ b/Documentation/Tutorials/Read-Write-Splitting-Tutorial.md @@ -81,10 +81,15 @@ to bind to a particular network interface when the host machine has multiple network interfaces. The default behavior is to listen on all network interfaces (the IPv6 address `::`). -## Configuring the Monitor and Servers +## Configuring Servers -The next step is the configuration of the monitor and the servers that the -service uses. This depends on the type of cluster you use with MaxScale. +Read the [Configuring Servers](Configuring-Servers.md) mini-tutorial to see how +the servers are configured. + +## Configuring the Monitor + +The next step is the configuration of the monitor. This depends on the type of +cluster you use with MaxScale. For master-slave clusters read the [Configuring MariaDB Monitor](Configuring-MariaDB-Monitor.md)