hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change mysqlmon to mariadbmon

Browse Source 
Some places had not been updated.
This commit is contained in:
Johan Wikman
2018-01-05 10:28:35 +02:00
parent bb33eb2638
commit fb62c7957a
8 changed files with 32 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Documentation/Monitors/MariaDB-Monitor.md
View File

@ -171,7 +171,7 @@ slave server (controlled by the `detect_stale_slave` parameter). When the
whether the server can be used as a master server. This is done by checking that whether the server can be used as a master server. This is done by checking that
the server is not in read-only mode and that it is not configured as a slave. the server is not in read-only mode and that it is not configured as a slave.
This mode in mysqlmon is completely passive in the sense that it does not modify This mode in mariadbmon is completely passive in the sense that it does not modify
the cluster or any of the servers in it. It only labels the last remaining the cluster or any of the servers in it. It only labels the last remaining
server in a cluster as the master server. server in a cluster as the master server.
@ -247,8 +247,8 @@ user to designate the new master as well as the current master. Example commands
are below: are below:
``` ```
call command mysqlmon failover MyMonitor call command mariadbmon failover MyMonitor
call command mysqlmon switchover MyMonitor SlaveServ3 MasterServ call command mariadbmon switchover MyMonitor SlaveServ3 MasterServ
``` ```
Failover can also activate automatically, if `auto_failover` is on. The Failover can also activate automatically, if `auto_failover` is on. The
@ -395,7 +395,7 @@ turned on manually via the REST API or MaxAdmin.
When switchover is iniated via the REST-API, the URL path is: When switchover is iniated via the REST-API, the URL path is:
``` ```
/v1/maxscale/mysqlmon/switchover?<monitor-instance>&<new-master>&<current-master> /v1/maxscale/mariadbmon/switchover?<monitor-instance>&<new-master>&<current-master>
``` ```
where `<monitor-instance>` is the monitor section mame from the MaxScale where `<monitor-instance>` is the monitor section mame from the MaxScale
configuration file, `<new-master>` the name of the server that should be configuration file, `<new-master>` the name of the server that should be
@ -407,20 +407,20 @@ So, given a MaxScale configuration file like
``` ```
[Cluster1] [Cluster1]
type=monitor type=monitor
module=mysqlmon module=mariadbmon
servers=server1, server2, server3, server 4 servers=server1, server2, server3, server 4
... ...
``` ```
with the assumption that `server2` is the current master, then the URL with the assumption that `server2` is the current master, then the URL
path for making `server4` the new master would be: path for making `server4` the new master would be:
``` ```
/v1/maxscale/mysqlmon/switchover?Cluster1&server4&server2 /v1/maxscale/mariadbmon/switchover?Cluster1&server4&server2
``` ```
The REST-API path for manual failover is similar, although the `<new-master>` The REST-API path for manual failover is similar, although the `<new-master>`
and `<current-master>` fields are left out. and `<current-master>` fields are left out.
``` ```
/v1/maxscale/mysqlmon/failover?Cluster1 /v1/maxscale/mariadbmon/failover?Cluster1
``` ```
## Using the MariaDB Monitor With Binlogrouter ## Using the MariaDB Monitor With Binlogrouter
@ -456,7 +456,7 @@ or a slave server goes down.
``` ```
[Database Monitor] [Database Monitor]
type=monitor type=monitor
module=mysqlmon module=mariadbmon
servers=server1,server2 servers=server1,server2
script=mail_to_admin.sh script=mail_to_admin.sh
events=master_down,slave_down events=master_down,slave_down

16
Documentation/REST-API/Resources-Monitor.md
View File

@ -21,10 +21,10 @@ GET /v1/monitors/:name
```javascript ```javascript
{ {
"links": { "links": {
"self": "http://localhost:8989/v1/monitors/MySQL-Monitor" "self": "http://localhost:8989/v1/monitors/MariaDB-Monitor"
}, },
"data": { "data": {
"id": "MySQL-Monitor", "id": "MariaDB-Monitor",
"type": "monitors", "type": "monitors",
"relationships": { "relationships": {
"servers": { "servers": {
@ -44,7 +44,7 @@ GET /v1/monitors/:name
} }
}, },
"attributes": { "attributes": {
"module": "mysqlmon", "module": "mariadbmon",
"state": "Running", "state": "Running",
"parameters": { "parameters": {
"user": "maxuser", "user": "maxuser",
@ -102,7 +102,7 @@ GET /v1/monitors/:name
} }
}, },
"links": { "links": {
"self": "http://localhost:8989/v1/monitors/MySQL-Monitor" "self": "http://localhost:8989/v1/monitors/MariaDB-Monitor"
} }
} }
} }
@ -127,7 +127,7 @@ GET /v1/monitors
}, },
"data": [ "data": [
{ {
"id": "MySQL-Monitor", "id": "MariaDB-Monitor",
"type": "monitors", "type": "monitors",
"relationships": { "relationships": {
"servers": { "servers": {
@ -147,7 +147,7 @@ GET /v1/monitors
} }
}, },
"attributes": { "attributes": {
"module": "mysqlmon", "module": "mariadbmon",
"state": "Running", "state": "Running",
"parameters": { "parameters": {
"user": "maxuser", "user": "maxuser",
@ -205,7 +205,7 @@ GET /v1/monitors
} }
}, },
"links": { "links": {
"self": "http://localhost:8989/v1/monitors/MySQL-Monitor" "self": "http://localhost:8989/v1/monitors/MariaDB-Monitor"
} }
} }
] ]
@ -234,7 +234,7 @@ a custom value for the _monitor_interval_ parameter.
"id": "test-monitor", // Name of the monitor "id": "test-monitor", // Name of the monitor
"type": "monitors", "type": "monitors",
"attributes": { "attributes": {
"module": "mysqlmon", // The monitor uses the mysqlmon module "module": "mariadbmon", // The monitor uses the mariadbmon module
"parameters": { // Monitor parameters "parameters": { // Monitor parameters
"monitor_interval": 1000 "monitor_interval": 1000
} }

4
Documentation/Reference/MaxAdmin.md
View File

@ -1230,7 +1230,7 @@ MaxAdminAuth | Authenticator | V2.1.0 | 1.1.0 | GA
maxscaled | Protocol | V2.0.0 | 1.1.0 | GA maxscaled | Protocol | V2.0.0 | 1.1.0 | GA
MySQLBackendAuth| Authenticator | V1.0.0 | 1.1.0 | GA MySQLBackendAuth| Authenticator | V1.0.0 | 1.1.0 | GA
MariaDBBackend | Protocol | V2.0.0 | 1.1.0 | GA MariaDBBackend | Protocol | V2.0.0 | 1.1.0 | GA
mysqlmon | Monitor | V1.5.0 | 3.0.0 | GA mariadbmon | Monitor | V1.5.0 | 3.0.0 | GA
schemarouter | Router | V1.0.0 | 2.0.0 | Beta schemarouter | Router | V1.0.0 | 2.0.0 | Beta
readwritesplit | Router | V1.1.0 | 2.0.0 | GA readwritesplit | Router | V1.1.0 | 2.0.0 | GA
topfilter | Filter | V1.0.1 | 2.2.0 | GA topfilter | Filter | V1.0.1 | 2.2.0 | GA
@ -1567,7 +1567,7 @@ Parameters:
NAME Monitor name NAME Monitor name
MODULE Monitor module MODULE Monitor module
Example: create monitor my-monitor mysqlmon Example: create monitor my-monitor mariadbmon
``` ```
### Altering Monitors ### Altering Monitors

20
Documentation/Tutorials/MaxScale-Information-Schema.md
View File

@ -297,7 +297,7 @@ mysql> show modules;
| maxscaled | Protocol | V1.0.0 | 1.0.0 | GA | | maxscaled | Protocol | V1.0.0 | 1.0.0 | GA |
| telnetd | Protocol | V1.0.1 | 1.0.0 | GA | | telnetd | Protocol | V1.0.1 | 1.0.0 | GA |
| MariaDBClient | Protocol | V1.0.0 | 1.0.0 | GA | | MariaDBClient | Protocol | V1.0.0 | 1.0.0 | GA |
| mysqlmon | Monitor | V1.4.0 | 1.0.0 | GA | | mariadbmon | Monitor | V1.4.0 | 1.0.0 | GA |
| readwritesplit | Router | V1.0.2 | 1.0.0 | GA | | readwritesplit | Router | V1.0.2 | 1.0.0 | GA |
| readconnroute | Router | V1.1.0 | 1.0.0 | GA | | readconnroute | Router | V1.1.0 | 1.0.0 | GA |
| debugcli | Router | V1.1.1 | 1.0.0 | GA | | debugcli | Router | V1.1.1 | 1.0.0 | GA |
@ -466,16 +466,14 @@ The /modules URI returns data for each plugin that has been loaded into MariaDB
``` ```
$ curl http://maxscale.mariadb.com:8003/modules $ curl http://maxscale.mariadb.com:8003/modules
[ { "Module Name" : "HTTPD", "Module Type" : "Protocol", "Version" : "V1.0.1", "API Version" : "1.0.0", "Status" : "In Development"}, [ { "Module Name" : "HTTPD", "Module Type" : "Protocol", "Version" : "V1.2.0", "API Version" : "1.1.0", "Status" : "In Development"},
{ "Module Name" : "maxscaled", "Module Type" : "Protocol", "Version" : "V1.0.0", "API Version" : "1.0.0", "Status" : "GA"}, { "Module Name" : "maxscaled", "Module Type" : "Protocol", "Version" : "V2.0.0", "API Version" : "1.1.0", "Status" : "GA"},
{ "Module Name" : "telnetd", "Module Type" : "Protocol", "Version" : "V1.0.1", "API Version" : "1.0.0", "Status" : "GA"}, { "Module Name" : "mariadbclient", "Module Type" : "Protocol", "Version" : "V1.1.0", "API Version" : "1.1.0", "Status" : "GA"},
{ "Module Name" : "MariaDBClient", "Module Type" : "Protocol", "Version" : "V1.0.0", "API Version" : "1.0.0", "Status" : "GA"}, { "Module Name" : "mariadbmon", "Module Type" : "Monitor", "Version" : "V1.5.0", "API Version" : "3.0.0", "Status" : "GA"},
{ "Module Name" : "mysqlmon", "Module Type" : "Monitor", "Version" : "V1.4.0", "API Version" : "1.0.0", "Status" : "GA"}, { "Module Name" : "readwritesplit", "Module Type" : "Router", "Version" : "V1.1.0", "API Version" : "2.0.0", "Status" : "GA"},
{ "Module Name" : "readwritesplit", "Module Type" : "Router", "Version" : "V1.0.2", "API Version" : "1.0.0", "Status" : "GA"}, { "Module Name" : "readconnroute", "Module Type" : "Router", "Version" : "V1.1.0", "API Version" : "2.0.0", "Status" : "GA"},
{ "Module Name" : "readconnroute", "Module Type" : "Router", "Version" : "V1.1.0", "API Version" : "1.0.0", "Status" : "GA"}, { "Module Name" : "cli", "Module Type" : "Router", "Version" : "V1.0.0", "API Version" : "2.0.0", "Status" : "GA"},
{ "Module Name" : "debugcli", "Module Type" : "Router", "Version" : "V1.1.1", "API Version" : "1.0.0", "Status" : "GA"}, { "Module Name" : "maxinfo", "Module Type" : "Router", "Version" : "V1.0.0", "API Version" : "2.0.0", "Status" : "Alpha"}]
{ "Module Name" : "cli", "Module Type" : "Router", "Version" : "V1.0.0", "API Version" : "1.0.0", "Status" : "GA"},
{ "Module Name" : "maxinfo", "Module Type" : "Router", "Version" : "V1.0.0", "API Version" : "1.0.0", "Status" : "Alpha"}]
$ $
``` ```

2
Documentation/Tutorials/MySQL-Replication-Connection-Routing-Tutorial.md
View File

@ -152,7 +152,7 @@ In order for MariaDB MaxScale to monitor the servers using the correct monitorin
``` ```
[Replication-Monitor] [Replication-Monitor]
type=monitor type=monitor
module=mysqlmon module=mariadbmon
servers=dbserv1, dbserv2, dbserv3 servers=dbserv1, dbserv2, dbserv3
user=maxscale user=maxscale
passwd=96F99AA1315BDC3604B006F427DD9484 passwd=96F99AA1315BDC3604B006F427DD9484

2
Documentation/Tutorials/MySQL-Replication-Read-Write-Splitting-Tutorial.md
View File

@ -158,7 +158,7 @@ username and password the monitor module should use when connecting.
``` ```
[Replication Monitor] [Replication Monitor]
type=monitor type=monitor
module=mysqlmon module=mariadbmon
servers=dbserv1, dbserv2, dbserv3 servers=dbserv1, dbserv2, dbserv3
user=maxscale user=maxscale
passwd=96F99AA1315BDC3604B006F427DD9484 passwd=96F99AA1315BDC3604B006F427DD9484

4
Documentation/Tutorials/RabbitMQ-And-Tee-Archiving.md
View File

@ -96,7 +96,7 @@ is lost and notify MariaDB MaxScale of the changed server states.
``` ```
[MySQL Monitor] [MySQL Monitor]
type=monitor type=monitor
module=mysqlmon module=mariadbmon
servers=production-1, archive-1 servers=production-1, archive-1
user=maxuser user=maxuser
passwd=maxpwd passwd=maxpwd
@ -235,7 +235,7 @@ protocol=MariaDBBackend
# MySQL server monitor # MySQL server monitor
[MySQL Monitor] [MySQL Monitor]
type=monitor type=monitor
module=mysqlmon module=mariadbmon
servers=production-1, archive-1 servers=production-1, archive-1
user=maxuser user=maxuser
passwd=maxpwd passwd=maxpwd

2
Documentation/Tutorials/Simple-Sharding-Tutorial.md
View File

@ -67,7 +67,7 @@ The final step is to configure a monitor which will monitor the state of the ser
``` ```
[MySQL Monitor] [MySQL Monitor]
type=monitor type=monitor
module=mysqlmon module=mariadbmon
servers=accounts_west,accounts_east servers=accounts_west,accounts_east
user=monitoruser user=monitoruser
passwd=7SP1Zcsow8TG+9EkEBVEbaKa passwd=7SP1Zcsow8TG+9EkEBVEbaKa