Merge branch 'master' into master

Author: osiegmar

cloudwatchmon/__init__.py

@@ -1 +1 @@
-VERSION = '2.0.4'
+VERSION = '2.0.5'

cloudwatchmon/cli/get_instance_stats.py

@@ -17,6 +17,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import print_function
 from cloudwatchmon.cloud_watch_client import *
 
 import argparse
@@ -76,17 +77,17 @@ def print_metric_stats(region, instance_id, namespace, metric, title,
                                          ['Average', 'Maximum', 'Minimum'],
                                          dims)
 
-    print title
+    print(title)
 
     if metrics:
         max_val = max(m['Maximum'] for m in metrics)
         min_val = min(m['Minimum'] for m in metrics)
         avg_val = sum(m['Average'] for m in metrics) / float(len(metrics))
 
-        print "    Average: {0:.2f}%, Minimum: {1:.2f}%, Maximum: {2:.2f}%\n" \
-            .format(avg_val, min_val, max_val)
+        print("    Average: {0:.2f}%, Minimum: {1:.2f}%, Maximum: {2:.2f}%\n"
+              .format(avg_val, min_val, max_val))
     else:
-        print "    Average: N/A, Minimum: N/A, Maximum: N/A\n"
+        print("    Average: N/A, Minimum: N/A, Maximum: N/A\n")
 
 
 def print_filesystem_stats(region, instance_id, namespace, metric, title,
@@ -117,21 +118,21 @@ def main():
     args = parser.parse_args()
 
     if args.version:
-        print CLIENT_NAME + ' version ' + VERSION
+        print(CLIENT_NAME + ' version ' + VERSION)
         return 0
 
     try:
         metadata = get_metadata()
 
         if args.verbose:
-            print 'Instance metadata: ' + str(metadata)
+            print('Instance metadata: ' + str(metadata))
 
         region = metadata['placement']['availability-zone'][:-1]
         instance_id = metadata['instance-id']
 
         unit = 'hours' if args.recent_hours > 1 else 'hour'
-        print 'Instance {0} statistics for the last {1} {2}.\n'\
-            .format(instance_id, args.recent_hours, unit)
+        print('Instance {0} statistics for the last {1} {2}.\n'
+              .format(instance_id, args.recent_hours, unit))
 
         print_metric_stats(region, instance_id,
                            'AWS/EC2',

cloudwatchmon/cli/put_instance_stats.py

@@ -17,6 +17,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import print_function
 from cloudwatchmon.cloud_watch_client import *
 
 import argparse
@@ -183,7 +184,7 @@ def send(self, verbose):
 
         size = len(self.names)
 
-        for idx_start in xrange(0, size, AWS_LIMIT_METRICS_SIZE):
+        for idx_start in range(0, size, AWS_LIMIT_METRICS_SIZE):
             idx_end = idx_start + AWS_LIMIT_METRICS_SIZE
             response = conn.put_metric_data('System/Linux',
                                             self.names[idx_start:idx_end],
@@ -282,7 +283,6 @@ def config_parser():
                                action='store_true',
                                help='Report load averages for 1min, 5min and 15min divided by the number of CPU cores.')
 
-
     disk_group = parser.add_argument_group('disk metrics')
     disk_group.add_argument('--disk-path',
                             metavar='PATH',
@@ -307,14 +307,12 @@ def config_parser():
                             action='store_true',
                             help='Reports disk inode utilization in percentages.')
 
-
     process_group = parser.add_argument_group('process metrics')
     process_group.add_argument('--process-name',
                                metavar='PROCNAME',
                                action='append',
                                help='Report CPU and Memory utilization metrics of processes.')
 
-
     exclusive_group = parser.add_mutually_exclusive_group()
     exclusive_group.add_argument('--from-cron',
                                  action='store_true',
@@ -364,6 +362,7 @@ def add_memory_metrics(args, metrics):
         metrics.add_metric('SwapUsed', mem_unit_name,
                            mem.swap_used() / mem_unit_div)
 
+
 def add_loadavg_metrics(args, metrics):
     loadavg = LoadAverage()
     if args.loadavg:
@@ -389,8 +388,8 @@ def get_disk_info(args):
         used = int(line[2]) * 1024
         avail = int(line[3]) * 1024
         disks.append(Disk(mount, file_system, total, used, avail, 0))
-    
-    #Gather inode utilization if it is requested
+
+    # Gather inode utilization if it is requested
     if not args.disk_inode_util:
         return disks
 
@@ -402,7 +401,7 @@ def get_disk_info(args):
         used = float(line[2])
         total = float(line[1])
         inode_util_val = 100.0 * used / total if total > 0 else 0
-        disks_inode_util.append(inode_util_val) 
+        disks_inode_util.append(inode_util_val)
 
     for index, disk in enumerate(disks):
         disk.inode_util = disks_inode_util[index]
@@ -428,7 +427,6 @@ def add_disk_metrics(args, metrics):
         if args.disk_inode_util:
             metrics.add_metric('InodeUtilization', 'Percent',
                                disk.inode_util, disk.mount, disk.file_system)
-            
 
 def add_process_metrics(args, metrics):
     process_names = args.process_name
@@ -452,7 +450,7 @@ def add_static_file_metrics(args, metrics):
                 (label, unit, value) = [x.strip() for x in line.split(',')]
                 metrics.add_metric(label, unit, value)
             except ValueError:
-                print 'Ignore unparseable metric: "' + line + '"'
+                print('Ignore unparseable metric: "' + line + '"')
                 pass
 
 
@@ -496,8 +494,8 @@ def validate_args(args):
         raise ValueError('Metrics to report disk space are provided but '
                          'disk path is not specified.')
 
-    if not report_mem_data and not report_disk_data and not args.from_file and \
-            not report_loadavg_data:
+    if not report_mem_data and not report_disk_data and \
+            not args.from_file and not report_loadavg_data:
         raise ValueError('No metrics specified for collection and '
                          'submission to CloudWatch.')
 
@@ -515,24 +513,25 @@ def main():
     args = parser.parse_args()
 
     if args.version:
-        print CLIENT_NAME + ' version ' + VERSION
+        print(CLIENT_NAME + ' version ' + VERSION)
         return 0
 
     try:
-        report_disk_data, report_mem_data, report_loadavg_data, report_process_data = validate_args(args)
+        report_disk_data, report_mem_data, report_loadavg_data, report_process_data = \
+            validate_args(args)
 
         # avoid a storm of calls at the beginning of a minute
         if args.from_cron:
             time.sleep(random.randint(0, 19))
 
         if args.verbose:
-            print 'Working in verbose mode'
-            print 'Boto-Version: ' + boto.__version__
+            print('Working in verbose mode')
+            print('Boto-Version: ' + boto.__version__)
 
         metadata = get_metadata()
 
         if args.verbose:
-            print 'Instance metadata: ' + str(metadata)
+            print('Instance metadata: ' + str(metadata))
 
         region = metadata['placement']['availability-zone'][:-1]
         instance_id = metadata['instance-id']
@@ -543,7 +542,7 @@ def main():
                                                                 args.verbose)
 
             if args.verbose:
-                print 'Autoscaling group: ' + autoscaling_group_name
+                print('Autoscaling group: ' + autoscaling_group_name)
 
         metrics = Metrics(region,
                           instance_id,
@@ -568,16 +567,16 @@ def main():
             add_process_metrics(args, metrics)
 
         if args.verbose:
-            print 'Request:\n' + str(metrics)
+            print('Request:\n' + str(metrics))
 
         if args.verify:
             if not args.from_cron:
-                print 'Verification completed successfully. ' \
-                      'No actual metrics sent to CloudWatch.'
+                print('Verification completed successfully. '
+                      'No actual metrics sent to CloudWatch.')
         else:
             metrics.send(args.verbose)
             if not args.from_cron:
-                print 'Successfully reported metrics to CloudWatch.'
+                print('Successfully reported metrics to CloudWatch.')
     except Exception as e:
         log_error(str(e), args.from_cron)
         return 1

cloudwatchmon/cloud_watch_client.py

@@ -15,6 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import print_function
 import boto
 import boto.utils
 import hashlib
@@ -56,7 +57,7 @@ def __call__(self, *args, **kwargs):
 
         tmp = self.fnc(*args, **kwargs)
         with open(filename, 'wb') as f:
-            os.chmod(filename, 0600)
+            os.chmod(filename, 0o600)
             pickle.dump(tmp, f)
 
         return tmp
@@ -66,7 +67,7 @@ def log_error(message, use_syslog):
     if use_syslog:
         syslog.syslog(syslog.LOG_ERR, message)
     else:
-        print >> sys.stderr, 'ERROR: ' + message
+        print('ERROR: ' + message, file=sys.stderr)
 
 
 @FileCache