fix

.woodpecker.yml

@@ -16,7 +16,7 @@ steps:
   scan_image:
     image: aquasec/trivy
     commands:
-      - trivy image $FORGE_NAME/$CI_REPO:$CI_COMMIT_SHA --quiet --exit-code 1
+      - TRIVY_DISABLE_VEX_NOTICE=1 trivy image $FORGE_NAME/$CI_REPO:$CI_COMMIT_SHA --quiet --exit-code 1
     when:
       - event: [push, tag]
   deploy:

deployment/deploy-yml.tmpl

@@ -1,17 +1,62 @@
-apiVersion: batch/v1
+apiVersion: apps/v1
-kind: CronJob
+kind: Deployment
 metadata:
-  name: pv-energy-calculator
+  name: pv-stats
+  labels:
+    app: pv-stats
 spec:
-  schedule: "15 * * * *"
+  replicas: 1
-  jobTemplate:
+  selector:
+    matchLabels:
+      app: pv-stats
+  template:
+    metadata:
+      labels:
+        app: pv-stats
     spec:
-      template:
+      containers:
-        spec:
+        - name: pv-stats
-          restartPolicy: OnFailure
+          image: %IMAGE%
-          containers:
+          envFrom:
-            - name: pv-energy-calculator
+            - secretRef: 
-              image: %IMAGE%
+                name: pv-stats
-              envFrom:
+          ports:
-                - secretRef:
+            - containerPort: 8080
-                    name: pv-energy-calculator
+              protocol: TCP
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: pv-stats
+spec:
+  type: ClusterIP
+  selector:
+    app: pv-stats
+  ports:
+    - name: http
+      targetPort: 8080
+      port: 80
+---
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: pv-stats
+  annotations:
+    cert-manager.io/cluster-issuer: letsencrypt-production-http
+spec:
+  tls:
+    - hosts:
+        - pv-stats.hottis.de
+      secretName: pv-stats-cert
+  rules:
+    - host: pv-stats.hottis.de
+      http:
+        paths:
+          - path: /
+            pathType: Prefix
+            backend:
+              service:
+                name: pv-stats
+                port:
+                  number: 80
+

deployment/deploy.sh

@@ -38,9 +38,9 @@ kubectl create secret generic pv-stats \
   --from-literal=OIDC_CLIENT_SECRETS="$OIDC_CLIENT_SECRETS" | \
   kubectl apply -f - -n $NAMESPACE
 
-# cat $DEPLOYMENT_DIR/deploy-yml.tmpl | \
+cat $DEPLOYMENT_DIR/deploy-yml.tmpl | \
-#   sed -e 's,%IMAGE%,'$IMAGE_NAME':'$IMAGE_TAG','g | \
+  sed -e 's,%IMAGE%,'$IMAGE_NAME':'$IMAGE_TAG','g | \
-#   kubectl apply -f - -n $NAMESPACE
+  kubectl apply -f - -n $NAMESPACE
 
 popd > /dev/null
 

deployment/secrets.asc

@@ -1,15 +1,15 @@
 -----BEGIN PGP MESSAGE-----
 
-jA0ECQMCGiCDDKK8KgP/0sExAeQ99bvndkYa/C1rLsDj14oKDgqea1ylRMTSm3if
+jA0ECQMCjSYtdE7M+rT/0sEmAbK6tjOB7cduweJyS3sULIl017BrOM1HGV1v4QkN
-jUdbOyaNR0p0R32AS1wVlR9qxE1g/e/dCNmGjYQ0lqpyRwX6uqJFZ8KubZp0rRCV
+NWtceKHpJEFmk1ZFh1EmyS724bDxtVLm8qJN4VzV+cLPa8/IiTzOHJEg4PDRcc0U
-40VpAfuu4eKE6NsxW8U4wlY5aDR21YUndoaHCwNQDgFV2exCDVeOsF1hyGgurWBG
+LRCZOb5PtfKWBcQdRshT3JhIxxOKG53ZKOHJ2VodZ/iqmpSbjZ39GtzLJoXlXwCJ
-QeAtlCN+HV6t9Gg6KUXRlr89C/wdZkkYScVGXxqemqetGntGhS96u37EFzyjnDaD
+jHAHgADdvq5J7joSaozjxVCXQI2nOmlEcZosZVd6LZDvemWtmci4ARJtOEqad4Wi
-P09d6LKOIuHnKHZgBcKUZSqkYYwlNk05Wum9FqoWQc8KgCMvMv0WQNaaQxkrRah5
+mbleupBF18pA7b63hfmHocO89b9pTpUZWw10b0SHrUiKZG6kHeQXE8GGu+4HiRcG
-DRgyXkNYrDg3WGt7357H3LO+IP1gTVAyjEsZl0OpazXLKGfrsWis+191t9omXk+x
+xJN/yYe2Ly4tHwT54gQ7ytLrxOnJUQKelSpq370t/lrGTf8L4b2eq+tED8/7z5Ho
-Y9g/dx1aSqgeIQ3SiTpjdHHItSYcJ+ZYvJy+4u6FeKFrk/5Z9nBA0LxEmo5ObGmg
+E12VDreYLFaS2IeJCFBefiGGbKgttPcHZvDCPCUpCpfSShlqtTaidwsTq2lPFGyo
-SrMCnzU1/JDCsAEp8mvAMQWFjJUrgUMUHM00uFm32Nq6SOAT50rW4/XIxak2w6/x
+0Lz9NHsqp4/U+4nabCWNVWhnZhwqIPYOt/kKsYvjq40U29q7RORnxz8l/Ym4vB1P
-Zi7j3kxD6dfEXAeGRqCbDeTPQHNWPlvq0Rez2uaYA8w8S1hNoS8iSOSUbBoMCdFK
+kLeouElJvAz6vt/1+nFQJb65YykTqKQpbKgbziFiUFwb37QzBqRO7tuv3/MUzJ1Q
-k61VApVRty0g35IsemcEuocIBw3YLWLLngHk7/xpKKWjbFO9H5AmxZT6FKcq7BwK
+KB7+IOQ43vFbAK6DZAhJZtAspVYiZ95niVxepaghzf33/FquhtZ+XpFEBDv525z7
-Q4DPHAmHDSCniiMzdcbcH7Y8GvO8q9jFPfQWE5MDETVlQ7Q=
+pML7BxFxuwF5q7HBTPtc4IeJBgGi16wm
-=gOlN
+=K6Qq
 -----END PGP MESSAGE-----

src/requirements.txt

@@ -10,6 +10,8 @@ cryptography==44.0.0
 Flask==3.1.0
 flask-oidc==2.2.2
 Flask-Session==0.8.0
+greenlet==3.1.1
+gunicorn==23.0.0
 idna==3.10
 importlib_metadata==8.6.1
 itsdangerous==2.2.0

src/run.py

@@ -37,22 +37,15 @@ oidc = OpenIDConnect(app)
 @app.route('/')
 @oidc.require_login
 def index():
-    counter = int(session.get('counter', '0'))
-    counter += 1
-    session['counter'] = f"{counter}"
-    return f"Hello, Flask! Called for the {counter}. time."
-
-@app.route('/plot')
-@oidc.require_login
-def plot():
     try:
         dbh = psycopg.connect()
         engine = sqlalchemy.create_engine("postgresql+psycopg://", creator=lambda: dbh)
+
         df = pd.read_sql("SELECT month, cast(year AS varchar), current_energy AS value FROM pv_energy_by_month", con=engine)
-        fig = px.bar(df, x='month', y='value', color='year', barmode='group')
+        fig_1 = px.bar(df, x='month', y='value', color='year', barmode='group')
-        fig.update_layout(
+        fig_1.update_layout(
             title="Jahreswerte Exportierte Energie",
-            xaxis_title="Monat",
+            xaxis_title="",
             yaxis_title="",
             legend_title="Jahr",
             xaxis=dict(
@@ -62,7 +55,27 @@ def plot():
             ),
             yaxis=dict(ticksuffix=" kWh")
         )
-        graph_html = fig.to_html(full_html=False)
+        graph_html_1 = fig_1.to_html(full_html=False, default_height='33%')
+
+        df = pd.read_sql("SELECT time_bucket('5 minutes', time) AS bucket, AVG(power) AS avg_power FROM pv_power_v WHERE time >= date_trunc('day', now()) - '1 day'::interval AND time < date_trunc('day', now()) GROUP BY bucket ORDER BY bucket", con=engine)
+        fig_2 = px.line(df, x='bucket', y='avg_power')
+        fig_2.update_layout(
+            xaxis_title="",
+            yaxis_title="",
+            title="Export gestern",
+            yaxis=dict(ticksuffix=" W")
+        )
+        graph_html_2 = fig_2.to_html(full_html=False, default_height='33%')
+
+        df = pd.read_sql("SELECT time_bucket('5 minutes', time) AS bucket, AVG(power) AS avg_power FROM pv_power_v WHERE time >= date_trunc('day', now()) AND time < date_trunc('day', now()) + '1 day'::interval GROUP BY bucket ORDER BY bucket", con=engine)
+        fig_3 = px.line(df, x='bucket', y='avg_power')
+        fig_3.update_layout(
+            xaxis_title="",
+            yaxis_title="",
+            title="Export heute",
+            yaxis=dict(ticksuffix=" W")
+        )
+        graph_html_3 = fig_3.to_html(full_html=False, default_height='33%')
 
         return render_template_string(f"""
             <html>
@@ -70,7 +83,9 @@ def plot():
                     <title>Jahreswerte PV-Energie</title>
                 </head>
                 <body>
-                    {graph_html}
+                    {graph_html_1}
+                    {graph_html_2}
+                    {graph_html_3}
                 </body>
             </html>
         """)