From c0ce8b08cab3adf6b7d358b8c0a784c17e5e39fb Mon Sep 17 00:00:00 2001 From: Joe Keen Date: Fri, 27 Mar 2015 11:42:01 -0600 Subject: [PATCH] Adjusted formatting functions for new measurement data We removed a reduntant column of data in the measurements so the formatting functions needed to understand that everything shifted left one position. Change-Id: Ie60bdb7cabfadffeb9fc49d7a196e3982e5fbed0 --- monascaclient/v2_0/shell.py | 32 ++++++++------------------------ 1 file changed, 8 insertions(+), 24 deletions(-) diff --git a/monascaclient/v2_0/shell.py b/monascaclient/v2_0/shell.py index 873f94a..998871b 100644 --- a/monascaclient/v2_0/shell.py +++ b/monascaclient/v2_0/shell.py @@ -150,20 +150,14 @@ def do_metric_list(mc, args): sortby=0) -def format_measure_id(measurements): - # returns newline separated measurements id's for the id column - measure_string_list = list() - for measure in measurements: - measure_string_list.append('{}'.format(measure[0])) - return '\n'.join(measure_string_list) - - def format_measure_timestamp(measurements): # returns newline separated times for the timestamp column - measure_string_list = list() - for measure in measurements: - measure_string_list.append(str(measure[1])) - return '\n'.join(measure_string_list) + return '\n'.join([str(m[0]) for m in measurements]) + + +def format_measure_value(measurements): + # returns newline separated values for the value column + return '\n'.join(['{:12.2f}'.format(m[1]) for m in measurements]) def format_value_meta(measurements): @@ -174,7 +168,7 @@ def format_value_meta(measurements): measure_string = "" else: meta_string_list = [] - for k, v in measure[3].items(): + for k, v in measure[2].items(): if isinstance(v, numbers.Number): m_str = k + ': ' + str(v) else: @@ -185,15 +179,6 @@ def format_value_meta(measurements): return '\n'.join(measure_string_list) -def format_measure_value(measurements): - # returns newline separated values for the value column - measure_string_list = list() - for measure in measurements: - measure_string = '{:12.2f}'.format(measure[2]) - measure_string_list.append(measure_string) - return '\n'.join(measure_string_list) - - def format_statistic_timestamp(statistics, columns, name): # returns newline separated times for the timestamp column time_index = 0 @@ -295,11 +280,10 @@ def do_measurement_list(mc, args): if args.json: print(utils.json_formatter(metric)) return - cols = ['name', 'dimensions', 'measurement_id', 'timestamp', 'value', 'value_meta'] + cols = ['name', 'dimensions', 'timestamp', 'value', 'value_meta'] formatters = { 'name': lambda x: x['name'], 'dimensions': lambda x: utils.format_dict(x['dimensions']), - 'measurement_id': lambda x: format_measure_id(x['measurements']), 'timestamp': lambda x: format_measure_timestamp(x['measurements']), 'value': lambda x: format_measure_value(x['measurements']), 'value_meta': lambda x: format_value_meta(x['measurements']),