support MySQL 8.4

Signed-off-by: Mitsuhiro Tanda <mitsuhiro.tanda@gmail.com>
prometheus · May 15, 2024 · 812dc66 · 812dc66
1 parent 0c89d59
commit 812dc66
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/collector/slave_hosts.go b/collector/slave_hosts.go
@@ -31,12 +31,12 @@ const (
 	// timestamps. %s will be replaced by the database and table name.
 	// The second column allows gets the server timestamp at the exact same
 	// time the query is run.
-	slaveHostsQuery = "SHOW SLAVE HOSTS"
 )
 
 // Metric descriptors.
 var (
-	SlaveHostsInfo = prometheus.NewDesc(
+	slaveHostsQueries = [2]string{"SHOW SLAVE HOSTS", "SHOW REPLICAS"}
+	SlaveHostsInfo    = prometheus.NewDesc(
 		prometheus.BuildFQName(namespace, heartbeat, "mysql_slave_hosts_info"),
 		"Information about running slaves",
 		[]string{"server_id", "slave_host", "port", "master_id", "slave_uuid"}, nil,
@@ -63,7 +63,17 @@ func (ScrapeSlaveHosts) Version() float64 {
 
 // Scrape collects data from database connection and sends it over channel as prometheus metric.
 func (ScrapeSlaveHosts) Scrape(ctx context.Context, db *sql.DB, ch chan<- prometheus.Metric, logger log.Logger) error {
-	slaveHostsRows, err := db.QueryContext(ctx, slaveHostsQuery)
+	var (
+		slaveHostsRows *sql.Rows
+		err            error
+	)
+	// Try the both syntax for MySQL 8.0 and MySQL 8.4
+	for _, query := range slaveHostsQueries {
+		slaveHostsRows, err = db.QueryContext(ctx, query)
+		if err == nil {
+			break
+		}
+	}
 	if err != nil {
 		return err
 	}

diff --git a/collector/slave_status.go b/collector/slave_status.go
@@ -30,7 +30,7 @@ const (
 	slaveStatus = "slave_status"
 )
 
-var slaveStatusQueries = [2]string{"SHOW ALL SLAVES STATUS", "SHOW SLAVE STATUS"}
+var slaveStatusQueries = [3]string{"SHOW ALL SLAVES STATUS", "SHOW SLAVE STATUS", "SHOW REPLICA STATUS"}
 var slaveStatusQuerySuffixes = [3]string{" NONBLOCKING", " NOLOCK", ""}
 
 func columnIndex(slaveCols []string, colName string) int {
@@ -113,7 +113,13 @@ func (ScrapeSlaveStatus) Scrape(ctx context.Context, db *sql.DB, ch chan<- prome
 		}
 
 		masterUUID := columnValue(scanArgs, slaveCols, "Master_UUID")
+		if masterUUID == "" {
+			masterUUID = columnValue(scanArgs, slaveCols, "Source_UUID")
+		}
 		masterHost := columnValue(scanArgs, slaveCols, "Master_Host")
+		if masterHost == "" {
+			masterHost = columnValue(scanArgs, slaveCols, "Source_Host")
+		}
 		channelName := columnValue(scanArgs, slaveCols, "Channel_Name")       // MySQL & Percona
 		connectionName := columnValue(scanArgs, slaveCols, "Connection_name") // MariaDB