Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -119,14 +119,14 @@ No modules.
| <a name="input_logs_agent_additional_metadata"></a> [logs\_agent\_additional\_metadata](#input\_logs\_agent\_additional\_metadata) | The list of additional metadata fields to add to the routed logs. | <pre>list(object({<br/> key = optional(string)<br/> value = optional(string)<br/> }))</pre> | `[]` | no |
| <a name="input_logs_agent_chart"></a> [logs\_agent\_chart](#input\_logs\_agent\_chart) | The name of the Helm chart to deploy. | `string` | `"logs-agent-helm"` | no |
| <a name="input_logs_agent_chart_location"></a> [logs\_agent\_chart\_location](#input\_logs\_agent\_chart\_location) | The location of the Logs agent helm chart. | `string` | `"oci://icr.io/ibm-observe"` | no |
| <a name="input_logs_agent_chart_version"></a> [logs\_agent\_chart\_version](#input\_logs\_agent\_chart\_version) | The version of the Helm chart to deploy. | `string` | `"1.6.3"` | no |
| <a name="input_logs_agent_chart_version"></a> [logs\_agent\_chart\_version](#input\_logs\_agent\_chart\_version) | The version of the Helm chart to deploy. | `string` | `"1.7.0"` | no |
| <a name="input_logs_agent_enable_scc"></a> [logs\_agent\_enable\_scc](#input\_logs\_agent\_enable\_scc) | Whether to enable creation of Security Context Constraints in Openshift. When installing on an OpenShift cluster, this setting is mandatory to configure permissions for pods within your cluster. | `bool` | `true` | no |
| <a name="input_logs_agent_exclude_log_source_paths"></a> [logs\_agent\_exclude\_log\_source\_paths](#input\_logs\_agent\_exclude\_log\_source\_paths) | The list of log sources to exclude. Specify the paths that the Logs agent ignores. | `list(string)` | `[]` | no |
| <a name="input_logs_agent_iam_api_key"></a> [logs\_agent\_iam\_api\_key](#input\_logs\_agent\_iam\_api\_key) | The IBM Cloud API key for the Logs agent to authenticate and communicate with the IBM Cloud Logs. It is required if `logs_agent_iam_mode` is set to `IAMAPIKey`. | `string` | `null` | no |
| <a name="input_logs_agent_iam_environment"></a> [logs\_agent\_iam\_environment](#input\_logs\_agent\_iam\_environment) | IAM authentication Environment: `Production` or `PrivateProduction` or `Staging` or `PrivateStaging`. `Production` specifies the public endpoint & `PrivateProduction` specifies the private endpoint. | `string` | `"PrivateProduction"` | no |
| <a name="input_logs_agent_iam_mode"></a> [logs\_agent\_iam\_mode](#input\_logs\_agent\_iam\_mode) | IAM authentication mode: `TrustedProfile` or `IAMAPIKey`. | `string` | `"TrustedProfile"` | no |
| <a name="input_logs_agent_image_version"></a> [logs\_agent\_image\_version](#input\_logs\_agent\_image\_version) | The version of the Logs agent image to deploy. | `string` | `"1.6.3@sha256:c4c03d39002278558e7be9a7349a3408c703de788ebc7ef5846edf1f8f5e4584"` | no |
| <a name="input_logs_agent_init_image_version"></a> [logs\_agent\_init\_image\_version](#input\_logs\_agent\_init\_image\_version) | The version of the Logs agent init container image to deploy. | `string` | `"1.6.3@sha256:0696d9be28088aad5ebcce26855d6de9abd7d4b0f8b98d050fb4507625ca465f"` | no |
| <a name="input_logs_agent_image_version"></a> [logs\_agent\_image\_version](#input\_logs\_agent\_image\_version) | The version of the Logs agent image to deploy. | `string` | `"1.7.0@sha256:50357cf3d3c7f0e649ce2ad044ace154d7eb6984847e70b1c052a6b7e285c548"` | no |
| <a name="input_logs_agent_init_image_version"></a> [logs\_agent\_init\_image\_version](#input\_logs\_agent\_init\_image\_version) | The version of the Logs agent init container image to deploy. | `string` | `"1.7.0@sha256:20acbf81ea70135644d12b6505476b54ed4bfe0db8f1571dee8215c03689cfd8"` | no |
| <a name="input_logs_agent_log_source_namespaces"></a> [logs\_agent\_log\_source\_namespaces](#input\_logs\_agent\_log\_source\_namespaces) | The list of namespaces from which logs should be forwarded by agent. If namespaces are not listed, logs from all namespaces will be sent. | `list(string)` | `[]` | no |
| <a name="input_logs_agent_name"></a> [logs\_agent\_name](#input\_logs\_agent\_name) | The name of the Logs agent. The name is used in all Kubernetes and Helm resources in the cluster. | `string` | `"logs-agent"` | no |
| <a name="input_logs_agent_namespace"></a> [logs\_agent\_namespace](#input\_logs\_agent\_namespace) | The namespace where the Logs agent is deployed. The default value is `ibm-observe`. | `string` | `"ibm-observe"` | no |
Expand Down
2 changes: 1 addition & 1 deletion common-dev-assets
2 changes: 1 addition & 1 deletion examples/logs-agent-iks/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ resource "time_sleep" "wait_operators" {

module "cloud_logs" {
source = "terraform-ibm-modules/cloud-logs/ibm"
version = "1.9.6"
version = "1.9.7"
resource_group_id = module.resource_group.resource_group_id
plan = "standard"
region = var.region
Expand Down
4 changes: 2 additions & 2 deletions examples/logs-agent-ocp/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ locals {

module "ocp_base" {
source = "terraform-ibm-modules/base-ocp-vpc/ibm"
version = "3.69.0"
version = "3.69.1"
resource_group_id = module.resource_group.resource_group_id
region = var.region
tags = var.resource_tags
Expand All @@ -131,7 +131,7 @@ data "ibm_container_cluster_config" "cluster_config" {

module "cloud_logs" {
source = "terraform-ibm-modules/cloud-logs/ibm"
version = "1.9.6"
version = "1.9.7"
resource_group_id = module.resource_group.resource_group_id
plan = "standard"
region = var.region
Expand Down
6 changes: 3 additions & 3 deletions solutions/fully-configurable/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -91,21 +91,21 @@ variable "logs_agent_chart_location" {
variable "logs_agent_chart_version" {
description = "The version of the Helm chart to deploy."
type = string
default = "1.6.3" # datasource: icr.io/ibm-observe/logs-agent-helm
default = "1.7.0" # datasource: icr.io/ibm-observe/logs-agent-helm
nullable = false
}

variable "logs_agent_init_image_version" {
description = "The version of the Logs agent init container image to deploy."
type = string
default = "1.6.3@sha256:0696d9be28088aad5ebcce26855d6de9abd7d4b0f8b98d050fb4507625ca465f" # datasource: icr.io/ibm/observe/logs-router-agent-init
default = "1.7.0@sha256:20acbf81ea70135644d12b6505476b54ed4bfe0db8f1571dee8215c03689cfd8" # datasource: icr.io/ibm/observe/logs-router-agent-init
nullable = false
}

variable "logs_agent_image_version" {
description = "The version of the Logs agent image to deploy."
type = string
default = "1.6.3@sha256:c4c03d39002278558e7be9a7349a3408c703de788ebc7ef5846edf1f8f5e4584" # datasource: icr.io/ibm/observe/logs-router-agent
default = "1.7.0@sha256:50357cf3d3c7f0e649ce2ad044ace154d7eb6984847e70b1c052a6b7e285c548" # datasource: icr.io/ibm/observe/logs-router-agent
nullable = false
}

Expand Down
8 changes: 4 additions & 4 deletions tests/resources/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ locals {

module "ocp_base" {
source = "terraform-ibm-modules/base-ocp-vpc/ibm"
version = "3.69.0"
version = "3.69.1"
resource_group_id = module.resource_group.resource_group_id
region = var.region
tags = var.resource_tags
Expand All @@ -93,7 +93,7 @@ module "ocp_base" {

module "cos" {
source = "terraform-ibm-modules/cos/ibm"
version = "10.5.3"
version = "10.5.4"
resource_group_id = module.resource_group.resource_group_id
region = var.region
cos_instance_name = "${var.prefix}-cos"
Expand All @@ -116,7 +116,7 @@ locals {

module "buckets" {
source = "terraform-ibm-modules/cos/ibm//modules/buckets"
version = "10.5.3"
version = "10.5.4"
bucket_configs = [
{
bucket_name = local.logs_bucket_name
Expand All @@ -140,7 +140,7 @@ module "buckets" {

module "cloud_logs" {
source = "terraform-ibm-modules/cloud-logs/ibm"
version = "1.9.6"
version = "1.9.7"
resource_group_id = module.ocp_base.resource_group_id
region = var.region
instance_name = "${var.prefix}-cloud-logs"
Expand Down
6 changes: 3 additions & 3 deletions variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -72,21 +72,21 @@ variable "logs_agent_chart_location" {
variable "logs_agent_chart_version" {
description = "The version of the Helm chart to deploy."
type = string
default = "1.6.3" # datasource: icr.io/ibm-observe/logs-agent-helm
default = "1.7.0" # datasource: icr.io/ibm-observe/logs-agent-helm
nullable = false
}

variable "logs_agent_init_image_version" {
description = "The version of the Logs agent init container image to deploy."
type = string
default = "1.6.3@sha256:0696d9be28088aad5ebcce26855d6de9abd7d4b0f8b98d050fb4507625ca465f" # datasource: icr.io/ibm/observe/logs-router-agent-init
default = "1.7.0@sha256:20acbf81ea70135644d12b6505476b54ed4bfe0db8f1571dee8215c03689cfd8" # datasource: icr.io/ibm/observe/logs-router-agent-init
nullable = false
}

variable "logs_agent_image_version" {
description = "The version of the Logs agent image to deploy."
type = string
default = "1.6.3@sha256:c4c03d39002278558e7be9a7349a3408c703de788ebc7ef5846edf1f8f5e4584" # datasource: icr.io/ibm/observe/logs-router-agent
default = "1.7.0@sha256:50357cf3d3c7f0e649ce2ad044ace154d7eb6984847e70b1c052a6b7e285c548" # datasource: icr.io/ibm/observe/logs-router-agent
nullable = false
validation {
condition = split("@", var.logs_agent_image_version)[0] == split("@", var.logs_agent_init_image_version)[0]
Expand Down