redisbench-admin 0.11.36__tar.gz → 0.11.38__tar.gz

{redisbench_admin-0.11.36 → redisbench_admin-0.11.38}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: redisbench-admin
-Version: 0.11.36
+Version: 0.11.38
 Summary: Redis benchmark run helper. A wrapper around Redis and Redis Modules benchmark tools ( ftsb_redisearch, memtier_benchmark, redis-benchmark, aibench, etc... ).
 Author: filipecosta90
 Author-email: filipecosta.90@gmail.com

{redisbench_admin-0.11.36 → redisbench_admin-0.11.38}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "redisbench-admin"
-version = "0.11.36"
+version = "0.11.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 <filipecosta.90@gmail.com>","Redis Performance Group <performance@redis.com>"]
 readme = "README.md"

{redisbench_admin-0.11.36 → redisbench_admin-0.11.38}/redisbench_admin/compare/args.py

@@ -161,6 +161,10 @@ def create_compare_arguments(parser):
         type=str,
         default="https://benchmarksrediscom.grafana.net/d/",
     )
+    parser.add_argument(
+        "--grafana_uid",
+        default=None,
+    )
     parser.add_argument(
         "--auto-approve",
         required=False,

{redisbench_admin-0.11.36 → redisbench_admin-0.11.38}/redisbench_admin/compare/compare.py

@@ -250,9 +250,12 @@ def compare_command_logic(args, project_name, project_version):
     }
     baseline_architecture = args.baseline_architecture
     comparison_architecture = args.comparison_architecture
-    uid = None
-    if tf_github_repo.lower() in grafana_dashboards_uids:
+    uid = args.grafana_uid
+    if tf_github_repo.lower() in grafana_dashboards_uids and uid is None:
         uid = grafana_dashboards_uids[tf_github_repo.lower()]
+        logging.info(f"Using uid from grafana_dashboards_uids. {grafana_dashboards_uids}. uid={uid}")
+    else:
+        logging.info(f"Using uid from args. uid={uid}")
     grafana_link_base = None
     if uid is not None:
         grafana_link_base = "{}/{}".format(grafana_base_dashboard, uid)

{redisbench_admin-0.11.36 → redisbench_admin-0.11.38}/redisbench_admin/export/args.py

@@ -4,13 +4,18 @@
 #  All rights reserved.
 #
 import datetime
-
+import os
 from redisbench_admin.utils.remote import (
     PERFORMANCE_RTS_HOST,
     PERFORMANCE_RTS_PORT,
     PERFORMANCE_RTS_AUTH,
 )
 
+ARCH_X86 = "x86_64"
+ARCH_ARM = "aarch64"
+VALID_ARCHS = [ARCH_X86, ARCH_ARM]
+ARCH = os.getenv("ARCH", ARCH_X86)
+
 
 def create_export_arguments(parser):
     parser.add_argument(
@@ -19,6 +24,13 @@ def create_export_arguments(parser):
         required=True,
         help="benchmark results file to read results from.",
     )
+    parser.add_argument(
+        "--architecture",
+        type=str,
+        required=False,
+        default=ARCH,
+        help=f"Architecture to run the benchmark on. One of {VALID_ARCHS}.",
+    )
     parser.add_argument(
         "--exporter-spec-file",
         type=str,

{redisbench_admin-0.11.36 → redisbench_admin-0.11.38}/redisbench_admin/export/export.py

@@ -77,8 +77,19 @@ def export_command_logic(args, project_name, project_version):
                 _,
                 _,
             ) = get_defaults(exporter_spec_file)
+    arch = args.architecture
+    logging.info("Using the following architecture on the timeseries: {}".format(arch))
 
     extra_tags_dict = split_tags_string(args.extra_tags)
+    if "results_format" not in extra_tags_dict:
+        extra_tags_dict["results_format"] = results_format
+        logging.info(f"Adding results_format={results_format} to extra tags")
+    if "arch" not in extra_tags_dict:
+        extra_tags_dict["arch"] = arch
+        logging.info(f"Adding arch={arch} to extra tags")
+    if "architecture" not in extra_tags_dict:
+        extra_tags_dict["architecture"] = arch
+        logging.info(f"Adding architecture={arch} to extra tags")
     logging.info("Using the following extra tags: {}".format(extra_tags_dict))
 
     results_dict = {}
@@ -161,6 +172,7 @@ def export_command_logic(args, project_name, project_version):
             github_org,
             github_repo,
             triggering_env,
+            arch,
         )
         logging.info("Parsed a total of {} metrics".format(len(timeseries_dict.keys())))
     logging.info(
@@ -221,6 +233,7 @@ def export_json_to_timeseries_dict(
     tf_github_org,
     tf_github_repo,
     triggering_env,
+    arch,
 ):
     results_dict = {}
     for test_name, d in benchmark_file.items():
@@ -245,6 +258,7 @@ def export_json_to_timeseries_dict(
                     tf_github_repo,
                     triggering_env,
                     False,
+                    arch,
                 )
                 results_dict[ts_name] = {
                     "labels": timeserie_tags.copy(),

{redisbench_admin-0.11.36 → redisbench_admin-0.11.38}/redisbench_admin/utils/remote.py

@@ -629,15 +629,6 @@ def push_data_to_redistimeseries(rts, time_series_dict: dict, expire_msecs=0):
         )
         for timeseries_name, time_series in time_series_dict.items():
             try:
-                arch = "x86_64"
-                if "arch" in time_series["labels"]:
-                    arch = time_series["labels"]["arch"]
-                if arch == "aarch64" and "aarch64" not in timeseries_name:
-                    original_timeseries_name = timeseries_name
-                    timeseries_name = f"{timeseries_name}/arch/{arch}"
-                    logging.warning(
-                        f"overriding key named {original_timeseries_name} given it does not contain arch and it's not x86_64. new key={timeseries_name}"
-                    )
                 exporter_create_ts(rts, time_series, timeseries_name)
                 for timestamp, value in time_series["data"].items():
                     try: