Compare commits
31 Commits
Author | SHA1 | Date | |
---|---|---|---|
73b55b05c4
|
|||
aa74c02498 | |||
6fd2bd0863 | |||
2c78fba3a6 | |||
86b883569f | |||
ba86a08632 | |||
0b61a18eb1 | |||
1418603007 | |||
9926c89ef2 | |||
fc6f407a52 | |||
0e9cb0a7f8 | |||
e3b2ea704d | |||
8bd4a4b695 | |||
89f3cbb5d1 | |||
37c4a373b7 | |||
408cff442c | |||
67b88aa2a1 | |||
7b0238b4a5 | |||
16771227bb | |||
aa97e3cdd3 | |||
2c93c7ec47 | |||
e0b1c469d2 | |||
d646090802 | |||
c4fd8b2cfd | |||
37ce3d47ca | |||
988f24994b | |||
b8dd70e5ae | |||
6ba9352edc | |||
aaa23a9839 | |||
812989df47 | |||
452161ff03 |
@ -16,11 +16,11 @@ 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:
|
||||
image: quay.io/wollud1969/k8s-admin-helper:0.1.3
|
||||
image: quay.io/wollud1969/k8s-admin-helper:0.2.1
|
||||
environment:
|
||||
KUBE_CONFIG_CONTENT:
|
||||
from_secret: kube_config
|
||||
|
@ -4,6 +4,8 @@ metadata:
|
||||
name: pv-stats
|
||||
labels:
|
||||
app: pv-stats
|
||||
annotations:
|
||||
secret.reloader.stakater.com/reload: pv-stats
|
||||
spec:
|
||||
replicas: 1
|
||||
selector:
|
||||
|
@ -19,10 +19,11 @@ kubectl create namespace $NAMESPACE \
|
||||
-o yaml | \
|
||||
kubectl -f - apply
|
||||
|
||||
SECRETS_FILE=`mktemp`
|
||||
gpg --decrypt --passphrase $GPG_PASSPHRASE --yes --batch --homedir /tmp/.gnupg --output $SECRETS_FILE secrets.asc
|
||||
. $SECRETS_FILE
|
||||
rm $SECRETS_FILE
|
||||
# SECRETS_FILE=`mktemp`
|
||||
# gpg --decrypt --passphrase $GPG_PASSPHRASE --yes --batch --homedir /tmp/.gnupg --output $SECRETS_FILE secrets.asc
|
||||
# . $SECRETS_FILE
|
||||
# rm $SECRETS_FILE
|
||||
eval "`cat secrets.asc | /usr/local/bin/decrypt-secrets.sh`"
|
||||
|
||||
kubectl create secret generic pv-stats \
|
||||
--dry-run=client \
|
||||
|
@ -1,15 +1,15 @@
|
||||
-----BEGIN PGP MESSAGE-----
|
||||
|
||||
jA0ECQMCjSYtdE7M+rT/0sEmAbK6tjOB7cduweJyS3sULIl017BrOM1HGV1v4QkN
|
||||
NWtceKHpJEFmk1ZFh1EmyS724bDxtVLm8qJN4VzV+cLPa8/IiTzOHJEg4PDRcc0U
|
||||
LRCZOb5PtfKWBcQdRshT3JhIxxOKG53ZKOHJ2VodZ/iqmpSbjZ39GtzLJoXlXwCJ
|
||||
jHAHgADdvq5J7joSaozjxVCXQI2nOmlEcZosZVd6LZDvemWtmci4ARJtOEqad4Wi
|
||||
mbleupBF18pA7b63hfmHocO89b9pTpUZWw10b0SHrUiKZG6kHeQXE8GGu+4HiRcG
|
||||
xJN/yYe2Ly4tHwT54gQ7ytLrxOnJUQKelSpq370t/lrGTf8L4b2eq+tED8/7z5Ho
|
||||
E12VDreYLFaS2IeJCFBefiGGbKgttPcHZvDCPCUpCpfSShlqtTaidwsTq2lPFGyo
|
||||
0Lz9NHsqp4/U+4nabCWNVWhnZhwqIPYOt/kKsYvjq40U29q7RORnxz8l/Ym4vB1P
|
||||
kLeouElJvAz6vt/1+nFQJb65YykTqKQpbKgbziFiUFwb37QzBqRO7tuv3/MUzJ1Q
|
||||
KB7+IOQ43vFbAK6DZAhJZtAspVYiZ95niVxepaghzf33/FquhtZ+XpFEBDv525z7
|
||||
pML7BxFxuwF5q7HBTPtc4IeJBgGi16wm
|
||||
=K6Qq
|
||||
jA0ECQMC4tvOFCp2PT7/0sE+AcZmiGwroHYdWW/vJA1sCoMrM2oW8xUc1KndDGto
|
||||
dFev2KcoZ4FRL9liCrJ7on773bZFCTDu2xiBNMeKF1p8drub1Ej5l61Oq15mLTYf
|
||||
XjXknFiWWq4PTzhhy53zvDyIV5yIcGfjotpGC83/qH5CBWIcCw9PZHI5+uHRVRKL
|
||||
OpdTpekJ8ljPAGQ4F3vbOeBbG1PMoclx8r5SpKxLwQco2iaXd71dXHtPkEnLujd4
|
||||
ZRCthVNVfxrIIRcTJfgxewz2oJWYF9008nmtxpKzqfBtNpFIdBtnTTVvv2lfcVuS
|
||||
S4eav9ljPPd/exZaT7fOGD/kuCdiiu6e0yGLzo2ykf0uBy7hG7ZJg8TH5e+LMBm9
|
||||
Q1OFD+5LWeEsOEdSTlT5UbV5EaVEiawKWQn7rMZOyvBNiPwLaOlquHirWoll5eIm
|
||||
OHgBVN0FiY/righpIoei/KP705FIg+hrpMUvc29PahiL8dgsxJycnKIo4t+2/nac
|
||||
H144hP/rqBeaobG05TkZIr+Cpt4rpwwfNWOHgmNFHVpxdmPfoeAmpT4nz760hTEN
|
||||
2ol4Qh8xL7n4GFiCpNg8tNZiZkPPa/aRUAFxgdq5beossvKukxCexQmlCFvxITSG
|
||||
x9RwssFMnT+wqTuzBN8neBeEF1d9AtAFQKPtg3wkMUyJAlYkxiGS/2NJuYDVpmEQ
|
||||
=Wr4f
|
||||
-----END PGP MESSAGE-----
|
||||
|
155
src/run.py
155
src/run.py
@ -7,9 +7,11 @@ import redis
|
||||
import json
|
||||
import os
|
||||
import plotly.express as px
|
||||
import plotly.graph_objects as po
|
||||
import pandas as pd
|
||||
import psycopg
|
||||
import sqlalchemy
|
||||
import time
|
||||
|
||||
try:
|
||||
redis_url = os.environ['REDIS_URL']
|
||||
@ -34,17 +36,35 @@ app.config.update({
|
||||
Session(app)
|
||||
oidc = OpenIDConnect(app)
|
||||
|
||||
@app.route('/token_debug', methods=['GET'])
|
||||
@oidc.require_login
|
||||
def token_debug():
|
||||
# Access Token vom Identity Provider abrufen
|
||||
access_token = oidc.get_access_token()
|
||||
return json.dumps({
|
||||
"access_token": access_token
|
||||
})
|
||||
|
||||
@app.route('/')
|
||||
@oidc.require_login
|
||||
def index():
|
||||
try:
|
||||
stepX_time = time.time()
|
||||
dbh = psycopg.connect()
|
||||
engine = sqlalchemy.create_engine("postgresql+psycopg://", creator=lambda: dbh)
|
||||
|
||||
step0_time = time.time()
|
||||
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.update_layout(
|
||||
title="Jahreswerte Exportierte Energie",
|
||||
xaxis_title="Monat",
|
||||
step1_time = time.time()
|
||||
duration1 = step1_time - step0_time
|
||||
logger.info(f"{duration1=}")
|
||||
fig_1 = px.bar(df, x='month', y='value', color='year', barmode='group')
|
||||
step2_time = time.time()
|
||||
duration2 = step2_time - step1_time
|
||||
logger.info(f"{duration2=}")
|
||||
fig_1.update_layout(
|
||||
title=f"Jahreswerte Exportierte Energie {duration1:.3f}, {duration2:.3f}",
|
||||
xaxis_title="",
|
||||
yaxis_title="",
|
||||
legend_title="Jahr",
|
||||
xaxis=dict(
|
||||
@ -54,7 +74,44 @@ def index():
|
||||
),
|
||||
yaxis=dict(ticksuffix=" kWh")
|
||||
)
|
||||
graph_html = fig.to_html(full_html=False)
|
||||
graph_html_1 = fig_1.to_html(full_html=False, default_height='30%')
|
||||
|
||||
step3_time = time.time()
|
||||
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)
|
||||
step4_time = time.time()
|
||||
duration3 = step4_time - step3_time
|
||||
logger.info(f"{duration3=}")
|
||||
fig_2 = px.line(df, x='bucket', y='avg_power')
|
||||
step5_time = time.time()
|
||||
duration4 = step5_time - step4_time
|
||||
logger.info(f"{duration4=}")
|
||||
fig_2.update_layout(
|
||||
xaxis_title="",
|
||||
yaxis_title="",
|
||||
title=f"Export gestern {duration3:.3f}, {duration4:.3f}",
|
||||
yaxis=dict(ticksuffix=" W")
|
||||
)
|
||||
graph_html_2 = fig_2.to_html(full_html=False, default_height='30%')
|
||||
|
||||
step6_time = time.time()
|
||||
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)
|
||||
step7_time = time.time()
|
||||
duration5 = step7_time - step6_time
|
||||
logger.info(f"{duration5=}")
|
||||
fig_3 = px.line(df, x='bucket', y='avg_power')
|
||||
step8_time = time.time()
|
||||
duration6 = step8_time - step7_time
|
||||
logger.info(f"{duration6=}")
|
||||
fig_3.update_layout(
|
||||
xaxis_title="",
|
||||
yaxis_title="",
|
||||
title=f"Export heute {duration5:.3f}, {duration6:.3f}",
|
||||
yaxis=dict(ticksuffix=" W")
|
||||
)
|
||||
graph_html_3 = fig_3.to_html(full_html=False, default_height='30%')
|
||||
stepZ_time = time.time()
|
||||
duration7 = stepZ_time - stepX_time
|
||||
logger.info(f"{duration7=}")
|
||||
|
||||
return render_template_string(f"""
|
||||
<html>
|
||||
@ -62,8 +119,26 @@ def index():
|
||||
<title>Jahreswerte PV-Energie</title>
|
||||
</head>
|
||||
<body>
|
||||
{graph_html}
|
||||
{graph_html}
|
||||
{graph_html_1}
|
||||
{graph_html_2}
|
||||
{graph_html_3}
|
||||
<div style="height:9vh; background-color:lightgrey; font-family: Courier, Consolas, monospace;">
|
||||
<table style="border-collapse: collapse;">
|
||||
<style>
|
||||
td.smallsep {{ padding-right: 10px }}
|
||||
td.largesep {{ padding-right: 30px }}
|
||||
</style>
|
||||
<tr>
|
||||
<td class="smallsep">Query 1:</td><td class="largesep"> {duration1:.3f} s</td><td class="smallsep">Graph 1:</td><td> {duration2:.3f} s</td>
|
||||
</tr><tr>
|
||||
<td class="smallsep">Query 2:</td><td class="largesep"> {duration3:.3f} s</td><td class="smallsep">Graph 2:</td><td> {duration4:.3f} s</td>
|
||||
</tr><tr>
|
||||
<td class="smallsep">Query 3:</td><td class="largesep"> {duration5:.3f} s</td><td class="smallsep">Graph 3:</td><td> {duration6:.3f} s</td>
|
||||
</tr><tr>
|
||||
<td class="smallsep">Total:</td><td> {duration7:.3f} s</td><td></td><td></td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
""")
|
||||
@ -74,6 +149,72 @@ def index():
|
||||
dbh.close()
|
||||
|
||||
|
||||
@app.route('/ntpserver')
|
||||
def ntpserver():
|
||||
try:
|
||||
dbh = psycopg.connect()
|
||||
engine = sqlalchemy.create_engine("postgresql+psycopg://", creator=lambda: dbh)
|
||||
|
||||
query = """
|
||||
select time_bucket('5 minutes', time) as bucket,
|
||||
device,
|
||||
avg(cast(values->'rootdisp'->>'value' as float)) as rootdisp,
|
||||
avg(cast(values->'stratum'->>'value' as int)) as stratum
|
||||
from measurements
|
||||
where time >= date_trunc('day', now()) AND time < date_trunc('day', now()) + '1 day'::interval and
|
||||
application = 'TSM' and attributes->>'Label' = 'david'
|
||||
group by bucket, device
|
||||
order by bucket, device
|
||||
"""
|
||||
|
||||
df = pd.read_sql(query, con=engine)
|
||||
|
||||
fig = po.Figure()
|
||||
fig.add_trace(po.Scatter(x=df['bucket'], y=df['rootdisp'], mode='lines', name='Root Dispersion', yaxis='y1', line=dict(color='red')))
|
||||
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'
|
||||
),
|
||||
|
||||
# Rechte Y-Achse
|
||||
yaxis2=dict(
|
||||
title='Stratum',
|
||||
overlaying='y', # Legt die zweite Y-Achse über die erste
|
||||
side='right', # Setzt sie auf die rechte Seite
|
||||
tickmode='linear', # Stellt sicher, dass die Ticks in festen Intervallen sind
|
||||
dtick=1, # Zeigt nur ganzzahlige Ticks
|
||||
),
|
||||
|
||||
legend=dict(x=0.05, y=1) # Position der Legende
|
||||
)
|
||||
|
||||
|
||||
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:
|
||||
if dbh is not None:
|
||||
dbh.close()
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
|
Reference in New Issue
Block a user