Merge branch 'optimise-loki' into 'master'

L2SS-1358: Tune loki config to create far fewer chunks

See merge request !599

docker-compose/apsct-sim.yml

@@ -15,6 +15,7 @@ services:
       args:
         - LOCAL_DOCKER_REGISTRY_HOST=${LOCAL_DOCKER_REGISTRY_HOST}
         - LOCAL_DOCKER_REGISTRY_LOFAR=${LOCAL_DOCKER_REGISTRY_LOFAR}
+    hostname: apsct-sim
     container_name: apsct-sim
     logging:
       driver: "json-file"

docker-compose/apspu-sim.yml

@@ -15,6 +15,7 @@ services:
       args:
         - LOCAL_DOCKER_REGISTRY_HOST=${LOCAL_DOCKER_REGISTRY_HOST}
         - LOCAL_DOCKER_REGISTRY_LOFAR=${LOCAL_DOCKER_REGISTRY_LOFAR}
+    hostname: apspu-sim
     container_name: apspu-sim
     logging:
       driver: "json-file"

docker-compose/ccd-sim.yml

@@ -15,6 +15,7 @@ services:
       args:
         - LOCAL_DOCKER_REGISTRY_HOST=${LOCAL_DOCKER_REGISTRY_HOST}
         - LOCAL_DOCKER_REGISTRY_LOFAR=${LOCAL_DOCKER_REGISTRY_LOFAR}
+    hostname: ccd-sim
     container_name: ccd-sim
     logging:
       driver: "json-file"

docker-compose/device-antennafield.yml

@@ -18,6 +18,7 @@ version: '2.1'
 services:
   device-antennafield:
     image: ${LOCAL_DOCKER_REGISTRY_HOST}/${LOCAL_DOCKER_REGISTRY_USER}/lofar-device-base
+    hostname: device-antennafield
     container_name: device-antennafield
     logging:
       driver: "json-file"

docker-compose/device-apsct.yml

@@ -17,6 +17,7 @@ version: '2.1'
 services:
   device-apsct:
     image: ${LOCAL_DOCKER_REGISTRY_HOST}/${LOCAL_DOCKER_REGISTRY_USER}/lofar-device-base
+    hostname: device-apsct
     container_name: device-apsct
     logging:
       driver: "json-file"

docker-compose/device-apspu.yml

@@ -17,6 +17,7 @@ version: '2.1'
 services:
   device-apspu:
     image: ${LOCAL_DOCKER_REGISTRY_HOST}/${LOCAL_DOCKER_REGISTRY_USER}/lofar-device-base
+    hostname: device-apspu
     container_name: device-apspu
     logging:
       driver: "json-file"

docker-compose/device-beamlet.yml

@@ -17,6 +17,7 @@ version: '2.1'
 services:
   device-beamlet:
     image: ${LOCAL_DOCKER_REGISTRY_HOST}/${LOCAL_DOCKER_REGISTRY_USER}/lofar-device-base
+    hostname: device-beamlet
     container_name: device-beamlet
     logging:
       driver: "json-file"

docker-compose/device-boot.yml

@@ -16,6 +16,7 @@ version: '2.1'
 services:
   device-boot:
     image: ${LOCAL_DOCKER_REGISTRY_HOST}/${LOCAL_DOCKER_REGISTRY_USER}/lofar-device-base
+    hostname: device-boot
     container_name: device-boot
     logging:
       driver: "json-file"

docker-compose/device-bst.yml

@@ -17,6 +17,7 @@ version: '2.1'
 services:
   device-bst:
     image: ${LOCAL_DOCKER_REGISTRY_HOST}/${LOCAL_DOCKER_REGISTRY_USER}/lofar-device-base
+    hostname: device-bst
     container_name: device-bst
     logging:
       driver: "json-file"

docker-compose/device-calibration.yml

@@ -17,6 +17,7 @@ version: '2.1'
 services:
   device-calibration:
     image: ${LOCAL_DOCKER_REGISTRY_HOST}/${LOCAL_DOCKER_REGISTRY_USER}/lofar-device-base
+    hostname: device-calibration
     container_name: device-calibration
     logging:
       driver: "json-file"

docker-compose/device-ccd.yml

@@ -17,6 +17,7 @@ version: '2.1'
 services:
   device-ccd:
     image: ${LOCAL_DOCKER_REGISTRY_HOST}/${LOCAL_DOCKER_REGISTRY_USER}/lofar-device-base
+    hostname: device-ccd
     container_name: device-ccd
     logging:
       driver: "json-file"

docker-compose/device-configuration.yml

@@ -17,6 +17,7 @@ version: '2.1'
 services:
   device-configuration:
     image: ${LOCAL_DOCKER_REGISTRY_HOST}/${LOCAL_DOCKER_REGISTRY_USER}/lofar-device-base
+    hostname: device-configuration
     container_name: device-configuration
     logging:
       driver: "json-file"

docker-compose/device-digitalbeam.yml

@@ -17,6 +17,7 @@ version: '2.1'
 services:
   device-digitalbeam:
     image: ${LOCAL_DOCKER_REGISTRY_HOST}/${LOCAL_DOCKER_REGISTRY_USER}/lofar-device-base
+    hostname: device-digitalbeam
     container_name: device-digitalbeam
     logging:
       driver: "json-file"

docker-compose/device-docker.yml

@@ -17,6 +17,7 @@ version: '2.1'
 services:
   device-docker:
     image: ${LOCAL_DOCKER_REGISTRY_HOST}/${LOCAL_DOCKER_REGISTRY_USER}/lofar-device-base
+    hostname: device-docker
     container_name: device-docker
     logging:
       driver: "json-file"

docker-compose/device-observation-control.yml

@@ -16,6 +16,7 @@ version: '2.1'
 services:
   device-observation-control:
     image: ${LOCAL_DOCKER_REGISTRY_HOST}/${LOCAL_DOCKER_REGISTRY_USER}/lofar-device-base
+    hostname: device-observation-control
     container_name: device-observation-control
     logging:
       driver: "json-file"

docker-compose/device-observation.yml

@@ -15,6 +15,7 @@ version: '2.1'
 services:
   device-observation:
     image: ${LOCAL_DOCKER_REGISTRY_HOST}/${LOCAL_DOCKER_REGISTRY_USER}/lofar-device-base
+    hostname: device-observation
     container_name: device-observation
     logging:
       driver: "json-file"

docker-compose/device-pcon.yml

@@ -12,6 +12,7 @@ volumes:
 services:
   device-pcon:
     image: ${LOCAL_DOCKER_REGISTRY_HOST}/${LOCAL_DOCKER_REGISTRY_USER}/lofar-device-base
+    hostname: device-pcon
     container_name: device-pcon
     logging:
       driver: "json-file"

docker-compose/device-psoc.yml

@@ -12,6 +12,7 @@ volumes:
 services:
   device-psoc:
     image: ${LOCAL_DOCKER_REGISTRY_HOST}/${LOCAL_DOCKER_REGISTRY_USER}/lofar-device-base
+    hostname: device-psoc
     container_name: device-psoc
     logging:
       driver: "json-file"

docker-compose/device-rcu2h.yml

@@ -17,6 +17,7 @@ version: '2.1'
 services:
   device-rcu2h:
     image: ${LOCAL_DOCKER_REGISTRY_HOST}/${LOCAL_DOCKER_REGISTRY_USER}/lofar-device-base
+    hostname: device-rcu2h
     container_name: device-rcu2h
     logging:
       driver: "json-file"

docker-compose/device-rcu2l.yml

@@ -17,6 +17,7 @@ version: '2.1'
 services:
   device-rcu2l:
     image: ${LOCAL_DOCKER_REGISTRY_HOST}/${LOCAL_DOCKER_REGISTRY_USER}/lofar-device-base
+    hostname: device-rcu2l
     container_name: device-rcu2l
     logging:
       driver: "json-file"