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

[postgres] Always sent OK status, even with cached connection. #1273

Merged
merged 3 commits into from
Jan 2, 2015
Merged

[postgres] Always sent OK status, even with cached connection. #1273

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aa09c2b
Always sent OK status with Postgres check, even with cached connection.
conorbranagan Dec 31, 2014
2ab1b66
Add SERVICE_CHECK_NAME attribute to postgres check.
conorbranagan Dec 31, 2014
57fa171
There should be 2 service checks from PG now, since we run twice.
conorbranagan Dec 31, 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
35 changes: 19 additions & 16 deletions checks.d/postgres.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ class PostgreSql(AgentCheck):
RATE = AgentCheck.rate
GAUGE = AgentCheck.gauge
MONOTONIC = AgentCheck.monotonic_count
SERVICE_CHECK_NAME = 'postgres.can_connect'

# turning columns into tags
DB_METRICS = {
Expand Down Expand Up @@ -181,7 +182,7 @@ class PostgreSql(AgentCheck):
SELECT %s
FROM pg_stat_database, max_con
"""
}
}

def __init__(self, name, init_config, agentConfig):
AgentCheck.__init__(self, name, init_config, agentConfig)
Expand Down Expand Up @@ -322,20 +323,21 @@ def _collect_stats(self, key, db, instance_tags, relations):
self.log.error("Connection error: %s" % str(e))
raise ShouldRestartException

def _get_service_check_tags(self, host, port, dbname):
service_check_tags = [
"host:%s" % host,
"port:%s" % port,
"db:%s" % dbname
]
return service_check_tags

def get_connection(self, key, host, port, user, password, dbname, use_cached=True):
"Get and memoize connections to instances"
if key in self.dbs and use_cached:
return self.dbs[key]

elif host != "" and user != "":
try:
service_check_tags = [
"host:%s" % host,
"port:%s" % port
]
if dbname:
service_check_tags.append("db:%s" % dbname)

if host == 'localhost' and password == '':
# Use ident method
connection = pg.connect("user=%s dbname=%s" % (user, dbname))
Expand All @@ -345,14 +347,11 @@ def get_connection(self, key, host, port, user, password, dbname, use_cached=Tru
else:
connection = pg.connect(host=host, user=user, password=password,
database=dbname)
status = AgentCheck.OK
self.service_check('postgres.can_connect', status, tags=service_check_tags)
self.log.info('pg status: %s' % status)

except Exception:
status = AgentCheck.CRITICAL
self.service_check('postgres.can_connect', status, tags=service_check_tags)
self.log.info('pg status: %s' % status)
except Exception as e:
message = u'Error establishing postgres connection: %s' % (str(e))
service_check_tags = self._get_service_check_tags(host, port, dbname)
self.service_check(self.SERVICE_CHECK_NAME, AgentCheck.CRITICAL,
tags=service_check_tags, message=message)
raise
else:
if not host:
Expand Down Expand Up @@ -406,6 +405,10 @@ def check(self, instance):
self._collect_stats(key, db, tags, relations)

if db is not None:
service_check_tags = self._get_service_check_tags(host, port, dbname)
message = u'Established connection to postgres://%s:%s/%s' % (host, port, dbname)
self.service_check(self.SERVICE_CHECK_NAME, AgentCheck.OK,
tags=service_check_tags, message=message)
try:
# commit to close the current query transaction
db.commit()
Expand Down
2 changes: 1 addition & 1 deletion tests/test_postgresql.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ def testChecks(self):
service_checks_count = len(service_checks)
self.assertTrue(type(service_checks) == type([]))
self.assertTrue(service_checks_count > 0)
self.assertEquals(len([sc for sc in service_checks if sc['check'] == "postgres.can_connect"]), 1, service_checks)
self.assertEquals(len([sc for sc in service_checks if sc['check'] == "postgres.can_connect"]), 2, service_checks)
# Assert that all service checks have the proper tags: host, port and db
self.assertEquals(len([sc for sc in service_checks if "host:localhost" in sc['tags']]), service_checks_count, service_checks)
self.assertEquals(len([sc for sc in service_checks if "port:%s" % config['instances'][0]['port'] in sc['tags']]), service_checks_count, service_checks)
Expand Down