Compare commits

...

2 Commits
0.2.7 ... 0.2.9

Author SHA1 Message Date
d85c32247e packets, 2
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/tag/woodpecker Pipeline was successful
2025-02-12 18:48:37 +01:00
ba7b86e527 packets
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/tag/woodpecker Pipeline was successful
2025-02-12 18:42:27 +01:00

View File

@ -199,8 +199,7 @@ def ntpserver():
query = """ query = """
select time_bucket('5 minutes', time) as bucket, select time_bucket('5 minutes', time) as bucket,
device, device,
avg(cast(values->'lan-out'->>'value' as int)) as outOctetsPerSeconds, avg(cast(values->'lan-in-pkts'->>'value' as float)) as packets
avg(cast(values->'lan-in'->>'value' as int)) as inOctetsPerSeconds
from measurements from measurements
where time >= date_trunc('day', now()) AND time < date_trunc('day', now()) + '1 day'::interval and where time >= date_trunc('day', now()) AND time < date_trunc('day', now()) + '1 day'::interval and
application = 'SNMP' and attributes->>'Label' = 'david' application = 'SNMP' and attributes->>'Label' = 'david'
@ -208,26 +207,18 @@ def ntpserver():
order by bucket, device order by bucket, device
""" """
df = pd.read_sql(query, con=engine) df = pd.read_sql(query, con=engine)
fig_2 = po.Figure() fig_2 = px.line(df, x='bucket', y='packets')
fig_2.add_trace(po.Scatter(x=df['bucket'], y=df['outOctetsPerSeconds'], mode='lines', name='Outbound Traffic', line=dict(color='green')))
fig_2.add_trace(po.Scatter(x=df['bucket'], y=df['inOctetsPerSeconds'], mode='lines', name='Inbound Traffic', line=dict(color='blue')))
fig_2.update_layout( fig_2.update_layout(
title='Network Load', xaxis_title="",
yaxis_title="",
# Linke Y-Achse title=f"Packets"
yaxis=dict(
ticksuffix=' KiB/s'
),
legend=dict(x=0.05, y=1) # Position der Legende
) )
graph_html_2 = fig_2.to_html(full_html=False, default_height='30%') graph_html_2 = fig_2.to_html(full_html=False, default_height='30%')
query = """ query = """
select time_bucket('5 minutes', time) as bucket, select time_bucket('5 minutes', time) as bucket,
device, device,
avg(cast(values->'local'->>'value' as float)) as loadAverage1Min avg(cast(values->'local'->>'value' as float)) as loadaverage1min
from measurements from measurements
where time >= date_trunc('day', now()) AND time < date_trunc('day', now()) + '1 day'::interval and where time >= date_trunc('day', now()) AND time < date_trunc('day', now()) + '1 day'::interval and
application = 'SNMP' and attributes->>'Label' = 'david' application = 'SNMP' and attributes->>'Label' = 'david'
@ -235,7 +226,7 @@ def ntpserver():
order by bucket, device order by bucket, device
""" """
df = pd.read_sql(query, con=engine) 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( fig_3.update_layout(
xaxis_title="", xaxis_title="",
yaxis_title="", yaxis_title="",