diff options
Diffstat (limited to 'csit.infra.dash/app/cdash')
| -rw-r--r-- | csit.infra.dash/app/cdash/data/_metadata/trending_mrr | bin | 8545 -> 9832 bytes | |||
| -rw-r--r-- | csit.infra.dash/app/cdash/data/data.yaml | 6 | ||||
| -rw-r--r-- | csit.infra.dash/app/cdash/trending/graphs.py | 109 | ||||
| -rw-r--r-- | csit.infra.dash/app/cdash/utils/constants.py | 4 |
4 files changed, 82 insertions, 37 deletions
diff --git a/csit.infra.dash/app/cdash/data/_metadata/trending_mrr b/csit.infra.dash/app/cdash/data/_metadata/trending_mrr Binary files differindex 64b0db0d0c..9d4e126e59 100644 --- a/csit.infra.dash/app/cdash/data/_metadata/trending_mrr +++ b/csit.infra.dash/app/cdash/data/_metadata/trending_mrr diff --git a/csit.infra.dash/app/cdash/data/data.yaml b/csit.infra.dash/app/cdash/data/data.yaml index f8c00731cf..cff25915e5 100644 --- a/csit.infra.dash/app/cdash/data/data.yaml +++ b/csit.infra.dash/app/cdash/data/data.yaml @@ -26,9 +26,9 @@ - result_receive_rate_rate_avg - result_receive_rate_rate_stdev - result_receive_rate_rate_unit - # - result_receive_rate_bandwidth_avg - # - result_receive_rate_bandwidth_stdev - # - result_receive_rate_bandwidth_unit + - result_receive_rate_bandwidth_avg + - result_receive_rate_bandwidth_stdev + - result_receive_rate_bandwidth_unit - telemetry - data_type: trending partition: test_type diff --git a/csit.infra.dash/app/cdash/trending/graphs.py b/csit.infra.dash/app/cdash/trending/graphs.py index fcfee26e3f..fa60ffdd77 100644 --- a/csit.infra.dash/app/cdash/trending/graphs.py +++ b/csit.infra.dash/app/cdash/trending/graphs.py @@ -14,6 +14,7 @@ """Implementation of graphs for trending data. """ +import logging import plotly.graph_objects as go import pandas as pd @@ -127,52 +128,92 @@ def graph_trending( y_data = [(v * norm_factor) for v in df[C.VALUE[ttype]].tolist()] units = df[C.UNIT[ttype]].unique().tolist() - anomalies, trend_avg, trend_stdev = classify_anomalies( - {k: v for k, v in zip(x_axis, y_data)} - ) + try: + anomalies, trend_avg, trend_stdev = classify_anomalies( + {k: v for k, v in zip(x_axis, y_data)} + ) + except ValueError as err: + logging.error(err) + return list(), list() hover = list() customdata = list() customdata_samples = list() name_lst = name.split("-") for idx, (_, row) in enumerate(df.iterrows()): + h_tput, h_band, h_lat = str(), str(), str() + if ttype in ("mrr", "mrr-bandwidth"): + h_tput = ( + f"tput avg [{row['result_receive_rate_rate_unit']}]: " + f"{row['result_receive_rate_rate_avg']:,.0f}<br>" + f"tput stdev [{row['result_receive_rate_rate_unit']}]: " + f"{row['result_receive_rate_rate_stdev']:,.0f}<br>" + ) + if pd.notna(row["result_receive_rate_bandwidth_avg"]): + h_band = ( + f"bandwidth avg " + f"[{row['result_receive_rate_bandwidth_unit']}]: " + f"{row['result_receive_rate_bandwidth_avg']:,.0f}<br>" + f"bandwidth stdev " + f"[{row['result_receive_rate_bandwidth_unit']}]: " + f"{row['result_receive_rate_bandwidth_stdev']:,.0f}<br>" + ) + elif ttype in ("ndr", "ndr-bandwidth"): + h_tput = ( + f"tput [{row['result_ndr_lower_rate_unit']}]: " + f"{row['result_ndr_lower_rate_value']:,.0f}<br>" + ) + if pd.notna(row["result_ndr_lower_bandwidth_value"]): + h_band = ( + f"bandwidth [{row['result_ndr_lower_bandwidth_unit']}]:" + f" {row['result_ndr_lower_bandwidth_value']:,.0f}<br>" + ) + elif ttype in ("pdr", "pdr-bandwidth", "latency"): + h_tput = ( + f"tput [{row['result_pdr_lower_rate_unit']}]: " + f"{row['result_pdr_lower_rate_value']:,.0f}<br>" + ) + if pd.notna(row["result_pdr_lower_bandwidth_value"]): + h_band = ( + f"bandwidth [{row['result_pdr_lower_bandwidth_unit']}]:" + f" {row['result_pdr_lower_bandwidth_value']:,.0f}<br>" + ) + if pd.notna(row["result_latency_forward_pdr_50_avg"]): + h_lat = ( + f"latency " + f"[{row['result_latency_forward_pdr_50_unit']}]: " + f"{row['result_latency_forward_pdr_50_avg']:,.0f}<br>" + ) + elif ttype in ("hoststack-cps", "hoststack-rps", + "hoststack-cps-bandwidth", + "hoststack-rps-bandwidth", "hoststack-latency"): + h_tput = ( + f"tput [{row['result_rate_unit']}]: " + f"{row['result_rate_value']:,.0f}<br>" + ) + h_band = ( + f"bandwidth [{row['result_bandwidth_unit']}]: " + f"{row['result_bandwidth_value']:,.0f}<br>" + ) + h_lat = ( + f"latency [{row['result_latency_unit']}]: " + f"{row['result_latency_value']:,.0f}<br>" + ) + elif ttype in ("hoststack-bps", ): + h_band = ( + f"bandwidth [{row['result_bandwidth_unit']}]: " + f"{row['result_bandwidth_value']:,.0f}<br>" + ) hover_itm = ( f"dut: {name_lst[0]}<br>" f"infra: {'-'.join(name_lst[1:5])}<br>" f"test: {'-'.join(name_lst[5:])}<br>" f"date: {row['start_time'].strftime('%Y-%m-%d %H:%M:%S')}<br>" - f"<prop> [{row[C.UNIT[ttype]]}]: {y_data[idx]:,.0f}<br>" - f"<stdev>" - f"<additional-info>" + f"{h_tput}{h_band}{h_lat}" f"{row['dut_type']}-ref: {row['dut_version']}<br>" f"csit-ref: {row['job']}/{row['build']}<br>" f"hosts: {', '.join(row['hosts'])}" ) - if ttype == "mrr": - stdev = ( - f"stdev [{row['result_receive_rate_rate_unit']}]: " - f"{row['result_receive_rate_rate_stdev']:,.0f}<br>" - ) - else: - stdev = str() - if ttype in ("hoststack-cps", "hoststack-rps"): - add_info = ( - f"bandwidth [{row[C.UNIT['hoststack-bps']]}]: " - f"{row[C.VALUE['hoststack-bps']]:,.0f}<br>" - f"latency [{row[C.UNIT['hoststack-latency']]}]: " - f"{row[C.VALUE['hoststack-latency']]:,.0f}<br>" - ) - elif ttype in ("ndr", "pdr"): # Add mrr - test_type = f"{ttype}-bandwidth" - add_info = ( - f"bandwidth [{row[C.UNIT[test_type]]}]: " - f"{row[C.VALUE[test_type]]:,.0f}<br>" - ) - else: - add_info = str() - hover_itm = hover_itm.replace( - "<prop>", "latency" if ttype == "latency" else "average" - ).replace("<stdev>", stdev).replace("<additional-info>", add_info) hover.append(hover_itm) if ttype == "latency": customdata_samples.append(get_hdrh_latencies(row, name)) @@ -333,7 +374,7 @@ def graph_trending( fig_tput = go.Figure() fig_tput.add_traces(traces) - if ttype in ("ndr", "pdr"): # Add mrr + if ttype in ("ndr", "pdr", "mrr", "hoststack-cps", "hoststack-rps"): traces, _ = _generate_trending_traces( f"{ttype}-bandwidth", itm["id"], @@ -346,9 +387,9 @@ def graph_trending( fig_band = go.Figure() fig_band.add_traces(traces) - if itm["testtype"] == "pdr": + if ttype in ("pdr", "hoststack-cps", "hoststack-rps"): traces, _ = _generate_trending_traces( - "latency", + "latency" if ttype == "pdr" else "hoststack-latency", itm["id"], df, get_color(idx), diff --git a/csit.infra.dash/app/cdash/utils/constants.py b/csit.infra.dash/app/cdash/utils/constants.py index fb887fe79e..922634898e 100644 --- a/csit.infra.dash/app/cdash/utils/constants.py +++ b/csit.infra.dash/app/cdash/utils/constants.py @@ -235,6 +235,8 @@ class Constants: "latency": "result_latency_forward_pdr_50_avg", "hoststack-cps": "result_rate_value", "hoststack-rps": "result_rate_value", + "hoststack-cps-bandwidth": "result_bandwidth_value", + "hoststack-rps-bandwidth": "result_bandwidth_value", "hoststack-bps": "result_bandwidth_value", "hoststack-latency": "result_latency_value" } @@ -260,6 +262,8 @@ class Constants: "latency": "result_latency_forward_pdr_50_unit", "hoststack-cps": "result_rate_unit", "hoststack-rps": "result_rate_unit", + "hoststack-cps-bandwidth": "result_bandwidth_unit", + "hoststack-rps-bandwidth": "result_bandwidth_unit", "hoststack-bps": "result_bandwidth_unit", "hoststack-latency": "result_latency_unit" } |