feat: The submodule directories formerly referred to as logdna and sy…

…sdig have been renamed as log_analysis and cloud_monitoring respectively. In addition all variables with the name Logdna & sysdig have been renamed to log_analysis and cloud_monitoring respectively (#259)

.secrets.baseline

@@ -90,7 +90,7 @@
         "hashed_secret": "3bd02b996f65f3548c1a0b5d93b00bfa7c88341a",
         "is_secret": true,
         "is_verified": false,
-        "line_number": 201,
+        "line_number": 209,
         "type": "Secret Keyword",
         "verified_result": null
       }

examples/observability_archive/README.md

@@ -1,4 +1,4 @@
-# Provision Sysdig and LogDNA + Activity Tracker with archiving enabled using encrypted COS bucket
+# Provision IBM Cloud Monitoring and Log Analysis + Activity Tracker with archiving enabled using encrypted COS bucket
 
-Example that deploys LogDNA, SysDig, and Activity Tracker instances, along with a Key Protect instance, root key, COS
+Example that deploys Log Analysis, Cloud Monitoring, and Activity Tracker instances, along with a Key Protect instance, root key, COS
 instance, and COS bucket which used to archive the LogDNA and Activity Tracker logs into an encrypted bucket.

examples/observability_archive/main.tf

@@ -45,7 +45,7 @@ module "cos" {
   create_hmac_key            = false
   retention_enabled          = false
   activity_tracker_crn       = module.observability_instance_creation.activity_tracker_crn
-  sysdig_crn                 = module.observability_instance_creation.sysdig_crn
+  sysdig_crn                 = module.observability_instance_creation.cloud_monitoring_crn
   kms_key_crn                = module.key_protect.keys["observability.observability-key"].crn
 }
 
@@ -57,28 +57,28 @@ module "observability_instance_creation" {
   }
   resource_group_id                 = module.resource_group.resource_group_id
   region                            = var.region
-  logdna_instance_name              = var.prefix
-  sysdig_instance_name              = var.prefix
+  log_analysis_instance_name        = var.prefix
+  cloud_monitoring_instance_name    = var.prefix
   activity_tracker_instance_name    = var.prefix
   enable_platform_metrics           = false
   enable_platform_logs              = false
-  logdna_plan                       = "7-day"
-  sysdig_plan                       = "graduated-tier"
+  log_analysis_plan                 = "7-day"
+  cloud_monitoring_plan             = "graduated-tier"
   activity_tracker_plan             = "7-day"
-  logdna_tags                       = var.resource_tags
-  sysdig_tags                       = var.resource_tags
+  log_analysis_tags                 = var.resource_tags
+  cloud_monitoring_tags             = var.resource_tags
   activity_tracker_tags             = var.resource_tags
-  logdna_manager_key_tags           = var.resource_tags
-  sysdig_manager_key_tags           = var.resource_tags
+  log_analysis_manager_key_tags     = var.resource_tags
+  cloud_monitoring_manager_key_tags = var.resource_tags
   activity_tracker_manager_key_tags = var.resource_tags
-  logdna_access_tags                = var.access_tags
-  sysdig_access_tags                = var.access_tags
+  log_analysis_access_tags          = var.access_tags
+  cloud_monitoring_access_tags      = var.access_tags
   activity_tracker_access_tags      = var.access_tags
   enable_archive                    = true
   ibmcloud_api_key                  = local.archive_api_key
-  logdna_cos_instance_id            = module.cos.cos_instance_id
-  logdna_cos_bucket_name            = local.bucket_name
-  logdna_cos_bucket_endpoint        = module.cos.s3_endpoint_public
+  log_analysis_cos_instance_id      = module.cos.cos_instance_id
+  log_analysis_cos_bucket_name      = local.bucket_name
+  log_analysis_cos_bucket_endpoint  = module.cos.s3_endpoint_public
   at_cos_bucket_name                = local.bucket_name
   at_cos_instance_id                = module.cos.cos_instance_id
   at_cos_bucket_endpoint            = module.cos.s3_endpoint_private

examples/observability_archive/outputs.tf

@@ -2,9 +2,9 @@
 # Outputs
 ##############################################################################
 
-output "logdna_name" {
-  value       = module.observability_instance_creation.logdna_name
-  description = "The name of the provisioned LogDNA instance."
+output "log_analysis_name" {
+  value       = module.observability_instance_creation.log_analysis_name
+  description = "The name of the provisioned Log Analysis instance."
 }
 
 output "cos_bucket" {

examples/observability_archive/providers.tf

@@ -14,6 +14,6 @@ provider "logdna" {
 
 provider "logdna" {
   alias      = "ld"
-  servicekey = module.observability_instance_creation.logdna_resource_key != null ? module.observability_instance_creation.logdna_resource_key : ""
+  servicekey = module.observability_instance_creation.log_analysis_resource_key != null ? module.observability_instance_creation.log_analysis_resource_key : ""
   url        = local.at_endpoint
 }

examples/observability_at_event_routing/README.md

@@ -1,3 +1,3 @@
-# Provision Activity Tracker with event routing to COS bucket, Event streams and LogDNA
+# Provision Activity Tracker with event routing to COS bucket, Event streams and Log Analysis
 
-Example that deploys an Activity Tracker instance with event routing to COS bucket, Event streams and LogDNA.
+Example that deploys an Activity Tracker instance with event routing to COS bucket, Event streams and Log Analysis.

examples/observability_at_event_routing/main.tf

@@ -14,7 +14,7 @@ locals {
   activity_tracker_resource_key = var.existing_activity_tracker_crn != null ? data.ibm_resource_key.at_resource_key.credentials["service_key"] : module.activity_tracker.resource_key
 
   cos_target_region          = var.cos_target_region != null ? var.cos_target_region : local.activity_tracker_region
-  logdna_target_region       = var.logdna_target_region != null ? var.logdna_target_region : local.activity_tracker_region
+  log_analysis_target_region = var.log_analysis_target_region != null ? var.log_analysis_target_region : local.activity_tracker_region
   eventstreams_target_region = var.eventstreams_target_region != null ? var.eventstreams_target_region : local.activity_tracker_region
 }
 
@@ -90,30 +90,30 @@ resource "ibm_resource_key" "es_resource_key" {
   role                 = "Writer"
 }
 
-# LogDNA target
-module "logdna_1" {
-  source = "../../modules/logdna"
+# Log Analysis target
+module "log_analysis_1" {
+  source = "../../modules/log_analysis"
   providers = {
     logdna.ld = logdna.ld_1
   }
   instance_name     = "${var.prefix}-logdna-target-instance-1"
   resource_group_id = module.resource_group.resource_group_id
   plan              = "7-day"
-  region            = local.logdna_target_region
+  region            = local.log_analysis_target_region
   manager_key_name  = "${var.prefix}-logdna-manager-key-1"
   resource_key_role = "Manager"
   access_tags       = var.access_tags
 }
 
-module "logdna_2" {
-  source = "../../modules/logdna"
+module "log_analysis_2" {
+  source = "../../modules/log_analysis"
   providers = {
     logdna.ld = logdna.ld_2
   }
   instance_name     = "${var.prefix}-logdna-target-instance-2"
   resource_group_id = module.resource_group.resource_group_id
   plan              = "7-day"
-  region            = local.logdna_target_region
+  region            = local.log_analysis_target_region
   manager_key_name  = "${var.prefix}-logdna-manager-key-2"
   resource_key_role = "Manager"
   access_tags       = var.access_tags
@@ -169,17 +169,17 @@ module "activity_tracker" {
     }
   ]
 
-  logdna_targets = [
+  log_analysis_targets = [
     {
-      instance_id   = module.logdna_1.crn
-      ingestion_key = module.logdna_1.ingestion_key
-      target_region = local.logdna_target_region
+      instance_id   = module.log_analysis_1.crn
+      ingestion_key = module.log_analysis_1.ingestion_key
+      target_region = local.log_analysis_target_region
       target_name   = "${var.prefix}-logdna-target-1"
     },
     {
-      instance_id   = module.logdna_2.crn
-      ingestion_key = module.logdna_2.ingestion_key
-      target_region = local.logdna_target_region
+      instance_id   = module.log_analysis_2.crn
+      ingestion_key = module.log_analysis_2.ingestion_key
+      target_region = local.log_analysis_target_region
       target_name   = "${var.prefix}-logdna-target-2"
     }
   ]

examples/observability_at_event_routing/providers.tf

@@ -15,12 +15,12 @@ provider "logdna" {
 
 provider "logdna" {
   alias      = "ld_1"
-  servicekey = module.logdna_1.resource_key != null ? module.logdna_1.resource_key : ""
+  servicekey = module.log_analysis_1.resource_key != null ? module.log_analysis_1.resource_key : ""
   url        = local.at_endpoint
 }
 
 provider "logdna" {
   alias      = "ld_2"
-  servicekey = module.logdna_2.resource_key != null ? module.logdna_2.resource_key : ""
+  servicekey = module.log_analysis_2.resource_key != null ? module.log_analysis_2.resource_key : ""
   url        = local.at_endpoint
 }

examples/observability_at_event_routing/variables.tf

@@ -59,9 +59,9 @@ variable "cos_target_region" {
   default     = null
 }
 
-variable "logdna_target_region" {
+variable "log_analysis_target_region" {
   type        = string
-  description = "Region where logdna target will be created"
+  description = "Region where log analysis target will be created"
   default     = null
 }
 

examples/observability_basic/README.md

@@ -1,3 +1,3 @@
-# Provision basic observability instances (LogDNA, Sysdig, Activity Tracker)
+# Provision basic observability instances (Log Analysis, Cloud Monitoring, Activity Tracker)
 
-Example that deploys LogDNA, SysDig, and Activity Tracker instances with basic configuration.
+Example that deploys Log Analysis, Cloud Monitoring, and Activity Tracker instances with basic configuration.

examples/observability_basic/main.tf

@@ -1,3 +1,7 @@
+##############################################################################
+# Resource Group
+##############################################################################
+
 module "resource_group" {
   source  = "terraform-ibm-modules/resource-group/ibm"
   version = "1.0.5"
@@ -13,22 +17,22 @@ module "test_observability_instance_creation" {
     logdna.ld = logdna.ld
   }
   region                            = var.region
-  logdna_instance_name              = var.prefix
+  log_analysis_instance_name        = var.prefix
   resource_group_id                 = module.resource_group.resource_group_id
-  sysdig_instance_name              = var.prefix
+  cloud_monitoring_instance_name    = var.prefix
   activity_tracker_instance_name    = var.prefix
-  logdna_plan                       = "7-day"
-  sysdig_plan                       = "graduated-tier"
+  log_analysis_plan                 = "7-day"
+  cloud_monitoring_plan             = "graduated-tier"
   activity_tracker_plan             = "7-day"
   enable_platform_logs              = false
   enable_platform_metrics           = false
-  logdna_tags                       = var.resource_tags
-  sysdig_tags                       = var.resource_tags
+  log_analysis_tags                 = var.resource_tags
+  cloud_monitoring_tags             = var.resource_tags
   activity_tracker_tags             = var.resource_tags
-  logdna_manager_key_tags           = var.resource_tags
-  sysdig_manager_key_tags           = var.resource_tags
+  log_analysis_manager_key_tags     = var.resource_tags
+  cloud_monitoring_manager_key_tags = var.resource_tags
   activity_tracker_manager_key_tags = var.resource_tags
-  logdna_access_tags                = var.access_tags
-  sysdig_access_tags                = var.access_tags
+  log_analysis_access_tags          = var.access_tags
+  cloud_monitoring_access_tags      = var.access_tags
   activity_tracker_access_tags      = var.access_tags
 }

examples/observability_basic/outputs.tf

@@ -2,14 +2,14 @@
 # Outputs
 ##############################################################################
 
-output "logdna_name" {
-  value       = module.test_observability_instance_creation.logdna_name
-  description = "The name of the provisioned LogDNA instance."
+output "log_analysis_name" {
+  value       = module.test_observability_instance_creation.log_analysis_name
+  description = "The name of the provisioned Log Analysis instance."
 }
 
-output "sysdig_name" {
-  value       = module.test_observability_instance_creation.sysdig_name
-  description = "The name of the provisioned Sysdig instance."
+output "cloud_monitoring_name" {
+  value       = module.test_observability_instance_creation.cloud_monitoring_name
+  description = "The name of the provisioned IBM cloud monitoring instance."
 }
 
 output "activity_tracker_name" {

examples/observability_basic/providers.tf

@@ -14,6 +14,6 @@ provider "logdna" {
 
 provider "logdna" {
   alias      = "ld"
-  servicekey = module.test_observability_instance_creation.logdna_resource_key != null ? module.test_observability_instance_creation.logdna_resource_key : ""
+  servicekey = module.test_observability_instance_creation.log_analysis_resource_key != null ? module.test_observability_instance_creation.log_analysis_resource_key : ""
   url        = local.at_endpoint
 }

main.tf

@@ -1,7 +1,7 @@
 ##############################################################################
 # observability-instances-module
 #
-# Deploy the observability instances - LogDNA, Sysdig and Activity Tracker
+# Deploy the observability instances - Log Analysis, Cloud Monitoring and Activity Tracker
 ##############################################################################
 
 # Activity tracker
@@ -28,47 +28,47 @@ module "activity_tracker" {
   activity_tracker_routes       = var.activity_tracker_routes
   cos_targets                   = var.cos_targets
   eventstreams_targets          = var.eventstreams_targets
-  logdna_targets                = var.logdna_targets
+  log_analysis_targets          = var.log_analysis_targets
   global_event_routing_settings = var.global_event_routing_settings
 }
 
-# LogDNA
-module "logdna" {
-  source = "./modules/logdna"
+# Log Analysis
+module "log_analysis" {
+  source = "./modules/log_analysis"
   providers = {
     logdna.ld = logdna.ld
   }
-  region               = var.region
-  resource_group_id    = var.resource_group_id
-  enable_archive       = var.enable_archive
-  ibmcloud_api_key     = var.ibmcloud_api_key
-  logdna_provision     = var.logdna_provision
-  instance_name        = var.logdna_instance_name
-  plan                 = var.logdna_plan
-  manager_key_name     = var.logdna_manager_key_name
-  manager_key_tags     = var.logdna_manager_key_tags
-  resource_key_role    = var.logdna_resource_key_role
-  tags                 = var.logdna_tags
-  access_tags          = var.logdna_access_tags
-  enable_platform_logs = var.enable_platform_logs
-  service_endpoints    = var.logdna_service_endpoints
-  cos_instance_id      = var.logdna_cos_instance_id
-  cos_bucket_name      = var.logdna_cos_bucket_name
-  cos_bucket_endpoint  = var.logdna_cos_bucket_endpoint
+  region                 = var.region
+  resource_group_id      = var.resource_group_id
+  enable_archive         = var.enable_archive
+  ibmcloud_api_key       = var.ibmcloud_api_key
+  log_analysis_provision = var.log_analysis_provision
+  instance_name          = var.log_analysis_instance_name
+  plan                   = var.log_analysis_plan
+  manager_key_name       = var.log_analysis_manager_key_name
+  manager_key_tags       = var.log_analysis_manager_key_tags
+  resource_key_role      = var.log_analysis_resource_key_role
+  tags                   = var.log_analysis_tags
+  access_tags            = var.log_analysis_access_tags
+  enable_platform_logs   = var.enable_platform_logs
+  service_endpoints      = var.log_analysis_service_endpoints
+  cos_instance_id        = var.log_analysis_cos_instance_id
+  cos_bucket_name        = var.log_analysis_cos_bucket_name
+  cos_bucket_endpoint    = var.log_analysis_cos_bucket_endpoint
 }
 
-# Sysdig
-module "sysdig" {
-  source                  = "./modules/sysdig"
-  region                  = var.region
-  resource_group_id       = var.resource_group_id
-  sysdig_provision        = var.sysdig_provision
-  instance_name           = var.sysdig_instance_name
-  plan                    = var.sysdig_plan
-  manager_key_name        = var.sysdig_manager_key_name
-  manager_key_tags        = var.sysdig_manager_key_tags
-  tags                    = var.sysdig_tags
-  access_tags             = var.sysdig_access_tags
-  enable_platform_metrics = var.enable_platform_metrics
-  service_endpoints       = var.sysdig_service_endpoints
+# IBM Cloud Monitoring
+module "cloud_monitoring" {
+  source                     = "./modules/cloud_monitoring"
+  region                     = var.region
+  resource_group_id          = var.resource_group_id
+  cloud_monitoring_provision = var.cloud_monitoring_provision
+  instance_name              = var.cloud_monitoring_instance_name
+  plan                       = var.cloud_monitoring_plan
+  manager_key_name           = var.cloud_monitoring_manager_key_name
+  manager_key_tags           = var.cloud_monitoring_manager_key_tags
+  tags                       = var.cloud_monitoring_tags
+  access_tags                = var.cloud_monitoring_access_tags
+  enable_platform_metrics    = var.enable_platform_metrics
+  service_endpoints          = var.cloud_monitoring_service_endpoints
 }