Skip to content

Add new option '--instance_id' to have the wrapper look up instance-i… #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
thors wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add new option '--instance_id' to have the wrapper look up instance-i… #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 13 additions & 4 deletions n2cw/aws.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import botocore.session
import urllib2


AWS_MD_AZ_URL = 'http://169.254.169.254/latest/meta-data/placement/availability-zone'
AWS_INSTANZE_ID_URL = 'http://169.254.169.254/latest/meta-data/instance-id'


def detect_region():
Expand All @@ -11,6 +11,12 @@ def detect_region():
except urllib2.URLError:
return None

def detect_instance_id():
try:
return urllib2.urlopen(AWS_INSTANZE_ID_URL, timeout=1).read()[:-1]
except urllib2.URLError:
return None


def cloudwatch_client(profile=None, region=None):
if region is None:
Expand All @@ -21,7 +27,6 @@ def cloudwatch_client(profile=None, region=None):
session.set_config_variable('profile', profile)
return session.create_client('cloudwatch')


class TestClient(object):
def __init__(self):
import logging
Expand All @@ -33,13 +38,17 @@ def put_metric_data(self, **kwargs):


class CW(object):
def __init__(self, namespace, base_name, dimensions=None, test=False):
def __init__(self, namespace, base_name, instance_id = False, dimensions=None, test=False):
self.namespace = namespace
self.base_name = base_name
self.dimensions = []
self.data = []

for k, v in dimensions.iteritems():
self.dimensions.append({'Name': k, 'Value': v})
self.data = []

if instance_id:
self.dimensions.append({'Name': 'instance-id', 'Value': detect_instance_id()})

if test:
self.client = TestClient()
Expand Down
4 changes: 3 additions & 1 deletion n2cw/cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ def cli(args=sys.argv[:]):
ap = ArgumentParser(usage=usage, description=__doc__)
ap.add_argument('--dimensions', metavar='key=value,key=value', default={},
action=ParseKv, help='CloudWatch metric dimensions')
ap.add_argument('--instance_id', action='store_true',
help='Add instance-id as a dimension\nWARNING: Will overwrite instance-id given via --dimensions option')
ap.add_argument('--noop', action='store_true',
help='Don\'t push metrics, just log')
ap.add_argument('namespace', help='CloudWatch namespace')
Expand All @@ -54,7 +56,7 @@ def cli(args=sys.argv[:]):
result = e.returncode
output = e.output

cw = aws.CW(args.namespace, args.base_name, args.dimensions, args.noop)
cw = aws.CW(args.namespace, args.base_name, args.instance_id, args.dimensions, args.noop)
if args.send_status:
cw.add('Status', result)
if args.send_perfdata:
Expand Down