packets, 3

src/run.py

@@ -195,11 +195,11 @@ def ntpserver():
         )
 
         graph_html_1 = fig.to_html(full_html=False, default_height='30%')
+
         query = """
-            select   tiem_bucket('5 minutes', time) as bucket,
+            select   time_bucket('5 minutes', time) as bucket,
               device,
-              avg(cast(values->'lan-out'->>'value'  as int)) as outOctetsPerSeconds,
-              avg(cast(values->'lan-in'->>'value'  as int)) as inOctetsPerSeconds    
+              avg(cast(values->'lan-in-pkts'->>'value'  as float)) as packets
             from measurements
             where time >= date_trunc('day', now()) AND time < date_trunc('day', now()) + '1 day'::interval and 
               application = 'SNMP' and attributes->>'Label' = 'david'
@@ -207,19 +207,18 @@ def ntpserver():
             order by bucket, device
         """
         df = pd.read_sql(query, con=engine)
-        fig_2 = px.line(df, x='bucket', y=['outOctetsPerSeconds', 'inOctetsPerSeconds'])
+        fig_2 = px.line(df, x='bucket', y='packets')
         fig_2.update_layout(
             xaxis_title="",
             yaxis_title="",
-            title=f"Network Load",
-            yaxis=dict(ticksuffix=" KiB/s")
+            title=f"Packets"
         )
         graph_html_2 = fig_2.to_html(full_html=False, default_height='30%')
 
         query = """
-            select   tiem_bucket('5 minutes', time) as bucket,
+            select   time_bucket('5 minutes', time) as bucket,
               device,
-              avg(cast(values->'local'->>'value'  as float)) as loadAverage1Min
+              avg(cast(values->'load1'->>'value'  as float)) as loadaverage1min
             from measurements
             where time >= date_trunc('day', now()) AND time < date_trunc('day', now()) + '1 day'::interval and 
               application = 'SNMP' and attributes->>'Label' = 'david'
@@ -227,7 +226,7 @@ def ntpserver():
             order by bucket, device
         """
         df = pd.read_sql(query, con=engine)
-        fig_3 = px.line(df, x='bucket', y='loadAverage1Min')
+        fig_3 = px.line(df, x='bucket', y='loadaverage1min')
         fig_3.update_layout(
             xaxis_title="",
             yaxis_title="",