Added:- 08/06 Support for Sqlwatch integration Added:- 08/06 Support for Sqlwatch integration

Author: Terraform Team Automation

examples/databasemanagement/mdb/main.tf

@@ -20,7 +20,7 @@ variable "compartment_id" {
 }
 
 variable "managed_database_id" {
-   default = "ocid1.test.oc1..<unique_ID>EXAMPLE-managedDatabaseId-Value"
+   default = "ocid1.test.oc1..<unique_ID>EXAMPLE-managedDatabase-Value"
 }
 
 variable "managed_database_deployment_type" {
@@ -82,13 +82,22 @@ resource "oci_database_management_managed_database" "test_managed_database" {
 
 # External CDB
 variable "external_cdb_id" {
-  default = "ocid1.externalcontainerdatabase"
+  default = "ocid1.test.oc1..<unique_ID>EXAMPLE-external-cdb-id-Value"
 }
 variable "connector_id" {
-  default = "ocid1.externaldatabaseconnector"
+  default = "ocid1.test.oc1..<unique_ID>EXAMPLE-external-conector-id-Value"
 }
 
-resource "oci_database_management_externalcontainerdatabase_external_container_dbm_features_management" "test_externalcontainerdatabase_external_container_dbm_features_management" {
+# External PDB
+variable "external_pdb_id" {
+  default = "ocid1.test.oc1..<unique_ID>EXAMPLE-external-pdb-id-Value"
+}
+variable "pdb_connector_id" {
+  default = "ocid1.test.oc1..<unique_ID>EXAMPLE-external-pdb-conector-id-Value"
+}
+
+
+resource "oci_database_management_externalcontainerdatabase_external_container_dbm_features_management" "test_externalcontainerdatabase_external_container_dbm_features_management_dbm" {
   feature_details {
     connector_details {
       connector_type = "EXTERNAL"
@@ -101,16 +110,42 @@ resource "oci_database_management_externalcontainerdatabase_external_container_d
   enable_external_container_dbm_feature = "true"
 }
 
-# Uncomment PDB enable APIs only after CDB enablement is done
-# External PDB
-/*variable "external_pdb_id" {
-  default = "ocid1.externalpluggabledatabase"
+resource "oci_database_management_externalcontainerdatabase_external_container_dbm_features_management" "test_externalcontainerdatabase_external_container_dbm_features_management_sqlwatch" {
+  feature_details {
+    connector_details {
+      connector_type = "EXTERNAL"
+      database_connector_id = var.connector_id
+    }
+    feature = "SQLWATCH"
+    license_model = "LICENSE_INCLUDED"
+  }
+  external_container_database_id = var.external_cdb_id
+  enable_external_container_dbm_feature = "true"
+  depends_on = [
+    oci_database_management_externalcontainerdatabase_external_container_dbm_features_management.test_externalcontainerdatabase_external_container_dbm_features_management_dbm
+  ]
 }
-variable "pdb_connector_id" {
-  default = "ocid1.externaldatabaseconnector"
+
+/*
+resource "oci_database_management_externalcontainerdatabase_external_container_dbm_features_management" "test_externalcontainerdatabase_external_container_dbm_features_management_dblm" {
+  feature_details {
+    connector_details {
+      connector_type = "EXTERNAL"
+      database_connector_id = var.connector_id
+    }
+    feature = "DB_LIFECYCLE_MANAGEMENT"
+    license_model = "LICENSE_INCLUDED"
+  }
+  external_container_database_id = var.external_cdb_id
+  enable_external_container_dbm_feature = "true"
+  depends_on = [
+    oci_database_management_externalcontainerdatabase_external_container_dbm_features_management.test_externalcontainerdatabase_external_container_dbm_features_management_sqlwatch
+  ]
 }
+*/
+
 
-resource "oci_database_management_externalpluggabledatabase_external_pluggable_dbm_features_management" "test_externalpluggabledatabase_external_pluggable_dbm_features_management" {
+resource "oci_database_management_externalpluggabledatabase_external_pluggable_dbm_features_management" "test_externalpluggabledatabase_external_pluggable_dbm_features_management_dbm" {
   feature_details {
     connector_details {
       connector_type = "EXTERNAL"
@@ -120,18 +155,39 @@ resource "oci_database_management_externalpluggabledatabase_external_pluggable_d
   }
   external_pluggable_database_id = var.external_pdb_id
   enable_external_pluggable_dbm_feature = "true"
-}*/
+
+  depends_on = [
+    oci_database_management_externalcontainerdatabase_external_container_dbm_features_management.test_externalcontainerdatabase_external_container_dbm_features_management_dbm
+  ]
+}
+
+resource "oci_database_management_externalpluggabledatabase_external_pluggable_dbm_features_management" "test_externalpluggabledatabase_external_pluggable_dbm_features_management_sqlwatch" {
+  feature_details {
+    connector_details {
+      connector_type = "EXTERNAL"
+      database_connector_id = var.pdb_connector_id
+    }
+    feature = "SQLWATCH"
+  }
+  external_pluggable_database_id = var.external_pdb_id
+  enable_external_pluggable_dbm_feature = "true"
+
+  depends_on = [
+    oci_database_management_externalpluggabledatabase_external_pluggable_dbm_features_management.test_externalpluggabledatabase_external_pluggable_dbm_features_management_dbm,
+    oci_database_management_externalcontainerdatabase_external_container_dbm_features_management.test_externalcontainerdatabase_external_container_dbm_features_management_sqlwatch
+  ]
+}
 
 
 # External Non-CDB
 variable "external_non_cdb_id" {
-  default = "ocid1.externalnoncontainerdatabase"
+  default = "ocid1.test.oc1..<unique_ID>EXAMPLE-external-noncdb-id-Value"
 }
 variable "non_cdb_connector_id" {
-  default = "ocid1.externaldatabaseconnector"
+  default = "ocid1.test.oc1..<unique_ID>EXAMPLE-external-noncdb-connector-id-Value"
 }
 
-resource "oci_database_management_externalnoncontainerdatabase_external_non_container_dbm_features_management" "test_externalnoncontainerdatabase_external_non_container_dbm_features_management" {
+resource "oci_database_management_externalnoncontainerdatabase_external_non_container_dbm_features_management" "test_externalnoncontainerdatabase_external_non_container_dbm_features_management_dbm" {
   feature_details {
     connector_details {
       connector_type = "EXTERNAL"
@@ -144,26 +200,84 @@ resource "oci_database_management_externalnoncontainerdatabase_external_non_cont
   enable_external_non_container_dbm_feature = "true"
 }
 
+resource "oci_database_management_externalnoncontainerdatabase_external_non_container_dbm_features_management" "test_externalnoncontainerdatabase_external_non_container_dbm_features_management_sqlwatch" {
+  feature_details {
+    connector_details {
+      connector_type = "EXTERNAL"
+      database_connector_id = var.non_cdb_connector_id
+    }
+    feature = "SQLWATCH"
+    license_model = "LICENSE_INCLUDED"
+  }
+  external_non_container_database_id = var.external_non_cdb_id
+  enable_external_non_container_dbm_feature = "true"
+  depends_on = [
+    oci_database_management_externalnoncontainerdatabase_external_non_container_dbm_features_management.test_externalnoncontainerdatabase_external_non_container_dbm_features_management_dbm
+  ]
+}
+
+/*
+resource "oci_database_management_externalnoncontainerdatabase_external_non_container_dbm_features_management" "test_externalnoncontainerdatabase_external_non_container_dbm_features_management_dblm" {
+  feature_details {
+    connector_details {
+      connector_type = "EXTERNAL"
+      database_connector_id = var.non_cdb_connector_id
+    }
+    feature = "DB_LIFECYCLE_MANAGEMENT"
+    license_model = "LICENSE_INCLUDED"
+  }
+  external_non_container_database_id = var.external_non_cdb_id
+  enable_external_non_container_dbm_feature = "true"
+  depends_on = [
+    oci_database_management_externalnoncontainerdatabase_external_non_container_dbm_features_management.test_externalnoncontainerdatabase_external_non_container_dbm_features_management_sqlwatch
+  ]
+}
+*/
+
 # Cloud CDB
 variable "cloud_cdb_id" {
-  default = "ocid1.database"
+  default = "ocid1.test.oc1..<unique_ID>EXAMPLE-cloud-cdb-id-Value"
 }
 variable "cdb_pe_id" {
-  default = "ocid1.dbmgmtprivateendpoint"
+  default = "ocid1.test.oc1..<unique_ID>EXAMPLE-cloud-cdb-pe-id-Value"
 }
 variable "vault_secret_id" {
-  default = "ocid1.vaultsecret"
+  default = "ocid1.test.oc1..<unique_ID>EXAMPLE-secret-id-Value"
+}
+
+variable "modified_vault_secret_id" {
+  default = "ocid1.test.oc1..<unique_ID>EXAMPLE-modified-secret-id-Value"
 }
+
 variable "cdb_user_role" {
-  default = "SYSDBA"
+  default = "NORMAL"
 }
 variable "cdb_user" {
   default = "dbsnmp"
 }
 variable "cdb_service" {
-  default = "cdb_service"
+  default = "cdb-service-id"
+}
+
+# Cloud PDB related variables
+variable "cloud_pdb_id" {
+  default = "ocid1.test.oc1..<unique_ID>EXAMPLE-cloud-pdb-id-Value"
+}
+variable "pdb_pe_id" {
+  default = "ocid1.test.oc1..<unique_ID>EXAMPLE-cloud-pdb-pe-id-Value"
 }
-resource "oci_database_management_database_dbm_features_management" "test_database_dbm_features_management" {
+variable "pdb_user_role" {
+  default = "NORMAL"
+}
+variable "pdb_user" {
+  default = "dbsnmp"
+}
+variable "db_service" {
+  default = "pdb-service-id"
+}
+
+# Enable DIAGNOSTICS_AND_MANAGEMENT
+resource "oci_database_management_database_dbm_features_management" "test_database_dbm_features_management_diag_enable" {
   feature_details {
     connector_details {
       connector_type = "PE"
@@ -188,29 +302,45 @@ resource "oci_database_management_database_dbm_features_management" "test_databa
   }
   database_id = var.cloud_cdb_id
   enable_database_dbm_feature = "true"
+  
 }
 
-# Uncomment PDB enable APIs only after CDB enablement is done
-# Cloud PDB
-/*variable "cloud_pdb_id" {
-  default = "ocid1.pluggabledatabase"
-}
-variable "pdb_pe_id" {
-  default = "ocid1.dbmgmtprivateendpoint"
-}
-variable "vault_secret_id" {
-  default = "ocid1.vaultsecret"
-}
-variable "pdb_user_role" {
-  default = "SYSDBA"
-}
-variable "pdb_user" {
-  default = "dbsnmp"
-}
-variable "db_service" {
-  default = "pdb_service"
+# Modify DIAGNOSTICS_AND_MANAGEMENT
+resource "oci_database_management_database_dbm_features_management" "test_database_dbm_features_management_diag_modify" {
+  feature_details {
+    connector_details {
+      connector_type = "PE"
+      private_end_point_id = var.cdb_pe_id
+    }
+    database_connection_details {
+      connection_credentials {
+        credential_type = "DETAILS"
+        password_secret_id = var.modified_vault_secret_id
+        role = var.cdb_user_role
+        user_name = var.cdb_user
+      }
+      connection_string {
+        connection_type = "BASIC"
+        port = "1521"
+        protocol = "TCP"
+        service = var.cdb_service
+      }
+    }
+    feature = "DIAGNOSTICS_AND_MANAGEMENT"
+    management_type = "ADVANCED"
+  }
+  database_id = var.cloud_cdb_id
+  enable_database_dbm_feature = "true"
+  modify_database_dbm_feature = "true"
+  depends_on = [
+    oci_database_management_database_dbm_features_management.test_database_dbm_features_management_diag_enable
+  ]
 }
-resource "oci_database_management_pluggabledatabase_pluggable_database_dbm_features_management" "test_pluggabledatabase_pluggable_database_dbm_features_management" {
+
+
+# Uncomment PDB enable APIs only after CDB enablement is done
+# Enable DIAGNOSTICS_AND_MANAGEMENT for Cloud PDB
+resource "oci_database_management_pluggabledatabase_pluggable_database_dbm_features_management" "test_pluggabledatabase_pluggable_database_dbm_features_management_enable_diag" {
   feature_details {
     connector_details {
       connector_type = "PE"
@@ -235,4 +365,70 @@ resource "oci_database_management_pluggabledatabase_pluggable_database_dbm_featu
   }
   pluggable_database_id = var.cloud_pdb_id
   enable_pluggable_database_dbm_feature = "true"
-}*/
+
+  depends_on = [
+    oci_database_management_database_dbm_features_management.test_database_dbm_features_management_diag_modify
+  ]
+}
+
+# Modify DIAGNOSTICS_AND_MANAGEMENT for Cloud PDB
+resource "oci_database_management_pluggabledatabase_pluggable_database_dbm_features_management" "test_pluggabledatabase_pluggable_database_dbm_features_management_modify_diag" {
+  feature_details {
+    connector_details {
+      connector_type = "PE"
+      private_end_point_id = var.pdb_pe_id
+    }
+    database_connection_details {
+      connection_credentials {
+        credential_type = "DETAILS"
+        password_secret_id = var.modified_vault_secret_id
+        role = var.pdb_user_role
+        user_name = var.pdb_user
+      }
+      connection_string {
+        connection_type = "BASIC"
+        port = "1521"
+        protocol = "TCP"
+        service = var.db_service
+      }
+    }
+    feature = "DIAGNOSTICS_AND_MANAGEMENT"
+    management_type = "ADVANCED"
+  }
+  pluggable_database_id = var.cloud_pdb_id
+  enable_pluggable_database_dbm_feature = "true"
+  modify_pluggable_database_dbm_feature = "true"
+  depends_on = [
+    oci_database_management_pluggabledatabase_pluggable_database_dbm_features_management.test_pluggabledatabase_pluggable_database_dbm_features_management_enable_diag
+  ]
+}
+
+
+
+# Disable DIAGNOSTICS_AND_MANAGEMENT for Cloud PDB
+resource "oci_database_management_pluggabledatabase_pluggable_database_dbm_features_management" "test_pluggabledatabase_pluggable_database_dbm_features_management_disable_diag" {
+  feature_details {
+    feature = "DIAGNOSTICS_AND_MANAGEMENT"
+    management_type = "ADVANCED"
+  }
+  pluggable_database_id = var.cloud_pdb_id
+  enable_pluggable_database_dbm_feature = "false"
+  depends_on = [
+    oci_database_management_pluggabledatabase_pluggable_database_dbm_features_management.test_pluggabledatabase_pluggable_database_dbm_features_management_modify_diag
+  ]
+}
+
+
+# Disable DIAGNOSTICS_AND_MANAGEMENT for Cloud CDB 
+resource "oci_database_management_database_dbm_features_management" "test_database_dbm_features_management_diag_disable" {
+  feature_details {
+    feature = "DIAGNOSTICS_AND_MANAGEMENT"
+    management_type = "ADVANCED"
+  }
+  database_id = var.cloud_cdb_id
+  enable_database_dbm_feature = "false"
+
+  depends_on = [
+    oci_database_management_pluggabledatabase_pluggable_database_dbm_features_management.test_pluggabledatabase_pluggable_database_dbm_features_management_disable_diag
+  ]
+}