add kaleido

ntp as png
disable trivy for the moment
2025-02-11 19:47:07 +01:00 · 2025-02-11 19:42:19 +01:00 · 2025-02-11 16:59:58 +01:00
3 changed files with 4 additions and 51 deletions
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@ -13,42 +13,6 @@ steps:
      dockerfile: Dockerfile
    when:
      - event: [push, tag]
-        
-  scan:
-    image: quay.io/wollud1969/woodpecker-helper:0.5.1
-    environment:
-      TRIVY_TOKEN:
-        from_secret: trivy_token
-      TRIVY_URL:
-        from_secret: trivy_url
-      DTRACK_API_KEY:
-        from_secret: dtrack_api_key
-      DTRACK_API_URL:
-        from_secret: dtrack_api_url
-    commands:
-      - HOME=/home/`id -nu`
-      - TAG="${CI_COMMIT_TAG:-$CI_COMMIT_SHA}"
-      - |
-        trivy image \
-              --server $TRIVY_URL \
-              --token $TRIVY_TOKEN \
-              --format cyclonedx \
-              --scanners license \
-              --output /tmp/sbom.xml \
-              $FORGE_NAME/$CI_REPO:$TAG
-      - cat /tmp/sbom.xml
-      - |
-        curl -X "POST" \
-             -H "Content-Type: multipart/form-data" \
-             -H "X-Api-Key: $DTRACK_API_KEY" \
-             -F "autoCreate=true" \
-             -F "projectName=$CI_REPO" \
-             -F "projectVersion=$TAG" \
-             -F "bom=@/tmp/sbom.xml"\
-             "$DTRACK_API_URL/api/v1/bom"        
-    when:
-      - event: [push, tag]
-
  deploy:
    image: quay.io/wollud1969/k8s-admin-helper:0.2.1
    environment:
--- a/src/requirements.txt
+++ b/src/requirements.txt
@ -1,3 +1,4 @@
+kaleido=0.2.1.post1
 async-timeout==5.0.1
 Authlib==1.4.0
 blinker==1.9.0
--- a/src/run.py
+++ b/src/run.py
@ -1,4 +1,4 @@
-from flask import Flask, session, g, render_template_string
+from flask import Flask, session, g, render_template_string, Response
 from flask_session import Session
 from flask_oidc import OpenIDConnect
 from werkzeug.middleware.proxy_fix import ProxyFix
@ -174,8 +174,6 @@ 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'
@ -193,19 +191,9 @@ 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 = fig.to_html(full_html=False, default_height='30%')
-
-        return render_template_string(f"""
-            <html>
-                <head>
-                    <title>NTP Server Numbers</title>
-                </head>
-                <body>
-                    {graph_html}
-                </body>
-            </html>
-        """)
    except Exception as e:
        raise Exception(f"Error when querying NTP server values: {e}")
    finally:
Author	SHA1	Message	Date
Wolfgang Hottgenroth	6236673d28	add kaleido Some checks failed ci/woodpecker/push/woodpecker Pipeline failed Details ci/woodpecker/tag/woodpecker Pipeline failed Details	2025-02-11 19:47:07 +01:00
Wolfgang Hottgenroth	4213dc7329	ntp as png All checks were successful ci/woodpecker/push/woodpecker Pipeline was successful Details ci/woodpecker/tag/woodpecker Pipeline was successful Details	2025-02-11 19:42:19 +01:00
Wolfgang Hottgenroth	2d3eab0db8	disable trivy for the moment All checks were successful ci/woodpecker/push/woodpecker Pipeline was successful Details ci/woodpecker/tag/woodpecker Pipeline was successful Details	2025-02-11 16:59:58 +01:00