packets, 3

packets, 2
packets
2025-02-12 19:01:58 +01:00 · 2025-02-12 18:48:37 +01:00 · 2025-02-12 18:42:27 +01:00 · 2025-02-12 13:38:26 +01:00 · 2025-02-12 13:28:29 +01:00 · 2025-02-12 13:18:41 +01:00
2 changed files with 57 additions and 8 deletions
--- a/src/requirements.txt
+++ b/src/requirements.txt
@ -16,7 +16,6 @@ idna==3.10
 importlib_metadata==8.6.1
 itsdangerous==2.2.0
 Jinja2==3.1.5
-kaleido==0.2.1
 loguru==0.7.3
 MarkupSafe==3.0.2
 msgspec==0.19.0
--- a/src/run.py
+++ b/src/run.py
@ -1,4 +1,4 @@
-from flask import Flask, session, g, render_template_string, Response
+from flask import Flask, session, g, render_template_string
 from flask_session import Session
 from flask_oidc import OpenIDConnect
 from werkzeug.middleware.proxy_fix import ProxyFix
@ -8,8 +8,6 @@ import json
 import os
 import plotly.express as px
 import plotly.graph_objects as po
-import plotly.io as pio
-import io
 import pandas as pd
 import psycopg
 import sqlalchemy
@ -176,9 +174,12 @@ def ntpserver():
        fig.add_trace(po.Scatter(x=df['bucket'], y=df['stratum'], mode='lines', name='Stratum', yaxis='y2', line=dict(color='blue')))

        fig.update_layout(
+            title='NTP Server Numbers',
+            
            # Linke Y-Achse
            yaxis=dict(
-                title='Root Dispersion'
+                title='Root Dispersion',
+                ticksuffix=' ms'
            ),
            
            # Rechte Y-Achse
@ -193,9 +194,58 @@ def ntpserver():
            legend=dict(x=0.05, y=1)  # Position der Legende
        )

-        img = fig.to_image(format='png')
-        return Response(img, mimetype='image/png')
+        graph_html_1 = fig.to_html(full_html=False, default_height='30%')

+        query = """
+            select   time_bucket('5 minutes', time) as bucket,
+              device,
+              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'
+            group by bucket, device
+            order by bucket, device
+        """
+        df = pd.read_sql(query, con=engine)
+        fig_2 = px.line(df, x='bucket', y='packets')
+        fig_2.update_layout(
+            xaxis_title="",
+            yaxis_title="",
+            title=f"Packets"
+        )
+        graph_html_2 = fig_2.to_html(full_html=False, default_height='30%')
+
+        query = """
+            select   time_bucket('5 minutes', time) as bucket,
+              device,
+              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'
+            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"""
+            <html>
+                <head>
+                    <title>NTP Server Numbers</title>
+                </head>
+                <body>
+                    {graph_html_1}
+                    {graph_html_2}
+                    {graph_html_3}
+                </body>
+            </html>
+        """)
    except Exception as e:
        raise Exception(f"Error when querying NTP server values: {e}")
    finally:
@ -208,7 +258,7 @@ def ntpserver():


 if __name__ == '__main__':
-    app.run(host="0.0.0.0", port=8080)
+    app.run(port=8080)
 else:
    exposed_app = ProxyFix(app, x_for=1, x_host=1)
Author	SHA1	Message	Date
Wolfgang Hottgenroth	af76406afa	packets, 3 Some checks failed ci/woodpecker/push/woodpecker Pipeline failed Details ci/woodpecker/tag/woodpecker Pipeline was successful Details	2025-02-12 19:01:58 +01:00
Wolfgang Hottgenroth	d85c32247e	packets, 2 All checks were successful ci/woodpecker/push/woodpecker Pipeline was successful Details ci/woodpecker/tag/woodpecker Pipeline was successful Details	2025-02-12 18:48:37 +01:00
Wolfgang Hottgenroth	ba7b86e527	packets All checks were successful ci/woodpecker/push/woodpecker Pipeline was successful Details ci/woodpecker/tag/woodpecker Pipeline was successful Details	2025-02-12 18:42:27 +01:00
Wolfgang Hottgenroth	c93ae4067e	more graphs, 5 All checks were successful ci/woodpecker/push/woodpecker Pipeline was successful Details ci/woodpecker/tag/woodpecker Pipeline was successful Details	2025-02-12 13:38:26 +01:00
Wolfgang Hottgenroth	1bbfdf65fb	more graphs, 3 All checks were successful ci/woodpecker/push/woodpecker Pipeline was successful Details ci/woodpecker/tag/woodpecker Pipeline was successful Details	2025-02-12 13:28:29 +01:00
Wolfgang Hottgenroth	315ad9998b	more graphs, 2 All checks were successful ci/woodpecker/push/woodpecker Pipeline was successful Details ci/woodpecker/tag/woodpecker Pipeline was successful Details	2025-02-12 13:18:41 +01:00
Wolfgang Hottgenroth	047a3a6c08	more graphs All checks were successful ci/woodpecker/push/woodpecker Pipeline was successful Details ci/woodpecker/tag/woodpecker Pipeline was successful Details	2025-02-12 13:14:01 +01:00
Wolfgang Hottgenroth	5573024fd9	ticksuffix, 2 Some checks failed ci/woodpecker/push/woodpecker Pipeline failed Details ci/woodpecker/tag/woodpecker Pipeline was successful Details	2025-02-12 12:54:33 +01:00
Wolfgang Hottgenroth	a58f914c40	ticksuffix All checks were successful ci/woodpecker/push/woodpecker Pipeline was successful Details ci/woodpecker/tag/woodpecker Pipeline was successful Details	2025-02-12 12:45:52 +01:00
Wolfgang Hottgenroth	4ec9690981	from ntpserver_added All checks were successful ci/woodpecker/push/woodpecker Pipeline was successful Details ci/woodpecker/tag/woodpecker Pipeline was successful Details	2025-02-12 12:38:41 +01:00
Wolfgang Hottgenroth	6af509c2f6	drop kaleido	2025-02-12 12:35:07 +01:00