Skip to content

Implement multi user authentication #2

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

Open
sekipaolo wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Implement multi user authentication #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bb7e742
Implement multi user authentication
Feb 22, 2017
45c7627
fix missing parameter
Feb 22, 2017
19c238b
fix missing parameter
Feb 22, 2017
bd2eb34
multi user aut docs
Feb 22, 2017
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
2 changes: 1 addition & 1 deletion docs/usage.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Library Usage
Set up a Pingdom connection:

>>> import pingdom
>>> c = pingdom.PingdomConnection(PINGDOM_USERNAME, PINGDOM_PASSWORD, API_KEY) # Same credentials you use for the Pingdom website
>>> c = pingdom.PingdomConnection(PINGDOM_USERNAME, PINGDOM_PASSWORD, API_KEY) # Same credentials you use for the Pingdom website. (email=EMAIL is required for multi users accounts)

Create a new Pingdom check:

Expand Down
11 changes: 8 additions & 3 deletions pingdom/connection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,9 @@ def __init__(self, connection, resource, post_data=None, method=None,

:type connection: :class:`PingdomConnection`
:param connection: Pingdom connection object populated with a username,
password and base URL
password and base URL.
Additional email can be provided for multi user authentication:
https://www.pingdom.com/resources/api#multi-user+authentication

:type resource: string
:param resource: Pingdom resource to query (in all lowercase)
Expand All @@ -60,6 +62,8 @@ def __init__(self, connection, resource, post_data=None, method=None,
self.method = self._method(method, post_data)
self.auth = HTTPBasicAuth(connection.username, connection.password)
self.headers = {'App-Key': connection.apikey}
if connection.email:
self.headers['Account-Email'] = connection.email

# TODO ensure this still works
# # Enable gzip
Expand Down Expand Up @@ -98,13 +102,14 @@ def __repr__(self):

class PingdomConnection(object):
def __init__(self, username, password, apikey='',
base_url=BASE_URL + BASE_VERSION):
base_url=BASE_URL + BASE_VERSION, email=''):
"""Interface to the Pingdom API."""

self.username = username
self.password = password
self.apikey = apikey
self.base_url = base_url
self.email = email

def __repr__(self):
return "Connection:%s" % self.base_url
Expand Down Expand Up @@ -198,7 +203,7 @@ def get_summary_average(self, check_id, from_time=0, to_time=0,
(check_id, from_time, to_time, include_uptime)
response = PingdomRequest(self, rs).fetch()
return response.content['summary']

def get_actions(self, limit):
"""Get a list of Pingdom actions/alerts"""
response = PingdomRequest(self, 'actions/?limit=%s' % limit).fetch()
Expand Down