data-catalog-services/ArchiveCostWebapp
0
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Von Basil vorgeschlagene Aenderungen wurden gemacht. Hoffentlich laeuft das Ganze nun auf der Produktion. Lokal laueft alles ohne Probleme.
Build and Publish Site / docker (push) Successful in 20s
Details

Browse Source
This commit is contained in:
huesser committed 2026-07-09 10:24:38 +02:00
1 parent b518ae8edb
commit dfe7ab485a
9 files changed
+82 -65
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

additional/archivecostwebapp.conf
+45
View File
@@ -0,0 +1,45 @@
server {
listen 80;
server_name archivecostwebapp.psi.ch;
return 301 https://$host$request_uri;
}
server {
listen 443 ssl;
server_name archivecostwebapp.psi.ch;
ssl_certificate /etc/nginx/certs/archivecostwebapp.psi.ch.crt;
ssl_certificate_key /etc/nginx/private/archivecostwebapp.psi.ch.key;
ssl_protocols TLSv1.2 TLSv1.3;
ssl_ciphers HIGH:!aNULL:!MD5;
ssl_prefer_server_ciphers on;
location / {
proxy_pass http://archive_cost_analytics:8501;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
}
location /logic/ {
proxy_pass http://archive_cost_logic:1880/;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
}
}
analytics/Dockerfile
+9 -5
View File
@@ -1,14 +1,18 @@
#FROM python:3.11-slim
FROM python:3.14-slim
# Arbeitsverzeichnis setzen
WORKDIR /app
# Erfordert keine schweren Systempakete, das beschleunigt auch den Build!
# Wir installieren direkt die benötigten Python-Bibliotheken
RUN pip3 install --no-cache-dir streamlit pandas plotly openpyxl
# Zuerst die Abhängigkeiten installieren, um den Docker-Cache optimal zu nutzen
COPY requirements.txt .
RUN pip3 install --no-cache-dir -r requirements.txt
# Jetzt den gesamten App-Code in das Arbeitsverzeichnis kopieren
COPY . .
# Port für Streamlit öffnen
EXPOSE 8501
# Streamlit starten und an alle Netzwerk-Schnittstellen binden
ENTRYPOINT ["streamlit", "run", "app.py", "--server.port=8501", "--server.address=0.0.0.0"]
# Standardbefehl zum Starten der App
CMD ["streamlit", "run", "app.py", "--server.port=8501", "--server.address=0.0.0.0"]
analytics/requirements.txt
+4
View File
@@ -0,0 +1,4 @@
streamlit
pandas
plotly
openpyxl
docker-compose.override.yml
+16
View File
@@ -0,0 +1,16 @@
services:
logic-red:
volumes:
- ./logic/node-red-data:/data
- ./shared_data:/data/results
- ./logic/scripts:/data/scripts
- /data/node_modules
ports:
- "1880:1880"
analytics-app:
volumes:
- ./analytics:/app
- ./shared_data:/data/results:ro
ports:
- "8501:8501"
docker-compose.prod.merge_yml
-37
View File
@@ -1,37 +0,0 @@
# Datacenter and DB Services (9522), Peter Hüsser (HP95)
# Archivkostenberechnung
logic-red:
image: gitea.psi.ch/data-catalog-services/archivecostwebapp-logic:latest
container_name: archive_cost_logic
restart: always
volumes:
- ./logic/node-red-data:/data
- ./shared_data:/data/results
- ./logic/scripts:/data/scripts
environment:
- TZ=Europe/Zurich
- GROUPINFO_JSON_LNK_NAME_WITH_PATH=/data/archivegroup_information.json
- BEGIN_NAME_GROUPINFO_JSON_FILE_WITH_PATH=/data/size_by_ownergroup_and_number_of_copies_
- JSON_CACHE_WITH_PATH=/data/results/json_cache.json
- NON_SPECIFIED_GROUPS=/data/non_specified_groups.csv
- ERROR_LOGFILE=/data/logs/get_new_groupinfo_error.log
- AD_SERVER=d.psi.ch
- AD_SEARCH_BASE=DC=d,DC=psi,DC=ch
- AD_USER=${AD_USER}
- AD_PASSWORD=${AD_PASSWORD}
- METABASE_API_KEY=${METABASE_API_KEY}
- MAIN_WORKFLOW_CRON=0 6 * * *
- CLEANUP_TIME=20
- CLEANUP_CRON=0 7 * * *
- CLEANUP_SCRIPT_PATH=/data/scripts/cleanup.sh
- CLEANUP_LOGFILE_PATH=/data/logs/cleanup.log
analytics-app:
image: gitea.psi.ch/data-catalog-services/archivecostwebapp-analytics:latest
container_name: archive_cost_analytics
restart: always
volumes:
- ./shared_data:/data/results:ro
environment:
- TZ=Europe/Zurich
docker-compose.yml
+5 -10
View File
@@ -3,9 +3,9 @@ services:
build: ./logic
container_name: archive_cost_logic
volumes:
- ./logic/node-red-data:/data
- ./shared_data:/data/results
- ./logic/scripts:/data/scripts
- /opt/webcontent/archivecost/logic/node-red-data:/data
- /opt/webcontent/archivecost/shared_data:/data/results
- /opt/webcontent/archivecost/logic/scripts:/data/scripts
environment:
- TZ=Europe/Zurich
- GROUPINFO_JSON_LNK_NAME_WITH_PATH=/data/archivegroup_information.json
@@ -24,16 +24,11 @@ services:
- CLEANUP_CRON=0 7 * * *
- CLEANUP_SCRIPT_PATH=/data/scripts/cleanup.sh
- CLEANUP_LOGFILE_PATH=/data/logs/cleanup.log
ports:
- "1880:1880"
analytics-app:
build: ./analytics
container_name: archive_cost_analytics
ports:
- "8501:8501"
volumes:
- ./analytics:/app
- ./shared_data:/data/results:ro
- /opt/webcontent/archivecost/shared_data:/data/results:ro
environment:
- TZ=Europe/Zurich
- TZ=Europe/Zurich
logic/node-red-data/archivegroup_information.json
+1 -1
View File
@@ -1 +1 @@
size_by_ownergroup_and_number_of_copies_2026-07-03T11_20_22.json
size_by_ownergroup_and_number_of_copies_2026-07-09T09_59_04.json
logic/start.sh
+1 -11
View File
@@ -1,12 +1,2 @@
#!/bin/sh
if [ ! -d "/data/node_modules" ] || [ -z "$(ls -A /data/node_modules 2>/dev/null)" ]; then
echo "Installing Node-RED modules ..."
cd /data
npm install --no-update-notifier \
node-red-contrib-moment \
node-red-contrib-cron-plus \
passport-ldapauth
fi
exec /usr/src/node-red/entrypoint.sh
exec /usr/src/node-red/entrypoint.sh
shared_data/json_cache.json
+1 -1
View File
@@ -1,2 +1,2 @@
[{"ownerGroup": "p22693", "copies": "oneCopyBig", "size": "15112600", "packedSize": "15687680", "beamline": "HRPT", "department": "3000"}, {"ownerGroup": "p16634", "copies": "oneCopySmall", "size": "2393985", "packedSize": "2764800", "beamline": "X04DB", "department": "6000"}, {"ownerGroup": "p18201", "copies": "oneCopySmall", "size": "15718025", "packedSize": "16455680", "beamline": "X12SA", "department": "6000"}, {"ownerGroup": "p20624", "copies": "oneCopyBig", "size": "4.769874464409E12", "packedSize": "4.7701085184E12", "beamline": "X12SA", "department": "6000"}, {"ownerGroup": "p10144", "copies": "oneCopySmall", "size": "433380", "packedSize": "522240", "beamline": "X04SA", "department": "6000"}, {"ownerGroup": "p16583", "copies": "oneCopySmall", "size": "45528", "packedSize": "81920", "beamline": "SARESA", "department": "6000"}, {"ownerGroup": "p18386", "copies": "oneCopyBig", "size": "1.39748438444615E14", "packedSize": "1.397485449216E14", "beamline": "SARESA", "department": "6000"}, {"ownerGroup": "p21055", "copies": "oneCopyBig", "size": "2360422904", "packedSize": "2361753600", "beamline": "gps", "department": "3000"}, {"ownerGroup": "p19395", "copies": "oneCopyBig", "size": "6.30152626406E11", "packedSize": "6.3017035776E11", "beamline": "X08SA", "department": "6000"}, {"ownerGroup": "p18941", "copies": "oneCopyBig", "size": "1.0335992928016E13", "packedSize": "1.033599361024E13", "beamline": "X02DA", "department": "6000"}, {"ownerGroup": "p20078", "copies": "oneCopyBig", "size": "1.5319190844241E13", "packedSize": "1.531919696896E13", "beamline": "X02DA", "department": "6000"}, {"ownerGroup": "p21145", "copies": "oneCopyBig", "size": "3.027038513451E13", "packedSize": "3.027222953984E13", "beamline": "SARESB", "department": "6000"}, {"ownerGroup": "p21665", "copies": "oneCopyBig", "size": "4324681909", "packedSize": "4326307840", "beamline": "flame", "department": "3000"}, {"ownerGroup": "p21773", "copies": "oneCopySmall", "size": "1038180", "packedSize": "1075200", "beamline": "DMC", "department": "3000"}, {"ownerGroup": "p22167", "copies": "oneCopyBig", "size": "1338051", "packedSize": "1873920", "beamline": "ZEBRA", "department": "3000"}, {"ownerGroup": "p17273", "copies": "twoCopiesBig", "size": "4.59254577896E11", "packedSize": "4.5925458944E11", "beamline": "X08SA", "department": "6000"}, {"ownerGroup": "p19830", "copies": "oneCopyBig", "size": "6485442923", "packedSize": "6486702080", "beamline": "lem", "department": "3000"}, {"ownerGroup": "p23144", "copies": "oneCopyBig", "size": "9207532450", "packedSize": "9207920640", "beamline": "lem", "department": "3000"}, {"ownerGroup": "p16188", "copies": "oneCopySmall", "size": "300598", "packedSize": "317440", "beamline": "X09LA", "department": "6000"}, {"ownerGroup": "p21039", "copies": "oneCopyBig", "size": "1629143841", "packedSize": "1631232000", "beamline": "dolly", "department": "3000"}, {"ownerGroup": "p22291", "copies": "oneCopyBig", "size": "140556035", "packedSize": "141987840", "beamline": "CAMEA", "department": "3000"}, {"ownerGroup": "p16846", "copies": "twoCopiesBig", "size": "1239913988", "packedSize": "1239930880", "beamline": "X12SA", "department": "6000"}, {"ownerGroup": "p22607", "copies": "oneCopyBig", "size": "4160326214", "packedSize": "4232130560", "beamline": "SANS-I", "department": "3000"}, {"ownerGroup": "p18180", "copies": "oneCopySmall", "size": "946869", "packedSize": "1423360", "beamline": "SARESA", "department": "6000"}, {"ownerGroup": "p21051", "copies": "oneCopyBig", "size": "1921462615", "packedSize": "1922611200", "beamline": "gps", "department": "3000"}, {"ownerGroup": "p23118", "copies": "oneCopySmall", "size": "106013837", "packedSize": "106823680", "beamline": "flame", "department": "3000"}, {"ownerGroup": "p22137", "copies": "oneCopySmall", "size": "1366682", "packedSize": "1433600", "beamline": "HRPT", "department": "3000"}, {"ownerGroup": "p17611", "copies": "twoCopiesBig", "size": "3.343674287963E12", "packedSize": "3.34423673856E12", "beamline": "X02DA", "department": "6000"}, {"ownerGroup": "p17675", "copies": "oneCopySmall", "size": "649839", "packedSize": "665600", "beamline": "X05LA", "department": "6000"}, {"ownerGroup": "p19047", "copies": "oneCopyBig", "size": "2308653994", "packedSize": "2310256640", "beamline": "gps", "department": "3000"}, {"ownerGroup": "a-35511", "copies": "twoCopiesBig", "size": "1.6906348859767E13", "packedSize": "1.690765755392E13", "department": "4000"}, {"ownerGroup": "p21714", "copies": "oneCopyBig", "size": "4744481199", "packedSize": "4747264000", "beamline": "dolly", "department": "3000"}, {"ownerGroup": "p22472", "copies": "oneCopyBig", "size": "1716261765", "packedSize": "1717360640", "beamline": "flame", "department": "3000"}, {"ownerGroup": "p12652", "copies": "twoCopiesBig", "size": "3.3010530641E10", "packedSize": "3.301040128E10", "beamline": "X02DA", "department": "6000"}, {"ownerGroup": "p22946", "copies": "oneCopyBig", "size": "58082862", "packedSize"Line truncated
[{"ownerGroup": "p16776", "copies": "oneCopyBig", "size": "2.324117768E9", "packedSize": "2.32664064E9", "beamline": "X11MA", "department": "6000"}, {"ownerGroup": "p21494", "copies": "oneCopyBig", "size": "6922887414", "packedSize": "6927267840", "beamline": "hal-9500", "department": "3000"}, {"ownerGroup": "p21110", "copies": "oneCopyBig", "size": "2.47131611176E11", "packedSize": "2.4723923968E11", "beamline": "X04DB", "department": "6000"}, {"ownerGroup": "p10041", "copies": "oneCopyBig", "size": "33729994", "packedSize": "34140160", "beamline": "X04SA", "department": "6000"}, {"ownerGroup": "p20565", "copies": "oneCopyBig", "size": "1.826341076438E12", "packedSize": "1.82650258432E12", "beamline": "X12SA", "department": "6000"}, {"ownerGroup": "p19833", "copies": "oneCopyBig", "size": "1627437520", "packedSize": "1628528640", "beamline": "gps", "department": "3000"}, {"ownerGroup": "p19438", "copies": "oneCopyBig", "size": "2889775100", "packedSize": "2893250560", "beamline": "gps", "department": "3000"}, {"ownerGroup": "p18284", "copies": "oneCopyBig", "size": "5.324044767E9", "packedSize": "5.32452352E9", "beamline": "X05LA", "department": "6000"}, {"ownerGroup": "p22134", "copies": "oneCopyBig", "size": "402204694", "packedSize": "415682560", "beamline": "HRPT", "department": "3000"}, {"ownerGroup": "p16242", "copies": "oneCopyBig", "size": "1.1387945255E10", "packedSize": "1.13889792E10", "beamline": "X05LA", "department": "6000"}, {"ownerGroup": "p21160", "copies": "oneCopyBig", "size": "7.9831859715546E13", "packedSize": "7.983199167488E13", "beamline": "SATESE", "department": "6000"}, {"ownerGroup": "p19874", "copies": "oneCopyBig", "size": "14447690046", "packedSize": "14449582080", "beamline": "lem", "department": "3000"}, {"ownerGroup": "p16862", "copies": "twoCopiesBig", "size": "1.96594992865E11", "packedSize": "1.965950464E11", "beamline": "X12SA", "department": "6000"}, {"ownerGroup": "p19406", "copies": "oneCopyBig", "size": "3.9198173732E11", "packedSize": "3.920262656E11", "beamline": "X12SA", "department": "6000"}, {"ownerGroup": "p16591", "copies": "oneCopySmall", "size": "7115", "packedSize": "20480", "beamline": "X12SA", "department": "6000"}, {"ownerGroup": "p21875", "copies": "oneCopyBig", "size": "78405909", "packedSize": "78735360", "beamline": "SANS-I", "department": "3000"}, {"ownerGroup": "p15673", "copies": "oneCopySmall", "size": "947", "packedSize": "10240", "beamline": "X02DA", "department": "6000"}, {"ownerGroup": "p21143", "copies": "twoCopiesBig", "size": "2.9333914646E10", "packedSize": "2.933392384E10", "beamline": "X12SA", "department": "6000"}, {"ownerGroup": "p22446", "copies": "oneCopyBig", "size": "1148893493", "packedSize": "1149900800", "beamline": "dolly", "department": "3000"}, {"ownerGroup": "p18127", "copies": "oneCopySmall", "size": "913", "packedSize": "10240", "beamline": "X11MA", "department": "6000"}, {"ownerGroup": "p23375", "copies": "oneCopyBig", "size": "5478545", "packedSize": "7004160", "beamline": "TASP", "department": "3000"}, {"ownerGroup": "p20277", "copies": "oneCopyBig", "size": "78759581", "packedSize": "78960640", "beamline": "X09LA", "department": "6000"}, {"ownerGroup": "p16483", "copies": "oneCopyBig", "size": "4084709196", "packedSize": "4085053440", "beamline": "X05LA", "department": "6000"}, {"ownerGroup": "p19938", "copies": "oneCopyBig", "size": "522307533", "packedSize": "522680320", "beamline": "FOCUS", "department": "3000"}, {"ownerGroup": "p17276", "copies": "oneCopySmall", "size": "1123630", "packedSize": "1198080", "beamline": "X09LA", "department": "6000"}, {"ownerGroup": "p18111", "copies": "oneCopyBig", "size": "1942944626", "packedSize": "1945835520", "beamline": "X09LA", "department": "6000"}, {"ownerGroup": "p19099", "copies": "oneCopyBig", "size": "1113519973", "packedSize": "1113958400", "beamline": "gps", "department": "3000"}, {"ownerGroup": "p21246", "copies": "oneCopyBig", "size": "2.96343794638E11", "packedSize": "2.9635618816E11", "beamline": "AMOR", "department": "3000"}, {"ownerGroup": "p19097", "copies": "oneCopyBig", "size": "1148395627", "packedSize": "1148866560", "beamline": "gps", "department": "3000"}, {"ownerGroup": "p21883", "copies": "oneCopySmall", "size": "893511", "packedSize": "1290240", "beamline": "ZEBRA", "department": "3000"}, {"ownerGroup": "p19831", "copies": "oneCopySmall", "size": "882270", "packedSize": "890880", "beamline": "lem", "department": "3000"}, {"ownerGroup": "p19546", "copies": "oneCopyBig", "size": "6.8955292516088E13", "packedSize": "6.895530114048E13", "beamline": "X02DA", "department": "6000"}, {"ownerGroup": "p14827", "copies": "oneCopyBig", "size": "11926248070", "packedSize": "11929374720", "beamline": "X05LA", "department": "6000"}, {"ownerGroup": "p16459", "copies": "oneCopyBig", "size": "7.64783527028E12", "packedSize": "7.64921375744E12", "beamline": "X02DA", "department": "6000"}, {"ownerGroup": "p19382", "copies": "oneCopyBig", "size": "24891406470", "packedSiLine truncated