Merge pull request #4278 from edx/jdmulloy/ops2545/fix_redis_script

Jdmulloy/ops2545/fix redis script

util/jenkins/check-celery-queues.py

@@ -73,7 +73,7 @@ class CwBotoWrapper(object):
               help='Maximum number of CloudWatch metrics to publish')
 @click.option('--threshold', default=50,
               help='Maximum queue length before alarm notification is sent')
-@click.option('--sns-arn', '-s', help='ARN for SNS alert topic')
+@click.option('--sns-arn', '-s', help='ARN for SNS alert topic', required=True)
 def check_queues(host, port, environment, deploy, max_metrics, threshold,
                  sns_arn):
     timeout = 1
@@ -117,7 +117,8 @@ def check_queues(host, port, environment, deploy, max_metrics, threshold,
             'Value': redis_client.llen(queue)
         })
 
-    cloudwatch.put_metric_data(Namespace=namespace, MetricData=metric_data)
+    if len(metric_data) > 0:
+        cloudwatch.put_metric_data(Namespace=namespace, MetricData=metric_data)
 
     for queue in queues:
         dimensions = [{'Name': dimension, 'Value': queue}]