diff --git a/reports/error_details.py b/reports/error_details.py index f7e8026..5a97af9 100644 --- a/reports/error_details.py +++ b/reports/error_details.py @@ -32,11 +32,9 @@ start = datetime.datetime(year=yesterday.year, month=yesterday.month, day=yester end = start + datetime.timedelta(hours=length-1, minutes=59, seconds=59) instance_map = {} # { uuid : [request_id, request_id, ...] } -metadata = {'raw_text': True, 'instances': instance_map} +metadata = {'format': 'json', 'instances': instance_map} report = [metadata] -#report.append("Generating report for %s to %s" % (start, end)) - dstart = dt.dt_to_decimal(start) dend = dt.dt_to_decimal(end) @@ -73,12 +71,12 @@ for uuid_dict in updates: for req_dict in reqs: req = req_dict['request_id'] - raws = list(models.RawData.objects.filter(request_id=req)\ - .exclude(event='compute.instance.exists')\ - .values("id", "when", "routing_key", "old_state", - "state", "tenant", "event", "image_type", - "deployment")\ - .order_by('when')) + raws = list(models.RawData.objects.filter(request_id=req) + .exclude(event='compute.instance.exists') + .values("id", "when", "routing_key", "old_state", + "state", "tenant", "event", "image_type", + "deployment") + .order_by('when')) _start = None err_id = None @@ -115,7 +113,7 @@ for uuid_dict in updates: err_id = _id if _old_state == 'error' and \ - (not _state in ['deleted', 'error']): + (not _state in ['deleted', 'error']): failure_type = None err_id = None @@ -176,7 +174,7 @@ for uuid_dict in updates: queue, body = json.loads(err.json) payload = body['payload'] - #Add error information to failed request report + # Add error information to failed request report failed_request['event_id'] = err.id failed_request['tenant'] = err.tenant failed_request['service'] = err.service diff --git a/reports/nova_usage_audit.py b/reports/nova_usage_audit.py index a62a300..a87587e 100644 --- a/reports/nova_usage_audit.py +++ b/reports/nova_usage_audit.py @@ -22,9 +22,9 @@ import argparse import datetime import json import sys -from os import environ +import os -sys.path.append(environ.get('STACKTACH_INSTALL_DIR', '/stacktach')) +sys.path.append(os.environ.get('STACKTACH_INSTALL_DIR', '/stacktach')) from stacktach import datetime_to_decimal as dt from stacktach import models diff --git a/reports/pretty.py b/reports/pretty.py index 6b5f84f..7867592 100644 --- a/reports/pretty.py +++ b/reports/pretty.py @@ -3,11 +3,10 @@ import datetime import json import sys import time -from os import environ - +import os import prettytable -sys.path.append(environ.get('STACKTACH_INSTALL_DIR', '/stacktach')) +sys.path.append(os.environ.get('STACKTACH_INSTALL_DIR', '/stacktach')) from stacktach import datetime_to_decimal as dt from stacktach import image_type