fix(go.d/mysql): fix MariaDB User CPU Time (#20262)
Ilya Mashchenko committed
May 9, 2025 at 09:34 UTC
aef0d226ff0e7ba6dc3b3b4d9b6b9bb8804ef69e
1 file changed
+3
-5
src/go/plugin/go.d/collector/mysql/collect_user_statistics.go
+3
-5
@@ -27,15 +27,13 @@ func (c *Collector) collectUserStatistics(mx map[string]int64) error {
27
c.addUserStatisticsCharts(user)
28
}
29
case "Cpu_time":
30
+ // https://jira.mariadb.org/browse/MDEV-36586
31
needsDivision := c.isMariaDB &&
31
- ((c.version.Major == 10 && c.version.GTE(semver.Version{Major: 10, Minor: 11, Patch: 11})) ||
32
- c.version.GTE(semver.Version{Major: 11, Minor: 4, Patch: 5}))
32
+ (c.version.EQ(semver.Version{Major: 10, Minor: 11, Patch: 11})) ||
33
+ c.version.EQ(semver.Version{Major: 11, Minor: 4, Patch: 5})
34
35
key := strings.ToLower(prefix + column)
36
if needsDivision {
36
- // TODO: theoretically should divide by 1e6 to convert to seconds,
37
- // but empirically need 1e7 to match pre-11.4.5 values.
38
- // Needs investigation - possible unit reporting inconsistency in MariaDB
37
mx[key] = int64(parseFloat(value) / 1e7 * 1000)
38
} else {
39
mx[key] = int64(parseFloat(value) * 1000)