Merge branch '2.3' into 2.4

Documentation/Getting-Started/Configuration-Guide.md

@@ -1863,6 +1863,13 @@ The `main-site-master` and `main-site-slave` servers will be used as long as
 they are available. When they are no longer available, the `DR-site-master` and
 `DR-site-slave` will be used.
 
+## Monitor
+
+Monitor sections are used to define the monitoring module that watches a set of
+servers. Each server can only be monitored by one monitor.
+
+Common monitor parameters [can be found here](../Monitors/Monitor-Common.md).
+
 ## Listener
 
 The listener defines a port and protocol pair that is used to listen for

Documentation/REST-API/Resources-MaxScale.md

@@ -157,6 +157,7 @@ Get the information for all threads. Returns a collection of threads resources.
 `Status: 200 OK`
 
 ```javascript
+// See `/v1/maxscale/threads/:id` for a descriptions of the fields
 {
     "links": {
         "self": "http://localhost:8989/v1/maxscale/threads/"
@@ -313,7 +314,7 @@ location where the log files are stored.
                 "log_debug": false
             },
             "log_file": "/home/markusjm/build/log/maxscale/maxscale.log", // The file MaxScale is logging into if `maxlog` is enabled
-            "log_priorities": [ // Active log priorities
+            "log_priorities": [ // Enabled log priorities
                 "error",
                 "warning",
                 "notice",

Documentation/REST-API/Resources-Monitor.md

@@ -24,10 +24,10 @@ all whitespace replaced with hyphens. The monitor names are case-sensitive.
         "self": "http://localhost:8989/v1/monitors/MariaDB-Monitor"
     },
     "data": {
-        "id": "MariaDB-Monitor",
+        "id": "MariaDB-Monitor", // Name of the monitor
         "type": "monitors",
         "relationships": {
-            "servers": {
+            "servers": { // Servers that are monitored by this monitor
                 "links": {
                     "self": "http://localhost:8989/v1/servers/"
                 },
@@ -44,9 +44,9 @@ all whitespace replaced with hyphens. The monitor names are case-sensitive.
             }
         },
         "attributes": {
-            "module": "mariadbmon",
+            "module": "mariadbmon", // The module that the monitor uses
-            "state": "Running",
+            "state": "Running", // Monitor state
-            "parameters": {
+            "parameters": { // Monitor parameters
                 "user": "maxuser",
                 "password": "maxpwd",
                 "monitor_interval": 10000,
@@ -64,7 +64,7 @@ all whitespace replaced with hyphens. The monitor names are case-sensitive.
                 "allow_cluster_recovery": true,
                 "journal_max_age": 28800
             },
-            "monitor_diagnostics": {
+            "monitor_diagnostics": { // Diagnostic output from the monitor, depends on the monitor module
                 "monitor_id": 0,
                 "detect_stale_master": true,
                 "detect_stale_slave": true,
@@ -121,6 +121,7 @@ Get all monitors.
 `Status: 200 OK`
 
 ```javascript
+// See `/v1/monitors/:name` for a descriptions of the fields
 {
     "links": {
         "self": "http://localhost:8989/v1/monitors/"

Documentation/REST-API/Resources-Session.md

@@ -29,10 +29,10 @@ an external server, the operation may be expensive.
         "self": "http://localhost:8989/v1/sessions/9"
     },
     "data": {
-        "id": "9",
+        "id": "9", // The session ID, same as the one sent to the client
         "type": "sessions",
         "relationships": {
-            "services": {
+            "services": { // The service that the session uses
                 "links": {
                     "self": "http://localhost:8989/v1/services/"
                 },
@@ -45,11 +45,11 @@ an external server, the operation may be expensive.
             }
         },
         "attributes": {
-            "state": "Session ready for routing",
+            "state": "Session ready for routing", // Session state
-            "user": "maxuser",
+            "user": "maxuser", // The user that this session uses
-            "remote": "::ffff:127.0.0.1",
+            "remote": "::ffff:127.0.0.1", // The client address
-            "connected": "Mon Jul 17 11:10:39 2017",
+            "connected": "Mon Jul 17 11:10:39 2017", // The time when the client connected
-            "idle": 23.800000000000001
+            "idle": 23.800000000000001 // How many seconds the session has been idle
         },
         "links": {
             "self": "http://localhost:8989/v1/sessions/9"
@@ -71,6 +71,7 @@ Get all sessions.
 `Status: 200 OK`
 
 ```javascript
+// See `/v1/sessions/:id` for a descriptions of the fields
 {
     "links": {
         "self": "http://localhost:8989/v1/sessions/"

Documentation/REST-API/Resources-User.md

@@ -24,10 +24,10 @@ user name.
         "self": "http://localhost:8989/v1/users/inet/my-user"
     },
     "data": {
-        "id": "my-user",
+        "id": "my-user", // Username
-        "type": "inet",
+        "type": "inet", // User type
         "attributes": {
-            "account": "admin"
+            "account": "admin" // Type of the user, "admin" for read-write operations, "basic" for read-only
         },
         "relationships": {
             "self": "http://localhost:8989/v1/users/inet/my-user"
@@ -49,6 +49,7 @@ Get all network users.
 `Status: 200 OK`
 
 ```javascript
+// See `/v1/users/inet/` for a descriptions of the fields
 {
     "links": {
         "self": "http://localhost:8989/v1/users/inet"
@@ -82,6 +83,7 @@ UNIX account name that has been enabled.
 `Status: 200 OK`
 
 ```javascript
+// See `/v1/users/inet/` for a descriptions of the fields
 {
     "links": {
         "self": "http://localhost:8989/v1/users/unix/maxscale"
@@ -112,6 +114,7 @@ Get all enabled UNIX accounts.
 `Status: 200 OK`
 
 ```javascript
+// See `/v1/users/inet/` for a descriptions of the fields
 {
     "links": {
         "self": "http://localhost:8989/v1/users/unix"
@@ -145,6 +148,7 @@ accounts.
 `Status: 200 OK`
 
 ```javascript
+// See `/v1/users/inet/` for a descriptions of the fields
 {
     "links": {
         "self": "http://localhost:8989/v1/users/"
@@ -205,11 +209,11 @@ password _my-password_ that is allowed to execute only read-only operations.
 ```javascript
 {
     "data": {
-        "id": "my-user",
+        "id": "my-user", // The user to create
-        "type": "inet",
+        "type": "inet", // The type of the user
         "attributes": {
-            "password": "my-password",
+            "password": "my-password", // The password to use for the user
-            "account": "basic"
+            "account": "basic" // The type of the account
         }
     }
 }
@@ -244,10 +248,10 @@ Here is an example request body enabling the UNIX account _jdoe_ for read-only o
 ```javascript
 {
     "data": {
-        "id": "jdoe",
+        "id": "jdoe", // Account name
-        "type": "unix"
+        "type": "unix" // Account type
         "attributes": {
-            "account": "basic"
+            "account": "basic" // Type of the user account in MaxScale
         }
     }
 }

system-test/maxtest/src/mariadb_nodes.cc

@@ -1529,7 +1529,8 @@ int Mariadb_nodes::prepare_server(int i)
             ssh_node(i, "mysql_install_db; sudo chown -R mysql:mysql /var/lib/mysql", true);
         }
     }
-
+    stop_node(i);
+    start_node(i, "");
     free(version);
     return ec;
 }