Skip to content

Fix postgres.replication_delay for postgres 10 #1172

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

Merged
merged 1 commit into from Mar 1, 2018
Merged

Fix postgres.replication_delay for postgres 10 #1172

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
17 changes: 15 additions & 2 deletions postgres/datadog_checks/postgres/postgres.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,11 @@ class PostgreSql(AgentCheck):
""".format(table_count_limit=TABLE_COUNT_LIMIT)
}


REPLICATION_METRICS_10 = {
'CASE WHEN pg_last_wal_receive_lsn() = pg_last_wal_replay_lsn() THEN 0 ELSE GREATEST (0, EXTRACT (EPOCH FROM now() - pg_last_xact_replay_timestamp())) END': ('postgresql.replication_delay', GAUGE),
}

REPLICATION_METRICS_9_1 = {
'CASE WHEN pg_last_xlog_receive_location() = pg_last_xlog_replay_location() THEN 0 ELSE GREATEST (0, EXTRACT (EPOCH FROM now() - pg_last_xact_replay_timestamp())) END': ('postgresql.replication_delay', GAUGE),
}
Expand Down Expand Up @@ -326,7 +331,7 @@ def _get_version(self, key, db):
cursor.execute('SHOW SERVER_VERSION;')
result = cursor.fetchone()
try:
version = map(int, result[0].split('.'))
version = map(int, result[0].split(' ')[0].split('.'))
except Exception:
version = result[0]
self.versions[key] = version
Expand All @@ -350,6 +355,11 @@ def _is_9_2_or_above(self, key, db):
def _is_9_4_or_above(self, key, db):
return self._is_above(key, db, [9,4,0])

def _is_10_or_above(self, key, db):
return self._is_above(key, db, [10,0,0])



def _get_instance_metrics(self, key, db, database_size_metrics, with_default):
"""Use either COMMON_METRICS or COMMON_METRICS + NEWER_92_METRICS
depending on the postgres version.
Expand Down Expand Up @@ -476,7 +486,10 @@ def _get_replication_metrics(self, key, db):
Uses a dictionnary to save the result for each instance
"""
metrics = self.replication_metrics.get(key)
if self._is_9_1_or_above(key, db) and metrics is None:
if self._is_10_or_above(key, db) and metrics is None:
self.replication_metrics[key] = dict(self.REPLICATION_METRICS_10)
metrics = self.replication_metrics.get(key)
elif self._is_9_1_or_above(key, db) and metrics is None:
self.replication_metrics[key] = dict(self.REPLICATION_METRICS_9_1)
if self._is_9_2_or_above(key, db):
self.replication_metrics[key].update(self.REPLICATION_METRICS_9_2)
Expand Down