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

Zeitangabe beim Filenamen des Cashes ist nun ok

Browse Source
This commit is contained in:
huesser committed 2026-06-23 10:06:15 +02:00
1 parent c8197b72fc
commit d0730901d2
7 files changed
+160 -45
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

TODO.md
+3 -1
View File
@@ -19,7 +19,9 @@
- [x] Zweistufige p-Gruppen-Abfrage stabilisieren
- [ ] Cronjob/Intervall in Node-RED für tägliches Update einrichten
- [ ] Fehlerhandling
- [ ] Zeit wird falsch angegeben (Zeit fuer Filenamen mit $now)
- [x] Zeit wird falsch angegeben (Zeit fuer Filenamen mit $now)
- [x] Aktuell Fehler beim berechnen der Zeit fuer das File
- [ ] In "Set Filename" wird soll eine Umgebungsvariable verwendet werden
## 🐳 Docker & Deployment
- [ ] Docker-Volumes für Produktion prüfen
logic/Dockerfile
+7 -1
View File
@@ -13,7 +13,10 @@ RUN apk add --no-cache \
gcc \
g++ \
musl-dev \
libffi-dev
libffi-dev \
tzdata
USER node-red
# Python-Pakete installieren (ldap3 separat via pip)
RUN pip install --no-cache-dir ldap3 --break-system-packages
@@ -27,3 +30,6 @@ RUN pip3 install --no-cache-dir --break-system-packages \
# Zurück zum Node-RED User für die Sicherheit
USER node-red
# Installiere "moment" Node um die richtige Zeitzone verwenden zu koennen
RUN npm install node-red-contrib-moment
logic/node-red-data/.config.nodes.json
+30
View File
@@ -426,5 +426,35 @@
"file": "/usr/src/node-red/node_modules/@node-red/nodes/core/storage/23-watch.js"
}
}
},
"node-red-contrib-moment": {
"name": "node-red-contrib-moment",
"version": "5.0.0",
"local": false,
"user": false,
"nodes": {
"moment": {
"name": "moment",
"types": [
"moment"
],
"enabled": true,
"local": false,
"user": false,
"module": "node-red-contrib-moment",
"file": "/usr/src/node-red/node_modules/node-red-contrib-moment/moment/nrmoment.js"
},
"humanizer": {
"name": "humanizer",
"types": [
"humanizer"
],
"enabled": true,
"local": false,
"user": false,
"module": "node-red-contrib-moment",
"file": "/usr/src/node-red/node_modules/node-red-contrib-moment/moment/nrhumanizer.js"
}
}
}
}
logic/node-red-data/.config.users.json
+4 -4
View File
@@ -27,7 +27,7 @@
"v": 4,
"tabs": [],
"primary": {
"width": 300,
"width": 276,
"top": {
"tabs": [
"info",
@@ -35,9 +35,9 @@
"config",
"context"
],
"height": 142,
"height": 153,
"hidden": false,
"active": "info"
"active": "help"
},
"bottom": {
"tabs": [
@@ -53,7 +53,7 @@
"tabs": [
"explorer"
],
"height": 302,
"height": 304,
"hidden": false,
"active": "explorer"
},
logic/node-red-data/archivegroup_information.json
+1 -1
View File
@@ -1 +1 @@
size_by_ownergroup_and_number_of_copies_2026-06-22T13_25_38.096Z.json
size_by_ownergroup_and_number_of_copies_2026-06-23T09_52_12.json
logic/node-red-data/flows.json
+114 -37
View File
@@ -50,7 +50,7 @@
"payload": "",
"payloadType": "date",
"x": 120,
"y": 360,
"y": 260,
"wires": [
[
"metabase_api_flow"
@@ -63,6 +63,13 @@
"z": "5a9dd923b7459820",
"name": "Metabase configuration of request",
"rules": [
{
"t": "set",
"p": "start_time",
"pt": "msg",
"to": "$millis()",
"tot": "jsonata"
},
{
"t": "set",
"p": "method",
@@ -98,7 +105,7 @@
"to": "",
"reg": false,
"x": 380,
"y": 360,
"y": 260,
"wires": [
[
"metabase_http_node"
@@ -122,7 +129,7 @@
"senderr": false,
"headers": [],
"x": 670,
"y": 360,
"y": 260,
"wires": [
[
"b8cc9c157460e2c5"
@@ -142,8 +149,8 @@
"targetType": "msg",
"statusVal": "",
"statusType": "auto",
"x": 930,
"y": 460,
"x": 250,
"y": 600,
"wires": []
},
{
@@ -154,11 +161,11 @@
"property": "payload",
"action": "",
"pretty": false,
"x": 210,
"y": 460,
"x": 190,
"y": 360,
"wires": [
[
"91e9f1c0e52a0592"
"2d607e7db0d4c765"
]
]
},
@@ -173,8 +180,8 @@
"createDir": false,
"overwriteFile": "true",
"encoding": "none",
"x": 690,
"y": 460,
"x": 130,
"y": 500,
"wires": [
[
"metabase_output_debug",
@@ -192,7 +199,7 @@
"t": "set",
"p": "filename",
"pt": "msg",
"to": "\"/data/size_by_ownergroup_and_number_of_copies_\" & $replace($now(), \":\", \"_\") & \".json\"",
"to": "\"/data/size_by_ownergroup_and_number_of_copies_\" & msg.date_string & \".json\"",
"tot": "jsonata"
}
],
@@ -201,11 +208,12 @@
"from": "",
"to": "",
"reg": false,
"x": 490,
"y": 460,
"x": 750,
"y": 360,
"wires": [
[
"cc064f55fd438347"
"cc064f55fd438347",
"7e0c38cadf8c5ebe"
]
]
},
@@ -231,8 +239,8 @@
"winHide": false,
"oldrc": false,
"name": "create link to newest archivegroup information json",
"x": 310,
"y": 600,
"x": 550,
"y": 500,
"wires": [
[
"0957c917da9bc8b3",
@@ -250,7 +258,7 @@
"id": "0957c917da9bc8b3",
"type": "debug",
"z": "5a9dd923b7459820",
"name": "end of workflow",
"name": "See external commands non errors",
"active": true,
"tosidebar": true,
"console": false,
@@ -259,8 +267,8 @@
"targetType": "msg",
"statusVal": "",
"statusType": "auto",
"x": 740,
"y": 560,
"x": 1020,
"y": 500,
"wires": []
},
{
@@ -274,8 +282,8 @@
"createDir": false,
"overwriteFile": "false",
"encoding": "none",
"x": 580,
"y": 740,
"x": 680,
"y": 660,
"wires": [
[
"394f5382cb6182dd"
@@ -301,8 +309,8 @@
"from": "",
"to": "",
"reg": false,
"x": 360,
"y": 740,
"x": 460,
"y": 660,
"wires": [
[
"7fa57e2c57d1e6eb"
@@ -322,8 +330,8 @@
"targetType": "msg",
"statusVal": "",
"statusType": "auto",
"x": 830,
"y": 740,
"x": 930,
"y": 660,
"wires": []
},
{
@@ -333,7 +341,7 @@
"name": "link in Get New Groupinformation",
"links": [],
"x": 125,
"y": 280,
"y": 180,
"wires": [
[
"metabase_api_flow"
@@ -347,8 +355,8 @@
"name": "link out Get New Groupinformation",
"mode": "return",
"links": [],
"x": 825,
"y": 640,
"x": 915,
"y": 420,
"wires": []
},
{
@@ -365,8 +373,8 @@
"91e9f1c0e52a0592",
"63ed8c262fa7753b"
],
"x": 720,
"y": 260,
"x": 240,
"y": 760,
"wires": [
[
"dfd30c3d6f180d27"
@@ -386,6 +394,48 @@
"targetType": "full",
"statusVal": "",
"statusType": "auto",
"x": 460,
"y": 760,
"wires": []
},
{
"id": "2d607e7db0d4c765",
"type": "moment",
"z": "5a9dd923b7459820",
"name": "Prepare date format for filename",
"topic": "",
"input": "start_time",
"inputType": "msg",
"inTz": "Europe/Zurich",
"adjAmount": 0,
"adjType": "days",
"adjDir": "add",
"format": "YYYY-MM-DD[T]HH_mm_ss",
"locale": "en-US",
"output": "date_string",
"outputType": "msg",
"outTz": "Europe/Zurich",
"x": 510,
"y": 360,
"wires": [
[
"91e9f1c0e52a0592"
]
]
},
{
"id": "7e0c38cadf8c5ebe",
"type": "debug",
"z": "5a9dd923b7459820",
"name": "Show filename",
"active": true,
"tosidebar": true,
"console": false,
"tostatus": false,
"complete": "filename",
"targetType": "msg",
"statusVal": "",
"statusType": "auto",
"x": 940,
"y": 260,
"wires": []
@@ -603,7 +653,7 @@
],
"linkType": "static",
"timeout": "300",
"x": 440,
"x": 380,
"y": 280,
"wires": [
[
@@ -621,7 +671,7 @@
],
"linkType": "static",
"timeout": "300",
"x": 820,
"x": 700,
"y": 280,
"wires": [
[
@@ -642,7 +692,7 @@
"targetType": "msg",
"statusVal": "",
"statusType": "auto",
"x": 1120,
"x": 960,
"y": 280,
"wires": []
},
@@ -655,8 +705,8 @@
"b994acfe29648a35",
"5dab821150d36d52"
],
"x": 420,
"y": 400,
"x": 400,
"y": 360,
"wires": [
[
"a613cbef5aae458b"
@@ -676,8 +726,35 @@
"targetType": "full",
"statusVal": "",
"statusType": "auto",
"x": 660,
"y": 400,
"x": 620,
"y": 360,
"wires": []
},
{
"id": "2f498ce2ead2e74c",
"type": "inject",
"z": "1593c8c9a04da215",
"name": "Periodischer Trigger",
"props": [
{
"p": "payload"
},
{
"p": "topic",
"vt": "str"
}
],
"repeat": "300",
"crontab": "",
"once": false,
"onceDelay": 0.1,
"topic": "",
"payload": "",
"payloadType": "date",
"x": 180,
"y": 180,
"wires": [
[]
]
}
]
shared_data/json_cache.json
+1 -1
View File
@@ -1,2 +1,2 @@
[{"ownerGroup": "p22115", "copies": "oneCopyBig", "size": "1939523", "packedSize": "2211840", "beamline": "EIGER", "department": "3000"}, {"ownerGroup": "p11114", "copies": "twoCopiesBig", "size": "2.7652999173554E13", "packedSize": "2.765299753984E13", "beamline": "X02DA", "department": "6000"}, {"ownerGroup": "p22768", "copies": "oneCopyBig", "size": "20685174681", "packedSize": "20686520320", "beamline": "lem", "department": "3000"}, {"ownerGroup": "p17828", "copies": "oneCopySmall", "size": "9230", "packedSize": "20480", "beamline": "X12SA", "department": "6000"}, {"ownerGroup": "p22799", "copies": "oneCopySmall", "size": "1273348", "packedSize": "1382400", "beamline": "flame", "department": "3000"}, {"ownerGroup": "p17924", "copies": "oneCopyBig", "size": "1335972712", "packedSize": "1341132800", "beamline": "X04SA", "department": "6000"}, {"ownerGroup": "p18530", "copies": "oneCopySmall", "size": "1087222", "packedSize": "2856960", "beamline": "X12SA", "department": "6000"}, {"ownerGroup": "p19634", "copies": "oneCopyBig", "size": "1.2906293763974E13", "packedSize": "1.290652928E13", "beamline": "SARESA", "department": "6000"}, {"ownerGroup": "p10334", "copies": "twoCopiesBig", "size": "2.42784330233E11", "packedSize": "2.4278431744E11", "beamline": "X04SA", "department": "6000"}, {"ownerGroup": "p19369", "copies": "oneCopyBig", "size": "1.8181177703E10", "packedSize": "1.818368E10", "beamline": "X12SA", "department": "6000"}, {"ownerGroup": "p19832", "copies": "oneCopyBig", "size": "2793878159", "packedSize": "2795816960", "beamline": "gps", "department": "3000"}, {"ownerGroup": "p18919", "copies": "oneCopyBig", "size": "730364122", "packedSize": "732057600", "beamline": "X09LA", "department": "6000"}, {"ownerGroup": "p22732", "copies": "oneCopyBig", "size": "82553681", "packedSize": "82677760", "beamline": "ZEBRA", "department": "3000"}, {"ownerGroup": "p15997", "copies": "oneCopyBig", "size": "1.3441560389E10", "packedSize": "1.347959808E10", "beamline": "X11MA", "department": "6000"}, {"ownerGroup": "p10383", "copies": "oneCopyBig", "size": "5743016", "packedSize": "5949440", "beamline": "X11MA", "department": "6000"}, {"ownerGroup": "p15930", "copies": "oneCopySmall", "size": "939", "packedSize": "10240", "beamline": "X02DA", "department": "6000"}, {"ownerGroup": "p16459", "copies": "oneCopyBig", "size": "7.64783527028E12", "packedSize": "7.64921375744E12", "beamline": "X02DA", "department": "6000"}, {"ownerGroup": "p17963", "copies": "oneCopyBig", "size": "1.982838463269E12", "packedSize": "1.98304909312E12", "beamline": "X12SA", "department": "6000"}, {"ownerGroup": "p21154", "copies": "twoCopiesBig", "size": "2.5388740942E11", "packedSize": "2.5388762112E11", "beamline": "X12SA", "department": "6000"}, {"ownerGroup": "p21821", "copies": "oneCopyBig", "size": "14896329", "packedSize": "15441920", "beamline": "HRPT", "department": "3000"}, {"ownerGroup": "p10015", "copies": "twoCopiesBig", "size": "1.34469534881E11", "packedSize": "1.3454106624E11", "beamline": "X06SA", "department": "6000"}, {"ownerGroup": "p18123", "copies": "oneCopyBig", "size": "3.2472406936E10", "packedSize": "3.248852992E10", "beamline": "X04SA", "department": "6000"}, {"ownerGroup": "p11810", "copies": "twoCopiesBig", "size": "4.7538494616E11", "packedSize": "4.7538502656E11", "beamline": "X02DA", "department": "6000"}, {"ownerGroup": "p19821", "copies": "oneCopyBig", "size": "2209046287", "packedSize": "2210017280", "beamline": "hal-9500", "department": "3000"}, {"ownerGroup": "p22366", "copies": "oneCopySmall", "size": "147474", "packedSize": "153600", "beamline": "ZEBRA", "department": "3000"}, {"ownerGroup": "p17253", "copies": "twoCopiesBig", "size": "7.975207238E10", "packedSize": "7.975211008E10", "beamline": "X12SA", "department": "6000"}, {"ownerGroup": "p19065", "copies": "oneCopyBig", "size": "12754767283", "packedSize": "12755456000", "beamline": "lem", "department": "3000"}, {"ownerGroup": "p22271", "copies": "oneCopyBig", "size": "128632034", "packedSize": "130160640", "beamline": "AMOR", "department": "3000"}, {"ownerGroup": "p22334", "copies": "oneCopySmall", "size": "3280402", "packedSize": "3450880", "beamline": "HRPT", "department": "3000"}, {"ownerGroup": "p21688", "copies": "oneCopyBig", "size": "1922910310", "packedSize": "1924208640", "beamline": "gps", "department": "3000"}, {"ownerGroup": "p18076", "copies": "oneCopyBig", "size": "1.17520235638918E14", "packedSize": "1.1752024526848E14", "beamline": "SARESA", "department": "6000"}, {"ownerGroup": "p20661", "copies": "oneCopyBig", "size": "1.5629813614E10", "packedSize": "1.563034624E10", "beamline": "X05LA", "department": "6000"}, {"ownerGroup": "a-35432", "copies": "twoCopiesBig", "size": "6.6133526312842E13", "packedSize": "6.614288992256E13", "department": "3000"}, {"ownerGroup": "p15459", "copies": "oneCopyBig", "size": "2.3144213631E10", "packedSize": "2.314753024E10", "beamline": "X05LA", "department": "6000"}, {"ownerGroup": "p18985", "copLine truncated
[{"ownerGroup": "p21679", "copies": "oneCopyBig", "size": "4433360998", "packedSize": "4436746240", "beamline": "gps", "department": "3000"}, {"ownerGroup": "p21742", "copies": "oneCopyBig", "size": "9.2553866758065E13", "packedSize": "9.255464433664E13", "beamline": "SARESB", "department": "6000"}, {"ownerGroup": "p22127", "copies": "oneCopyBig", "size": "255470353", "packedSize": "255918080", "beamline": "FOCUS", "department": "3000"}, {"ownerGroup": "p22057", "copies": "oneCopyBig", "size": "18319205106", "packedSize": "18320035840", "beamline": "lem", "department": "3000"}, {"ownerGroup": "p10787", "copies": "oneCopyBig", "size": "7.56620277E9", "packedSize": "7.570944E9", "beamline": "X04SA", "department": "6000"}, {"ownerGroup": "p13142", "copies": "twoCopiesBig", "size": "1.950315768183E12", "packedSize": "1.95031387136E12", "beamline": "X02DA", "department": "6000"}, {"ownerGroup": "p21886", "copies": "oneCopyBig", "size": "60747413", "packedSize": "60856320", "beamline": "ZEBRA", "department": "3000"}, {"ownerGroup": "p19535", "copies": "oneCopyBig", "size": "6.62969376868E11", "packedSize": "6.6308801536E11", "beamline": "X12SA", "department": "6000"}, {"ownerGroup": "p19719", "copies": "oneCopyBig", "size": "1.555025018923E12", "packedSize": "1.55506786304E12", "beamline": "X08SA", "department": "6000"}, {"ownerGroup": "p21640", "copies": "oneCopyBig", "size": "1.989830522204E12", "packedSize": "1.98987122688E12", "beamline": "SARESC", "department": "6000"}, {"ownerGroup": "p22028", "copies": "oneCopyBig", "size": "1724612455", "packedSize": "1725736960", "beamline": "flame", "department": "3000"}, {"ownerGroup": "p18748", "copies": "oneCopyBig", "size": "5.612534516314E12", "packedSize": "5.6140198912E12", "beamline": "X02DA", "department": "6000"}, {"ownerGroup": "p14462", "copies": "oneCopySmall", "size": "6208966", "packedSize": "6922240", "beamline": "X06DA", "department": "6000"}, {"ownerGroup": "p18026", "copies": "twoCopiesBig", "size": "5.879929403955E12", "packedSize": "5.88092916736E12", "beamline": "X02DA", "department": "6000"}, {"ownerGroup": "p18098", "copies": "oneCopyBig", "size": "2.566008027956E12", "packedSize": "2.56600849408E12", "beamline": "X08SA", "department": "6000"}, {"ownerGroup": "p19027", "copies": "oneCopyBig", "size": "2012880766", "packedSize": "2014228480", "beamline": "gpd", "department": "3000"}, {"ownerGroup": "p20390", "copies": "oneCopySmall", "size": "10041", "packedSize": "20480", "beamline": "TASP", "department": "3000"}, {"ownerGroup": "p22669", "copies": "oneCopyBig", "size": "379815545", "packedSize": "380160000", "beamline": "FOCUS", "department": "3000"}, {"ownerGroup": "p23118", "copies": "oneCopyBig", "size": "12102505", "packedSize": "12185600", "beamline": "flame", "department": "3000"}, {"ownerGroup": "p21950", "copies": "oneCopySmall", "size": "10023553", "packedSize": "10178560", "beamline": "flame", "department": "3000"}, {"ownerGroup": "p22277", "copies": "oneCopyBig", "size": "1.3726053288712E13", "packedSize": "1.372623541248E13", "beamline": "SATESE", "department": "6000"}, {"ownerGroup": "p21094", "copies": "oneCopyBig", "size": "2414519512", "packedSize": "2415605760", "beamline": "hal-9500", "department": "3000"}, {"ownerGroup": "p21089", "copies": "oneCopySmall", "size": "636685", "packedSize": "645120", "beamline": "lem", "department": "3000"}, {"ownerGroup": "p20602", "copies": "oneCopyBig", "size": "1.2432326062619E13", "packedSize": "1.243232715776E13", "beamline": "X02DA", "department": "6000"}, {"ownerGroup": "p22767", "copies": "oneCopyBig", "size": "15214173342", "packedSize": "15215329280", "beamline": "lem", "department": "3000"}, {"ownerGroup": "p11449", "copies": "twoCopiesBig", "size": "2.7652087843E10", "packedSize": "2.765213696E10", "beamline": "X08SA", "department": "6000"}, {"ownerGroup": "p10026", "copies": "twoCopiesBig", "size": "2.34555181699E11", "packedSize": "2.3455509504E11", "beamline": "X06SA", "department": "6000"}, {"ownerGroup": "p21957", "copies": "oneCopyBig", "size": "4.0529589145807E13", "packedSize": "4.052973850624E13", "beamline": "SARESA", "department": "6000"}, {"ownerGroup": "p22502", "copies": "oneCopyBig", "size": "229052165", "packedSize": "232417280", "beamline": "SANS-I", "department": "3000"}, {"ownerGroup": "p17164", "copies": "oneCopyBig", "size": "3049608474", "packedSize": "3052113920", "beamline": "X09LA", "department": "6000"}, {"ownerGroup": "p18874", "copies": "oneCopyBig", "size": "1.676594832595E12", "packedSize": "1.67674580992E12", "beamline": "X12SA", "department": "6000"}, {"ownerGroup": "p10414", "copies": "twoCopiesBig", "size": "1.43057126E11", "packedSize": "1.4305709056E11", "beamline": "X02DA", "department": "6000"}, {"ownerGroup": "p12358", "copies": "twoCopiesBig", "size": "1.882568003831E12", "packedSize": "1.88256703488E12", "beamline": "X02DA", "department": "6000"}, {"ownerGroup": "p22590", "copies": "oneCopyBig", "size": "2.360727258761E12", "packedSize": "2.3Line truncated