redisbench-admin 0.11.36__py3-none-any.whl → 0.11.38__py3-none-any.whl

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/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/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/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/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:

{redisbench_admin-0.11.36.dist-info → redisbench_admin-0.11.38.dist-info}/METADATA

@@ -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.dist-info → redisbench_admin-0.11.38.dist-info}/RECORD

@@ -3,8 +3,8 @@ redisbench_admin/cli.py,sha256=LAS5qnqScXKhxHYfXWB0mvAYaUYrSurIwadhexEa9g4,7740
 redisbench_admin/commands/__init__.py,sha256=mzVrEtqefFdopyzR-W6xx3How95dyZfToGKm1-_YzeY,95
 redisbench_admin/commands/commands.json.py,sha256=mzVrEtqefFdopyzR-W6xx3How95dyZfToGKm1-_YzeY,95
 redisbench_admin/compare/__init__.py,sha256=DtBXRp0Q01XgCFmY-1OIePMyyYihVNAjZ1Y8zwqSDN0,101
-redisbench_admin/compare/args.py,sha256=PPONBCMSDXcVe23vDuc80SnHlZbTwc-azS8B9S1w3ts,6178
-redisbench_admin/compare/compare.py,sha256=H-mAVNAgtuFEiZ_e969Iy7E-8Y9Zt9wBWL4jdfm0Y-0,39601
+redisbench_admin/compare/args.py,sha256=CYMOIogW7WFcs7gEwBfi88vSSSAdVq8sr-tAJ9ngfGk,6256
+redisbench_admin/compare/compare.py,sha256=tNFBXbb3YCmz7qR_wAkQR49oee9EYQFCPvb8bN2onYA,39797
 redisbench_admin/deploy/__init__.py,sha256=DtBXRp0Q01XgCFmY-1OIePMyyYihVNAjZ1Y8zwqSDN0,101
 redisbench_admin/deploy/args.py,sha256=neLUcQqI__HkJItkQg2C293hl5g3yHG40t171r7-E5Y,1732
 redisbench_admin/deploy/deploy.py,sha256=MtfJbsL97DLrbBYut6zRCzyEMebX4xWoZE-m4-JDRB8,3885
@@ -12,10 +12,10 @@ redisbench_admin/environments/__init__.py,sha256=cD7zfXt0VEmy0b7452HvcAxX_9kVj6V
 redisbench_admin/environments/oss_cluster.py,sha256=lUOG6oN8VXAnDXFK7Xns-ag-hSOSxxxL8jZ4Mh03hQY,6681
 redisbench_admin/environments/oss_standalone.py,sha256=Sl38rUpwJ3wNOl9zn38iK8q2iJi2pRFmaJAZJbuT_SQ,2474
 redisbench_admin/export/__init__.py,sha256=DtBXRp0Q01XgCFmY-1OIePMyyYihVNAjZ1Y8zwqSDN0,101
-redisbench_admin/export/args.py,sha256=kzBfU21mXYWLZ8YPhKA8MCfxJo-OU4m8-OBZFY7VKnA,3189
+redisbench_admin/export/args.py,sha256=v_WjJCNz_LeIFMNwSN6XwRmvSx1K2ys8XS1gK50EM_4,3508
 redisbench_admin/export/common/__init__.py,sha256=DtBXRp0Q01XgCFmY-1OIePMyyYihVNAjZ1Y8zwqSDN0,101
 redisbench_admin/export/common/common.py,sha256=LnvXjMLlJRzMTxiFIjrfRFfDx9JJm88OZHu7lnTOpFA,4331
-redisbench_admin/export/export.py,sha256=xxrFwUOeDT7WwT8E-6TPfCGcnQWIgq2uSg-Bw_5JZzY,10624
+redisbench_admin/export/export.py,sha256=u00NjaCbWhCJ319leVlP4ZkqiqZt5FN4Gbag4Poo23M,11274
 redisbench_admin/export/google_benchmark/__init__.py,sha256=DtBXRp0Q01XgCFmY-1OIePMyyYihVNAjZ1Y8zwqSDN0,101
 redisbench_admin/export/google_benchmark/google_benchmark_json_format.py,sha256=OuMaMmmma5VvXA0rcLIQSMxIq81oa5I3xYDFhbWj-IA,1804
 redisbench_admin/export/memtier_benchmark/__init__.py,sha256=DtBXRp0Q01XgCFmY-1OIePMyyYihVNAjZ1Y8zwqSDN0,101
@@ -228,15 +228,15 @@ redisbench_admin/utils/benchmark_config.py,sha256=bC2C6rnj89wkkSlOXyyfe0N15unn_M
 redisbench_admin/utils/local.py,sha256=zUvyVI9LZMT3qyxs1pO3mXL6Bt_1z9EZUGppaRcWNRA,3890
 redisbench_admin/utils/redisearch.py,sha256=lchUEzpt0zB1rHwlDlw9LLifAnxFWcLP-PePw7TjL-0,1602
 redisbench_admin/utils/redisgraph_benchmark_go.py,sha256=os7EJt6kBxsFJLKkSoANbjMT7-cEq4-Ns-49alk2Tf8,2048
-redisbench_admin/utils/remote.py,sha256=QYlkAffgHQ20pxbSaM42LCfw87tOLyFi-i2EIdMHkd4,41256
+redisbench_admin/utils/remote.py,sha256=xQuTbfEMNpHW38njaiuw2j1P4BPYsv-uCzfIVsKot0Q,40694
 redisbench_admin/utils/results.py,sha256=uKk3uNJ--bSXlUj_HGQ2OaV6MVqmXJVM8xTzFV6EOw4,3267
 redisbench_admin/utils/ssh.py,sha256=QW4AwlocMHJt05QMdN_4f8WeDmxiEwR80ny8VBThq6k,6533
 redisbench_admin/utils/utils.py,sha256=YxuSPS6dtBw7T8e09678rUNNiCSkuFtVXNc05-qytbI,14370
 redisbench_admin/watchdog/__init__.py,sha256=cD7zfXt0VEmy0b7452HvcAxX_9kVj6Vm213yNdUHP20,95
 redisbench_admin/watchdog/args.py,sha256=nKsG1G6ATOZlAMHMtT9u3kXxduKCbejSZ5x8oB_ynZ8,1312
 redisbench_admin/watchdog/watchdog.py,sha256=0wWYge3x_OMxWrzazNhJif2NK4tKsI963HVZqjczRag,6189
-redisbench_admin-0.11.36.dist-info/LICENSE,sha256=AAMtfs82zOOvmG68vILivm6lxi2rcOlGObmA8jzxQvw,10768
-redisbench_admin-0.11.36.dist-info/METADATA,sha256=H7RfV-AfB0SfO9yoQCrmvzWh6l3Atm8ZTpKWOnpdtg8,5389
-redisbench_admin-0.11.36.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-redisbench_admin-0.11.36.dist-info/entry_points.txt,sha256=UUawXk_AS-PlieKJ1QxPQXGsRLb6OW_F0MtmA1W0KE8,113
-redisbench_admin-0.11.36.dist-info/RECORD,,
+redisbench_admin-0.11.38.dist-info/LICENSE,sha256=AAMtfs82zOOvmG68vILivm6lxi2rcOlGObmA8jzxQvw,10768
+redisbench_admin-0.11.38.dist-info/METADATA,sha256=LHJ92Q7F48ZA7p8bujz4yqK4C4eGVnoR0s0eEB1E74M,5389
+redisbench_admin-0.11.38.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+redisbench_admin-0.11.38.dist-info/entry_points.txt,sha256=UUawXk_AS-PlieKJ1QxPQXGsRLb6OW_F0MtmA1W0KE8,113
+redisbench_admin-0.11.38.dist-info/RECORD,,