docker-compose.prod.yml angepasst, damit es auf unserer Produktion laeuft.
This commit is contained in:
huesser committed
1 parent
7136fc24c1
commit
6fad380a1b
4 files changed
+15
-18
No files matched your search
@@ -13,6 +13,7 @@
|
||||
- [ ] Benutzerseite, wo er selber Filter erstellen kann, z.B. Anzahl Datasets groesser als ...
|
||||
- [x] Diagramm für die Department-Verteilung einbauen (Plotly)
|
||||
- [x] Export-Button für gefilterte Excel-Dateien hinzufügen
|
||||
- [ ] Zeile 30/31 scheint mir noch nicht richtig in app.py
|
||||
|
||||
## ⚙️ Node-RED & AD-Skript
|
||||
- [x] Python-Skript auf lokale Datei-Pipes umstellen
|
||||
|
||||
+12
-16
@@ -1,25 +1,25 @@
|
||||
services:
|
||||
logic-red:
|
||||
build: ./logic
|
||||
container_name: archive_cost_logic
|
||||
volumes:
|
||||
- ./logic/node-red-data:/data
|
||||
- ./shared_data:/data/results # Hier landen die JSON/SQLite Dateien
|
||||
- ./shared_data:/data/results
|
||||
- ./logic/scripts:/data/scripts
|
||||
environment:
|
||||
- TZ=Europe/Zurich
|
||||
- GROUPINFO_JSON_LNK_NAME=archivegroup_information.json
|
||||
- GROUPINFO_JSON_LNK_NAME_WITH_PATH=/data/archivegroup_information.json
|
||||
- NON_SPECIFIED_GROUPS=/data/non_specified_groups.csv
|
||||
- BEGIN_NAME_GROUPINFO_JSON_FILE=size_by_ownergroup_and_number_of_copies_
|
||||
- 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
|
||||
- JSON_CACHE=json_cache.json
|
||||
- JSON_CACHE_WITH_PATH=/data/json_cache.json
|
||||
- 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}
|
||||
# Ausfuehrungszeitpunkt fuer den Haupt-Workflow im Cron-Format
|
||||
- MAIN_WORKFLOW_CRON=0 6 * * *
|
||||
# Behalte size_by_ownergroup_and_number_of_copies_ Files juenger als CLEANUP_TIME Tage
|
||||
- CLEANUP_TIME=20
|
||||
# Ausfuehrungszeitpunkt fuer den Cleanup im Cron-Format (Minuten Stunden * * *)
|
||||
@@ -28,33 +28,29 @@ services:
|
||||
- CLEANUP_SCRIPT_PATH=/data/scripts/cleanup.sh
|
||||
# Pfad zum Logfile des Cleanup-Skripts
|
||||
- CLEANUP_LOGFILE_PATH=/data/logs/cleanup.log
|
||||
# Ausfuehrungszeitpunkt fuer den Haupt-Workflow im Cron-Format
|
||||
- MAIN_WORKFLOW_CRON=0 6 * * *
|
||||
ports:
|
||||
- "1880:1880"
|
||||
secrets:
|
||||
- ad_user
|
||||
- ad_password
|
||||
- metabase_api_key
|
||||
ports:
|
||||
- "1880:1880"
|
||||
|
||||
# --- NEUER STREAMLIT CONTAINER ---
|
||||
analytics-app:
|
||||
build: ./analytics
|
||||
container_name: archive_cost_analytics
|
||||
ports:
|
||||
- "8501:8501" # Standard-Port für Streamlit im Browser
|
||||
volumes:
|
||||
- ./analytics:/app # Mappt deinen Code, damit Änderungen live ohne Rebuild sichtbar sind
|
||||
- ./shared_data:/data:ro # Bindet die JSON-Daten NUR LESEND unter /data ein
|
||||
- ./analytics/config:/app/config # Mappt den config Ordner
|
||||
- ./analytics/data:/app/data # Mappt den data Ordner
|
||||
- ./analytics:/app
|
||||
- ./shared_data:/data/results:ro
|
||||
environment:
|
||||
- TZ=Europe/Zurich
|
||||
|
||||
# Deklarieren, dass die Secrets von "außen" kommen
|
||||
secrets:
|
||||
ad_user:
|
||||
external: true
|
||||
ad_password:
|
||||
external: true
|
||||
metabase_api_key:
|
||||
external: true
|
||||
external: true
|
||||
@@ -1 +1 @@
|
||||
size_by_ownergroup_and_number_of_copies_2026-06-26T12_45_18.json
|
||||
size_by_ownergroup_and_number_of_copies_2026-06-29T09_28_19.json
|
||||
@@ -1,2 +1,2 @@
|
||||
[{"ownerGroup": "p19020", "copies": "oneCopyBig", "size": "2041477768", "packedSize": "2042920960", "beamline": "gpd", "department": "3000"}, {"ownerGroup": "p21908", "copies": "oneCopyBig", "size": "1.5736314651E10", "packedSize": "1.573692416E10", "beamline": "AMOR", "department": "3000"}, {"ownerGroup": "p22166", "copies": "oneCopyBig", "size": "33126193", "packedSize": "33873920", "beamline": "ZEBRA", "department": "3000"}, {"ownerGroup": "p21647", "copies": "oneCopyBig", "size": "396958571", "packedSize": "397527040", "beamline": "dolly", "department": "3000"}, {"ownerGroup": "p18788", "copies": "oneCopyBig", "size": "13500133719", "packedSize": "13500364800", "beamline": "X02DA", "department": "6000"}, {"ownerGroup": "p10880", "copies": "twoCopiesBig", "size": "1689128827", "packedSize": "1689139200", "beamline": "X08SA", "department": "6000"}, {"ownerGroup": "p20475", "copies": "oneCopyBig", "size": "1707113196", "packedSize": "1708154880", "beamline": "gps", "department": "3000"}, {"ownerGroup": "p22687", "copies": "oneCopyBig", "size": "67275590", "packedSize": "69611520", "beamline": "HRPT", "department": "3000"}, {"ownerGroup": "p22709", "copies": "oneCopySmall", "size": "534407", "packedSize": "552960", "beamline": "SANS-I", "department": "3000"}, {"ownerGroup": "p21638", "copies": "oneCopySmall", "size": "711163", "packedSize": "727040", "beamline": "SATESE", "department": "6000"}, {"ownerGroup": "p15741", "copies": "twoCopiesBig", "size": "2.4893270451635E13", "packedSize": "2.489396355072E13", "beamline": "X02DA", "department": "6000"}, {"ownerGroup": "p21868", "copies": "oneCopyBig", "size": "718857078", "packedSize": "731473920", "beamline": "SANS-I", "department": "3000"}, {"ownerGroup": "p13269", "copies": "twoCopiesBig", "size": "1.00581070092526E14", "packedSize": "1.0058104543232E14", "beamline": "X02DA", "department": "6000"}, {"ownerGroup": "p17413", "copies": "twoCopiesBig", "size": "6.35081963259E11", "packedSize": "6.3508207616E11", "beamline": "X12SA", "department": "6000"}, {"ownerGroup": "p20443", "copies": "oneCopySmall", "size": "2996190", "packedSize": "3440640", "beamline": "SARESC", "department": "6000"}, {"ownerGroup": "p17536", "copies": "oneCopyBig", "size": "2.5391452836991E13", "packedSize": "2.539149494272E13", "beamline": "SARESB", "department": "6000"}, {"ownerGroup": "p21689", "copies": "oneCopyBig", "size": "2333861155", "packedSize": "2334699520", "beamline": "gps", "department": "3000"}, {"ownerGroup": "p20629", "copies": "oneCopyBig", "size": "2.501227432425E12", "packedSize": "2.50132770816E12", "beamline": "X12SA", "department": "6000"}, {"ownerGroup": "p22382", "copies": "oneCopyBig", "size": "16161615", "packedSize": "18104320", "beamline": "ZEBRA", "department": "3000"}, {"ownerGroup": "p18495", "copies": "oneCopySmall", "size": "115804006", "packedSize": "116992000", "beamline": "X12SA", "department": "6000"}, {"ownerGroup": "p20546", "copies": "oneCopySmall", "size": "967728", "packedSize": "1003520", "beamline": "X12SA", "department": "6000"}, {"ownerGroup": "p21225", "copies": "oneCopyBig", "size": "1.378641644379E12", "packedSize": "1.37864512512E12", "beamline": "SARESC", "department": "6000"}, {"ownerGroup": "p17077", "copies": "twoCopiesBig", "size": "7.322012491578E12", "packedSize": "7.32325153792E12", "beamline": "X02DA", "department": "6000"}, {"ownerGroup": "p20055", "copies": "oneCopySmall", "size": "1093071", "packedSize": "1239040", "beamline": "X03MA", "department": "6000"}, {"ownerGroup": "p21905", "copies": "oneCopySmall", "size": "48552", "packedSize": "61440", "beamline": "CAMEA", "department": "3000"}, {"ownerGroup": "p20220285", "copies": "oneCopyBig", "size": "3610546138", "packedSize": "3615795200", "beamline": "not_found", "department": "not_found"}, {"ownerGroup": "a-35575", "copies": "twoCopiesBig", "size": "1.9293387685E10", "packedSize": "1.92934912E10", "department": "4000"}, {"ownerGroup": "p21447", "copies": "oneCopyBig", "size": "1791629", "packedSize": "2754560", "beamline": "ORION", "department": "3000"}, {"ownerGroup": "p21140", "copies": "twoCopiesSmall", "size": "4289", "packedSize": "10240", "beamline": "X12SA", "department": "6000"}, {"ownerGroup": "p21901", "copies": "oneCopyBig", "size": "131250158", "packedSize": "133478400", "beamline": "SANS-I", "department": "3000"}, {"ownerGroup": "p10144", "copies": "twoCopiesBig", "size": "1.065226548574E12", "packedSize": "1.06522643456E12", "beamline": "X04SA", "department": "6000"}, {"ownerGroup": "p22818", "copies": "oneCopyBig", "size": "2107624519", "packedSize": "2109204480", "beamline": "flame", "department": "3000"}, {"ownerGroup": "hipapie1", "copies": "oneCopySmall", "size": "757638", "packedSize": "778240", "department": "70000"}, {"ownerGroup": "p19007", "copies": "oneCopyBig", "size": "2969228762", "packedSize": "2970828800", "beamline": "dolly", "department": "3000"}, {"ownerGroup": "p11848", "copies": "twoCopiesBig", "size": "8.6706232678E10", "packedSize"Line truncated
|
||||
[{"ownerGroup": "p17616", "copies": "twoCopiesBig", "size": "9.365672042636E12", "packedSize": "9.36741023744E12", "beamline": "X02DA", "department": "6000"}, {"ownerGroup": "a-35261", "copies": "oneCopySmall", "size": "3270", "packedSize": "20480", "department": "2000"}, {"ownerGroup": "p20488", "copies": "oneCopyBig", "size": "11574304229", "packedSize": "11575203840", "beamline": "lem", "department": "3000"}, {"ownerGroup": "p17969", "copies": "oneCopySmall", "size": "4141279", "packedSize": "4208640", "beamline": "X12SA", "department": "6000"}, {"ownerGroup": "p22079", "copies": "oneCopyBig", "size": "457722426", "packedSize": "457994240", "beamline": "FOCUS", "department": "3000"}, {"ownerGroup": "p22447", "copies": "oneCopyBig", "size": "1909389099", "packedSize": "1910528000", "beamline": "flame", "department": "3000"}, {"ownerGroup": "p23195", "copies": "oneCopySmall", "size": "580171", "packedSize": "593920", "beamline": "lem", "department": "3000"}, {"ownerGroup": "p19449", "copies": "oneCopyBig", "size": "3691658904", "packedSize": "3694827520", "beamline": "gpd", "department": "3000"}, {"ownerGroup": "p10675", "copies": "oneCopyBig", "size": "11890265", "packedSize": "12912640", "beamline": "X11MA", "department": "6000"}, {"ownerGroup": "p19014", "copies": "oneCopyBig", "size": "698100486", "packedSize": "698777600", "beamline": "dolly", "department": "3000"}, {"ownerGroup": "p19159", "copies": "oneCopyBig", "size": "18587490561", "packedSize": "18588211200", "beamline": "lem", "department": "3000"}, {"ownerGroup": "p17613", "copies": "oneCopyBig", "size": "8.649146109136E12", "packedSize": "8.64914630656E12", "beamline": "X02DA", "department": "6000"}, {"ownerGroup": "p19404", "copies": "oneCopyBig", "size": "1.898489165328E12", "packedSize": "1.89848848384E12", "beamline": "X08SA", "department": "6000"}, {"ownerGroup": "p19190", "copies": "oneCopyBig", "size": "4.721158671547E12", "packedSize": "4.72116100096E12", "beamline": "X02DA", "department": "6000"}, {"ownerGroup": "p21701", "copies": "oneCopyBig", "size": "7742441633", "packedSize": "7747020800", "beamline": "hal-9500", "department": "3000"}, {"ownerGroup": "p20756", "copies": "oneCopyBig", "size": "1.111643115722E12", "packedSize": "1.1116949504E12", "beamline": "X12SA", "department": "6000"}, {"ownerGroup": "p20220482", "copies": "oneCopyBig", "size": "5.6797936E9", "packedSize": "5.68832E9", "beamline": "not_found", "department": "not_found"}, {"ownerGroup": "p22711", "copies": "oneCopyBig", "size": "359704832", "packedSize": "367063040", "beamline": "SANS-I", "department": "3000"}, {"ownerGroup": "p23368", "copies": "oneCopyBig", "size": "28904859", "packedSize": "29358080", "beamline": "SANS-I", "department": "3000"}, {"ownerGroup": "p18783", "copies": "oneCopyBig", "size": "1633352434", "packedSize": "1637509120", "beamline": "X03MA", "department": "6000"}, {"ownerGroup": "p18276", "copies": "twoCopiesBig", "size": "2.406374759733E12", "packedSize": "2.40678317056E12", "beamline": "X02DA", "department": "6000"}, {"ownerGroup": "p23245", "copies": "oneCopyBig", "size": "2.5718605902E10", "packedSize": "2.571879424E10", "beamline": "BOA", "department": "3000"}, {"ownerGroup": "a-35580", "copies": "twoCopiesBig", "size": "1.41589802862E11", "packedSize": "1.416255488E11", "department": "2000"}, {"ownerGroup": "p22087", "copies": "oneCopyBig", "size": "2620009955", "packedSize": "2621757440", "beamline": "flame", "department": "3000"}, {"ownerGroup": "p19091", "copies": "oneCopyBig", "size": "1712741806", "packedSize": "1713592320", "beamline": "gps", "department": "3000"}, {"ownerGroup": "p19087", "copies": "oneCopyBig", "size": "4222087690", "packedSize": "4224808960", "beamline": "gps", "department": "3000"}, {"ownerGroup": "p11218", "copies": "twoCopiesBig", "size": "5.7265896839097E13", "packedSize": "5.726666595328E13", "beamline": "X02DA", "department": "6000"}, {"ownerGroup": "p19440", "copies": "oneCopyBig", "size": "2422760962", "packedSize": "2424442880", "beamline": "gps", "department": "3000"}, {"ownerGroup": "p17133", "copies": "oneCopySmall", "size": "477892", "packedSize": "491520", "beamline": "X09LA", "department": "6000"}, {"ownerGroup": "p22656", "copies": "oneCopyBig", "size": "76026689", "packedSize": "76871680", "beamline": "DMC", "department": "3000"}, {"ownerGroup": "p18023", "copies": "twoCopiesBig", "size": "2.10522323132E12", "packedSize": "2.10522356736E12", "beamline": "X02DA", "department": "6000"}, {"ownerGroup": "a-35615", "copies": "oneCopySmall", "size": "78096", "packedSize": "102400", "department": "3000"}, {"ownerGroup": "p21883", "copies": "oneCopySmall", "size": "893511", "packedSize": "1290240", "beamline": "ZEBRA", "department": "3000"}, {"ownerGroup": "p17501", "copies": "oneCopyBig", "size": "4.57677746289E11", "packedSize": "4.5771967488E11", "beamline": "X04DB", "department": "6000"}, {"ownerGroup": "p22784", "copies": "oneCopyBig", "size": "1446821471", "packedSize": "1447823360", "beamLine truncated
|
||||
|
||||
Reference in new issue
Block a user