Enabled --override-test-time feature on redisbench-admin export (#227)

* [add] enabled --override-test-time feature on redisbench-admin export

* Bumping version from 0.5.8 to 0.5.9

* [add] Enabled data format of %Y-%m-%d %H:%M:%S on redisbench-admin export

Author: filipecosta90

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "redisbench-admin"
-version = "0.5.8"
+version = "0.5.9"
 description = "Redis benchmark run helper. A wrapper around Redis and Redis Modules benchmark tools ( ftsb_redisearch, memtier_benchmark, redis-benchmark, aibench, etc... )."
 authors = ["filipecosta90 <[email protected]>","Redis Performance Group <[email protected]>"]
 readme = "README.md"

redisbench_admin/export/args.py

@@ -3,6 +3,8 @@
 #  Copyright (c) 2021., Redis Labs Modules
 #  All rights reserved.
 #
+import datetime
+
 from redisbench_admin.utils.remote import (
     PERFORMANCE_RTS_HOST,
     PERFORMANCE_RTS_PORT,
@@ -87,4 +89,9 @@ def create_export_arguments(parser):
         "--redistimeseries_pass", type=str, default=PERFORMANCE_RTS_AUTH
     )
     parser.add_argument("--redistimeseries_user", type=str, default=None)
+    parser.add_argument(
+        "--override-test-time",
+        type=lambda s: datetime.datetime.strptime(s, "%Y-%m-%d %H:%M:%S"),
+        help='Override the test time passing datetime in format "%%Y-%%m-%%d %%H:%%M:%%S". Example valid datetime: "2021-01-01 10:00:00". Times are in UTC TZ. If this argument is set, the parsed test time is overridden.',
+    )
     return parser

redisbench_admin/export/export.py

@@ -40,7 +40,11 @@ def export_command_logic(args, project_name, project_version):
     extra_tags_dict = split_tags_string(args.extra_tags)
     logging.info("Using the following extra tags: {}".format(extra_tags_dict))
 
-    logging.info("Checking connection to RedisTimeSeries.")
+    logging.info(
+        "Checking connection to RedisTimeSeries to host: {}:{}".format(
+            args.redistimeseries_host, args.redistimeseries_port
+        )
+    )
     rts = Client(
         host=args.redistimeseries_host,
         port=args.redistimeseries_port,
@@ -65,19 +69,31 @@ def export_command_logic(args, project_name, project_version):
         _,
         _,
     ) = get_defaults(exporter_spec_file)
-
-    datapoints_timestamp = parse_exporter_timemetric(
-        exporter_timemetric_path, results_dict
-    )
-    if datapoints_timestamp is None:
-        datapoints_timestamp = int(
-            datetime.datetime.now(datetime.timezone.utc).timestamp() * 1000.0
+    if args.override_test_time:
+        datapoints_timestamp = int(args.override_test_time.timestamp() * 1000.0)
+        logging.info(
+            "Overriding test time with the following date {}. Timestamp {}".format(
+                args.override_test_time, datapoints_timestamp
+            )
         )
-        logging.warning(
-            "Error while trying to parse datapoints timestamp. Using current system timestamp Error: {}".format(
-                datapoints_timestamp
+    else:
+        logging.info(
+            "Trying to parse the time-metric from path {}".format(
+                exporter_timemetric_path
             )
         )
+        datapoints_timestamp = parse_exporter_timemetric(
+            exporter_timemetric_path, results_dict
+        )
+        if datapoints_timestamp is None:
+            datapoints_timestamp = int(
+                datetime.datetime.now(datetime.timezone.utc).timestamp() * 1000.0
+            )
+            logging.warning(
+                "Error while trying to parse datapoints timestamp. Using current system timestamp Error: {}".format(
+                    datapoints_timestamp
+                )
+            )
 
     timeseries_test_sucess_flow(
         True,

tests/test_data/common-properties-v0.5-memtier-previous-1.3.0.yml

@@ -0,0 +1,6 @@
+version: 0.5
+exporter:
+  redistimeseries:
+    timemetric: "$.'ALL STATS'.Runtime.'Start time'"
+    metrics:
+      - "$.'BEST RUN RESULTS'.Totals.'Ops/sec'"