diff --git a/src/run.py b/src/run.py index d45bab8..8f9b8b8 100644 --- a/src/run.py +++ b/src/run.py @@ -194,8 +194,45 @@ def ntpserver(): legend=dict(x=0.05, y=1) # Position der Legende ) + graph_html_1 = fig.to_html(full_html=False, default_height='30%') + query = """ + select tiem_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 + from measurements + where time >= date_trunc('day', now()) AND time < date_trunc('day', now()) + '1 day'::interval and + application = 'SNMP' and attributes->>'Label' = 'david' + group by bucket, device + order by bucket, device + """ + df = pd.read_sql(query, con=engine) + fig_2 = px.line(df, x='bucket', y=['outOctetsPerSeconds', 'inOctetsPerSeconds']) + xaxis_title="", + yaxis_title="", + title=f"Network Load", + yaxis=dict(ticksuffix=" KiB/s") + ) + graph_html_2 = fig_2.to_html(full_html=False, default_height='30%') - graph_html = fig.to_html(full_html=False, default_height='30%') + query = """ + select tiem_bucket('5 minutes', time) as bucket, + device, + avg(cast(values->'local'->>'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' + group by bucket, device + order by bucket, device + """ + df = pd.read_sql(query, con=engine) + fig_3 = px.line(df, x='bucket', y='loadAverage1Min') + fig_3.update_layout( + xaxis_title="", + yaxis_title="", + title=f"CPU Load" + ) + graph_html_3 = fig_3.to_html(full_html=False, default_height='30%') return render_template_string(f""" @@ -203,7 +240,9 @@ def ntpserver(): NTP Server Numbers - {graph_html} + {graph_html_1} + {graph_html_2} + {graph_html_3} """)