Merge branch 'fix-avs-chreportdatasource' into 'master'

Fix ts field on CHTableReportDataSource.

See merge request !5450

lib/app/reportdatasources/base.py

@@ -404,6 +404,7 @@ class CHTableReportDataSource(ReportDataSource):
     CHUNK_SIZE = 5000
     TABLE_NAME = None
     object_field = "sa.ManagedObject"
+    ts_field = "ts"
 
     def get_client(self):
         if not hasattr(self, "_client"):
@@ -476,7 +477,7 @@ class CHTableReportDataSource(ReportDataSource):
             "q_select": select or [],
             "q_group": group or [],
             "q_where": [
-                f"(date >= toDate({ts_from_date})) AND (ts >= toDateTime({ts_from_date}) AND ts <= toDateTime({ts_to_date})) %s",  # objectids_filter
+                f"(date >= toDate({ts_from_date})) AND ({self.ts_field} >= toDateTime({ts_from_date}) AND {self.ts_field} <= toDateTime({ts_to_date})) %s",  # objectids_filter
             ],
         }
 

lib/app/reportdatasources/reportinterfacemetrics.py

@@ -12,6 +12,8 @@ from .base import CHTableReportDataSource, ReportField
 class ReportInterfaceMetrics(CHTableReportDataSource):
     name = "reportinterfacemetrics"
     description = "Query Metrics from Interface table"
+    object_field = "managed_object"
+    CHUNK_SIZE = 1500
 
     TABLE_NAME = "noc.interface"
     FIELDS = [
@@ -61,6 +63,13 @@ class ReportInterfaceMetrics(CHTableReportDataSource):
             unit="BIT/S",
             metric_name="round(quantile(0.90)(load_in), 0)",
         ),
+        ReportField(
+            name="load_in_avg",
+            label="Load In (Average)",
+            description="",
+            unit="BIT/S",
+            metric_name="round(avg(load_in), 0)",
+        ),
         ReportField(
             name="load_in_p",
             label="Load In (% Bandwith)",
@@ -75,6 +84,13 @@ class ReportInterfaceMetrics(CHTableReportDataSource):
             unit="BIT/S",
             metric_name="round(quantile(0.90)(load_out), 0)",
         ),
+        ReportField(
+            name="load_out_avg",
+            label="Load Out (Average)",
+            description="",
+            unit="BIT/S",
+            metric_name="round(avg(load_out), 0)",
+        ),
         ReportField(
             name="load_out_p",
             label="Load Out (% Bandwith)",