diff --git a/Documentation/Monitors/MariaDB-Monitor.md b/Documentation/Monitors/MariaDB-Monitor.md index 795498b36..32412f53a 100644 --- a/Documentation/Monitors/MariaDB-Monitor.md +++ b/Documentation/Monitors/MariaDB-Monitor.md @@ -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 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 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: ``` -call command mysqlmon failover MyMonitor -call command mysqlmon switchover MyMonitor SlaveServ3 MasterServ +call command mariadbmon failover MyMonitor +call command mariadbmon switchover MyMonitor SlaveServ3 MasterServ ``` 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: ``` -/v1/maxscale/mysqlmon/switchover?&& +/v1/maxscale/mariadbmon/switchover?&& ``` where `` is the monitor section mame from the MaxScale configuration file, `` the name of the server that should be @@ -407,20 +407,20 @@ So, given a MaxScale configuration file like ``` [Cluster1] type=monitor -module=mysqlmon +module=mariadbmon servers=server1, server2, server3, server 4 ... ``` with the assumption that `server2` is the current master, then the URL 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 `` and `` fields are left out. ``` -/v1/maxscale/mysqlmon/failover?Cluster1 +/v1/maxscale/mariadbmon/failover?Cluster1 ``` ## Using the MariaDB Monitor With Binlogrouter @@ -456,7 +456,7 @@ or a slave server goes down. ``` [Database Monitor] type=monitor -module=mysqlmon +module=mariadbmon servers=server1,server2 script=mail_to_admin.sh events=master_down,slave_down diff --git a/Documentation/REST-API/Resources-Monitor.md b/Documentation/REST-API/Resources-Monitor.md index 84495a0a2..75cca9a9c 100644 --- a/Documentation/REST-API/Resources-Monitor.md +++ b/Documentation/REST-API/Resources-Monitor.md @@ -21,10 +21,10 @@ GET /v1/monitors/:name ```javascript { "links": { - "self": "http://localhost:8989/v1/monitors/MySQL-Monitor" + "self": "http://localhost:8989/v1/monitors/MariaDB-Monitor" }, "data": { - "id": "MySQL-Monitor", + "id": "MariaDB-Monitor", "type": "monitors", "relationships": { "servers": { @@ -44,7 +44,7 @@ GET /v1/monitors/:name } }, "attributes": { - "module": "mysqlmon", + "module": "mariadbmon", "state": "Running", "parameters": { "user": "maxuser", @@ -102,7 +102,7 @@ GET /v1/monitors/:name } }, "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": [ { - "id": "MySQL-Monitor", + "id": "MariaDB-Monitor", "type": "monitors", "relationships": { "servers": { @@ -147,7 +147,7 @@ GET /v1/monitors } }, "attributes": { - "module": "mysqlmon", + "module": "mariadbmon", "state": "Running", "parameters": { "user": "maxuser", @@ -205,7 +205,7 @@ GET /v1/monitors } }, "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 "type": "monitors", "attributes": { - "module": "mysqlmon", // The monitor uses the mysqlmon module + "module": "mariadbmon", // The monitor uses the mariadbmon module "parameters": { // Monitor parameters "monitor_interval": 1000 } diff --git a/Documentation/Reference/MaxAdmin.md b/Documentation/Reference/MaxAdmin.md index cf33389e3..20b54f169 100644 --- a/Documentation/Reference/MaxAdmin.md +++ b/Documentation/Reference/MaxAdmin.md @@ -1230,7 +1230,7 @@ MaxAdminAuth | Authenticator | V2.1.0 | 1.1.0 | GA maxscaled | Protocol | V2.0.0 | 1.1.0 | GA MySQLBackendAuth| Authenticator | V1.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 readwritesplit | Router | V1.1.0 | 2.0.0 | GA topfilter | Filter | V1.0.1 | 2.2.0 | GA @@ -1567,7 +1567,7 @@ Parameters: NAME Monitor name MODULE Monitor module -Example: create monitor my-monitor mysqlmon +Example: create monitor my-monitor mariadbmon ``` ### Altering Monitors diff --git a/Documentation/Tutorials/MaxScale-Information-Schema.md b/Documentation/Tutorials/MaxScale-Information-Schema.md index ab4bf9791..cb6dfbd36 100644 --- a/Documentation/Tutorials/MaxScale-Information-Schema.md +++ b/Documentation/Tutorials/MaxScale-Information-Schema.md @@ -297,7 +297,7 @@ mysql> show modules; | maxscaled | Protocol | V1.0.0 | 1.0.0 | GA | | telnetd | Protocol | V1.0.1 | 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 | | readconnroute | Router | V1.1.0 | 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 -[ { "Module Name" : "HTTPD", "Module Type" : "Protocol", "Version" : "V1.0.1", "API Version" : "1.0.0", "Status" : "In Development"}, -{ "Module Name" : "maxscaled", "Module Type" : "Protocol", "Version" : "V1.0.0", "API Version" : "1.0.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.0.0", "API Version" : "1.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.0.2", "API Version" : "1.0.0", "Status" : "GA"}, -{ "Module Name" : "readconnroute", "Module Type" : "Router", "Version" : "V1.1.0", "API Version" : "1.0.0", "Status" : "GA"}, -{ "Module Name" : "debugcli", "Module Type" : "Router", "Version" : "V1.1.1", "API Version" : "1.0.0", "Status" : "GA"}, -{ "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"}] +[ { "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" : "V2.0.0", "API Version" : "1.1.0", "Status" : "GA"}, +{ "Module Name" : "mariadbclient", "Module Type" : "Protocol", "Version" : "V1.1.0", "API Version" : "1.1.0", "Status" : "GA"}, +{ "Module Name" : "mariadbmon", "Module Type" : "Monitor", "Version" : "V1.5.0", "API Version" : "3.0.0", "Status" : "GA"}, +{ "Module Name" : "readwritesplit", "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" : "2.0.0", "Status" : "GA"}, +{ "Module Name" : "cli", "Module Type" : "Router", "Version" : "V1.0.0", "API Version" : "2.0.0", "Status" : "GA"}, +{ "Module Name" : "maxinfo", "Module Type" : "Router", "Version" : "V1.0.0", "API Version" : "2.0.0", "Status" : "Alpha"}] $ ``` diff --git a/Documentation/Tutorials/MySQL-Replication-Connection-Routing-Tutorial.md b/Documentation/Tutorials/MySQL-Replication-Connection-Routing-Tutorial.md index 376a0c33d..a25f5f8a2 100644 --- a/Documentation/Tutorials/MySQL-Replication-Connection-Routing-Tutorial.md +++ b/Documentation/Tutorials/MySQL-Replication-Connection-Routing-Tutorial.md @@ -152,7 +152,7 @@ In order for MariaDB MaxScale to monitor the servers using the correct monitorin ``` [Replication-Monitor] type=monitor -module=mysqlmon +module=mariadbmon servers=dbserv1, dbserv2, dbserv3 user=maxscale passwd=96F99AA1315BDC3604B006F427DD9484 diff --git a/Documentation/Tutorials/MySQL-Replication-Read-Write-Splitting-Tutorial.md b/Documentation/Tutorials/MySQL-Replication-Read-Write-Splitting-Tutorial.md index 2a74b4022..93f95dff2 100644 --- a/Documentation/Tutorials/MySQL-Replication-Read-Write-Splitting-Tutorial.md +++ b/Documentation/Tutorials/MySQL-Replication-Read-Write-Splitting-Tutorial.md @@ -158,7 +158,7 @@ username and password the monitor module should use when connecting. ``` [Replication Monitor] type=monitor -module=mysqlmon +module=mariadbmon servers=dbserv1, dbserv2, dbserv3 user=maxscale passwd=96F99AA1315BDC3604B006F427DD9484 diff --git a/Documentation/Tutorials/RabbitMQ-And-Tee-Archiving.md b/Documentation/Tutorials/RabbitMQ-And-Tee-Archiving.md index 0f11419f2..bee53948b 100644 --- a/Documentation/Tutorials/RabbitMQ-And-Tee-Archiving.md +++ b/Documentation/Tutorials/RabbitMQ-And-Tee-Archiving.md @@ -96,7 +96,7 @@ is lost and notify MariaDB MaxScale of the changed server states. ``` [MySQL Monitor] type=monitor -module=mysqlmon +module=mariadbmon servers=production-1, archive-1 user=maxuser passwd=maxpwd @@ -235,7 +235,7 @@ protocol=MariaDBBackend # MySQL server monitor [MySQL Monitor] type=monitor -module=mysqlmon +module=mariadbmon servers=production-1, archive-1 user=maxuser passwd=maxpwd diff --git a/Documentation/Tutorials/Simple-Sharding-Tutorial.md b/Documentation/Tutorials/Simple-Sharding-Tutorial.md index a9984a578..1a4ec4211 100644 --- a/Documentation/Tutorials/Simple-Sharding-Tutorial.md +++ b/Documentation/Tutorials/Simple-Sharding-Tutorial.md @@ -67,7 +67,7 @@ The final step is to configure a monitor which will monitor the state of the ser ``` [MySQL Monitor] type=monitor -module=mysqlmon +module=mariadbmon servers=accounts_west,accounts_east user=monitoruser passwd=7SP1Zcsow8TG+9EkEBVEbaKa