Skip to content

fix: remove logdna and AT from fscloud example #542

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 12 commits into from
Oct 16, 2024
Merged

fix: remove logdna and AT from fscloud example #542

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
2856f5d
fix: remove logdna and AT from fscloud example
Oct 10, 2024
d32d587
fix: remove log_analysis creation from mzr_cluster example
Oct 10, 2024
bf62c2b
update other_test
Oct 11, 2024
390c306
fix: pre-commit issues
iamar7 Oct 11, 2024
28883c4
fix: resolve pc issue
Oct 15, 2024
d6c1dad
Merge branch '11113-hp' of https://github.com/terraform-ibm-modules/t…
Oct 15, 2024
c7357d6
fix: resolve pc issue
Oct 15, 2024
2fcae4e
Merge branch 'main' into 11113-hp
iamar7 Oct 15, 2024
38e8e03
fix: pc error
iamar7 Oct 15, 2024
ab7299b
Merge branch 'main' into 11113-hp
iamar7 Oct 15, 2024
6f72ae4
resolve comments
iamar7 Oct 15, 2024
c5e63e5
Merge branch '11113-hp' of https://github.com/terraform-ibm-modules/t…
iamar7 Oct 15, 2024
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
3 changes: 1 addition & 2 deletions examples/fscloud/catalogValidationValues.json.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
23 changes: 4 additions & 19 deletions examples/fscloud/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ module "cos_fscloud" {
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
}

Expand Down Expand Up @@ -101,33 +100,19 @@ module "vpc" {
}

########################################################################################################################
# Observability Instances (Sysdig + AT)
# Observability Instances (Cloud Monitoring)
########################################################################################################################

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
# Create Cloud Monitoring instance
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"
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
}

Expand Down
16 changes: 0 additions & 16 deletions examples/fscloud/provider.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
6 changes: 0 additions & 6 deletions examples/fscloud/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 0 additions & 4 deletions examples/fscloud/version.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,5 @@ terraform {
source = "ibm-cloud/ibm"
version = ">= 1.68.0"
}
logdna = {
source = "logdna/logdna"
version = ">= 1.14.2"
}
}
}
21 changes: 6 additions & 15 deletions examples/multiple_mzr_clusters/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand All @@ -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
}
16 changes: 0 additions & 16 deletions examples/multiple_mzr_clusters/provider.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
4 changes: 0 additions & 4 deletions examples/multiple_mzr_clusters/version.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,5 @@ terraform {
source = "hashicorp/helm"
version = ">= 2.8.0"
}
logdna = {
source = "logdna/logdna"
version = ">= 1.14.2"
}
}
}
8 changes: 0 additions & 8 deletions tests/other_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down