diff --git a/examples/fscloud/catalogValidationValues.json.template b/examples/fscloud/catalogValidationValues.json.template index 1f0c16fc..cfc9b236 100644 --- a/examples/fscloud/catalogValidationValues.json.template +++ b/examples/fscloud/catalogValidationValues.json.template @@ -5,6 +5,5 @@ "prefix": $PREFIX, "hpcs_instance_guid": $HPCS_US_SOUTH_GUID, "hpcs_key_crn_cluster": $HPCS_US_SOUTH_ROOT_KEY_CRN, - "hpcs_key_crn_worker_pool": $HPCS_US_SOUTH_ROOT_KEY_CRN, - "existing_at_instance_crn": $AT_CRN + "hpcs_key_crn_worker_pool": $HPCS_US_SOUTH_ROOT_KEY_CRN } diff --git a/examples/fscloud/main.tf b/examples/fscloud/main.tf index e5a66ebd..a59fd091 100644 --- a/examples/fscloud/main.tf +++ b/examples/fscloud/main.tf @@ -21,8 +21,6 @@ module "cos_fscloud" { create_cos_bucket = false cos_instance_name = "${var.prefix}-cos" skip_iam_authorization_policy = true - monitoring_crn = module.observability_instances.cloud_monitoring_crn - activity_tracker_crn = local.at_crn # Don't set CBR rules here as we don't want to create a circular dependency with the VPC module } @@ -100,37 +98,6 @@ module "vpc" { } } -######################################################################################################################## -# Observability Instances (Sysdig + AT) -######################################################################################################################## - -locals { - existing_at = var.existing_at_instance_crn != null ? true : false - at_crn = var.existing_at_instance_crn == null ? module.observability_instances.activity_tracker_crn : var.existing_at_instance_crn -} - - -# Create Sysdig and Activity Tracker instance -module "observability_instances" { - source = "terraform-ibm-modules/observability-instances/ibm" - version = "2.18.1" - providers = { - logdna.at = logdna.at - logdna.ld = logdna.ld - } - region = var.region - resource_group_id = module.resource_group.resource_group_id - cloud_monitoring_instance_name = "${var.prefix}-sysdig" - cloud_monitoring_plan = "graduated-tier" - enable_platform_logs = false - enable_platform_metrics = false - log_analysis_provision = false - activity_tracker_instance_name = "${var.prefix}-at" - activity_tracker_plan = "7-day" - activity_tracker_provision = !local.existing_at - cloud_logs_provision = false -} - ######################################################################################################################## # Get Cloud Account ID ######################################################################################################################## diff --git a/examples/fscloud/provider.tf b/examples/fscloud/provider.tf index f3caaa37..d445d11e 100644 --- a/examples/fscloud/provider.tf +++ b/examples/fscloud/provider.tf @@ -6,19 +6,3 @@ provider "ibm" { ibmcloud_api_key = var.ibmcloud_api_key region = var.region } - -locals { - at_endpoint = "https://api.${var.region}.logging.cloud.ibm.com" -} - -provider "logdna" { - alias = "at" - servicekey = module.observability_instances.activity_tracker_resource_key != null ? module.observability_instances.activity_tracker_resource_key : "" - url = local.at_endpoint -} - -provider "logdna" { - alias = "ld" - servicekey = module.observability_instances.log_analysis_resource_key != null ? module.observability_instances.log_analysis_resource_key : "" - url = local.at_endpoint -} diff --git a/examples/fscloud/variables.tf b/examples/fscloud/variables.tf index 89163a36..69696467 100644 --- a/examples/fscloud/variables.tf +++ b/examples/fscloud/variables.tf @@ -50,12 +50,6 @@ variable "hpcs_key_crn_worker_pool" { type = string } -variable "existing_at_instance_crn" { - type = string - description = "Optionally pass an existing activity tracker instance CRN to use in the example. If not passed, a new instance will be provisioned" - default = null -} - variable "access_tags" { type = list(string) description = "A list of access tags to apply to the resources created by the module" diff --git a/examples/fscloud/version.tf b/examples/fscloud/version.tf index e150d0c6..76f6871e 100644 --- a/examples/fscloud/version.tf +++ b/examples/fscloud/version.tf @@ -8,9 +8,5 @@ terraform { source = "ibm-cloud/ibm" version = ">= 1.68.0" } - logdna = { - source = "logdna/logdna" - version = ">= 1.14.2" - } } } diff --git a/examples/multiple_mzr_clusters/main.tf b/examples/multiple_mzr_clusters/main.tf index c4ea5fd3..f2939356 100644 --- a/examples/multiple_mzr_clusters/main.tf +++ b/examples/multiple_mzr_clusters/main.tf @@ -174,20 +174,13 @@ data "ibm_container_cluster_config" "cluster_config_c2" { ######################################################################################################################## module "observability_instances" { - source = "terraform-ibm-modules/observability-instances/ibm" - version = "2.18.1" - providers = { - logdna.at = logdna.at - logdna.ld = logdna.ld - } + source = "terraform-ibm-modules/observability-instances/ibm" + version = "3.0.0" resource_group_id = module.resource_group.resource_group_id region = var.region - log_analysis_plan = "7-day" cloud_monitoring_plan = "graduated-tier" - activity_tracker_provision = false enable_platform_logs = false enable_platform_metrics = false - log_analysis_instance_name = "${var.prefix}-logdna" cloud_monitoring_instance_name = "${var.prefix}-sysdig" cloud_logs_provision = false } @@ -198,28 +191,26 @@ module "observability_instances" { module "observability_agents_1" { source = "terraform-ibm-modules/observability-agents/ibm" - version = "1.29.1" + version = "1.30.2" 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 - log_analysis_ingestion_key = module.observability_instances.log_analysis_ingestion_key - log_analysis_instance_region = var.region cloud_monitoring_access_key = module.observability_instances.cloud_monitoring_access_key cloud_monitoring_instance_region = var.region + logs_agent_enabled = false } module "observability_agents_2" { source = "terraform-ibm-modules/observability-agents/ibm" - version = "1.29.1" + version = "1.30.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 - log_analysis_ingestion_key = module.observability_instances.log_analysis_ingestion_key - log_analysis_instance_region = var.region cloud_monitoring_access_key = module.observability_instances.cloud_monitoring_access_key cloud_monitoring_instance_region = var.region + logs_agent_enabled = false } diff --git a/examples/multiple_mzr_clusters/provider.tf b/examples/multiple_mzr_clusters/provider.tf index 81b4dd71..369da6e1 100644 --- a/examples/multiple_mzr_clusters/provider.tf +++ b/examples/multiple_mzr_clusters/provider.tf @@ -38,19 +38,3 @@ provider "kubernetes" { token = data.ibm_container_cluster_config.cluster_config_c2.token cluster_ca_certificate = data.ibm_container_cluster_config.cluster_config_c2.ca_certificate } - -locals { - at_endpoint = "https://api.${var.region}.logging.cloud.ibm.com" -} - -provider "logdna" { - alias = "at" - servicekey = module.observability_instances.activity_tracker_resource_key != null ? module.observability_instances.activity_tracker_resource_key : "" - url = local.at_endpoint -} - -provider "logdna" { - alias = "ld" - servicekey = module.observability_instances.log_analysis_resource_key != null ? module.observability_instances.log_analysis_resource_key : "" - url = local.at_endpoint -} diff --git a/examples/multiple_mzr_clusters/version.tf b/examples/multiple_mzr_clusters/version.tf index d62322fd..17ee49ca 100644 --- a/examples/multiple_mzr_clusters/version.tf +++ b/examples/multiple_mzr_clusters/version.tf @@ -16,9 +16,5 @@ terraform { source = "hashicorp/helm" version = ">= 2.8.0" } - logdna = { - source = "logdna/logdna" - version = ">= 1.14.2" - } } } diff --git a/tests/other_test.go b/tests/other_test.go index 68cbd660..ff5eb529 100644 --- a/tests/other_test.go +++ b/tests/other_test.go @@ -47,24 +47,16 @@ func TestRunMultiClusterExample(t *testing.T) { }, IgnoreUpdates: testhelper.Exemptions{ // Ignore for consistency check List: []string{ - "module.observability_agents_1.helm_release.logdna_agent", "module.observability_agents_1.helm_release.sysdig_agent", - "module.observability_agents_2.helm_release.logdna_agent", "module.observability_agents_2.helm_release.sysdig_agent", - "module.observability_agents_1.helm_release.log_analysis_agent", "module.observability_agents_1.helm_release.cloud_monitoring_agent", - "module.observability_agents_2.helm_release.log_analysis_agent", "module.observability_agents_2.helm_release.cloud_monitoring_agent", }, }, ImplicitDestroy: []string{ // Ignore full destroy to speed up tests - "module.observability_agents_1.helm_release.logdna_agent", "module.observability_agents_1.helm_release.sysdig_agent", - "module.observability_agents_2.helm_release.logdna_agent", "module.observability_agents_2.helm_release.sysdig_agent", - "module.observability_agents_1.helm_release.log_analysis_agent", "module.observability_agents_1.helm_release.cloud_monitoring_agent", - "module.observability_agents_2.helm_release.log_analysis_agent", "module.observability_agents_2.helm_release.cloud_monitoring_agent", // workaround for the issue https://github.ibm.com/GoldenEye/issues/issues/10743 // when the issue is fixed on IKS, so the destruction of default workers pool is correctly managed on provider/clusters service the next two entries should be removed