From 757c9e4b6b5572e58f05aaa0952bcfef5b4e49bd Mon Sep 17 00:00:00 2001
From: Trent Lloyd <trent.lloyd@canonical.com>
Date: Tue, 27 Apr 2021 20:11:21 +0800
Subject: [mysql] Update collection paths for Debian/Ubuntu

- All configuration files from /etc/mysql/
- Default error log path: /var/log/mysql/error.log
- Alternative data directory location /var/lib/percona-xtradb-cluster
- gvwstate.dat for galera debugging
- Update the various server package names (though all seem to depend on
  mysql-common anyway)

Signed-off-by: Trent Lloyd <trent.lloyd@canonical.com>
---
 sos/report/plugins/mysql.py | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/sos/report/plugins/mysql.py b/sos/report/plugins/mysql.py
index 6fc021e1..72e5c653 100644
--- a/sos/report/plugins/mysql.py
+++ b/sos/report/plugins/mysql.py
@@ -35,7 +35,8 @@ class Mysql(Plugin):
             "/var/log/mysqld.log",
             "/var/log/mysql/mysqld.log",
             "/var/log/mariadb/mariadb.log",
-            "/var/lib/mysql/grastate.dat"
+            "/var/lib/mysql/grastate.dat",
+            "/var/lib/mysql/gvwstate.dat"
         ])
 
         if self.get_option("all_logs"):
@@ -98,14 +99,25 @@ class RedHatMysql(Mysql, RedHatPlugin):
 class DebianMysql(Mysql, DebianPlugin, UbuntuPlugin):
 
     packages = (
-        'mysql-server',
+        'mysql-server.*',
         'mysql-common',
-        'mariadb-server',
-        'mariadb-common'
+        'mariadb-server.*',
+        'mariadb-common',
+        'percona-xtradb-cluster-server-.*',
     )
 
     def setup(self):
         super(DebianMysql, self).setup()
-        self.add_copy_spec("/etc/mysql/conf.d/mysql*")
+        self.add_copy_spec([
+            "/etc/mysql/",
+            "/var/log/mysql/error.log",
+            "/var/lib/mysql/*.err",
+            "/var/lib/percona-xtradb-cluster/*.err",
+            "/var/lib/percona-xtradb-cluster/grastate.dat",
+            "/var/lib/percona-xtradb-cluster/gvwstate.dat",
+            "/var/lib/percona-xtradb-cluster/innobackup.*.log",
+        ])
+        self.add_cmd_output("du -s /var/lib/percona-xtradb-cluster/*")
+
 
 # vim: set et ts=4 sw=4 :
-- 
cgit