diff --git a/atdb_stats.py b/atdb_stats.py index 937d63d0830cde0e3e34a63c05bf31e0d33e69eb..0f667650a66fab8b60b48e9733e93d4021a6ec97 100644 --- a/atdb_stats.py +++ b/atdb_stats.py @@ -307,7 +307,7 @@ def do_ingest_speeds(args, starttime, endtime, plot_engine='plotly'): sorted_datapoints = sorted(datapoints, key=lambda k: k['timestamp']) # plot the results - atdb_plot.do_speed_plot(args.title, args.y_axis_title, args.query, sorted_datapoints) + atdb_plot.do_speed_plot(args.title, args.y_axis_title, args.query, args.annotate, sorted_datapoints) @@ -412,6 +412,9 @@ def main(): parser.add_argument("--query", default=None, help="query for the REST API, like 'taskID__contains=190607'") + parser.add_argument("--annotate", + default=None, + help="field to annotate datapoints in the (speed) plot, like 'taskid'") parser.add_argument("--interval", default="day", help="Shows bars per interval. Possible options: minute, hour, day, month") diff --git a/data/ingest_speed_imaging.args b/data/ingest_speed_imaging.args index f352747b29bc32f467ec28e825f9d5b9f0204d16..7262817fdc42fd297be475c720acc1170cddfe5c 100644 --- a/data/ingest_speed_imaging.args +++ b/data/ingest_speed_imaging.args @@ -5,5 +5,7 @@ --y_axis_title=I/O Speed in Gbps --starttime=2019-06-08 00:00 --endtime=2019-06-09 00:00 ---query=taskID__contains=190607 +--query=taskID__contains=190608 +--query=starttime__gt=2019-06-07T00:00:00Z&starttime__lt=2019-06-11T00:00:00Z +--annotate=taskid --plot_engine=mathplotlib \ No newline at end of file diff --git a/dist/atdb_plot-1.0.0.tar.gz b/dist/atdb_plot-1.0.0.tar.gz index 4c179a637568f50d43a611c9bd8238d833e7d00e..f295e205a10fd66827184cf2702917da251893c5 100644 Binary files a/dist/atdb_plot-1.0.0.tar.gz and b/dist/atdb_plot-1.0.0.tar.gz differ