fix(mysql-version): handle the new MariaDB 11.4 client banner and mariadbd

MariaDB 11.4 dropped the legacy `mysqld` symlink and renamed the
`mariadb --version` client banner from `Distrib X.Y.Z, ...` to
`from X.Y.Z, ...`. The plugin's old fallback regex `r'(?i)b (.*?),'`
matched the `b ` in `mariadb` (the program name) instead of the one
in `Distrib`, so on 11.4 and later it produced output like
`MariaDB vfrom 11.4.10` and the printed version string was wrong
(EOL detection still happened to work because `lib.version.version()`
re-extracts the digits, but that was luck, not design).

Rewrite `get_installed_version()` so it:

- tries `mysqld`, `mariadbd`, `mariadb` and `mysql` in that order,
  picking the new MariaDB binaries up where the old symlinks no
  longer exist;
- runs three explicit regexes against the output:
  - `Ver (\d+\.\d+\.\d+(?:-MariaDB)?)` for the `mysqld` and
    `mariadbd` server banners (also strips ugly package suffixes
    like `-1~trusty` and `-ubu2204`);
  - `Distrib (\S+?),` for the legacy `mysql --version` /
    `mariadb --version` Distrib banner;
  - `from (\d+\.\d+\.\d+(?:-MariaDB)?),` for the new MariaDB 11.4+
    client banner.

Add fixtures and TESTS for every MariaDB cycle that endoflife.date
currently lists (5.5, 10.4, 10.5 x2, 10.6, 10.11, 11.4, 11.8, 12.0,
12.1, 12.2) plus the existing MySQL 8.0/8.4 captures. Eleven of the
fifteen testcases hit a WARN state today, exercising the EOL code
path against both very old (5.5) and brand-new (12.0) cycles.

Bumps `__version__` to `2026041302`.

Author: markuslf

check-plugins/mysql-version/mysql-version

@@ -123,46 +123,58 @@ def parse_args():
     return args
 
 
+# Output formats this parser handles:
+#
+#   mysqld  Ver 8.0.45 for Linux on x86_64 (Source distribution)
+#   mysqld  Ver 10.11.15-MariaDB for Linux on x86_64 (MariaDB Server)
+#   mysql  Ver 14.14 Distrib 5.7.44, for Linux (x86_64) using EditLine wrapper
+#   mariadb  Ver 15.1 Distrib 10.5.x-MariaDB, for Linux on x86_64
+#   mariadb from 11.4.10-MariaDB, client 15.2 for debian-linux-gnu (x86_64) using EditLine wrapper
+#
+# MariaDB 11.4 dropped the `mysqld` symlink and renamed the client
+# version banner from "Distrib X.Y.Z" to "from X.Y.Z", so the parser
+# also tries `mariadbd` and accepts both prefixes.
+_VERSION_REGEXES = (
+    # `mysqld  Ver X.Y.Z[-MariaDB] for ...` (the package suffix that
+    # some distros append, e.g. `-1~trusty`, is stripped)
+    r'Ver (\d+\.\d+\.\d+(?:-MariaDB)?)',
+    # `mysql  Ver 14.14 Distrib X.Y.Z[-MariaDB], for ...`
+    # `mariadb  Ver 15.1 Distrib 10.5.x-MariaDB, for ...`
+    r'Distrib (\S+?),',
+    # `mariadb from X.Y.Z[-MariaDB], client ...`  (MariaDB 11.4+)
+    r'from (\d+\.\d+\.\d+(?:-MariaDB)?),',
+)
+
+
+def _parse_version(stdout):
+    """Try every known version-string regex against `stdout` and
+    return the first match, or `''` if none of them apply.
+    """
+    for regex in _VERSION_REGEXES:
+        m = re.search(regex, stdout)
+        if m:
+            return m.group(1).strip()
+    return ''
+
+
 def get_installed_version(test_arg=None):
-    # In test mode, read the fixture once and try both regexes
-    # against it. The mysqld output matches the first one; the
-    # mariadb / mysql client outputs match the second.
     if test_arg is not None:
         stdout, _, _ = lib.lftest.test(test_arg)
-        stdout = stdout.strip()
-        m = re.search(r'Ver (.*?) ', stdout)
-        if m:
-            return m.group(1).strip()
-        m = re.search(r'(?i)b (.*?),', stdout)
-        if m:
-            return m.group(1).strip()
-        return ''
-
-    success, result = lib.shell.shell_exec('mysqld --version')
-    if success:
-        stdout = result[0].strip()
-        # where to find the version number in output?
-        version_regex = r'Ver (.*?) '
-        try:
-            stdout = re.search(version_regex, stdout)
-            return stdout.group(1).strip()
-        except Exception:
-            pass
-
-    success, result = lib.shell.shell_exec('mariadb --version')
-    if not success:
-        success, result = lib.shell.shell_exec('mysql --version')
-    if not success:
-        return ''
-
-    stdout = result[0].strip()
-    # where to find the version number in output?
-    version_regex = r'(?i)b (.*?),'
-    try:
-        stdout = re.search(version_regex, stdout)
-        return stdout.group(1).strip()
-    except Exception:
-        return ''
+        return _parse_version(stdout.strip())
+
+    # Try the server binary first under both its old name (`mysqld`)
+    # and its current MariaDB name (`mariadbd`), then fall back to the
+    # client binary under both its current name (`mariadb`) and its
+    # legacy name (`mysql`).
+    for command in ('mysqld --version', 'mariadbd --version',
+                    'mariadb --version', 'mysql --version'):
+        success, result = lib.shell.shell_exec(command)
+        if not success:
+            continue
+        version = _parse_version(result[0].strip())
+        if version:
+            return version
+    return ''
 
 
 def main():

check-plugins/mysql-version/unit-test/run

@@ -11,20 +11,21 @@
 """Unit tests for the mysql-version check plugin.
 
 The plugin probes for either MySQL Community Server or MariaDB by
-running `mysqld --version` first and falling back to
-`mariadb --version` / `mysql --version` if the server binary is not
-available. Two regexes parse the two output formats:
+running `mysqld`, `mariadbd`, `mariadb` or `mysql` with `--version`
+and parses the result. Three regexes cover three output formats:
 
-  - mysqld output:   `mysqld  Ver 10.11.15-MariaDB for Linux ...`
-                     `/usr/libexec/mysqld  Ver 8.0.45 for Linux ...`
-  - client output:   `mysql  Ver 15.1 Distrib 10.11.x-MariaDB, for ...`
+  - `mysqld  Ver X.Y.Z[-MariaDB] for ...`         (mysqld and mariadbd)
+  - `mysql  Ver 14.14 Distrib X.Y.Z, for ...`     (legacy mysql client)
+  - `mariadb from X.Y.Z-MariaDB, client ...`      (MariaDB 11.4+ client)
 
-The fixtures in `stdout/` are the real `mysqld --version` strings
-captured from the Red Hat / CentOS Stream sclorg containers
-(`quay.io/sclorg/mariadb-105-c8s`, `mariadb-105-c9s`,
-`mariadb-1011-c10s`, `mysql-80-c8s`, `mysql-80-c9s`,
-`mysql-84-c10s`). Both the MariaDB-suffixed format and the
-upstream-MySQL format are covered.
+Fixtures in `stdout/` come from a mix of sources:
+
+  - `quay.io/sclorg/mysql-{80,84}-c{8,9,10}s` and
+    `quay.io/sclorg/mariadb-{105,1011}-c{8,9,10}s` for the Red Hat /
+    CentOS Stream packaging
+  - `docker.io/library/mariadb:<tag>` for the older 5.5 and 10.4
+    cycles plus the upstream-only 10.6, 11.4, 11.8, 12.0, 12.1 and
+    12.2 MariaDB releases (no Red Hat container ships those yet)
 
 Each testcase pins the expected Nagios state to whatever
 `lib.version.check_eol()` returned when these fixtures were saved
@@ -43,8 +44,20 @@ import lib.lftest
 
 
 TESTS = [
+    # ---- MariaDB --------------------------------------------------
+    {
+        'id': 'warn-mariadb-5-5-eol',
+        'test': 'stdout/mysqld-version-mariadb-5.5,,0',
+        'assert-retc': STATE_WARN,
+        'assert-in': ['MariaDB v5.5.64', 'EOL 2020-04-11', '[WARNING]'],
+    },
+    {
+        'id': 'warn-mariadb-10-4-eol',
+        'test': 'stdout/mysqld-version-mariadb-10.4,,0',
+        'assert-retc': STATE_WARN,
+        'assert-in': ['MariaDB v10.4.34', 'EOL 2024-06-18', '[WARNING]'],
+    },
     {
-        # MariaDB 10.5 reached EOL 2025-06-24.
         'id': 'warn-mariadb-10-5-c8s-eol',
         'test': 'stdout/mysqld-version-mariadb-10.5-c8s,,0',
         'assert-retc': STATE_WARN,
@@ -56,13 +69,53 @@ TESTS = [
         'assert-retc': STATE_WARN,
         'assert-in': ['MariaDB v10.5.29', 'EOL 2025-06-24', '[WARNING]'],
     },
+    {
+        # MariaDB 10.6 LTS, EOL 2026-07-06.
+        'id': 'ok-mariadb-10-6-supported',
+        'test': 'stdout/mysqld-version-mariadb-10.6,,0',
+        'assert-retc': STATE_OK,
+        'assert-in': ['MariaDB v10.6.25', 'EOL 2026-07-06'],
+    },
     {
         # MariaDB 10.11 LTS, EOL 2028-02-16.
         'id': 'ok-mariadb-10-11-c10s-supported',
         'test': 'stdout/mysqld-version-mariadb-10.11-c10s,,0',
         'assert-retc': STATE_OK,
         'assert-in': ['MariaDB v10.11.15', 'EOL 2028-02-16'],
     },
+    {
+        # MariaDB 11.4 LTS via the new `mariadb --version` client
+        # banner. Exercises the third parser regex (`from X.Y.Z,`).
+        'id': 'ok-mariadb-11-4-client-banner-supported',
+        'test': 'stdout/mariadb-version-client-11.4,,0',
+        'assert-retc': STATE_OK,
+        'assert-in': ['MariaDB v11.4.10', 'EOL 2029-05-29'],
+    },
+    {
+        'id': 'ok-mariadb-11-8-client-banner-supported',
+        'test': 'stdout/mariadb-version-client-11.8,,0',
+        'assert-retc': STATE_OK,
+        'assert-in': ['MariaDB v11.8.6', 'EOL 2028-06-04'],
+    },
+    {
+        'id': 'warn-mariadb-12-0-near-eol',
+        'test': 'stdout/mariadb-version-client-12.0,,0',
+        'assert-retc': STATE_WARN,
+        'assert-in': ['MariaDB v12.0.2', 'EOL 2025-11-18', '[WARNING]'],
+    },
+    {
+        'id': 'warn-mariadb-12-1-near-eol',
+        'test': 'stdout/mariadb-version-client-12.1,,0',
+        'assert-retc': STATE_WARN,
+        'assert-in': ['MariaDB v12.1.2', 'EOL 2026-02-13', '[WARNING]'],
+    },
+    {
+        'id': 'warn-mariadb-12-2-near-eol',
+        'test': 'stdout/mariadb-version-client-12.2,,0',
+        'assert-retc': STATE_WARN,
+        'assert-in': ['MariaDB v12.2.2', 'EOL 2026-05-13', '[WARNING]'],
+    },
+    # ---- MySQL ----------------------------------------------------
     {
         # MySQL 8.0 - full support already ended, hard EOL 2026-04-30.
         'id': 'warn-mysql-8-0-c8s-near-eol',
@@ -88,8 +141,8 @@ TESTS = [
         'assert-retc': STATE_OK,
         'assert-in': ['MySQL v8.4.8', 'EOL 2032-04-30'],
     },
+    # ---- Edge case ------------------------------------------------
     {
-        # Parser edge case: command not found.
         'id': 'unknown-garbage-output',
         'test': 'stdout/garbage-output,,0',
         'assert-retc': STATE_UNKNOWN,

check-plugins/mysql-version/unit-test/stdout/mariadb-version-client-11.4

@@ -0,0 +1 @@
+mariadb from 11.4.10-MariaDB, client 15.2 for debian-linux-gnu (x86_64) using  EditLine wrapper

check-plugins/mysql-version/unit-test/stdout/mariadb-version-client-11.8

@@ -0,0 +1 @@
+mariadb from 11.8.6-MariaDB, client 15.2 for debian-linux-gnu (x86_64) using  EditLine wrapper

check-plugins/mysql-version/unit-test/stdout/mariadb-version-client-12.0

@@ -0,0 +1 @@
+mariadb from 12.0.2-MariaDB, client 15.2 for debian-linux-gnu (x86_64) using  EditLine wrapper

check-plugins/mysql-version/unit-test/stdout/mariadb-version-client-12.1

@@ -0,0 +1 @@
+mariadb from 12.1.2-MariaDB, client 15.2 for debian-linux-gnu (x86_64) using  EditLine wrapper

check-plugins/mysql-version/unit-test/stdout/mariadb-version-client-12.2

@@ -0,0 +1 @@
+mariadb from 12.2.2-MariaDB, client 15.2 for debian-linux-gnu (x86_64) using  EditLine wrapper

check-plugins/mysql-version/unit-test/stdout/mysqld-version-mariadb-10.4

@@ -0,0 +1 @@
+mysqld  Ver 10.4.34-MariaDB-1:10.4.34+maria~ubu2004 for debian-linux-gnu on x86_64 (mariadb.org binary distribution)

check-plugins/mysql-version/unit-test/stdout/mysqld-version-mariadb-10.6

@@ -0,0 +1 @@
+mysqld  Ver 10.6.25-MariaDB-ubu2204 for debian-linux-gnu on x86_64 (mariadb.org binary distribution)

check-plugins/mysql-version/unit-test/stdout/mysqld-version-mariadb-5.5

@@ -0,0 +1 @@
+mysqld  Ver 5.5.64-MariaDB-1~trusty for debian-linux-gnu on x86_64 (mariadb.org binary distribution)