Skip to content

chore: update example to use new Observability modules #741

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jul 24, 2025
Merged

chore: update example to use new Observability modules #741

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
67f03c2
chore: update example to use new Observability modules
ocofaigh Jul 22, 2025
b385e64
Update main.tf
ocofaigh Jul 22, 2025
83cd2ce
Update main.tf
ocofaigh Jul 22, 2025
0f51994
hook
ocofaigh Jul 23, 2025
cd454ed
Merge branch 'main' into ocofaigh-patch-1
ocofaigh Jul 23, 2025
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
41 changes: 18 additions & 23 deletions examples/advanced/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" {
Expand All @@ -245,24 +242,22 @@ 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"
value = module.ocp_base.cluster_id
}]
# 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
}
55 changes: 26 additions & 29 deletions examples/multiple_mzr_clusters/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}