From 83a1665be55649fb57c1630e5d900e91697badf7 Mon Sep 17 00:00:00 2001 From: Bruce Pennypacker Date: Thu, 7 Nov 2013 15:39:41 +0000 Subject: [PATCH 1/2] Made URL an optional parameter --- library/monitoring/airbrake_deployment | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/library/monitoring/airbrake_deployment b/library/monitoring/airbrake_deployment index 6b8ed3c0e0c..b65928c8f39 100644 --- a/library/monitoring/airbrake_deployment +++ b/library/monitoring/airbrake_deployment @@ -47,6 +47,11 @@ options: description: - A hash, number, tag, or other identifier showing what revision was deployed required: false + url: + description: + - Optional URL to submit the notification to. Use to send notifications to Airbrake-compliant tools like Errbit. + required: false + default: https://airbrake.io/deploys # informational: requirements for nodes requirements: [ urllib, urllib2 ] @@ -89,6 +94,7 @@ def main(): user=dict(required=False), repo=dict(required=False), revision=dict(required=False), + url=dict(required=False, default='https://airbrake.io/deploys') ), supports_check_mode=True ) @@ -110,21 +116,23 @@ def main(): params["api_key"] = module.params["token"] + url = module.params.get('url') + # If we're in check mode, just exit pretending like we succeeded if module.check_mode: module.exit_json(changed=True) # Send the data to airbrake try: - req = urllib2.Request("https://airbrake.io/deploys", urllib.urlencode(params)) + req = urllib2.Request(url, urllib.urlencode(params)) result=urllib2.urlopen(req) except Exception, e: - module.fail_json(msg="unable to update airbrake: %s" % e) + module.fail_json(msg="unable to update airbrake via %s : %s" % (url, e)) else: if result.code == 200: module.exit_json(changed=True) else: - module.fail_json(msg="HTTP result code: %d" % result.code) + module.fail_json(msg="HTTP result code: %d connecting to %s" % (result.code, url)) # this is magic, see lib/ansible/module_common.py #<> From a694c0c44cf2f4639b799fe9afaad08bc1ff4fa9 Mon Sep 17 00:00:00 2001 From: Bruce Pennypacker Date: Wed, 20 Nov 2013 16:52:15 +0000 Subject: [PATCH 2/2] use new airbrake API URL --- library/monitoring/airbrake_deployment | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/library/monitoring/airbrake_deployment b/library/monitoring/airbrake_deployment index b65928c8f39..50a353a5bf6 100644 --- a/library/monitoring/airbrake_deployment +++ b/library/monitoring/airbrake_deployment @@ -94,7 +94,7 @@ def main(): user=dict(required=False), repo=dict(required=False), revision=dict(required=False), - url=dict(required=False, default='https://airbrake.io/deploys') + url=dict(required=False, default='https://api.airbrake.io/deploys.txt') ), supports_check_mode=True ) @@ -127,7 +127,7 @@ def main(): req = urllib2.Request(url, urllib.urlencode(params)) result=urllib2.urlopen(req) except Exception, e: - module.fail_json(msg="unable to update airbrake via %s : %s" % (url, e)) + module.fail_json(msg="unable to update airbrake via %s?%s : %s" % (url, urllib.urlencode(params), e)) else: if result.code == 200: module.exit_json(changed=True)