[add] Enabled target tables on RTS (#242)

filipecosta90 · web-flow · commit ed1df96a6db2 · 2021-11-22T11:40:33.000Z
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "redisbench-admin"
-version = "0.5.18"
+version = "0.5.19"
 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"
diff --git a/redisbench_admin/run/common.py b/redisbench_admin/run/common.py
@@ -229,6 +229,10 @@ def common_exporter_logic(
     per_version_time_series_dict = {}
     per_branch_time_series_dict = {}
     testcase_metric_context_paths = []
+    version_target_table_keyname = None
+    version_target_table_dict = None
+    branch_target_table_keyname = None
+    branch_target_table_dict = None
 
     if exporter_timemetric_path is not None and len(metrics) > 0:
         if datapoints_timestamp is None:
@@ -245,6 +249,8 @@ def common_exporter_logic(
             (
                 _,
                 per_version_time_series_dict,
+                version_target_table_keyname,
+                version_target_table_dict,
             ) = extract_perversion_timeseries_from_results(
                 datapoints_timestamp,
                 metrics,
@@ -263,7 +269,12 @@ def common_exporter_logic(
             )
         if tf_github_branch is not None and tf_github_branch != "":
             # extract per branch datapoints
-            _, per_branch_time_series_dict = extract_perbranch_timeseries_from_results(
+            (
+                _,
+                per_branch_time_series_dict,
+                branch_target_table_keyname,
+                branch_target_table_dict,
+            ) = extract_perbranch_timeseries_from_results(
                 datapoints_timestamp,
                 metrics,
                 results_dict,
@@ -295,6 +306,10 @@ def common_exporter_logic(
         per_version_time_series_dict,
         per_branch_time_series_dict,
         testcase_metric_context_paths,
+        version_target_table_keyname,
+        version_target_table_dict,
+        branch_target_table_keyname,
+        branch_target_table_dict,
     )
 
 
diff --git a/redisbench_admin/run/redistimeseries.py b/redisbench_admin/run/redistimeseries.py
@@ -49,6 +49,10 @@ def prepare_timeseries_dict(
         per_version_time_series_dict,
         per_branch_time_series_dict,
         testcase_metric_context_paths,
+        version_target_table_keyname,
+        version_target_table_dict,
+        branch_target_table_keyname,
+        branch_target_table_dict,
     ) = common_exporter_logic(
         deployment_name,
         deployment_type,
@@ -71,6 +75,10 @@ def prepare_timeseries_dict(
     return (
         time_series_dict,
         testcase_metric_context_paths,
+        version_target_table_keyname,
+        version_target_table_dict,
+        branch_target_table_keyname,
+        branch_target_table_dict,
     )
 
 
@@ -237,7 +245,14 @@ def timeseries_test_sucess_flow(
 ):
     testcase_metric_context_paths = []
     if timeseries_dict is None:
-        timeseries_dict, testcase_metric_context_paths = prepare_timeseries_dict(
+        (
+            timeseries_dict,
+            testcase_metric_context_paths,
+            version_target_table_keyname,
+            version_target_table_dict,
+            branch_target_table_keyname,
+            branch_target_table_dict,
+        ) = prepare_timeseries_dict(
             artifact_version,
             benchmark_config,
             default_metrics,
@@ -262,6 +277,21 @@ def timeseries_test_sucess_flow(
             )
         )
         push_data_to_redistimeseries(rts, timeseries_dict)
+        if (
+            version_target_table_keyname is not None
+            and version_target_table_dict is not None
+        ):
+            rts.redis.hset(
+                version_target_table_keyname, None, None, version_target_table_dict
+            )
+        if (
+            branch_target_table_keyname is not None
+            and branch_target_table_dict is not None
+        ):
+            rts.redis.hset(
+                branch_target_table_keyname, None, None, branch_target_table_dict
+            )
+
         update_secondary_result_keys(
             artifact_version,
             benchmark_duration_seconds,
diff --git a/redisbench_admin/utils/remote.py b/redisbench_admin/utils/remote.py
@@ -583,7 +583,11 @@ def extract_perversion_timeseries_from_results(
 ):
     break_by_key = "version"
     break_by_str = "by.{}".format(break_by_key)
-    branch_time_series_dict = common_timeseries_extraction(
+    (
+        branch_time_series_dict,
+        target_table_keyname,
+        target_table_dict,
+    ) = common_timeseries_extraction(
         break_by_key,
         break_by_str,
         datapoints_timestamp,
@@ -601,7 +605,7 @@ def extract_perversion_timeseries_from_results(
         running_platform,
         testcase_metric_context_paths,
     )
-    return True, branch_time_series_dict
+    return True, branch_time_series_dict, target_table_keyname, target_table_dict
 
 
 def common_timeseries_extraction(
@@ -633,7 +637,7 @@ def common_timeseries_extraction(
         test_case_targets_dict = cleaned_metric[4]
         use_metric_context_path = cleaned_metric[5]
 
-        from_metric_kv_to_timeserie(
+        target_table_keyname, target_table_dict = from_metric_kv_to_timeserie(
             break_by_key,
             break_by_str,
             break_by_value,
@@ -656,7 +660,7 @@ def common_timeseries_extraction(
             time_series_dict,
             use_metric_context_path,
         )
-    return time_series_dict
+    return time_series_dict, target_table_keyname, target_table_dict
 
 
 def from_metric_kv_to_timeserie(
@@ -706,6 +710,16 @@ def from_metric_kv_to_timeserie(
         "data": {datapoints_timestamp: metric_value},
     }
     original_ts_name = ts_name
+    target_table_keyname = "ci.benchmarks.redislabs/{break_by_key}/{break_by_str}/{tf_github_org}/{tf_github_repo}/{deployment_type}/{deployment_name}/{metric_name}".format(
+        break_by_key=break_by_key,
+        break_by_str=break_by_str,
+        tf_github_org=tf_github_org,
+        tf_github_repo=tf_github_repo,
+        deployment_name=deployment_name,
+        deployment_type=deployment_type,
+        metric_name=metric_name,
+    )
+    target_table_dict = {"test-case": test_name, tf_github_repo: metric_value}
     for target_name, target_value in test_case_targets_dict.items():
         ts_name = original_ts_name + "/target/{}".format(target_name)
         timeserie_tags_target = timeserie_tags.copy()
@@ -717,6 +731,26 @@ def from_metric_kv_to_timeserie(
             "labels": timeserie_tags_target,
             "data": {datapoints_timestamp: target_value},
         }
+        if "overallQuantiles" in metric_name:
+            comparison_type = "(lower-better)"
+        else:
+            comparison_type = "(higher-better)"
+        if comparison_type == "(higher-better)":
+            target_value_pct = (
+                (float(metric_value) / float(target_value)) - 1.0
+            ) * 100.0
+        else:
+            target_value_pct = (
+                (float(target_value) / float(metric_value)) - 1.0
+            ) * 100.0
+
+        target_value_pct_str = "{:.2f}".format(target_value_pct)
+
+        target_table_dict[target_name] = target_value
+        target_table_dict[
+            "{}:percent {}".format(target_name, comparison_type)
+        ] = target_value_pct_str
+    return target_table_keyname, target_table_dict
 
 
 def get_ts_tags_and_name(
@@ -827,7 +861,11 @@ def extract_perbranch_timeseries_from_results(
 ):
     break_by_key = "branch"
     break_by_str = "by.{}".format(break_by_key)
-    branch_time_series_dict = common_timeseries_extraction(
+    (
+        branch_time_series_dict,
+        target_table_keyname,
+        target_table_dict,
+    ) = common_timeseries_extraction(
         break_by_key,
         break_by_str,
         datapoints_timestamp,
@@ -845,7 +883,7 @@ def extract_perbranch_timeseries_from_results(
         running_platform,
         testcase_metric_context_paths,
     )
-    return True, branch_time_series_dict
+    return True, branch_time_series_dict, target_table_keyname, target_table_dict
 
 
 def get_overall_dashboard_keynames(
diff --git a/tests/test_remote.py b/tests/test_remote.py
@@ -150,7 +150,7 @@ def test_extract_perversion_timeseries_from_results():
         ) as json_file:
             results_dict = json.load(json_file)
 
-            (timeseries_dict, _,) = prepare_timeseries_dict(
+            (timeseries_dict, _, _, _, _, _) = prepare_timeseries_dict(
                 "1.0.0",
                 benchmark_config,
                 default_metrics,
@@ -207,6 +207,8 @@ def test_extract_timeseries_from_results():
             (
                 ok,
                 per_version_time_series_dict,
+                _,
+                _,
             ) = extract_perversion_timeseries_from_results(
                 datapoints_timestamp,
                 metrics,
@@ -228,6 +230,8 @@ def test_extract_timeseries_from_results():
             (
                 ok,
                 per_branch_time_series_dict,
+                _,
+                _,
             ) = extract_perbranch_timeseries_from_results(
                 datapoints_timestamp,
                 metrics,
@@ -415,7 +419,7 @@ def test_common_timeseries_extraction():
     tf_github_repo = "redis"
     tf_triggering_env = "gh"
 
-    timeseries_dict = common_timeseries_extraction(
+    timeseries_dict, _, _ = common_timeseries_extraction(
         break_by_key,
         break_by_str,
         datapoints_timestamp,
