-
Notifications
You must be signed in to change notification settings - Fork 80
Add Async IO support #26
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.
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
dszakallas
wants to merge
2
commits into
SumoLogic:master
Choose a base branch
from
dszakallas:async-support
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,7 +4,7 @@ | |
name="sumologic-sdk", | ||
version="0.1.7", | ||
packages=find_packages(), | ||
install_requires=['requests>=2.2.1'], | ||
install_requires=['requests>=2.2.1', 'aiohttp>=2.3.1'], | ||
# PyPI metadata | ||
author="Yoway Buorn, Melchi Salins", | ||
author_email="[email protected], [email protected]", | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,185 @@ | ||
from copy import copy | ||
import json | ||
import logging | ||
import asyncio | ||
import aiohttp | ||
import threading | ||
|
||
|
||
class SumoLogic(object): | ||
def __init__(self, accessId, accessKey, endpoint=None, cookieFile='cookies.txt'): | ||
self.session = aiohttp.ClientSession( | ||
auth=aiohttp.BasicAuth(accessId, accessKey), headers={ | ||
'content-type': 'application/json', | ||
'accept': 'application/json' | ||
}) | ||
|
||
self._lock = asyncio.Lock() | ||
self._endpoint = None | ||
|
||
async def __aenter__(self): | ||
await self.session.__aenter__() | ||
return self | ||
|
||
async def __aexit__(self, *args): | ||
await self.session.__aexit__(*args) | ||
|
||
async def _set_endpoint(self): | ||
if self._endpoint is None: | ||
with await self._lock: | ||
if self._endpoint is None: | ||
async with self.session.get('https://api.sumologic.com/api/v1/collectors') as resp: # Dummy call to get endpoint | ||
self._endpoint = str(resp.url).replace('/collectors', '') # dirty hack to sanitise URI and retain domain | ||
|
||
async def delete(self, method, params=None): | ||
await self._set_endpoint() | ||
r = await self.session.delete(self._endpoint + method, params=params) | ||
r.raise_for_status() | ||
return r | ||
|
||
async def get(self, method, params=None): | ||
await self._set_endpoint() | ||
r = await self.session.get(self._endpoint + method, params=params) | ||
if 400 <= r.status < 600: | ||
r.reason = await r.text() | ||
r.raise_for_status() | ||
return r | ||
|
||
async def post(self, method, params, headers=None): | ||
await self._set_endpoint() | ||
r = await self.session.post(self._endpoint + method, data=json.dumps(params), headers=headers) | ||
r.raise_for_status() | ||
return r | ||
|
||
async def put(self, method, params, headers=None): | ||
await self._set_endpoint() | ||
r = await self.session.put(self._endpoint + method, data=json.dumps(params), headers=headers) | ||
r.raise_for_status() | ||
return r | ||
|
||
async def search(self, query, fromTime=None, toTime=None, timeZone='UTC'): | ||
params = {'q': query, 'from': fromTime, 'to': toTime, 'tz': timeZone} | ||
r = await self.get('/logs/search', params) | ||
async with r: | ||
return json.loads(await r.text()) | ||
|
||
async def search_job(self, query, fromTime=None, toTime=None, timeZone='UTC'): | ||
params = {'query': query, 'from': fromTime, 'to': toTime, 'timeZone': timeZone} | ||
r = await self.post('/search/jobs', params) | ||
async with r: | ||
return json.loads(await r.text()) | ||
|
||
async def search_job_status(self, search_job): | ||
r = await self.get('/search/jobs/' + str(search_job['id'])) | ||
async with r: | ||
return json.loads(await r.text()) | ||
|
||
async def search_job_messages(self, search_job, limit=None, offset=0): | ||
params = {'limit': limit, 'offset': offset} | ||
r = await self.get('/search/jobs/' + str(search_job['id']) + '/messages', params) | ||
async with r: | ||
return json.loads(await r.text()) | ||
|
||
async def search_job_records(self, search_job, limit=None, offset=0): | ||
params = {'limit': limit, 'offset': offset} | ||
r = await self.get('/search/jobs/' + str(search_job['id']) + '/records', params) | ||
async with r: | ||
return json.loads(await r.text()) | ||
|
||
async def delete_search_job(self, search_job): | ||
return await self.delete('/search/jobs/' + str(search_job['id'])) | ||
|
||
async def collectors(self, limit=None, offset=None): | ||
params = {'limit': limit, 'offset': offset} | ||
r = await self.get('/collectors', params) | ||
async with r: | ||
return json.loads(await r.text())['collectors'] | ||
|
||
async def collector(self, collector_id): | ||
async with r: | ||
r = await self.get('/collectors/' + str(collector_id)) | ||
return json.loads(await r.text()), r.headers['etag'] | ||
|
||
async def update_collector(self, collector, etag): | ||
headers = {'If-Match': etag} | ||
return await self.put('/collectors/' + str(collector['collector']['id']), collector, headers) | ||
|
||
async def delete_collector(self, collector): | ||
return await self.delete('/collectors/' + str(collector['id'])) | ||
|
||
async def sources(self, collector_id, limit=None, offset=None): | ||
params = {'limit': limit, 'offset': offset} | ||
async with r: | ||
r = await self.get('/collectors/' + str(collector_id) + '/sources', params) | ||
return json.loads(await r.text())['sources'] | ||
|
||
async def source(self, collector_id, source_id): | ||
async with r: | ||
r = await self.get('/collectors/' + str(collector_id) + '/sources/' + str(source_id)) | ||
return json.loads(await r.text()), r.headers['etag'] | ||
|
||
async def create_source(self, collector_id, source): | ||
return await self.post('/collectors/' + str(collector_id) + '/sources', source) | ||
|
||
async def update_source(self, collector_id, source, etag): | ||
headers = {'If-Match': etag} | ||
return await self.put('/collectors/' + str(collector_id) + '/sources/' + str(source['source']['id']), source, headers) | ||
|
||
async def delete_source(self, collector_id, source): | ||
return await self.delete('/collectors/' + str(collector_id) + '/sources/' + str(source['source']['id'])) | ||
|
||
async def create_content(self, path, data): | ||
r = await self.post('/content/' + path, data) | ||
async with r: | ||
return await r.text() | ||
|
||
async def get_content(self, path): | ||
r = await self.get('/content/' + path) | ||
async with r: | ||
return json.loads(await r.text()) | ||
|
||
async def delete_content(self): | ||
r = await self.delete('/content/' + path) | ||
async with r: | ||
return json.loads(await r.text()) | ||
|
||
async def dashboards(self, monitors=False): | ||
params = {'monitors': monitors} | ||
r = await self.get('/dashboards', params) | ||
async with r: | ||
return json.loads(await r.text())['dashboards'] | ||
|
||
async def dashboard(self, dashboard_id): | ||
r = await self.get('/dashboard' + str(dashboard_id)) | ||
async with r: | ||
return json.loads(await r.text())['dashboard'] | ||
|
||
async def dashboard_data(self, dashboard_id): | ||
r = await self.get('/dashboards/' + str(dashboard_id) + '/data') | ||
async with r: | ||
return json.loads(await r.text())['dashboardMonitorDatas'] | ||
|
||
async def search_metrics(self, query, fromTime=None, toTime=None, requestedDataPoints=600, maxDataPoints=800): | ||
'''Perform a single Sumo metrics query''' | ||
|
||
def millisectimestamp(ts): | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I believe the common functions should be extracted to a util namespace to reduce code duplications. |
||
'''Convert UNIX timestamp to milliseconds''' | ||
if ts > 10**12: | ||
ts = ts / (10**(len(str(ts)) - 13)) | ||
else: | ||
ts = ts * 10**(12 - len(str(ts))) | ||
return int(ts) | ||
|
||
params = { | ||
'query': [{ | ||
"query": query, | ||
"rowId": "A" | ||
}], | ||
'startTime': millisectimestamp(fromTime), | ||
'endTime': millisectimestamp(toTime), | ||
'requestedDataPoints': requestedDataPoints, | ||
'maxDataPoints': maxDataPoints | ||
} | ||
r = await self.post('/metrics/results', params) | ||
async with r: | ||
return json.loads(await r.text()) |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't like it that the whole file is basically copied, but I couldn't find a better way. Is there?