PMM-12375 add database version to services

.golangci.yml

@@ -104,6 +104,8 @@ linters:
     - nlreturn         # too annoying
     - nosnakecase      # deprecated
     - scopelint        # too many false positives
+    - structcheck      # replaced by unused
+    - varcheck         # replaced by unused
     - varnamelen       # useless
     - wrapcheck        # we do not use wrapping everywhere
     - wsl              # too annoying

admin/commands/management/add.go

@@ -21,7 +21,7 @@ import (
 
 // AddCommand is used by Kong for CLI flags and commands.
 type AddCommand struct {
-	External           AddExternalCommand           `cmd:"" help:"Add External source of data (like a custom exporter running on a port) to the monitoring"`
+	External           AddExternalCommand           `cmd:"" help:"Add External source of data (like a custom exporter running on a port) to monitoring"`
 	ExternalServerless AddExternalServerlessCommand `cmd:"" help:"Add External Service on Remote node to monitoring"`
 	HAProxy            AddHAProxyCommand            `cmd:"" name:"haproxy" help:"Add HAProxy to monitoring"`
 	MongoDB            AddMongoDBCommand            `cmd:"" name:"mongodb" help:"Add MongoDB to monitoring"`

agent/connectionchecker/connection_checker.go

@@ -154,8 +154,15 @@ func (cc *ConnectionChecker) checkMySQLConnection(ctx context.Context, dsn strin
 		tableCount = math.MaxInt32
 	}
 
+	var version string
+	if err = db.QueryRowContext(ctx, "SELECT /* agent='connectionchecker' */ VERSION()").Scan(&version); err != nil {
+		res.Error = err.Error()
+		return &res
+	}
+
 	res.Stats = &agentpb.CheckConnectionResponse_Stats{
 		TableCount: tableCount,
+		Version:    version,
 	}
 
 	return &res
@@ -201,6 +208,25 @@ func (cc *ConnectionChecker) checkMongoDBConnection(ctx context.Context, dsn str
 		return &res
 	}
 
+	resp = client.Database("admin").RunCommand(ctx, bson.D{{Key: "buildInfo", Value: 1}})
+	if err = resp.Err(); err != nil {
+		res.Error = err.Error()
+		return &res
+	}
+
+	buildInfo := struct {
+		Version string `bson:"version"`
+	}{}
+
+	if err = resp.Decode(&buildInfo); err != nil {
+		cc.l.Debugf("checkMongoDBConnection: failed to decode buildInfo: %s", err)
+		return &res
+	}
+
+	res.Stats = &agentpb.CheckConnectionResponse_Stats{
+		Version: buildInfo.Version,
+	}
+
 	return &res
 }
 
@@ -228,6 +254,16 @@ func (cc *ConnectionChecker) checkPostgreSQLConnection(ctx context.Context, dsn
 		res.Error = err.Error()
 	}
 
+	var version string
+	if err = db.QueryRowContext(ctx, "SHOW /* agent='connectionchecker' */ SERVER_VERSION").Scan(&version); err != nil {
+		res.Error = err.Error()
+		return &res
+	}
+
+	res.Stats = &agentpb.CheckConnectionResponse_Stats{
+		Version: version,
+	}
+
 	return &res
 }
 
@@ -253,6 +289,23 @@ func (cc *ConnectionChecker) checkProxySQLConnection(ctx context.Context, dsn st
 		res.Error = err.Error()
 	}
 
+	// if _, err := db.ExecContext(ctx, "USE mysql"); err != nil {
+	// 	res.Error = err.Error()
+	// 	return &res
+	// }
+
+	var version string
+	if err := db.QueryRowContext(
+		ctx,
+		"SELECT /* agent='connectionchecker' */ variable_value FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE variable_name = 'admin-version'").Scan(&version); err != nil {
+		res.Error = err.Error()
+		return &res
+	}
+
+	res.Stats = &agentpb.CheckConnectionResponse_Stats{
+		Version: version,
+	}
+
 	return &res
 }
 

api/agentpb/agent.proto

@@ -444,6 +444,7 @@ message CheckConnectionResponse {
   message Stats {
     // A number of tables, 0 if unknown.
     int32 table_count = 1;
+    string version = 2;
   }
   // Error message if connection check failed.
   string error = 1;

api/inventorypb/json/inventorypb.json

@@ -11066,6 +11066,11 @@
                       "description": "Access unix socket.\nAddress (and port) or socket is required.",
                       "type": "string",
                       "x-order": 5
+                    },
+                    "version": {
+                      "description": "MongoDB version.",
+                      "type": "string",
+                      "x-order": 10
                     }
                   },
                   "x-order": 0
@@ -11239,6 +11244,11 @@
                       "description": "Access unix socket.\nAddress (and port) or socket is required.",
                       "type": "string",
                       "x-order": 5
+                    },
+                    "version": {
+                      "description": "MySQL version.",
+                      "type": "string",
+                      "x-order": 10
                     }
                   },
                   "x-order": 0
@@ -11417,6 +11427,11 @@
                       "description": "Access unix socket.\nAddress (and port) or socket is required.",
                       "type": "string",
                       "x-order": 6
+                    },
+                    "version": {
+                      "description": "PostgreSQL version.",
+                      "type": "string",
+                      "x-order": 11
                     }
                   },
                   "x-order": 0
@@ -12043,6 +12058,11 @@
                       "description": "Access unix socket.\nAddress (and port) or socket is required.",
                       "type": "string",
                       "x-order": 5
+                    },
+                    "version": {
+                      "description": "MongoDB version.",
+                      "type": "string",
+                      "x-order": 10
                     }
                   },
                   "x-order": 1
@@ -12104,6 +12124,11 @@
                       "description": "Access unix socket.\nAddress (and port) or socket is required.",
                       "type": "string",
                       "x-order": 5
+                    },
+                    "version": {
+                      "description": "MySQL version.",
+                      "type": "string",
+                      "x-order": 10
                     }
                   },
                   "x-order": 0
@@ -12170,6 +12195,11 @@
                       "description": "Access unix socket.\nAddress (and port) or socket is required.",
                       "type": "string",
                       "x-order": 6
+                    },
+                    "version": {
+                      "description": "PostgreSQL version.",
+                      "type": "string",
+                      "x-order": 11
                     }
                   },
                   "x-order": 2
@@ -12483,6 +12513,11 @@
                         "description": "Access unix socket.\nAddress (and port) or socket is required.",
                         "type": "string",
                         "x-order": 5
+                      },
+                      "version": {
+                        "description": "MongoDB version.",
+                        "type": "string",
+                        "x-order": 10
                       }
                     }
                   },
@@ -12547,6 +12582,11 @@
                         "description": "Access unix socket.\nAddress (and port) or socket is required.",
                         "type": "string",
                         "x-order": 5
+                      },
+                      "version": {
+                        "description": "MySQL version.",
+                        "type": "string",
+                        "x-order": 10
                       }
                     }
                   },
@@ -12616,6 +12656,11 @@
                         "description": "Access unix socket.\nAddress (and port) or socket is required.",
                         "type": "string",
                         "x-order": 6
+                      },
+                      "version": {
+                        "description": "PostgreSQL version.",
+                        "type": "string",
+                        "x-order": 11
                       }
                     }
                   },