diff --git a/README.md b/README.md index 42624e68..a8648aa9 100644 --- a/README.md +++ b/README.md @@ -117,6 +117,7 @@ No modules. | [cluster\_config\_endpoint\_type](#input\_cluster\_config\_endpoint\_type) | The type of endpoint to use for the cluster config access: `default`, `private`, `vpe`, or `link`. The `default` value uses the default endpoint of the cluster. | `string` | `"default"` | no | | [cluster\_id](#input\_cluster\_id) | The ID of the cluster to deploy the agent. | `string` | n/a | yes | | [cluster\_resource\_group\_id](#input\_cluster\_resource\_group\_id) | The resource group ID of the cluster. | `string` | n/a | yes | +| [enable\_multiline](#input\_enable\_multiline) | Enable or disable multiline log support. [Learn more](https://cloud.ibm.com/docs/cloud-logs?topic=cloud-logs-agent-multiline) | `bool` | `false` | no | | [is\_vpc\_cluster](#input\_is\_vpc\_cluster) | Specify true if the target cluster for the agent is a VPC cluster, false if it is a classic cluster. | `bool` | `true` | no | | [logs\_agent\_additional\_log\_source\_paths](#input\_logs\_agent\_additional\_log\_source\_paths) | The list of additional log sources. By default, the Logs agent collects logs from a single source at `/var/log/containers/*.log`. | `list(string)` | `[]` | no | | [logs\_agent\_additional\_metadata](#input\_logs\_agent\_additional\_metadata) | The list of additional metadata fields to add to the routed logs. |
list(object({
key = optional(string)
value = optional(string)
}))
| `[]` | no | diff --git a/ibm_catalog.json b/ibm_catalog.json index f301f9c5..50273d01 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -248,6 +248,9 @@ }, { "key": "wait_till_timeout" + }, + { + "key": "enable_multiline" } ], "install_type": "fullstack" diff --git a/main.tf b/main.tf index e18753ed..ecc16aad 100644 --- a/main.tf +++ b/main.tf @@ -110,6 +110,10 @@ resource "helm_release" "logs_agent" { name = "scc.create" value = var.logs_agent_enable_scc } + set { + name = "enableMultiline" + value = var.enable_multiline + } # dummy value hack to force update https://github.com/hashicorp/terraform-provider-helm/issues/515#issuecomment-813088122 values = [ diff --git a/solutions/fully-configurable/main.tf b/solutions/fully-configurable/main.tf index ea0740bd..ee8ee019 100644 --- a/solutions/fully-configurable/main.tf +++ b/solutions/fully-configurable/main.tf @@ -43,4 +43,5 @@ module "logs_agent" { is_vpc_cluster = var.is_vpc_cluster wait_till = var.wait_till wait_till_timeout = var.wait_till_timeout + enable_multiline = var.enable_multiline } diff --git a/solutions/fully-configurable/variables.tf b/solutions/fully-configurable/variables.tf index d0db7eea..a533217c 100644 --- a/solutions/fully-configurable/variables.tf +++ b/solutions/fully-configurable/variables.tf @@ -225,3 +225,8 @@ variable "cloud_logs_ingress_port" { condition = contains([3443, 443], var.cloud_logs_ingress_port) } } +variable "enable_multiline" { + description = "Enable or disable multiline log support. [Learn more](https://cloud.ibm.com/docs/cloud-logs?topic=cloud-logs-agent-multiline)" + type = bool + default = false +} diff --git a/variables.tf b/variables.tf index d76c8c70..62725c14 100644 --- a/variables.tf +++ b/variables.tf @@ -233,3 +233,8 @@ variable "cloud_logs_ingress_port" { condition = contains([3443, 443], var.cloud_logs_ingress_port) } } +variable "enable_multiline" { + description = "Enable or disable multiline log support. [Learn more](https://cloud.ibm.com/docs/cloud-logs?topic=cloud-logs-agent-multiline)" + type = bool + default = false +}