X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Ftools%2Fdash%2Fapp%2Fpal%2Ftrending%2Fgraphs.py;h=36c19495a3ed7597acb4487650d773dd9dfb1c87;hb=72766c8177fb76ac5ca4cbbfe616c19ec4a9a97a;hp=3b81cf39c4551cbc70723768605ecc6b2f23e2e6;hpb=650d20f1fc6bdea669982f2a549744fcdcce5a37;p=csit.git

diff --git a/resources/tools/dash/app/pal/trending/graphs.py b/resources/tools/dash/app/pal/trending/graphs.py
index 3b81cf39c4..36c19495a3 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
@@ -212,18 +211,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')}<br>"
-            f"<prop> [{row[_UNIT[ttype]]}]: {row[_VALUE[ttype]]}<br>"
+            f"date: {row['start_time'].strftime('%Y-%m-%d %H:%M:%S')}<br>"
+            f"<prop> [{row[_UNIT[ttype]]}]: {row[_VALUE[ttype]]:,.0f}<br>"
             f"<stdev>"
-            f"{row['dut_type']}-ref: {row['dut_version']}<br>"
+            f"{d_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']}<br>"
+                f"{row['result_receive_rate_rate_stdev']:,.0f}<br>"
             )
         else:
             stdev = ""
@@ -236,11 +236,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')}<br>"
-            f"trend [pps]: {avg}<br>"
-            f"stdev [pps]: {stdev}<br>"
-            f"{row['dut_type']}-ref: {row['dut_version']}<br>"
+            f"date: {row['start_time'].strftime('%Y-%m-%d %H:%M:%S')}<br>"
+            f"trend [pps]: {avg:,.0f}<br>"
+            f"stdev [pps]: {stdev:,.0f}<br>"
+            f"{d_type}-ref: {row['dut_version']}<br>"
             f"csit-ref: {row['job']}/{row['build']}<br>"
             f"hosts: {', '.join(row['hosts'])}"
         )
@@ -293,8 +294,8 @@ def _generate_trending_traces(ttype: str, name: str, df: pd.DataFrame,
                 anomaly_y.append(trend_avg[idx])
                 anomaly_color.append(_ANOMALY_COLOR[anomaly])
                 hover_itm = (
-                    f"date: {x_axis[idx].strftime('%d-%m-%Y %H:%M:%S')}<br>"
-                    f"trend [pps]: {trend_avg[idx]}<br>"
+                    f"date: {x_axis[idx].strftime('%Y-%m-%d %H:%M:%S')}<br>"
+                    f"trend [pps]: {trend_avg[idx]:,.0f}<br>"
                     f"classification: {anomaly}"
                 )
                 if ttype == "pdr-lat":