Fixed generate_artifacts_table_grafana_redis() not to rely on args (#348)

Author: filipecosta90

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "redisbench-admin"
-version = "0.8.4"
+version = "0.8.5"
 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/run/grafana.py

@@ -16,10 +16,10 @@
 
 
 def generate_artifacts_table_grafana_redis(
-    args,
+    push_results_redistimeseries,
     grafana_profile_dashboard,
     profile_artifacts,
-    rts,
+    redis_conn,
     setup_name,
     start_time_ms,
     start_time_str,
@@ -103,30 +103,30 @@ def generate_artifacts_table_grafana_redis(
         test_name,
         profile_id,
     )
-    if args.push_results_redistimeseries:
+    if push_results_redistimeseries:
         current_time = time.time() * 1000
         timeframe_by_branch = current_time - EXPIRE_TIME_MSECS_PROFILE_KEYS
-        rts.zadd(
+        redis_conn.zadd(
             zset_profiles_setups_testcases_branches,
             {tf_github_branch: start_time_ms},
         )
-        rts.zadd(
+        redis_conn.zadd(
             zset_profiles_setups_testcases_branches_latest_link,
             {https_link: start_time_ms},
         )
-        rts.zadd(
+        redis_conn.zadd(
             zset_profiles_setup,
             {setup_name: start_time_ms},
         )
-        rts.zadd(
+        redis_conn.zadd(
             zset_profiles_setups_testcases,
             {test_name: start_time_ms},
         )
-        rts.zadd(
+        redis_conn.zadd(
             zset_profiles_setups_testcases_profileid,
             {profile_id: start_time_ms},
         )
-        rts.zadd(
+        redis_conn.zadd(
             zset_profiles,
             {profile_id: start_time_ms},
         )
@@ -138,11 +138,11 @@ def generate_artifacts_table_grafana_redis(
             zset_profiles_setups_testcases_branches_latest_link,
         ]
         for keyname in sorted_set_keys:
-            rts.zremrangebyscore(keyname, 0, int(timeframe_by_branch))
+            redis_conn.zremrangebyscore(keyname, 0, int(timeframe_by_branch))
 
-        rts.sadd(profile_set_redis_key, test_name)
-        rts.expire(profile_set_redis_key, EXPIRE_TIME_SECS_PROFILE_KEYS)
-        rts.setex(
+        redis_conn.sadd(profile_set_redis_key, test_name)
+        redis_conn.expire(profile_set_redis_key, EXPIRE_TIME_SECS_PROFILE_KEYS)
+        redis_conn.setex(
             profile_string_testcase_markdown_key,
             EXPIRE_TIME_SECS_PROFILE_KEYS,
             profile_markdown_str,

redisbench_admin/run_remote/run_remote.py

@@ -641,7 +641,7 @@ def run_remote_command_logic(args, project_name, project_version):
                                         else:
                                             https_link = (
                                                 generate_artifacts_table_grafana_redis(
-                                                    args,
+                                                    args.push_results_redistimeseries,
                                                     grafana_profile_dashboard,
                                                     profile_artifacts,
                                                     rts,

redisbench_admin/watchdog/watchdog.py

@@ -177,7 +177,9 @@ def watchdog_command_logic(args, project_name, project_version):
             )
         except redis.exceptions.ConnectionError as e:
             logging.error(
-                "Detected an error while writing data to rts: {}".format(e.__str__())
+                "Detected an error while writing data to redis_conn: {}".format(
+                    e.__str__()
+                )
             )
         sleep_time_secs = float(update_interval) - (
             (datetime.datetime.now() - starttime).total_seconds()

tests/test_aa_run_remote.py

@@ -35,7 +35,7 @@ def test_redistimeseries_results_logic():
     #     deployment_type,
     #     exporter_timemetric_path,
     #     results_dict,
-    #     rts,
+    #     redis_conn,
     #     test_name,
     #     tf_github_branch,
     #     tf_github_org,

tests/test_run_local.py

@@ -93,9 +93,9 @@ def test_datasink_profile_tabular_data():
                 pprof_format, profile_test_suffix
             )
             assert rts.exists(table_columns_text_key)
-        # assert rts.exists(testcases_setname)
-        # assert rts.exists(running_platforms_setname)
-        # assert rts.exists(build_variant_setname)
+        # assert redis_conn.exists(testcases_setname)
+        # assert redis_conn.exists(running_platforms_setname)
+        # assert redis_conn.exists(build_variant_setname)
 
     except redis.exceptions.ConnectionError:
         pass
@@ -183,7 +183,7 @@ def test_run_local_command_logic():
     except SystemExit as e:
         assert e.code == 1
 
-    ## run while pushing results to rts
+    ## run while pushing results to redis_conn
     rts_host = os.getenv("RTS_DATASINK_HOST", None)
     rts_port = 16379
     if rts_host is None: