Skip to content

Commit

Permalink
Add support of Amazon CloudWatch Logs
Browse files Browse the repository at this point in the history
Conflicts:
	docs/source/index.rst
	setup.py
  • Loading branch information
danielgtaylor committed Jul 9, 2014
1 parent 04e68ca commit 125c94d
Show file tree
Hide file tree
Showing 13 changed files with 812 additions and 1 deletion.
1 change: 1 addition & 0 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ At the moment, boto supports:
* Monitoring

* Amazon CloudWatch (EC2 Only)
* Amazon CloudWatch Logs

* Networking

Expand Down
22 changes: 22 additions & 0 deletions boto/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -835,6 +835,28 @@ def connect_kinesis(aws_access_key_id=None,
**kwargs
)

def connect_logs(aws_access_key_id=None,
aws_secret_access_key=None,
**kwargs):
"""
Connect to Amazon CloudWatch Logs
:type aws_access_key_id: string
:param aws_access_key_id: Your AWS Access Key ID
:type aws_secret_access_key: string
:param aws_secret_access_key: Your AWS Secret Access Key
rtype: :class:`boto.kinesis.layer1.CloudWatchLogsConnection`
:return: A connection to the Amazon CloudWatch Logs service
"""
from boto.logs.layer1 import CloudWatchLogsConnection
return CloudWatchLogsConnection(
aws_access_key_id=aws_access_key_id,
aws_secret_access_key=aws_secret_access_key,
**kwargs
)

def storage_uri(uri_str, default_scheme='file', debug=0, validate=True,
bucket_storage_uri_class=BucketStorageUri,
suppress_consec_slashes=True, is_latest=False):
Expand Down
3 changes: 3 additions & 0 deletions boto/endpoints.json
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,9 @@
"us-west-2": "kinesis.us-west-2.amazonaws.com",
"eu-west-1": "kinesis.eu-west-1.amazonaws.com"
},
"logs": {
"us-east-1": "logs.us-east-1.amazonaws.com"
},
"opsworks": {
"us-east-1": "opsworks.us-east-1.amazonaws.com"
},
Expand Down
41 changes: 41 additions & 0 deletions boto/logs/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
# Copyright (c) 2014 Amazon.com, Inc. or its affiliates.
# All Rights Reserved
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the
# "Software"), to deal in the Software without restriction, including
# without limitation the rights to use, copy, modify, merge, publish, dis-
# tribute, sublicense, and/or sell copies of the Software, and to permit
# persons to whom the Software is furnished to do so, subject to the fol-
# lowing conditions:
#
# The above copyright notice and this permission notice shall be included
# in all copies or substantial portions of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABIL-
# ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
# SHALL THE AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
# IN THE SOFTWARE.
#
from boto.regioninfo import get_regions


def regions():
"""
Get all available regions for the Amazon Kinesis service.
:rtype: list
:return: A list of :class:`boto.regioninfo.RegionInfo`
"""
from boto.logs.layer1 import CloudWatchLogsConnection
return get_regions('logs', connection_cls=CloudWatchLogsConnection)


def connect_to_region(region_name, **kw_params):
for region in regions():
if region.name == region_name:
return region.connect(**kw_params)
return None
59 changes: 59 additions & 0 deletions boto/logs/exceptions.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
# -*- coding: utf-8 -*-
# Copyright (c) 2012 Thomas Parslow http://almostobsolete.net/
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the
# "Software"), to deal in the Software without restriction, including
# without limitation the rights to use, copy, modify, merge, publish, dis-
# tribute, sublicense, and/or sell copies of the Software, and to permit
# persons to whom the Software is furnished to do so, subject to the fol-
# lowing conditions:
#
# The above copyright notice and this permission notice shall be included
# in all copies or substantial portions of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABIL-
# ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
# SHALL THE AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
# IN THE SOFTWARE.
#
from boto.exception import BotoServerError


class LimitExceededException(BotoServerError):
pass


class DataAlreadyAcceptedException(BotoServerError):
pass


class ResourceInUseException(BotoServerError):
pass


class ServiceUnavailableException(BotoServerError):
pass


class InvalidParameterException(BotoServerError):
pass


class ResourceNotFoundException(BotoServerError):
pass


class ResourceAlreadyExistsException(BotoServerError):
pass


class OperationAbortedException(BotoServerError):
pass


class InvalidSequenceTokenException(BotoServerError):
pass
Loading

0 comments on commit 125c94d

Please sign in to comment.