Added parseExporterTimeMetricDefinition() (#38)

* [add] Added parseExporterTimeMetricDefinition()

* Bumping version from 0.1.37 to 0.1.38

Author: filipecosta90

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "redisbench-admin"
-version = "0.1.37"
+version = "0.1.38"
 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]>"]
 readme = "README.md"

redisbench_admin/utils/benchmark_config.py

@@ -1,17 +1,41 @@
 from jsonpath_ng import parse
 
 
+<<<<<<< HEAD
+def parseExporterMetricsDefinition(
+    benchmark_config: dict, configkey: str = "redistimeseries"
+):
+    metrics = []
+    if configkey in benchmark_config:
+        if "metrics" in benchmark_config[configkey]:
+            for metric_name in benchmark_config[configkey]["metrics"]:
+=======
 def parseExporterMetricsDefinition(benchmark_config, configkey="redistimeseries"):
     metrics = []
     if configkey in benchmark_config:
         if "metrics" in benchmark_config[configkey]:
             for metric_name in benchmark_config[configkey][
                 "metrics"
             ]:
+>>>>>>> origin/master
                 metrics.append(metric_name)
     return metrics
 
 
+<<<<<<< HEAD
+def parseExporterTimeMetricDefinition(
+    benchmark_config: dict, configkey: str = "redistimeseries"
+):
+    metricPath = None
+    if "timemetric" in benchmark_config[configkey]:
+        metricPath = benchmark_config[configkey]["timemetric"]
+    return metricPath
+
+
+def parseExporterTimeMetric(metricPath: str, results_dict: dict):
+    jsonpath_expr = parse(metricPath)
+    datapoints_timestamp = int(jsonpath_expr.find(results_dict)[0].value)
+=======
 def parseExporterTimeMetric(benchmark_config, results_dict, configkey="redistimeseries"):
     datapoints_timestamp = None
     if "timemetric" in benchmark_config[configkey]:
@@ -20,4 +44,5 @@ def parseExporterTimeMetric(benchmark_config, results_dict, configkey="redistime
         datapoints_timestamp = int(
             jsonpath_expr.find(results_dict)[0].value
         )
+>>>>>>> origin/master
     return datapoints_timestamp

redisbench_admin/utils/remote.py

@@ -283,7 +283,11 @@ def get_run_full_filename(
     return benchmark_output_filename
 
 
-def fetchRemoteSetupFromConfig(remote_setup_config, repo="https://github.com/RedisLabsModules/testing-infrastructure.git",branch="master"):
+def fetchRemoteSetupFromConfig(
+    remote_setup_config,
+    repo="https://github.com/RedisLabsModules/testing-infrastructure.git",
+    branch="master",
+):
     type = None
     setup = None
     for remote_setup_property in remote_setup_config:
@@ -292,7 +296,7 @@ def fetchRemoteSetupFromConfig(remote_setup_config, repo="https://github.com/Red
         if "setup" in remote_setup_property:
             setup = remote_setup_property["setup"]
     # fetch terraform folder
-    path = "/terraform/{}-{}".format(type,setup)
+    path = "/terraform/{}-{}".format(type, setup)
     temporary_dir = tempfile.mkdtemp()
     logging.info(
         "Fetching infrastructure definition from git repo {}/{} (branch={})".format(