Skip to content
This repository was archived by the owner on Feb 9, 2024. It is now read-only.

Adds support for Python 3 #6

Open
Dunedan wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Adds support for Python 3 #6

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a5a4cf1
Adds support for Python 3.
Jul 26, 2016
284501e
Fixes broken unicode handling with Python 2.
Jul 27, 2016
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
82 changes: 45 additions & 37 deletions dogpush/dogpush.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#!/usr/bin/env python

from __future__ import print_function

import argparse
import calendar
import copy
Expand All @@ -17,10 +19,16 @@

import bcolors


PROGNAME = 'dogpush'


# To check for unicode strings use basestring for Python 2 and str for Python 3.
try:
basestring
except NameError:
basestring = str


class DogPushException(Exception):
pass

Expand Down Expand Up @@ -96,18 +104,18 @@ def _canonical_monitor(original, default_team=None, **kwargs):
m.pop(field, None)
for field in IGNORE_OPTIONS:
m.get('options', {}).pop(field, None)
option_defaults = (DATADOG_DEFAULT_OPTIONS.items() +
CONFIG['default_rule_options'].items())
option_defaults = (list(DATADOG_DEFAULT_OPTIONS.items()) +
list(CONFIG['default_rule_options'].items()))
for (field, value) in option_defaults:
if m.get('options', {}).get(field) == value:
del m['options'][field]
for (field, value) in CONFIG['default_rules'].items():
for (field, value) in list(CONFIG['default_rules'].items()):
if m.get(field) == value:
del m[field]
# If options is {'thresholds': {'critical': x}}, then it is redundant.
if not m.get('options'):
m.pop('options', None)
elif m['options'].keys() == ['thresholds'] and m['options']['thresholds'].keys() == ['critical']:
elif list(m['options'].keys()) == ['thresholds'] and list(m['options']['thresholds'].keys()) == ['critical']:
del m['options']
m['name'] = m['name'].strip()
original_team = original.get('team')
Expand Down Expand Up @@ -151,7 +159,7 @@ def _check_monitor_names_unique(monitors):
for name in names:
counts[name] = counts.get(name, 0) + 1
if counts[name] > 1:
print >> sys.stderr, "Duplicate name: %s" % name
print("Duplicate name: %s" % name, file=sys.stderr)
return False
return True

Expand Down Expand Up @@ -193,11 +201,11 @@ def get_local_monitors():

def _prepare_monitor(m):
obj = copy.deepcopy(m['obj'])
for (key, value) in CONFIG['default_rule_options'].items():
for (key, value) in list(CONFIG['default_rule_options'].items()):
obj['options'] = obj.get('options', {})
if key not in obj['options']:
obj['options'][key] = value
for (key, value) in CONFIG['default_rules'].items():
for (key, value) in list(CONFIG['default_rules'].items()):
obj[key] = obj.get(key, value)
return obj

Expand All @@ -212,11 +220,11 @@ def _is_changed(local, remote):


def command_init():
remote_monitors = [m['obj'] for m in get_datadog_monitors().values()]
remote_monitors = [m['obj'] for m in list(get_datadog_monitors().values())]
monitors = {'alerts': remote_monitors}
print '# team: TEAMNAME'
print
print _pretty_yaml(monitors)
print('# team: TEAMNAME')
print()
print(_pretty_yaml(monitors))


def command_push():
Expand All @@ -225,15 +233,15 @@ def command_push():

only_local = set(local_monitors.keys()) - set(remote_monitors.keys())
if only_local:
print "Pushing %d new monitors." % len(only_local)
print("Pushing %d new monitors." % len(only_local))
for name in only_local:
datadog.api.Monitor.create(**_prepare_monitor(local_monitors[name]))

common_names = set(local_monitors.keys()) & set(remote_monitors.keys())
changed = [name for name in common_names
if _is_changed(local_monitors[name], remote_monitors[name])]
if changed:
print "Updating %d modified alerts" % len(changed)
print("Updating %d modified alerts" % len(changed))
for name in changed:
datadog.api.Monitor.update(
remote_monitors[name]['id'],
Expand Down Expand Up @@ -267,7 +275,7 @@ def command_mute():
mute_tags = {}

now = datetime.datetime.now(pytz.UTC)
for tag_key, tag_value in CONFIG.get('mute_tags', {}).items():
for tag_key, tag_value in list(CONFIG.get('mute_tags', {}).items()):
tz = pytz.timezone(tag_value['timezone'])
if _should_mute(tag_value['expr'], tz, now):
next_active_time = _mute_until(tag_value['expr'], tz, now)
Expand All @@ -278,18 +286,18 @@ def command_mute():
else:
mute_tags[tag_key] = None

for monitor in local_monitors.values():
for monitor in list(local_monitors.values()):
if monitor['mute_when']:
remote = remote_monitors[monitor['name']]
if remote['is_silenced']:
print "Alert '%s' is already muted. Skipping." % monitor['name']
print("Alert '%s' is already muted. Skipping." % monitor['name'])
continue
mute_until = mute_tags[monitor['mute_when']]
if mute_until:
id = remote['id']
datadog.api.Monitor.mute(id, end=mute_until['timestamp'])
print "Muting alert '%s' until %s" % (monitor['name'],
mute_until['datetime'])
print("Muting alert '%s' until %s" % (monitor['name'],
mute_until['datetime']))


def command_diff():
Expand All @@ -305,21 +313,21 @@ def command_diff():

if only_local:
sys.stdout.write(bcolors.WARNING)
print '---------------------------------------------------------'
print ' NEW MONITORS. These monitors are currently missing in'
print ' datadog and can be pushed using "%s push"' % PROGNAME
print '---------------------------------------------------------'
print('---------------------------------------------------------')
print(' NEW MONITORS. These monitors are currently missing in')
print(' datadog and can be pushed using "%s push"' % PROGNAME)
print('---------------------------------------------------------')
sys.stdout.write(bcolors.ENDC)
monitors = [local_monitors[name]['obj'] for name in only_local]
print _pretty_yaml(monitors)
print(_pretty_yaml(monitors))
if changed:
sys.stdout.write(bcolors.WARNING)
print '---------------------------------------------------------'
print ' TO BE UPDATED. These monitors exist in datadog, but are'
print ' different than the local version. Use "%s push"' % PROGNAME
print ' to push them to datadog.'
print '---------------------------------------------------------'
print
print('---------------------------------------------------------')
print(' TO BE UPDATED. These monitors exist in datadog, but are')
print(' different than the local version. Use "%s push"' % PROGNAME)
print(' to push them to datadog.')
print('---------------------------------------------------------')
print()
sys.stdout.write(bcolors.ENDC)
for name in changed:
remote_name = 'datadog:%s' % name
Expand All @@ -338,16 +346,16 @@ def command_diff():
sys.stdout.write(line)
if only_remote:
sys.stdout.write(bcolors.WARNING)
print '------------------------------------------------------------'
print ' UNTRACKED MONITORS. These monitors are only in datadog '
print ' and needed to be MANUALLY added to a local file or removed '
print ' from datadog. '
print '------------------------------------------------------------'
print('------------------------------------------------------------')
print(' UNTRACKED MONITORS. These monitors are only in datadog ')
print(' and needed to be MANUALLY added to a local file or removed ')
print(' from datadog. ')
print('------------------------------------------------------------')
sys.stdout.write(bcolors.ENDC)
monitors = [remote_monitors[name]['obj'] for name in only_remote]
print _pretty_yaml(monitors)
print(_pretty_yaml(monitors))
sys.stdout.write(bcolors.FAIL)
print "*** FAILED *** Untracked monitors found."
print("*** FAILED *** Untracked monitors found.")
sys.stdout.write(bcolors.ENDC)
sys.exit(1)

Expand Down