[fix] Only collecting commandstats/server stats on master branch or version. (#276)

* [fix] Only collecting commandstats/server stats on master branch or version.

Author: filipecosta90

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "redisbench-admin"
-version = "0.6.12"
+version = "0.6.13"
 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/compare/compare.py

@@ -211,7 +211,7 @@ def compare_command_logic(args, project_name, project_version):
 
         except redis.exceptions.ResponseError:
             pass
-
+        unstable = False
         if baseline_v != "N/A" and comparison_v != "N/A":
             stamp_b = ""
             unstable = False

redisbench_admin/run_remote/run_remote.py

@@ -530,14 +530,18 @@ def run_remote_command_logic(args, project_name, project_version):
                                                 )
                                             )
 
-                                    if args.push_results_redistimeseries:
+                                    if args.push_results_redistimeseries and (
+                                        artifact_version is not None
+                                        or tf_github_branch == "master"
+                                    ):
                                         (
                                             end_time_ms,
                                             _,
                                             overall_end_time_metrics,
                                         ) = collect_redis_metrics(
-                                            redis_conns, ["cpu", "memory"]
+                                            redis_conns, ["memory"]
                                         )
+                                        expire_ms = 7 * 24 * 60 * 60 * 1000
                                         export_redis_metrics(
                                             artifact_version,
                                             end_time_ms,
@@ -550,6 +554,8 @@ def run_remote_command_logic(args, project_name, project_version):
                                             tf_github_org,
                                             tf_github_repo,
                                             tf_triggering_env,
+                                            {"metric-type": "redis-metrics"},
+                                            expire_ms,
                                         )
                                         (
                                             end_time_ms,
@@ -571,6 +577,7 @@ def run_remote_command_logic(args, project_name, project_version):
                                             tf_github_repo,
                                             tf_triggering_env,
                                             {"metric-type": "commandstats"},
+                                            expire_ms,
                                         )
 
                                     if setup_details["env"] is None:
@@ -791,6 +798,7 @@ def export_redis_metrics(
     tf_github_repo,
     tf_triggering_env,
     metadata_dict=None,
+    expire_ms=0,
 ):
     datapoint_errors = 0
     datapoint_inserts = 0
@@ -858,7 +866,9 @@ def export_redis_metrics(
                 ),
                 "data": {end_time_ms: metric_value},
             }
-    i_errors, i_inserts = push_data_to_redistimeseries(rts, timeseries_dict)
+    i_errors, i_inserts = push_data_to_redistimeseries(
+        rts, timeseries_dict, expire_msecs
+    )
     datapoint_errors = datapoint_errors + i_errors
     datapoint_inserts = datapoint_inserts + i_inserts
     return datapoint_errors, datapoint_inserts

redisbench_admin/utils/remote.py

@@ -504,7 +504,7 @@ def fetch_remote_setup_from_config(
     return terraform_working_dir, setup_type, setup
 
 
-def push_data_to_redistimeseries(rts, time_series_dict: dict):
+def push_data_to_redistimeseries(rts, time_series_dict: dict, expire_msecs=0):
     datapoint_errors = 0
     datapoint_inserts = 0
     if rts is not None and time_series_dict is not None:
@@ -543,6 +543,8 @@ def push_data_to_redistimeseries(rts, time_series_dict: dict):
                     )
                     datapoint_errors += 1
                     pass
+            if expire_msecs > 0:
+                rts.redis.pexpire(timeseries_name, expire_msecs)
     return datapoint_errors, datapoint_inserts