Add configurable container logging driver in infra

input-output-hk · Jun 2, 2023 · b2d9441 · b2d9441
1 parent 8a5a29d
commit b2d9441
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 37 deletions.
diff --git a/mithril-infra/assets/docker/docker-compose-aggregator.yaml b/mithril-infra/assets/docker/docker-compose-aggregator.yaml
@@ -15,10 +15,7 @@ services:
       - cardano
       - all
     logging:
-      driver: "json-file"
-      options:
-        max-size: "100m"
-        max-file: "5"
+      driver: "${LOGGING_DRIVER}"
     volumes:
       - ./cardano-configurations/network/${NETWORK}:/config
       - ../data/${NETWORK}/mithril-aggregator/cardano/db:/db
@@ -79,10 +76,7 @@ services:
       cardano-node-aggregator:
         condition: service_started
     logging:
-      driver: "json-file"
-      options:
-        max-size: "100m"
-        max-file: "5"
+      driver: "${LOGGING_DRIVER}"
     labels:
       - 'traefik.enable=true'
       - 'traefik.http.routers.mithril-aggregator.rule=Host(`${AGGREGATOR_HOST}`)'

diff --git a/mithril-infra/assets/docker/docker-compose-reverse-proxy.yaml b/mithril-infra/assets/docker/docker-compose-reverse-proxy.yaml
@@ -15,6 +15,8 @@ services:
     volumes:
       - ./traefik:/etc/traefik
       - /var/run/docker.sock:/var/run/docker.sock:ro
+    logging:
+      driver: "${LOGGING_DRIVER}"
 
 networks:
   default:

diff --git a/mithril-infra/assets/docker/docker-compose-signer-unverified-alone.yaml b/mithril-infra/assets/docker/docker-compose-signer-unverified-alone.yaml
@@ -29,10 +29,7 @@ services:
       - ../data/${NETWORK}/mithril-aggregator/cardano/db:/mithril-aggregator/cardano/db
       - ../data/${NETWORK}/mithril-aggregator/cardano/ipc:/ipc
     logging:
-      driver: "json-file"
-      options:
-        max-size: "100m"
-        max-file: "5"
+      driver: "${LOGGING_DRIVER}"
 
 networks:
   default:

diff --git a/mithril-infra/assets/docker/docker-compose-signer-unverified.yaml b/mithril-infra/assets/docker/docker-compose-signer-unverified.yaml
@@ -17,10 +17,7 @@ services:
       - cardano
       - all
     logging:
-      driver: "json-file"
-      options:
-        max-size: "100m"
-        max-file: "5"
+      driver: "${LOGGING_DRIVER}"
     volumes:
       - ./cardano-configurations/network/${NETWORK}:/config
       - ../data/${NETWORK}/mithril-signer-${SIGNER_ID}/cardano/db/passive:/db
@@ -68,10 +65,7 @@ services:
       cardano-node-signer:
         condition: service_started
     logging:
-      driver: "json-file"
-      options:
-        max-size: "100m"
-        max-file: "5"
+      driver: "${LOGGING_DRIVER}"
 
 networks:
   default:

diff --git a/mithril-infra/assets/docker/docker-compose-signer-verified.yaml b/mithril-infra/assets/docker/docker-compose-signer-verified.yaml
@@ -17,10 +17,7 @@ services:
       - cardano
       - all
     logging:
-      driver: "json-file"
-      options:
-        max-size: "100m"
-        max-file: "5"
+      driver: "${LOGGING_DRIVER}"
     volumes:
       - ./cardano-configurations/network/${NETWORK}:/config
       - ../data/${NETWORK}/mithril-signer-${SIGNER_ID}/cardano/db/relay:/db
@@ -59,10 +56,7 @@ services:
       - cardano
       - all
     logging:
-      driver: "json-file"
-      options:
-        max-size: "100m"
-        max-file: "5"
+      driver: "${LOGGING_DRIVER}"
     volumes:
       - ./cardano-configurations/network/${NETWORK}:/config
       - ../data/${NETWORK}/mithril-signer-${SIGNER_ID}/cardano/db/block-producer:/db
@@ -127,10 +121,7 @@ services:
       cardano-node-signer-relay:
         condition: service_started
     logging:
-      driver: "json-file"
-      options:
-        max-size: "100m"
-        max-file: "5"
+      driver: "${LOGGING_DRIVER}"
 
   mithril-signer-www:
     image: nginx:latest
@@ -144,10 +135,7 @@ services:
     ports:
       - "${SIGNER_WWW_PORT}:8080"
     logging:
-      driver: "json-file"
-      options:
-        max-size: "100m"
-        max-file: "5"
+      driver: "${LOGGING_DRIVER}"
     labels:
       - 'traefik.enable=true'
       - 'traefik.http.routers.mithril-signer-${SIGNER_ID}.rule=Host(`${SIGNER_HOST}`)'

diff --git a/mithril-infra/mithril.aggregator.tf b/mithril-infra/mithril.aggregator.tf
@@ -42,6 +42,7 @@ resource "null_resource" "mithril_aggregator" {
       "export ERA_READER_ADAPTER_TYPE='${var.mithril_era_reader_adapter_type}'",
       "export ERA_READER_ADAPTER_PARAMS=$(jq -nc --arg address $(wget -q -O - ${var.mithril_era_reader_address_url}) --arg verification_key $(wget -q -O - ${var.mithril_era_reader_verification_key_url}) '{\"address\": $address, \"verification_key\": $verification_key}')",
       "export ERA_READER_SECRET_KEY='${var.mithril_era_reader_secret_key}'",
+      "export LOGGING_DRIVER='${var.mithril_container_logging_driver}'",
       "export CURRENT_UID=$(id -u)",
       "export DOCKER_GID=$(getent group docker | cut -d: -f3)",
       "docker-compose -f /home/curry/docker/docker-compose-aggregator.yaml --profile all up -d",

diff --git a/mithril-infra/mithril.reverse-proxy.tf b/mithril-infra/mithril.reverse-proxy.tf
@@ -25,6 +25,7 @@ resource "null_resource" "mithril_reverse_proxy" {
 
   provisioner "remote-exec" {
     inline = [
+      "export LOGGING_DRIVER='${var.mithril_container_logging_driver}'",
       "export CURRENT_UID=$(id -u)",
       "export DOCKER_GID=$(getent group docker | cut -d: -f3)",
       "docker-compose -f /home/curry/docker/docker-compose-reverse-proxy.yaml --profile all up -d",

diff --git a/mithril-infra/mithril.signer.tf b/mithril-infra/mithril.signer.tf
@@ -68,6 +68,7 @@ EOT
       "export SIGNER_CARDANO_BLOCK_PRODUCER_PORT=${local.mithril_signers_block_producer_cardano_port[each.key]}",
       "export ERA_READER_ADAPTER_TYPE='${var.mithril_era_reader_adapter_type}'",
       "export ERA_READER_ADAPTER_PARAMS=$(jq -nc --arg address $(wget -q -O - ${var.mithril_era_reader_address_url}) --arg verification_key $(wget -q -O - ${var.mithril_era_reader_verification_key_url}) '{\"address\": $address, \"verification_key\": $verification_key}')",
+      "export LOGGING_DRIVER='${var.mithril_container_logging_driver}'",
       "export CURRENT_UID=$(id -u)",
       "export DOCKER_GID=$(getent group docker | cut -d: -f3)",
       "docker-compose -p $SIGNER_ID -f /home/curry/docker/docker-compose-signer-${each.value.type}.yaml --profile all up -d",

diff --git a/mithril-infra/variables.tf b/mithril-infra/variables.tf
@@ -79,7 +79,6 @@ variable "google_compute_instance_boot_disk_snapshot_start_time" {
   default     = "04:00"
 }
 
-
 variable "google_compute_instance_data_disk_size" {
   type        = number
   description = "Size of the data disk in GB"
@@ -155,6 +154,12 @@ variable "mithril_image_id" {
   description = "The Mithril image tag of service to deploy"
 }
 
+variable "mithril_container_logging_driver" {
+  type        = string
+  description = "The logging driver used by Mithril containers"
+  default     = "json-file"
+}
+
 variable "mithril_genesis_verification_key_url" {
   type        = string
   description = "The url of the Mithril genesis verification key used by to verify a genesis certificate"