feat(logging): add log_class parameter to runner log files configuration

Author: Brend-Smits

modules/multi-runner/variables.tf

@@ -152,6 +152,7 @@ variable "multi_runner_config" {
         prefix_log_group = bool
         file_path        = string
         log_stream_name  = string
+        log_class        = optional(string, "STANDARD")
       })), null)
       block_device_mappings = optional(list(object({
         delete_on_termination = optional(bool, true)

modules/runners/logging.tf

@@ -7,35 +7,40 @@ locals {
         "prefix_log_group" : true,
         "file_path" : "/var/log/messages",
         "log_group_name" : "messages",
-        "log_stream_name" : "{instance_id}"
+        "log_stream_name" : "{instance_id}",
+        "log_class" : "STANDARD"
       },
       {
         "log_group_name" : "user_data",
         "prefix_log_group" : true,
         "file_path" : var.runner_os == "windows" ? "C:/UserData.log" : "/var/log/user-data.log",
-        "log_stream_name" : "{instance_id}"
+        "log_stream_name" : "{instance_id}",
+        "log_class" : "STANDARD"
       },
       {
         "log_group_name" : "runner",
         "prefix_log_group" : true,
         "file_path" : var.runner_os == "windows" ? "C:/actions-runner/_diag/Runner_*.log" : "/opt/actions-runner/_diag/Runner_**.log",
-        "log_stream_name" : "{instance_id}"
+        "log_stream_name" : "{instance_id}",
+        "log_class" : "STANDARD"
       },
       {
         "log_group_name" : "runner-startup",
         "prefix_log_group" : true,
         "file_path" : var.runner_os == "windows" ? "C:/runner-startup.log" : "/var/log/runner-startup.log",
-        "log_stream_name" : "{instance_id}"
+        "log_stream_name" : "{instance_id}",
+        "log_class" : "STANDARD"
       }
     ]
   )
   logfiles = var.enable_cloudwatch_agent ? [for l in local.runner_log_files : {
     "log_group_name" : l.prefix_log_group ? "/github-self-hosted-runners/${var.prefix}/${l.log_group_name}" : "/${l.log_group_name}"
     "log_stream_name" : l.log_stream_name
     "file_path" : l.file_path
+    "log_class" : try(l.log_class, "STANDARD")
   }] : []
 
-  loggroups_names = distinct([for l in local.logfiles : l.log_group_name])
+  loggroups = distinct([for l in local.logfiles : { name = l.log_group_name, log_class = l.log_class }])
 
 }
 
@@ -51,10 +56,11 @@ resource "aws_ssm_parameter" "cloudwatch_agent_config_runner" {
 }
 
 resource "aws_cloudwatch_log_group" "gh_runners" {
-  count             = length(local.loggroups_names)
-  name              = local.loggroups_names[count.index]
+  for_each          = { for lg in local.loggroups : lg.name => lg }
+  name              = each.value.name
   retention_in_days = var.logging_retention_in_days
   kms_key_id        = var.logging_kms_key_id
+  log_group_class   = each.value.log_class
   tags              = local.tags
 }
 

modules/runners/variables.tf

@@ -395,12 +395,13 @@ variable "cloudwatch_config" {
 }
 
 variable "runner_log_files" {
-  description = "(optional) List of logfiles to send to CloudWatch, will only be used if `enable_cloudwatch_agent` is set to true. Object description: `log_group_name`: Name of the log group, `prefix_log_group`: If true, the log group name will be prefixed with `/github-self-hosted-runners/<var.prefix>`, `file_path`: path to the log file, `log_stream_name`: name of the log stream."
+  description = "(optional) List of logfiles to send to CloudWatch, will only be used if `enable_cloudwatch_agent` is set to true. Object description: `log_group_name`: Name of the log group, `prefix_log_group`: If true, the log group name will be prefixed with `/github-self-hosted-runners/<var.prefix>`, `file_path`: path to the log file, `log_stream_name`: name of the log stream, `log_class`: The log class of the log group. Valid values are `STANDARD` or `INFREQUENT_ACCESS`. Defaults to `STANDARD`."
   type = list(object({
     log_group_name   = string
     prefix_log_group = bool
     file_path        = string
     log_stream_name  = string
+    log_class        = optional(string, "STANDARD")
   }))
   default = null
 }

variables.tf

@@ -491,6 +491,7 @@ variable "runner_log_files" {
     prefix_log_group = bool
     file_path        = string
     log_stream_name  = string
+    log_class        = optional(string, "STANDARD")
   }))
   default = null
 }