redisbench-admin 0.11.58__py3-none-any.whl → 0.11.60__py3-none-any.whl

redisbench_admin/run/args.py

@@ -38,6 +38,7 @@ GIT_BRANCH = os.getenv("GIT_BRANCH", None)
 GIT_REPO = os.getenv("GIT_REPO", None)
 PROFILERS_ENABLED = bool(int(os.getenv("PROFILE", 0)))
 COMMANDSTATS_ENABLED = bool(int(os.getenv("COMMANDSTATS_ENABLED", 1)))
+SEARCH_MEMORY_ENABLED = bool(int(os.getenv("SEARCH_MEMORY_ENABLED", 0)))
 PROFILERS = os.getenv("PROFILERS", PROFILERS_DEFAULT)
 MAX_PROFILERS_PER_TYPE = int(os.getenv("MAX_PROFILERS", 1))
 PROFILE_FREQ = os.getenv("PROFILE_FREQ", PROFILE_FREQ_DEFAULT)
@@ -202,6 +203,12 @@ def common_run_args(parser):
         default=COMMANDSTATS_ENABLED,
         help="Enables commandstats collection.",
     )
+    parser.add_argument(
+        "--collect_search_memory",
+        type=bool,
+        default=SEARCH_MEMORY_ENABLED,
+        help="Enables search memory collection.",
+    )
     parser.add_argument(
         "--allowed-envs",
         type=str,

redisbench_admin/run_remote/run_remote.py

@@ -108,6 +108,7 @@ def run_remote_command_logic(args, project_name, project_version):
     tf_github_branch = args.github_branch
     required_modules = args.required_module
     collect_commandstats = args.collect_commandstats
+    collect_search_memory = args.collect_search_memory
 
     (
         tf_github_actor,
@@ -987,6 +988,32 @@ def run_remote_command_logic(args, project_name, project_version):
                                                     },
                                                     expire_ms,
                                                 )
+                                                if collect_search_memory:
+                                                    (
+                                                        end_time_ms,
+                                                        _,
+                                                        overall_search_memory_metrics,
+                                                    ) = collect_redis_metrics(
+                                                        redis_conns, ["search_memory"]
+                                                    )
+                                                    export_redis_metrics(
+                                                        artifact_version,
+                                                        end_time_ms,
+                                                        overall_search_memory_metrics,
+                                                        rts,
+                                                        setup_name,
+                                                        setup_type,
+                                                        test_name,
+                                                        tf_github_branch,
+                                                        tf_github_org,
+                                                        tf_github_repo,
+                                                        tf_triggering_env,
+                                                        {
+                                                            "metric-type": "search-memory",
+                                                            "arch": architecture,
+                                                        },
+                                                        expire_ms,
+                                                    )
                                                 if collect_commandstats:
                                                     (
                                                         end_time_ms,

redisbench_admin/utils/remote.py

@@ -498,13 +498,24 @@ def validate_result_expectations(
 
 
 def check_and_fix_pem_str(ec2_private_pem: str):
-    pem_str = ec2_private_pem.replace("-----BEGIN RSA PRIVATE KEY-----", "")
-    pem_str = pem_str.replace("-----END RSA PRIVATE KEY-----", "")
-    pem_str = pem_str.replace(" ", "\n")
-    pem_str = "-----BEGIN RSA PRIVATE KEY-----\n" + pem_str
-    pem_str = pem_str + "-----END RSA PRIVATE KEY-----\n"
-    # remove any dangling whitespace
+    if "RSA" in ec2_private_pem:
+        print("Detected RSA private key")
+        pem_str = ec2_private_pem.replace("-----BEGIN RSA PRIVATE KEY-----", "")
+        pem_str = pem_str.replace("-----END RSA PRIVATE KEY-----", "")
+        pem_str = pem_str.replace(" ", "\n")
+        pem_str = "-----BEGIN RSA PRIVATE KEY-----\n" + pem_str
+        pem_str = pem_str + "-----END RSA PRIVATE KEY-----\n"
+    if "OPENSSH" in ec2_private_pem:
+        print("Detected OPENSSH private key")
+        pem_str = ec2_private_pem.replace("-----BEGIN OPENSSH PRIVATE KEY-----", "")
+        pem_str = pem_str.replace("-----END OPENSSH PRIVATE KEY-----", "")
+        pem_str = pem_str.replace(" ", "\n")
+        pem_str = "-----BEGIN OPENSSH PRIVATE KEY-----\n" + pem_str
+        pem_str = pem_str + "-----END OPENSSH PRIVATE KEY-----\n"
+        # remove any dangling whitespace
     pem_str = os.linesep.join([s for s in pem_str.splitlines() if s])
+    # add a final newline
+    pem_str = pem_str + "\n"
     return pem_str
 
 

{redisbench_admin-0.11.58.dist-info → redisbench_admin-0.11.60.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: redisbench-admin
-Version: 0.11.58
+Version: 0.11.60
 Summary: Redis benchmark run helper. A wrapper around Redis and Redis Modules benchmark tools ( ftsb_redisearch, memtier_benchmark, redis-benchmark, aibench, etc... ).
 License-File: LICENSE
 Author: filipecosta90

{redisbench_admin-0.11.58.dist-info → redisbench_admin-0.11.60.dist-info}/RECORD

@@ -48,7 +48,7 @@ redisbench_admin/run/aibench_run_inference_redisai_vision/__init__.py,sha256=DtB
 redisbench_admin/run/aibench_run_inference_redisai_vision/aibench_run_inference_redisai_vision.py,sha256=03GDbZZSo21f9iBTcNTdBKQAfq_Ghd0zxr-KYe1QIMU,1917
 redisbench_admin/run/ann/__init__.py,sha256=DtBXRp0Q01XgCFmY-1OIePMyyYihVNAjZ1Y8zwqSDN0,101
 redisbench_admin/run/ann/ann.py,sha256=h8VE7fouyNkpMSjNhgjkI_R-aWb-lKIKxvNZPOO8pFY,1288
-redisbench_admin/run/args.py,sha256=4OJIj19fieEjvz7Xnk1rIjaa50R5Kv1IlyMyECHtj0Y,8219
+redisbench_admin/run/args.py,sha256=w6kVMHXFMCMtMvIBAFm3AHcJya3iGOblSze_8sfosog,8466
 redisbench_admin/run/asm.py,sha256=Hybna8Xs7SnsP2IBwg6kMsiGPoCK0TlvhyKX94XmOEs,16738
 redisbench_admin/run/cluster.py,sha256=_Y6a8Dbu1cJ7OxhgymKQSZcCmV8cZ3UpGEWL6b6O84Y,6363
 redisbench_admin/run/common.py,sha256=1zJPQtIk3tjvLTjNUgxvDdcviN73psiaDBQ8cRJMIl8,29341
@@ -95,7 +95,7 @@ redisbench_admin/run_remote/remote_db.py,sha256=EEDeiOZk-godr5EINscEkOJLGWUN3gFf
 redisbench_admin/run_remote/remote_env.py,sha256=Ux_0QT1unNRlKl3cakzjG5Px1uuxOOfBoF_pnalx_T8,4936
 redisbench_admin/run_remote/remote_failures.py,sha256=IOo6DyxarcwwMPCeN4gWB2JrhuC9iBLwq0nCROqr5ak,1567
 redisbench_admin/run_remote/remote_helpers.py,sha256=6rbENEUs62ZAqXDVgLMfh9o8gttcG0bG0lXE0HNdFeo,13271
-redisbench_admin/run_remote/run_remote.py,sha256=tZqCu1fTfB5gWooVIEsSDoaVfnVRfxeCpn-RLmYI3IM,75476
+redisbench_admin/run_remote/run_remote.py,sha256=-f1yuUvGXDYdAxyiB2ecI5vSzVOaR-wokZljPhds0aw,77366
 redisbench_admin/run_remote/standalone.py,sha256=WRgiY8oMJwDUPht1LAPG9tnOLvhJmhRvVOi3GBnMoX4,27952
 redisbench_admin/run_remote/terraform.py,sha256=vV3eWXNwj7vsnFNqUgCir5ueZS4VYopEyzWiTtoSq0Q,4018
 redisbench_admin/utils/__init__.py,sha256=DtBXRp0Q01XgCFmY-1OIePMyyYihVNAjZ1Y8zwqSDN0,101
@@ -103,15 +103,15 @@ redisbench_admin/utils/benchmark_config.py,sha256=SREplEGIfPtR9NKIjJXb5pug-ikbJD
 redisbench_admin/utils/local.py,sha256=uVU91Bvk3FAaDGmTIbI0zXYd1K24A9-Xwm15xI_SYC4,4086
 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=MsRL6x-eekzJOVE6Ho05igZzUX54m-4fRVCQlSYxyw0,42306
+redisbench_admin/utils/remote.py,sha256=cyxIsN717RRtmd5R32wNA7OElLu1FPSiDwXxmg8Jo4A,42882
 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=XVSvo1_DdcYwk2jOxL3VPVPbnDnhGYt8ieYfANo6rTo,15085
 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.58.dist-info/METADATA,sha256=c-SW0SwVQ3NXU7l69rv4zHC-J9DpCbePfKteRNPVYvU,5724
-redisbench_admin-0.11.58.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-redisbench_admin-0.11.58.dist-info/entry_points.txt,sha256=UUawXk_AS-PlieKJ1QxPQXGsRLb6OW_F0MtmA1W0KE8,113
-redisbench_admin-0.11.58.dist-info/licenses/LICENSE,sha256=AAMtfs82zOOvmG68vILivm6lxi2rcOlGObmA8jzxQvw,10768
-redisbench_admin-0.11.58.dist-info/RECORD,,
+redisbench_admin-0.11.60.dist-info/METADATA,sha256=jJDvtYY-1hVd3iV87xAw0VB8FzhuQTx9v4PI9RBdh-w,5724
+redisbench_admin-0.11.60.dist-info/WHEEL,sha256=3ny-bZhpXrU6vSQ1UPG34FoxZBp3lVcvK0LkgUz6VLk,88
+redisbench_admin-0.11.60.dist-info/entry_points.txt,sha256=UUawXk_AS-PlieKJ1QxPQXGsRLb6OW_F0MtmA1W0KE8,113
+redisbench_admin-0.11.60.dist-info/licenses/LICENSE,sha256=AAMtfs82zOOvmG68vILivm6lxi2rcOlGObmA8jzxQvw,10768
+redisbench_admin-0.11.60.dist-info/RECORD,,

{redisbench_admin-0.11.58.dist-info → redisbench_admin-0.11.60.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 2.2.1
+Generator: poetry-core 2.3.0
 Root-Is-Purelib: true
 Tag: py3-none-any