From 614342e370f18fc54e8c6c13364a9dc344834551 Mon Sep 17 00:00:00 2001 From: lukken <lukken@astron.nl> Date: Wed, 26 Jan 2022 07:34:17 +0000 Subject: [PATCH] L2SS-561: Add 100mb log limit to all containers not using syslog --- docker-compose/apsct-sim.yml | 5 +++++ docker-compose/apspu-sim.yml | 5 +++++ docker-compose/device-apsct.yml | 5 +++++ docker-compose/device-apspu.yml | 5 +++++ docker-compose/device-beam.yml | 5 +++++ docker-compose/device-boot.yml | 5 +++++ docker-compose/device-docker.yml | 5 +++++ docker-compose/device-observation_control.yml | 5 +++++ docker-compose/device-recv.yml | 5 +++++ docker-compose/device-sdp.yml | 5 +++++ docker-compose/device-sst.yml | 5 +++++ docker-compose/device-unb2.yml | 5 +++++ docker-compose/device-xst.yml | 5 +++++ docker-compose/elk.yml | 10 ++++++++++ docker-compose/itango.yml | 5 +++++ docker-compose/jupyter.yml | 5 +++++ docker-compose/lofar-device-base.yml | 5 +++++ docker-compose/prometheus.yml | 5 +++++ docker-compose/recv-sim.yml | 5 +++++ docker-compose/sdptr-sim.yml | 5 +++++ docker-compose/tango-prometheus-exporter.yml | 5 +++++ docker-compose/unb2-sim.yml | 5 +++++ 22 files changed, 115 insertions(+) diff --git a/docker-compose/apsct-sim.yml b/docker-compose/apsct-sim.yml index b9742fdb9..326e3b130 100644 --- a/docker-compose/apsct-sim.yml +++ b/docker-compose/apsct-sim.yml @@ -14,6 +14,11 @@ services: - LOCAL_DOCKER_REGISTRY_HOST=${LOCAL_DOCKER_REGISTRY_HOST} - LOCAL_DOCKER_REGISTRY_LOFAR=${LOCAL_DOCKER_REGISTRY_LOFAR} container_name: ${CONTAINER_NAME_PREFIX}apsct-sim + logging: + driver: "json-file" + options: + max-size: "100m" + max-file: "10" networks: - control entrypoint: python3 pypcc2.py --simulator --port 4843 --config APSCTTR diff --git a/docker-compose/apspu-sim.yml b/docker-compose/apspu-sim.yml index f5677048f..1de9375d6 100644 --- a/docker-compose/apspu-sim.yml +++ b/docker-compose/apspu-sim.yml @@ -14,6 +14,11 @@ services: - LOCAL_DOCKER_REGISTRY_HOST=${LOCAL_DOCKER_REGISTRY_HOST} - LOCAL_DOCKER_REGISTRY_LOFAR=${LOCAL_DOCKER_REGISTRY_LOFAR} container_name: ${CONTAINER_NAME_PREFIX}apspu-sim + logging: + driver: "json-file" + options: + max-size: "100m" + max-file: "10" networks: - control entrypoint: python3 pypcc2.py --simulator --port 4842 --config APSPUTR diff --git a/docker-compose/device-apsct.yml b/docker-compose/device-apsct.yml index 0e258fecd..a23e8a0a1 100644 --- a/docker-compose/device-apsct.yml +++ b/docker-compose/device-apsct.yml @@ -22,6 +22,11 @@ services: args: SOURCE_IMAGE: ${LOCAL_DOCKER_REGISTRY_HOST}/${LOCAL_DOCKER_REGISTRY_USER}/tango-itango:${TANGO_ITANGO_VERSION} container_name: ${CONTAINER_NAME_PREFIX}device-apsct + logging: + driver: "json-file" + options: + max-size: "100m" + max-file: "10" networks: - control ports: diff --git a/docker-compose/device-apspu.yml b/docker-compose/device-apspu.yml index 5f325b19f..9fbdda2ce 100644 --- a/docker-compose/device-apspu.yml +++ b/docker-compose/device-apspu.yml @@ -22,6 +22,11 @@ services: args: SOURCE_IMAGE: ${LOCAL_DOCKER_REGISTRY_HOST}/${LOCAL_DOCKER_REGISTRY_USER}/tango-itango:${TANGO_ITANGO_VERSION} container_name: ${CONTAINER_NAME_PREFIX}device-apspu + logging: + driver: "json-file" + options: + max-size: "100m" + max-file: "10" networks: - control ports: diff --git a/docker-compose/device-beam.yml b/docker-compose/device-beam.yml index b7572dda6..4b765f96a 100644 --- a/docker-compose/device-beam.yml +++ b/docker-compose/device-beam.yml @@ -17,6 +17,11 @@ services: args: SOURCE_IMAGE: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}-tango-itango:${TANGO_ITANGO_VERSION} container_name: ${CONTAINER_NAME_PREFIX}device-beam + logging: + driver: "json-file" + options: + max-size: "100m" + max-file: "10" networks: - control ports: diff --git a/docker-compose/device-boot.yml b/docker-compose/device-boot.yml index 330cb723e..abbce963a 100644 --- a/docker-compose/device-boot.yml +++ b/docker-compose/device-boot.yml @@ -21,6 +21,11 @@ services: args: SOURCE_IMAGE: ${LOCAL_DOCKER_REGISTRY_HOST}/${LOCAL_DOCKER_REGISTRY_USER}/tango-itango:${TANGO_ITANGO_VERSION} container_name: ${CONTAINER_NAME_PREFIX}device-boot + logging: + driver: "json-file" + options: + max-size: "100m" + max-file: "10" networks: - control ports: diff --git a/docker-compose/device-docker.yml b/docker-compose/device-docker.yml index a9e4ccfdd..ae73d963d 100644 --- a/docker-compose/device-docker.yml +++ b/docker-compose/device-docker.yml @@ -22,6 +22,11 @@ services: args: SOURCE_IMAGE: ${LOCAL_DOCKER_REGISTRY_HOST}/${LOCAL_DOCKER_REGISTRY_USER}/tango-itango:${TANGO_ITANGO_VERSION} container_name: ${CONTAINER_NAME_PREFIX}device-docker + logging: + driver: "json-file" + options: + max-size: "100m" + max-file: "10" networks: - control ports: diff --git a/docker-compose/device-observation_control.yml b/docker-compose/device-observation_control.yml index d4f6f15d1..2a77d0e5c 100644 --- a/docker-compose/device-observation_control.yml +++ b/docker-compose/device-observation_control.yml @@ -21,6 +21,11 @@ services: args: SOURCE_IMAGE: ${LOCAL_DOCKER_REGISTRY_HOST}/${LOCAL_DOCKER_REGISTRY_USER}/tango-itango:${TANGO_ITANGO_VERSION} container_name: ${CONTAINER_NAME_PREFIX}device-observation_control + logging: + driver: "json-file" + options: + max-size: "100m" + max-file: "10" networks: - control ports: diff --git a/docker-compose/device-recv.yml b/docker-compose/device-recv.yml index 25e767726..0a42904ce 100644 --- a/docker-compose/device-recv.yml +++ b/docker-compose/device-recv.yml @@ -22,6 +22,11 @@ services: args: SOURCE_IMAGE: ${LOCAL_DOCKER_REGISTRY_HOST}/${LOCAL_DOCKER_REGISTRY_USER}/tango-itango:${TANGO_ITANGO_VERSION} container_name: ${CONTAINER_NAME_PREFIX}device-recv + logging: + driver: "json-file" + options: + max-size: "100m" + max-file: "10" networks: - control ports: diff --git a/docker-compose/device-sdp.yml b/docker-compose/device-sdp.yml index 06a523f60..1f3967d65 100644 --- a/docker-compose/device-sdp.yml +++ b/docker-compose/device-sdp.yml @@ -22,6 +22,11 @@ services: args: SOURCE_IMAGE: ${LOCAL_DOCKER_REGISTRY_HOST}/${LOCAL_DOCKER_REGISTRY_USER}/tango-itango:${TANGO_ITANGO_VERSION} container_name: ${CONTAINER_NAME_PREFIX}device-sdp + logging: + driver: "json-file" + options: + max-size: "100m" + max-file: "10" networks: - control ports: diff --git a/docker-compose/device-sst.yml b/docker-compose/device-sst.yml index 86651c787..4e600ef41 100644 --- a/docker-compose/device-sst.yml +++ b/docker-compose/device-sst.yml @@ -22,6 +22,11 @@ services: args: SOURCE_IMAGE: ${LOCAL_DOCKER_REGISTRY_HOST}/${LOCAL_DOCKER_REGISTRY_USER}/tango-itango:${TANGO_ITANGO_VERSION} container_name: ${CONTAINER_NAME_PREFIX}device-sst + logging: + driver: "json-file" + options: + max-size: "100m" + max-file: "10" networks: - control - data diff --git a/docker-compose/device-unb2.yml b/docker-compose/device-unb2.yml index 2b9b47146..3939635b2 100644 --- a/docker-compose/device-unb2.yml +++ b/docker-compose/device-unb2.yml @@ -22,6 +22,11 @@ services: args: SOURCE_IMAGE: ${LOCAL_DOCKER_REGISTRY_HOST}/${LOCAL_DOCKER_REGISTRY_USER}/tango-itango:${TANGO_ITANGO_VERSION} container_name: ${CONTAINER_NAME_PREFIX}device-unb2 + logging: + driver: "json-file" + options: + max-size: "100m" + max-file: "10" networks: - control ports: diff --git a/docker-compose/device-xst.yml b/docker-compose/device-xst.yml index 54ca5a21f..e2cfd8c7d 100644 --- a/docker-compose/device-xst.yml +++ b/docker-compose/device-xst.yml @@ -22,6 +22,11 @@ services: args: SOURCE_IMAGE: ${LOCAL_DOCKER_REGISTRY_HOST}/${LOCAL_DOCKER_REGISTRY_USER}/tango-itango:${TANGO_ITANGO_VERSION} container_name: ${CONTAINER_NAME_PREFIX}device-xst + logging: + driver: "json-file" + options: + max-size: "100m" + max-file: "10" networks: - control - data diff --git a/docker-compose/elk.yml b/docker-compose/elk.yml index 25bb1b218..78345420e 100644 --- a/docker-compose/elk.yml +++ b/docker-compose/elk.yml @@ -18,6 +18,11 @@ services: build: context: elk-configure-host container_name: ${CONTAINER_NAME_PREFIX}elk-configure-host + logging: + driver: "json-file" + options: + max-size: "100m" + max-file: "10" networks: - control privileged: true @@ -27,6 +32,11 @@ services: build: context: elk container_name: ${CONTAINER_NAME_PREFIX}elk + logging: + driver: "json-file" + options: + max-size: "100m" + max-file: "10" networks: - control volumes: diff --git a/docker-compose/itango.yml b/docker-compose/itango.yml index 02d6801bd..3e3df5a53 100644 --- a/docker-compose/itango.yml +++ b/docker-compose/itango.yml @@ -19,6 +19,11 @@ services: args: SOURCE_IMAGE: ${LOCAL_DOCKER_REGISTRY_HOST}/${LOCAL_DOCKER_REGISTRY_USER}/tango-itango:${TANGO_ITANGO_VERSION} container_name: ${CONTAINER_NAME_PREFIX}itango + logging: + driver: "json-file" + options: + max-size: "100m" + max-file: "10" networks: - control extra_hosts: diff --git a/docker-compose/jupyter.yml b/docker-compose/jupyter.yml index bbc20f269..8bc6eb8ce 100644 --- a/docker-compose/jupyter.yml +++ b/docker-compose/jupyter.yml @@ -18,6 +18,11 @@ services: CONTAINER_EXECUTION_UID: ${CONTAINER_EXECUTION_UID} SOURCE_IMAGE: ${LOCAL_DOCKER_REGISTRY_HOST}/${LOCAL_DOCKER_REGISTRY_USER}/tango-itango:${TANGO_ITANGO_VERSION} container_name: ${CONTAINER_NAME_PREFIX}jupyter + logging: + driver: "json-file" + options: + max-size: "100m" + max-file: "10" networks: - control volumes: diff --git a/docker-compose/lofar-device-base.yml b/docker-compose/lofar-device-base.yml index f01faac2d..dddd50c9a 100644 --- a/docker-compose/lofar-device-base.yml +++ b/docker-compose/lofar-device-base.yml @@ -23,6 +23,11 @@ services: container_name: ${CONTAINER_NAME_PREFIX}lofar-device-base # These parameters are just visual queues, you have to define them again # in derived docker-compose files! + logging: + driver: "json-file" + options: + max-size: "100m" + max-file: "10" networks: - control extra_hosts: diff --git a/docker-compose/prometheus.yml b/docker-compose/prometheus.yml index e7924c1a7..8029e9ba6 100644 --- a/docker-compose/prometheus.yml +++ b/docker-compose/prometheus.yml @@ -16,6 +16,11 @@ services: build: context: prometheus container_name: ${CONTAINER_NAME_PREFIX}prometheus + logging: + driver: "json-file" + options: + max-size: "100m" + max-file: "10" networks: - control volumes: diff --git a/docker-compose/recv-sim.yml b/docker-compose/recv-sim.yml index 8fd795be6..91d1a13cd 100644 --- a/docker-compose/recv-sim.yml +++ b/docker-compose/recv-sim.yml @@ -14,6 +14,11 @@ services: - LOCAL_DOCKER_REGISTRY_HOST=${LOCAL_DOCKER_REGISTRY_HOST} - LOCAL_DOCKER_REGISTRY_LOFAR=${LOCAL_DOCKER_REGISTRY_LOFAR} container_name: ${CONTAINER_NAME_PREFIX}recv-sim + logging: + driver: "json-file" + options: + max-size: "100m" + max-file: "10" networks: - control entrypoint: python3 pypcc2.py --simulator --port 4840 --config RECVTR diff --git a/docker-compose/sdptr-sim.yml b/docker-compose/sdptr-sim.yml index badf707e3..112b6d4e5 100644 --- a/docker-compose/sdptr-sim.yml +++ b/docker-compose/sdptr-sim.yml @@ -14,6 +14,11 @@ services: - LOCAL_DOCKER_REGISTRY_HOST=${LOCAL_DOCKER_REGISTRY_HOST} - LOCAL_DOCKER_REGISTRY_LOFAR=${LOCAL_DOCKER_REGISTRY_LOFAR} container_name: ${CONTAINER_NAME_PREFIX}sdptr-sim + logging: + driver: "json-file" + options: + max-size: "100m" + max-file: "10" networks: - control restart: unless-stopped diff --git a/docker-compose/tango-prometheus-exporter.yml b/docker-compose/tango-prometheus-exporter.yml index bc43a6777..87ca7109f 100644 --- a/docker-compose/tango-prometheus-exporter.yml +++ b/docker-compose/tango-prometheus-exporter.yml @@ -8,6 +8,11 @@ services: build: context: tango-prometheus-exporter container_name: ${CONTAINER_NAME_PREFIX}tango-prometheus-exporter + logging: + driver: "json-file" + options: + max-size: "100m" + max-file: "10" networks: - control environment: diff --git a/docker-compose/unb2-sim.yml b/docker-compose/unb2-sim.yml index b01802cd0..f7bff91fe 100644 --- a/docker-compose/unb2-sim.yml +++ b/docker-compose/unb2-sim.yml @@ -14,6 +14,11 @@ services: - LOCAL_DOCKER_REGISTRY_HOST=${LOCAL_DOCKER_REGISTRY_HOST} - LOCAL_DOCKER_REGISTRY_LOFAR=${LOCAL_DOCKER_REGISTRY_LOFAR} container_name: ${CONTAINER_NAME_PREFIX}unb2-sim + logging: + driver: "json-file" + options: + max-size: "100m" + max-file: "10" networks: - control entrypoint: python3 pypcc2.py --simulator --port 4841 --config UNB2 -- GitLab