diff --git a/examples/advanced/main.tf b/examples/advanced/main.tf index 44e7be85..2ec8037c 100644 --- a/examples/advanced/main.tf +++ b/examples/advanced/main.tf @@ -209,16 +209,13 @@ locals { logs_agent_name = "logs-agent" } -module "observability_instances" { - source = "terraform-ibm-modules/observability-instances/ibm" - version = "3.5.3" - resource_group_id = module.resource_group.resource_group_id - region = var.region - cloud_logs_plan = "standard" - cloud_monitoring_plan = "graduated-tier" - enable_platform_metrics = false - cloud_logs_instance_name = "${var.prefix}-cloud-logs" - cloud_monitoring_provision = false +module "cloud_logs" { + source = "terraform-ibm-modules/cloud-logs/ibm" + version = "1.5.11" + resource_group_id = module.resource_group.resource_group_id + region = var.region + plan = "standard" + instance_name = "${var.prefix}-cloud-logs" } module "trusted_profile" { @@ -245,18 +242,17 @@ module "trusted_profile" { ] } -module "observability_agents" { - depends_on = [module.kube_audit] - source = "terraform-ibm-modules/observability-agents/ibm" - version = "2.8.3" - cluster_id = module.ocp_base.cluster_id - cluster_resource_group_id = module.resource_group.resource_group_id - # Cloud Logs agent - logs_agent_trusted_profile = module.trusted_profile.trusted_profile.id - logs_agent_namespace = local.logs_agent_namespace - logs_agent_name = local.logs_agent_name - cloud_logs_ingress_endpoint = module.observability_instances.cloud_logs_ingress_private_endpoint - cloud_logs_ingress_port = 3443 +module "logs_agents" { + depends_on = [module.kube_audit] + source = "terraform-ibm-modules/logs-agent/ibm" + version = "1.1.10" + cluster_id = module.ocp_base.cluster_id + cluster_resource_group_id = module.resource_group.resource_group_id + logs_agent_trusted_profile_id = module.trusted_profile.trusted_profile.id + logs_agent_namespace = local.logs_agent_namespace + logs_agent_name = local.logs_agent_name + cloud_logs_ingress_endpoint = module.cloud_logs.ingress_private_endpoint + cloud_logs_ingress_port = 3443 # example of how to add additional metadata to the logs agents logs_agent_additional_metadata = [{ key = "cluster_id" @@ -264,5 +260,4 @@ module "observability_agents" { }] # example of how to add only kube-audit log source path logs_agent_selected_log_source_paths = ["/var/log/audit/*.log"] - cloud_monitoring_enabled = false } diff --git a/examples/multiple_mzr_clusters/main.tf b/examples/multiple_mzr_clusters/main.tf index 80ddaf53..e543f80e 100644 --- a/examples/multiple_mzr_clusters/main.tf +++ b/examples/multiple_mzr_clusters/main.tf @@ -168,46 +168,43 @@ data "ibm_container_cluster_config" "cluster_config_c2" { } ######################################################################################################################## -# Observability instances : Create Cloud Logs and Cloud monitoring instances. -######################################################################################################################## - -module "observability_instances" { - source = "terraform-ibm-modules/observability-instances/ibm" - version = "3.5.3" - resource_group_id = module.resource_group.resource_group_id - region = var.region - cloud_monitoring_plan = "graduated-tier" - enable_platform_metrics = false - cloud_monitoring_instance_name = "${var.prefix}-sysdig" - cloud_logs_provision = false +# Cloud monitoring instance +######################################################################################################################## + +module "monitoring_instance" { + source = "terraform-ibm-modules/cloud-monitoring/ibm" + version = "1.5.0" + resource_group_id = module.resource_group.resource_group_id + region = var.region + plan = "graduated-tier" + enable_platform_metrics = false + instance_name = "${var.prefix}-mon" } ######################################################################################################################## -# Observability agents +# Cloud monitoring agents ######################################################################################################################## -module "observability_agents_1" { - source = "terraform-ibm-modules/observability-agents/ibm" - version = "2.8.3" +module "monitoring_agent_1" { providers = { helm = helm.helm_cluster_1 } - cluster_id = module.ocp_base_cluster_1.cluster_id - cluster_resource_group_id = module.resource_group.resource_group_id - cloud_monitoring_access_key = module.observability_instances.cloud_monitoring_access_key - cloud_monitoring_instance_region = var.region - logs_agent_enabled = false + source = "terraform-ibm-modules/monitoring-agent/ibm" + version = "1.4.1" + cluster_id = module.ocp_base_cluster_1.cluster_id + cluster_resource_group_id = module.resource_group.resource_group_id + access_key = module.monitoring_instance.access_key + instance_region = var.region } -module "observability_agents_2" { - source = "terraform-ibm-modules/observability-agents/ibm" - version = "2.8.3" +module "monitoring_agent_2" { providers = { helm = helm.helm_cluster_2 } - cluster_id = module.ocp_base_cluster_2.cluster_id - cluster_resource_group_id = module.ocp_base_cluster_2.resource_group_id - cloud_monitoring_access_key = module.observability_instances.cloud_monitoring_access_key - cloud_monitoring_instance_region = var.region - logs_agent_enabled = false + source = "terraform-ibm-modules/monitoring-agent/ibm" + version = "1.4.1" + cluster_id = module.ocp_base_cluster_2.cluster_id + cluster_resource_group_id = module.resource_group.resource_group_id + access_key = module.monitoring_instance.access_key + instance_region = var.region }