X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Fdash%2Fapp%2Fpal%2Ftrending%2Fgraphs.py;h=fb87cec953655689e99c859765b63398232d2f2b;hp=dc4e7afca8a82f465f7b2833c411ef7c16dca707;hb=d294d31e7cadd858c1c27dae9b5a85732aa95b23;hpb=ab10e17fd7853043afde6af25921f6ab636e0964
diff --git a/resources/tools/dash/app/pal/trending/graphs.py b/resources/tools/dash/app/pal/trending/graphs.py
index dc4e7afca8..fb87cec953 100644
--- a/resources/tools/dash/app/pal/trending/graphs.py
+++ b/resources/tools/dash/app/pal/trending/graphs.py
@@ -16,7 +16,6 @@
import plotly.graph_objects as go
import pandas as pd
-import re
import hdrh.histogram
import hdrh.codec
@@ -27,35 +26,29 @@ from numpy import isnan
from ..jumpavg import classify
-_COLORS = (
- u"#1A1110", u"#DA2647", u"#214FC6", u"#01786F", u"#BD8260", u"#FFD12A",
- u"#A6E7FF", u"#738276", u"#C95A49", u"#FC5A8D", u"#CEC8EF", u"#391285",
- u"#6F2DA8", u"#FF878D", u"#45A27D", u"#FFD0B9", u"#FD5240", u"#DB91EF",
- u"#44D7A8", u"#4F86F7", u"#84DE02", u"#FFCFF1", u"#614051"
-)
_ANOMALY_COLOR = {
- u"regression": 0.0,
- u"normal": 0.5,
- u"progression": 1.0
+ "regression": 0.0,
+ "normal": 0.5,
+ "progression": 1.0
}
_COLORSCALE_TPUT = [
- [0.00, u"red"],
- [0.33, u"red"],
- [0.33, u"white"],
- [0.66, u"white"],
- [0.66, u"green"],
- [1.00, u"green"]
+ [0.00, "red"],
+ [0.33, "red"],
+ [0.33, "white"],
+ [0.66, "white"],
+ [0.66, "green"],
+ [1.00, "green"]
]
-_TICK_TEXT_TPUT = [u"Regression", u"Normal", u"Progression"]
+_TICK_TEXT_TPUT = ["Regression", "Normal", "Progression"]
_COLORSCALE_LAT = [
- [0.00, u"green"],
- [0.33, u"green"],
- [0.33, u"white"],
- [0.66, u"white"],
- [0.66, u"red"],
- [1.00, u"red"]
+ [0.00, "green"],
+ [0.33, "green"],
+ [0.33, "white"],
+ [0.66, "white"],
+ [0.66, "red"],
+ [1.00, "red"]
]
-_TICK_TEXT_LAT = [u"Progression", u"Normal", u"Regression"]
+_TICK_TEXT_LAT = ["Progression", "Normal", "Regression"]
_VALUE = {
"mrr": "result_receive_rate_rate_avg",
"ndr": "result_ndr_lower_rate_value",
@@ -83,17 +76,29 @@ _LAT_HDRH = ( # Do not change the order
PERCENTILE_MAX = 99.999501
_GRAPH_LAT_HDRH_DESC = {
- u"result_latency_forward_pdr_0_hdrh": u"No-load.",
- u"result_latency_reverse_pdr_0_hdrh": u"No-load.",
- u"result_latency_forward_pdr_10_hdrh": u"Low-load, 10% PDR.",
- u"result_latency_reverse_pdr_10_hdrh": u"Low-load, 10% PDR.",
- u"result_latency_forward_pdr_50_hdrh": u"Mid-load, 50% PDR.",
- u"result_latency_reverse_pdr_50_hdrh": u"Mid-load, 50% PDR.",
- u"result_latency_forward_pdr_90_hdrh": u"High-load, 90% PDR.",
- u"result_latency_reverse_pdr_90_hdrh": u"High-load, 90% PDR."
+ "result_latency_forward_pdr_0_hdrh": "No-load.",
+ "result_latency_reverse_pdr_0_hdrh": "No-load.",
+ "result_latency_forward_pdr_10_hdrh": "Low-load, 10% PDR.",
+ "result_latency_reverse_pdr_10_hdrh": "Low-load, 10% PDR.",
+ "result_latency_forward_pdr_50_hdrh": "Mid-load, 50% PDR.",
+ "result_latency_reverse_pdr_50_hdrh": "Mid-load, 50% PDR.",
+ "result_latency_forward_pdr_90_hdrh": "High-load, 90% PDR.",
+ "result_latency_reverse_pdr_90_hdrh": "High-load, 90% PDR."
}
+def _get_color(idx: int) -> str:
+ """
+ """
+ _COLORS = (
+ "#1A1110", "#DA2647", "#214FC6", "#01786F", "#BD8260", "#FFD12A",
+ "#A6E7FF", "#738276", "#C95A49", "#FC5A8D", "#CEC8EF", "#391285",
+ "#6F2DA8", "#FF878D", "#45A27D", "#FFD0B9", "#FD5240", "#DB91EF",
+ "#44D7A8", "#4F86F7", "#84DE02", "#FFCFF1", "#614051"
+ )
+ return _COLORS[idx % len(_COLORS)]
+
+
def _get_hdrh_latencies(row: pd.Series, name: str) -> dict:
"""
"""
@@ -135,7 +140,7 @@ def _classify_anomalies(data):
stdv = 0.0
for sample in data.values():
if isnan(sample):
- classification.append(u"outlier")
+ classification.append("outlier")
avgs.append(sample)
stdevs.append(sample)
continue
@@ -151,7 +156,7 @@ def _classify_anomalies(data):
stdevs.append(stdv)
values_left -= 1
continue
- classification.append(u"normal")
+ classification.append("normal")
avgs.append(avg)
stdevs.append(stdv)
values_left -= 1
@@ -165,30 +170,38 @@ def select_trending_data(data: pd.DataFrame, itm:dict) -> pd.DataFrame:
phy = itm["phy"].split("-")
if len(phy) == 4:
topo, arch, nic, drv = phy
- if drv in ("dpdk", "ixgbe"):
+ if drv == "dpdk":
drv = ""
else:
drv += "-"
drv = drv.replace("_", "-")
else:
return None
- cadence = \
- "weekly" if (arch == "aws" or itm["testtype"] != "mrr") else "daily"
- sel_topo_arch = (
- f"csit-vpp-perf-"
- f"{itm['testtype'] if itm['testtype'] == 'mrr' else 'ndrpdr'}-"
- f"{cadence}-master-{topo}-{arch}"
- )
- df_sel = data.loc[(data["job"] == sel_topo_arch)]
- regex = (
- f"^.*{nic}.*\.{itm['framesize']}-{itm['core']}-{drv}{itm['test']}-"
- f"{'mrr' if itm['testtype'] == 'mrr' else 'ndrpdr'}$"
- )
- df = df_sel.loc[
- df_sel["test_id"].apply(
- lambda x: True if re.search(regex, x) else False
- )
- ].sort_values(by="start_time", ignore_index=True)
+
+ core = str() if itm["dut"] == "trex" else f"{itm['core']}"
+ ttype = "ndrpdr" if itm["testtype"] in ("ndr", "pdr") else itm["testtype"]
+ dut_v100 = "none" if itm["dut"] == "trex" else itm["dut"]
+ dut_v101 = itm["dut"]
+
+ df = data.loc[(
+ (
+ (
+ (data["version"] == "1.0.0") &
+ (data["dut_type"].str.lower() == dut_v100)
+ ) |
+ (
+ (data["version"] == "1.0.1") &
+ (data["dut_type"].str.lower() == dut_v101)
+ )
+ ) &
+ (data["test_type"] == ttype) &
+ (data["passed"] == True)
+ )]
+ df = df[df.job.str.endswith(f"{topo}-{arch}")]
+ df = df[df.test_id.str.contains(
+ f"^.*[.|-]{nic}.*{itm['framesize']}-{core}-{drv}{itm['test']}-{ttype}$",
+ regex=True
+ )].sort_values(by="start_time", ignore_index=True)
return df
@@ -199,10 +212,13 @@ def _generate_trending_traces(ttype: str, name: str, df: pd.DataFrame,
"""
df = df.dropna(subset=[_VALUE[ttype], ])
+ if df.empty:
+ return list()
+ df = df.loc[((df["start_time"] >= start) & (df["start_time"] <= end))]
if df.empty:
return list()
- x_axis = [d for d in df["start_time"] if d >= start and d <= end]
+ x_axis = df["start_time"].tolist()
anomalies, trend_avg, trend_stdev = _classify_anomalies(
{k: v for k, v in zip(x_axis, df[_VALUE[ttype]])}
@@ -211,18 +227,19 @@ def _generate_trending_traces(ttype: str, name: str, df: pd.DataFrame,
hover = list()
customdata = list()
for _, row in df.iterrows():
+ d_type = "trex" if row["dut_type"] == "none" else row["dut_type"]
hover_itm = (
- f"date: {row['start_time'].strftime('%d-%m-%Y %H:%M:%S')}
"
- f" [{row[_UNIT[ttype]]}]: {row[_VALUE[ttype]]}
"
+ f"date: {row['start_time'].strftime('%Y-%m-%d %H:%M:%S')}
"
+ f" [{row[_UNIT[ttype]]}]: {row[_VALUE[ttype]]:,.0f}
"
f""
- f"{row['dut_type']}-ref: {row['dut_version']}
"
+ f"{d_type}-ref: {row['dut_version']}
"
f"csit-ref: {row['job']}/{row['build']}
"
f"hosts: {', '.join(row['hosts'])}"
)
if ttype == "mrr":
stdev = (
f"stdev [{row['result_receive_rate_rate_unit']}]: "
- f"{row['result_receive_rate_rate_stdev']}
"
+ f"{row['result_receive_rate_rate_stdev']:,.0f}
"
)
else:
stdev = ""
@@ -235,11 +252,12 @@ def _generate_trending_traces(ttype: str, name: str, df: pd.DataFrame,
hover_trend = list()
for avg, stdev, (_, row) in zip(trend_avg, trend_stdev, df.iterrows()):
+ d_type = "trex" if row["dut_type"] == "none" else row["dut_type"]
hover_itm = (
- f"date: {row['start_time'].strftime('%d-%m-%Y %H:%M:%S')}
"
- f"trend [pps]: {avg}
"
- f"stdev [pps]: {stdev}
"
- f"{row['dut_type']}-ref: {row['dut_version']}
"
+ f"date: {row['start_time'].strftime('%Y-%m-%d %H:%M:%S')}
"
+ f"trend [pps]: {avg:,.0f}
"
+ f"stdev [pps]: {stdev:,.0f}
"
+ f"{d_type}-ref: {row['dut_version']}
"
f"csit-ref: {row['job']}/{row['build']}
"
f"hosts: {', '.join(row['hosts'])}"
)
@@ -254,12 +272,12 @@ def _generate_trending_traces(ttype: str, name: str, df: pd.DataFrame,
name=name,
mode="markers",
marker={
- u"size": 5,
- u"color": color,
- u"symbol": u"circle",
+ "size": 5,
+ "color": color,
+ "symbol": "circle",
},
text=hover,
- hoverinfo=u"text+name",
+ hoverinfo="text+name",
showlegend=True,
legendgroup=name,
customdata=customdata
@@ -270,12 +288,12 @@ def _generate_trending_traces(ttype: str, name: str, df: pd.DataFrame,
name=name,
mode="lines",
line={
- u"shape": u"linear",
- u"width": 1,
- u"color": color,
+ "shape": "linear",
+ "width": 1,
+ "color": color,
},
text=hover_trend,
- hoverinfo=u"text+name",
+ hoverinfo="text+name",
showlegend=False,
legendgroup=name,
)
@@ -285,47 +303,54 @@ def _generate_trending_traces(ttype: str, name: str, df: pd.DataFrame,
anomaly_x = list()
anomaly_y = list()
anomaly_color = list()
+ hover = list()
for idx, anomaly in enumerate(anomalies):
- if anomaly in (u"regression", u"progression"):
+ if anomaly in ("regression", "progression"):
anomaly_x.append(x_axis[idx])
anomaly_y.append(trend_avg[idx])
anomaly_color.append(_ANOMALY_COLOR[anomaly])
+ hover_itm = (
+ f"date: {x_axis[idx].strftime('%Y-%m-%d %H:%M:%S')}
"
+ f"trend [pps]: {trend_avg[idx]:,.0f}
"
+ f"classification: {anomaly}"
+ )
+ if ttype == "pdr-lat":
+ hover_itm = hover_itm.replace("[pps]", "[us]")
+ hover.append(hover_itm)
anomaly_color.extend([0.0, 0.5, 1.0])
traces.append(
go.Scatter(
x=anomaly_x,
y=anomaly_y,
- mode=u"markers",
- hoverinfo=u"none",
+ mode="markers",
+ text=hover,
+ hoverinfo="text+name",
showlegend=False,
legendgroup=name,
- name=f"{name}-anomalies",
+ name=name,
marker={
- u"size": 15,
- u"symbol": u"circle-open",
- u"color": anomaly_color,
- u"colorscale": _COLORSCALE_LAT \
+ "size": 15,
+ "symbol": "circle-open",
+ "color": anomaly_color,
+ "colorscale": _COLORSCALE_LAT \
if ttype == "pdr-lat" else _COLORSCALE_TPUT,
- u"showscale": True,
- u"line": {
- u"width": 2
+ "showscale": True,
+ "line": {
+ "width": 2
},
- u"colorbar": {
- u"y": 0.5,
- u"len": 0.8,
- u"title": u"Circles Marking Data Classification",
- u"titleside": u"right",
- # u"titlefont": {
- # u"size": 14
- # },
- u"tickmode": u"array",
- u"tickvals": [0.167, 0.500, 0.833],
- u"ticktext": _TICK_TEXT_LAT \
+ "colorbar": {
+ "y": 0.5,
+ "len": 0.8,
+ "title": "Circles Marking Data Classification",
+ "titleside": "right",
+ "tickmode": "array",
+ "tickvals": [0.167, 0.500, 0.833],
+ "ticktext": _TICK_TEXT_LAT \
if ttype == "pdr-lat" else _TICK_TEXT_TPUT,
- u"ticks": u"",
- u"ticklen": 0,
- u"tickangle": -90,
- u"thickness": 10
+ "ticks": "",
+ "ticklen": 0,
+ "tickangle": -90,
+ "thickness": 10
}
}
)
@@ -347,16 +372,13 @@ def graph_trending(data: pd.DataFrame, sel:dict, layout: dict,
for idx, itm in enumerate(sel):
df = select_trending_data(data, itm)
- if df is None:
+ if df is None or df.empty:
continue
- name = (
- f"{itm['phy']}-{itm['framesize']}-{itm['core']}-"
- f"{itm['test']}-{itm['testtype']}"
- )
-
+ name = "-".join((itm["dut"], itm["phy"], itm["framesize"], itm["core"],
+ itm["test"], itm["testtype"], ))
traces = _generate_trending_traces(
- itm["testtype"], name, df, start, end, _COLORS[idx % len(_COLORS)]
+ itm["testtype"], name, df, start, end, _get_color(idx)
)
if traces:
if not fig_tput:
@@ -365,7 +387,7 @@ def graph_trending(data: pd.DataFrame, sel:dict, layout: dict,
if itm["testtype"] == "pdr":
traces = _generate_trending_traces(
- "pdr-lat", name, df, start, end, _COLORS[idx % len(_COLORS)]
+ "pdr-lat", name, df, start, end, _get_color(idx)
)
if traces:
if not fig_lat:
@@ -386,11 +408,6 @@ def graph_hdrh_latency(data: dict, layout: dict) -> go.Figure:
fig = None
- try:
- name = data.pop("name")
- except (KeyError, AttributeError):
- return None
-
traces = list()
for idx, (lat_name, lat_hdrh) in enumerate(data.items()):
try:
@@ -412,7 +429,7 @@ def graph_hdrh_latency(data: dict, layout: dict) -> go.Figure:
yaxis.append(item.value_iterated_to)
hovertext.append(
f"{_GRAPH_LAT_HDRH_DESC[lat_name]}
"
- f"Direction: {(u'W-E', u'E-W')[idx % 2]}
"
+ f"Direction: {('W-E', 'E-W')[idx % 2]}
"
f"Percentile: {prev_perc:.5f}-{percentile:.5f}%
"
f"Latency: {item.value_iterated_to}uSec"
)
@@ -421,7 +438,7 @@ def graph_hdrh_latency(data: dict, layout: dict) -> go.Figure:
yaxis.append(item.value_iterated_to)
hovertext.append(
f"{_GRAPH_LAT_HDRH_DESC[lat_name]}
"
- f"Direction: {(u'W-E', u'E-W')[idx % 2]}
"
+ f"Direction: {('W-E', 'E-W')[idx % 2]}
"
f"Percentile: {prev_perc:.5f}-{percentile:.5f}%
"
f"Latency: {item.value_iterated_to}uSec"
)
@@ -433,16 +450,16 @@ def graph_hdrh_latency(data: dict, layout: dict) -> go.Figure:
x=xaxis,
y=yaxis,
name=_GRAPH_LAT_HDRH_DESC[lat_name],
- mode=u"lines",
+ mode="lines",
legendgroup=_GRAPH_LAT_HDRH_DESC[lat_name],
showlegend=bool(idx % 2),
line=dict(
- color=_COLORS[int(idx/2)],
- dash=u"solid",
+ color=_get_color(int(idx/2)),
+ dash="solid",
width=1 if idx % 2 else 2
),
hovertext=hovertext,
- hoverinfo=u"text"
+ hoverinfo="text"
)
)
if traces:
@@ -450,7 +467,6 @@ def graph_hdrh_latency(data: dict, layout: dict) -> go.Figure:
fig.add_traces(traces)
layout_hdrh = layout.get("plot-hdrh-latency", None)
if lat_hdrh:
- layout_hdrh["title"]["text"] = f"{name}"
fig.update_layout(layout_hdrh)
return fig