Merge branch 'EUMETNET:main' into main

Author: teunoknmi

api/load-test/locust-ewc.py

@@ -74,7 +74,7 @@ def get_data_area_single_parameter_last_hour(self):
         top = cy + sz
         polygon = f"POLYGON(({left} {bottom},{right} {bottom},{right} {top},{left} {top},{left} {bottom}))"
         url = f"/collections/observations/area?coords={polygon}&standard_names={standard_name}&datetime={dt_string}/.."
-        self.client.get(url, name=f"area {sz*2.0}deg x {sz*2.0}deg x 1h", headers=headers)
+        self.client.get(url, name=f"area {sz * 2.0}deg x {sz * 2.0}deg x 1h", headers=headers)
         # if sz == 2.0:
         #     j = response.json()
         #     # print(sz*2.0)

datastore/datastore/Dockerfile

@@ -5,7 +5,7 @@
 # docker image rm -f main
 # ...
 
-FROM golang:1.21-bookworm
+FROM golang:1.24-bookworm
 
 ARG VERSION_GRPC_HEALTH_PROBE=v0.4.19
 

ingest/api/send_mqtt.py

@@ -1,10 +1,15 @@
+import os
 import logging
 import json
 from paho.mqtt import client as mqtt_client
 from fastapi import HTTPException
 
 logger = logging.getLogger(__name__)
 
+if "MQTT_TOPIC_PREPEND" in os.environ:
+    mqtt_topic_prepend = os.getenv("MQTT_TOPIC_PREPEND", "")
+    mqtt_topic_prepend = mqtt_topic_prepend if mqtt_topic_prepend.endswith("/") else mqtt_topic_prepend + "/"
+
 
 def connect_mqtt(mqtt_conf: dict):
     def on_connect(client, userdata, flags, rc, properties=None):
@@ -33,7 +38,7 @@ def on_disconnect(client, userdata, flags, rc, properties):
 
 def send_message(topic: str, message: str, client: object):
     if len(topic) != 0:
-        mqtt_topic = topic
+        mqtt_topic = mqtt_topic_prepend + topic
     try:
         if isinstance(message, dict):
             client.publish(mqtt_topic, json.dumps(message))