Skip to content
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

Jump to bottom

Fix posture check when several versions of postgres #1035

Merged
merged 4 commits into from
Jul 16, 2014
Merged

Fix posture check when several versions of postgres #1035

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
667c342
Fix posture check when several versions of postgres
tmichelet Jul 16, 2014
9b5dbbd
Add come comments
tmichelet Jul 16, 2014
2fa5aad
Update the self.instance_metrics to store dicts
tmichelet Jul 16, 2014
331b240
small Update of the code format
tmichelet Jul 16, 2014
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
46 changes: 31 additions & 15 deletions checks.d/postgres.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,7 @@ class PostgreSql(AgentCheck):
'descriptors': [
('datname', 'db')
],
'metrics': {
'numbackends' : ('postgresql.connections', GAUGE),
'xact_commit' : ('postgresql.commits', RATE),
'xact_rollback' : ('postgresql.rollbacks', RATE),
'blks_read' : ('postgresql.disk_read', RATE),
'blks_hit' : ('postgresql.buffer_hit', RATE),
'tup_returned' : ('postgresql.rows_returned', RATE),
'tup_fetched' : ('postgresql.rows_fetched', RATE),
'tup_inserted' : ('postgresql.rows_inserted', RATE),
'tup_updated' : ('postgresql.rows_updated', RATE),
'tup_deleted' : ('postgresql.rows_deleted', RATE),
},
'metrics': {},
'query': """
SELECT datname,
%s
Expand All @@ -41,6 +30,19 @@ class PostgreSql(AgentCheck):
'relation': False,
}

COMMON_METRICS = {
'numbackends' : ('postgresql.connections', GAUGE),
'xact_commit' : ('postgresql.commits', RATE),
'xact_rollback' : ('postgresql.rollbacks', RATE),
'blks_read' : ('postgresql.disk_read', RATE),
'blks_hit' : ('postgresql.buffer_hit', RATE),
'tup_returned' : ('postgresql.rows_returned', RATE),
'tup_fetched' : ('postgresql.rows_fetched', RATE),
'tup_inserted' : ('postgresql.rows_inserted', RATE),
'tup_updated' : ('postgresql.rows_updated', RATE),
'tup_deleted' : ('postgresql.rows_deleted', RATE),
}

NEWER_92_METRICS = {
'deadlocks' : ('postgresql.deadlocks', GAUGE),
'temp_bytes' : ('postgresql.temp_bytes', RATE),
Expand Down Expand Up @@ -100,6 +102,7 @@ def __init__(self, name, init_config, agentConfig):
AgentCheck.__init__(self, name, init_config, agentConfig)
self.dbs = {}
self.versions = {}
self.instance_metrics = {}

def _get_version(self, key, db):
if key not in self.versions:
Expand All @@ -121,15 +124,28 @@ def _is_9_2_or_above(self, key, db):

return False

def _get_instance_metrics(self, key, db):
"""Use either COMMON_METRICS or COMMON_METRICS + NEWER_92_METRICS
depending on the postgres version.
Uses a dictionnary to save the result for each instance
"""
# Extended 9.2+ metrics if needed
metrics = self.instance_metrics.get(key)
if metrics is None:
if self._is_9_2_or_above(key, db):
self.instance_metrics[key] = dict(self.COMMON_METRICS, **self.NEWER_92_METRICS)
else:
self.instance_metrics[key] = dict(self.COMMON_METRICS)
metrics = self.instance_metrics.get(key)
return metrics
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will return a list, not a dictionary. The rest of the code won't work with that.


def _collect_stats(self, key, db, instance_tags, relations):
"""Query pg_stat_* for various metrics
If relations is not an empty list, gather per-relation metrics
on top of that.
"""

# Extended 9.2+ metrics
if self._is_9_2_or_above(key, db):
self.DB_METRICS['metrics'].update(self.NEWER_92_METRICS)
self.DB_METRICS['metrics'] = self._get_instance_metrics(key, db)

# Do we need relation-specific metrics?
if not relations:
Expand Down