Skip to content

Add schema tag to vacuum progress queries and fix max_dead_tuple_discrepancies #22041

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
joelmarcotte wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Add schema tag to vacuum progress queries and fix max_dead_tuple_discrepancies #22041

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions postgres/datadog_checks/postgres/util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -662,37 +662,42 @@ def trim_leading_set_stmts(sql):
VACUUM_PROGRESS_METRICS = {
'name': 'vacuum_progress_metrics',
'query': """
SELECT v.datname, c.relname, v.phase,
SELECT v.datname, N.nspname, c.relname, v.phase,
v.heap_blks_total, v.heap_blks_scanned, v.heap_blks_vacuumed,
v.index_vacuum_count, v.max_dead_tuple_bytes, v.num_dead_item_ids
v.index_vacuum_count, v.max_dead_tuple_bytes, v.num_dead_item_ids, v.dead_tuple_bytes
FROM pg_stat_progress_vacuum as v
JOIN pg_class c on c.oid = v.relid
LEFT JOIN pg_namespace N ON N.oid = c.relnamespace
""",
'columns': [
{'name': 'db', 'type': 'tag'},
{'name': 'schema', 'type': 'tag'},
{'name': 'table', 'type': 'tag'},
{'name': 'phase', 'type': 'tag'},
{'name': 'vacuum.heap_blks_total', 'type': 'gauge'},
{'name': 'vacuum.heap_blks_scanned', 'type': 'gauge'},
{'name': 'vacuum.heap_blks_vacuumed', 'type': 'gauge'},
{'name': 'vacuum.index_vacuum_count', 'type': 'gauge'},
{'name': 'vacuum.max_dead_tuples', 'type': 'gauge'},
{'name': 'vacuum.max_dead_tuple_bytes', 'type': 'gauge'},
{'name': 'vacuum.num_dead_tuples', 'type': 'gauge'},
{'name': 'vacuum.dead_tuple_bytes', 'type': 'gauge'},
],
}

# Requires PG10+
VACUUM_PROGRESS_METRICS_LT_17 = {
'name': 'vacuum_progress_metrics',
'query': """
SELECT v.datname, c.relname, v.phase,
SELECT v.datname, N.nspname, c.relname, v.phase,
v.heap_blks_total, v.heap_blks_scanned, v.heap_blks_vacuumed,
v.index_vacuum_count, v.max_dead_tuples, v.num_dead_tuples
FROM pg_stat_progress_vacuum as v
JOIN pg_class c on c.oid = v.relid
LEFT JOIN pg_namespace N ON N.oid = c.relnamespace
""",
'columns': [
{'name': 'db', 'type': 'tag'},
{'name': 'schema', 'type': 'tag'},
{'name': 'table', 'type': 'tag'},
{'name': 'phase', 'type': 'tag'},
{'name': 'vacuum.heap_blks_total', 'type': 'gauge'},
Expand Down
Loading