diff options
| -rw-r--r-- | sos/plugins/foreman.py | 29 | ||||
| -rw-r--r-- | sos/plugins/katello.py | 28 |
2 files changed, 15 insertions, 42 deletions
diff --git a/sos/plugins/foreman.py b/sos/plugins/foreman.py index bb3ebac0..12fa6057 100644 --- a/sos/plugins/foreman.py +++ b/sos/plugins/foreman.py @@ -134,20 +134,21 @@ class Foreman(Plugin): ]) # collect tables sizes, ordered - _cmd = self.build_query_cmd("\ - SELECT schema_name, relname, \ - pg_size_pretty(table_size) AS size, table_size \ - FROM ( \ - SELECT \ - pg_catalog.pg_namespace.nspname AS schema_name, \ - relname, \ - pg_relation_size(pg_catalog.pg_class.oid) AS table_size \ - FROM pg_catalog.pg_class \ - JOIN pg_catalog.pg_namespace \ - ON relnamespace = pg_catalog.pg_namespace.oid \ - ) t \ - WHERE schema_name NOT LIKE 'pg_%' \ - ORDER BY table_size DESC;") + _cmd = self.build_query_cmd( + "SELECT table_name, pg_size_pretty(total_bytes) AS total, " + "pg_size_pretty(index_bytes) AS INDEX , " + "pg_size_pretty(toast_bytes) AS toast, pg_size_pretty(table_bytes)" + " AS TABLE FROM ( SELECT *, " + "total_bytes-index_bytes-COALESCE(toast_bytes,0) AS table_bytes " + "FROM (SELECT c.oid,nspname AS table_schema, relname AS " + "TABLE_NAME, c.reltuples AS row_estimate, " + "pg_total_relation_size(c.oid) AS total_bytes, " + "pg_indexes_size(c.oid) AS index_bytes, " + "pg_total_relation_size(reltoastrelid) AS toast_bytes " + "FROM pg_class c LEFT JOIN pg_namespace n ON " + "n.oid = c.relnamespace WHERE relkind = 'r') a) a order by " + "total_bytes DESC" + ) self.add_cmd_output(_cmd, suggest_filename='foreman_db_tables_sizes', env=self.env) diff --git a/sos/plugins/katello.py b/sos/plugins/katello.py index 1ea52da8..5f0a99c8 100644 --- a/sos/plugins/katello.py +++ b/sos/plugins/katello.py @@ -9,7 +9,6 @@ # See the LICENSE file in the source distribution for further information. from sos.plugins import Plugin, RedHatPlugin -from pipes import quote import os.path @@ -36,32 +35,5 @@ class Katello(Plugin, RedHatPlugin): (opt, cert) for opt in "quc" ]) - kat_db = self.build_query_cmd( - "select id,name,checksum_type,updated_at from katello_repositories" - ) - self.add_cmd_output(kat_db, suggest_filename="katello_repositories") - - db_size = self.build_query_cmd( - "SELECT table_name, pg_size_pretty(total_bytes) AS total, " - "pg_size_pretty(index_bytes) AS INDEX , " - "pg_size_pretty(toast_bytes) AS toast, pg_size_pretty(table_bytes)" - " AS TABLE FROM ( SELECT *, " - "total_bytes-index_bytes-COALESCE(toast_bytes,0) AS table_bytes " - "FROM (SELECT c.oid,nspname AS table_schema, relname AS " - "TABLE_NAME, c.reltuples AS row_estimate, " - "pg_total_relation_size(c.oid) AS total_bytes, " - "pg_indexes_size(c.oid) AS index_bytes, " - "pg_total_relation_size(reltoastrelid) AS toast_bytes " - "FROM pg_class c LEFT JOIN pg_namespace n ON " - "n.oid = c.relnamespace WHERE relkind = 'r') a) a order by " - "total_bytes DESC" - ) - self.add_cmd_output(db_size, suggest_filename="db_table_size") - - def build_query_cmd(self, query): - _cmd = "su postgres -c %s" - _dbcmd = "psql foreman -c %s" - dbq = _dbcmd % quote(query) - return _cmd % quote(dbq) # vim: set et ts=4 sw=4 : |