Fix MariaDB InnoDB pending flush metric parsing (#13658)

* Fix MariaDB InnoDB pending flush metric parsing * Add MariaDB 10.10 to test version matrix --------- Co-authored-by: Jack Robertson <[email protected]>
DataDog · Mar 30, 2023 · 544fb21 · 544fb21
1 parent b9683e0
commit 544fb21
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/mysql/datadog_checks/mysql/innodb_metrics.py b/mysql/datadog_checks/mysql/innodb_metrics.py
@@ -203,9 +203,13 @@ def get_stats_from_innodb_status(self, db):
                     results['Innodb_pending_aio_log_ios'] = 0
                     results['Innodb_pending_aio_sync_ios'] = 0
             elif line.find('Pending flushes (fsync)') == 0:
-                # Pending flushes (fsync) log: 0; buffer pool: 0
-                results['Innodb_pending_log_flushes'] = long(row[4])
-                results['Innodb_pending_buffer_pool_flushes'] = long(row[7])
+                if len(row) == 4:
+                    # Pending flushes (fsync): 0
+                    results['Innodb_pending_buffer_pool_flushes'] = long(row[3])
+                else:
+                    # Pending flushes (fsync) log: 0; buffer pool: 0
+                    results['Innodb_pending_log_flushes'] = long(row[4])
+                    results['Innodb_pending_buffer_pool_flushes'] = long(row[7])
 
             # INSERT BUFFER AND ADAPTIVE HASH INDEX
             elif line.find('Ibuf for space 0: size ') == 0:

diff --git a/mysql/hatch.toml b/mysql/hatch.toml
@@ -32,6 +32,7 @@ flavor = ["mariadb"]
 version = [
   "10.2",  # EOL 23 May 2022
   "10.5",  # EOL 24 June 2025
+  "10.10", # EOL 17 November 2023
 ]
 
 [envs.default.overrides]