Skip to content

Commit ba9a7fb

Browse files
kumar-ankansahilg11
kumar-ankan
authored and
sahilg11
committed
Added - Changes for Data Plane Events for VM/BM DBCS
1 parent c0df323 commit ba9a7fb

24 files changed

+456
-15
lines changed

‎examples/database/db_systems/db_exacs/resources.tf‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ resource "oci_database_cloud_vm_cluster" "test_cloud_vm_cluster" {
3333
data_collection_options {
3434
#Optional
3535
is_diagnostics_events_enabled = "true"
36+
is_health_monitoring_enabled = "true"
37+
is_incident_logs_enabled = "true"
3638
}
3739
}
3840

‎examples/database/exadata_cc/vm_cluster.tf‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,8 @@ resource "oci_database_vm_cluster" "test_vm_cluster" {
109109
data_collection_options {
110110
#Optional
111111
is_diagnostics_events_enabled = "true"
112+
is_health_monitoring_enabled = "true"
113+
is_incident_logs_enabled = "true"
112114
}
113115

114116
}

‎internal/integrationtest/database_cloud_vm_cluster_test.go‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,8 @@ var (
104104
}
105105
cloudVmClusterDataCollectionOptionsRepresentation = map[string]interface{}{
106106
"is_diagnostics_events_enabled": acctest.Representation{RepType: acctest.Optional, Create: `false`, Update: `true`},
107+
"is_health_monitoring_enabled": acctest.Representation{RepType: acctest.Optional, Create: `false`, Update: `true`},
108+
"is_incident_logs_enabled": acctest.Representation{RepType: acctest.Optional, Create: `false`, Update: `true`},
107109
}
108110

109111
ad_subnet_security = `
@@ -298,6 +300,8 @@ func TestDatabaseCloudVmClusterResource_basic(t *testing.T) {
298300
resource.TestCheckResourceAttr(resourceName, "cpu_core_count", "4"),
299301
resource.TestCheckResourceAttr(resourceName, "data_collection_options.#", "1"),
300302
resource.TestCheckResourceAttr(resourceName, "data_collection_options.0.is_diagnostics_events_enabled", "false"),
303+
resource.TestCheckResourceAttr(resourceName, "data_collection_options.0.is_health_monitoring_enabled", "false"),
304+
resource.TestCheckResourceAttr(resourceName, "data_collection_options.0.is_incident_logs_enabled", "false"),
301305
resource.TestCheckResourceAttr(resourceName, "data_storage_percentage", "40"),
302306
resource.TestCheckResourceAttr(resourceName, "display_name", "cloudVmCluster"),
303307
resource.TestCheckResourceAttrSet(resourceName, "domain"),
@@ -343,6 +347,8 @@ func TestDatabaseCloudVmClusterResource_basic(t *testing.T) {
343347
resource.TestCheckResourceAttr(resourceName, "cpu_core_count", "4"),
344348
resource.TestCheckResourceAttr(resourceName, "data_collection_options.#", "1"),
345349
resource.TestCheckResourceAttr(resourceName, "data_collection_options.0.is_diagnostics_events_enabled", "false"),
350+
resource.TestCheckResourceAttr(resourceName, "data_collection_options.0.is_health_monitoring_enabled", "false"),
351+
resource.TestCheckResourceAttr(resourceName, "data_collection_options.0.is_incident_logs_enabled", "false"),
346352
resource.TestCheckResourceAttr(resourceName, "data_storage_percentage", "40"),
347353
resource.TestCheckResourceAttr(resourceName, "display_name", "cloudVmCluster"),
348354
resource.TestCheckResourceAttrSet(resourceName, "domain"),
@@ -383,6 +389,8 @@ func TestDatabaseCloudVmClusterResource_basic(t *testing.T) {
383389
resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentId),
384390
resource.TestCheckResourceAttr(resourceName, "data_collection_options.#", "1"),
385391
resource.TestCheckResourceAttr(resourceName, "data_collection_options.0.is_diagnostics_events_enabled", "true"),
392+
resource.TestCheckResourceAttr(resourceName, "data_collection_options.0.is_health_monitoring_enabled", "true"),
393+
resource.TestCheckResourceAttr(resourceName, "data_collection_options.0.is_incident_logs_enabled", "true"),
386394
resource.TestCheckResourceAttr(resourceName, "cpu_core_count", "6"),
387395
resource.TestCheckResourceAttr(resourceName, "data_storage_percentage", "40"),
388396
resource.TestCheckResourceAttr(resourceName, "display_name", "displayName2"),
@@ -432,6 +440,8 @@ func TestDatabaseCloudVmClusterResource_basic(t *testing.T) {
432440
resource.TestCheckResourceAttr(datasourceName, "cloud_vm_clusters.0.compartment_id", compartmentId),
433441
resource.TestCheckResourceAttr(datasourceName, "cloud_vm_clusters.0.data_collection_options.#", "1"),
434442
resource.TestCheckResourceAttr(datasourceName, "cloud_vm_clusters.0.data_collection_options.0.is_diagnostics_events_enabled", "true"),
443+
resource.TestCheckResourceAttr(datasourceName, "cloud_vm_clusters.0.data_collection_options.0.is_health_monitoring_enabled", "true"),
444+
resource.TestCheckResourceAttr(datasourceName, "cloud_vm_clusters.0.data_collection_options.0.is_incident_logs_enabled", "true"),
435445
resource.TestCheckResourceAttr(datasourceName, "cloud_vm_clusters.0.cpu_core_count", "6"),
436446
resource.TestCheckResourceAttr(datasourceName, "cloud_vm_clusters.0.data_storage_percentage", "40"),
437447
resource.TestCheckResourceAttrSet(datasourceName, "cloud_vm_clusters.0.disk_redundancy"),
@@ -471,6 +481,8 @@ func TestDatabaseCloudVmClusterResource_basic(t *testing.T) {
471481
resource.TestCheckResourceAttr(singularDatasourceName, "compartment_id", compartmentId),
472482
resource.TestCheckResourceAttr(singularDatasourceName, "data_collection_options.#", "1"),
473483
resource.TestCheckResourceAttr(singularDatasourceName, "data_collection_options.0.is_diagnostics_events_enabled", "true"),
484+
resource.TestCheckResourceAttr(singularDatasourceName, "data_collection_options.0.is_health_monitoring_enabled", "true"),
485+
resource.TestCheckResourceAttr(singularDatasourceName, "data_collection_options.0.is_incident_logs_enabled", "true"),
474486
resource.TestCheckResourceAttr(singularDatasourceName, "cpu_core_count", "6"),
475487
resource.TestCheckResourceAttr(singularDatasourceName, "data_storage_percentage", "40"),
476488
resource.TestCheckResourceAttrSet(singularDatasourceName, "disk_redundancy"),

‎internal/integrationtest/database_data_guard_association_test.go‎

Lines changed: 90 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,9 @@ var (
4646
"protection_mode": acctest.Representation{RepType: acctest.Required, Create: `MAXIMUM_PERFORMANCE`},
4747
"transport_type": acctest.Representation{RepType: acctest.Required, Create: `ASYNC`},
4848
"cpu_core_count": acctest.Representation{RepType: acctest.Optional, Create: `10`},
49-
"storage_volume_performance_mode": acctest.Representation{RepType: acctest.Optional, Create: `BALANCED`},
49+
"data_collection_options": acctest.RepresentationGroup{RepType: acctest.Optional, Group: dataGuardAssociationDataCollectionOptionsRepresentation},
5050
"is_active_data_guard_enabled": acctest.Representation{RepType: acctest.Optional, Create: `false`},
51+
"storage_volume_performance_mode": acctest.Representation{RepType: acctest.Optional, Create: `BALANCED`},
5152
}
5253

5354
dataGuardAssociationRepresentationBaseForExadata = map[string]interface{}{
@@ -67,6 +68,12 @@ var (
6768
"lifecycle": acctest.RepresentationGroup{RepType: acctest.Required, Group: ignoreDataGuardAssociationRepresentationExistingDbSystem},
6869
})
6970

71+
dataGuardAssociationDataCollectionOptionsRepresentation = map[string]interface{}{
72+
"is_diagnostics_events_enabled": acctest.Representation{RepType: acctest.Optional, Create: `false`},
73+
"is_health_monitoring_enabled": acctest.Representation{RepType: acctest.Optional, Create: `false`},
74+
"is_incident_logs_enabled": acctest.Representation{RepType: acctest.Optional, Create: `false`},
75+
}
76+
7077
ignoreDataGuardAssociationRepresentationExistingDbSystem = map[string]interface{}{
7178
"ignore_changes": acctest.Representation{RepType: acctest.Required, Create: []string{`database_defined_tags`, `database_freeform_tags`, `db_system_defined_tags`, `db_system_freeform_tags`, `fault_domains`, `license_model`, `node_count`, `private_ip`, `time_zone`}},
7279
}
@@ -231,6 +238,84 @@ var (
231238
}
232239
}
233240
`
241+
242+
DataGuardAssociationResourceDependencies = DatabaseDataGuardAssociationResourceDependenciesBase + `
243+
resource "oci_database_db_system" "test_db_system" {
244+
availability_domain = "${lower("${data.oci_identity_availability_domains.test_availability_domains.availability_domains.0.name}")}"
245+
compartment_id = "${var.compartment_id}"
246+
subnet_id = "${oci_core_subnet.test_subnet.id}"
247+
database_edition = "ENTERPRISE_EDITION"
248+
disk_redundancy = "NORMAL"
249+
shape = "BM.DenseIO2.52"
250+
cpu_core_count = "2"
251+
ssh_public_keys = ["ssh-rsa KKKLK3NzaC1yc2EAAAADAQABAAABAQC+UC9MFNA55NIVtKPIBCNw7++ACXhD0hx+Zyj25JfHykjz/QU3Q5FAU3DxDbVXyubgXfb/GJnrKRY8O4QDdvnZZRvQFFEOaApThAmCAM5MuFUIHdFvlqP+0W+ZQnmtDhwVe2NCfcmOrMuaPEgOKO3DOW6I/qOOdO691Xe2S9NgT9HhN0ZfFtEODVgvYulgXuCCXsJs+NUqcHAOxxFUmwkbPvYi0P0e2DT8JKeiOOC8VKUEgvVx+GKmqasm+Y6zHFW7vv3g2GstE1aRs3mttHRoC/JPM86PRyIxeWXEMzyG5wHqUu4XZpDbnWNxi6ugxnAGiL3CrIFdCgRNgHz5qS1l MustWin"]
252+
domain = "${oci_core_subnet.test_subnet.subnet_domain_name}"
253+
hostname = "myOracleDB"
254+
data_storage_size_in_gb = "256"
255+
license_model = "LICENSE_INCLUDED"
256+
node_count = "1"
257+
display_name = "TFTestDbSystemBM1"
258+
db_home {
259+
db_version = "12.1.0.2"
260+
display_name = "TFTestDbHome1"
261+
database {
262+
admin_password = "BEstrO0ng_#11"
263+
db_name = "tfDbName"
264+
}
265+
}
266+
}
267+
268+
resource "oci_database_db_system" "test_db_system2" {
269+
availability_domain = "${lower("${data.oci_identity_availability_domains.test_availability_domains.availability_domains.0.name}")}"
270+
compartment_id = "${var.compartment_id}"
271+
subnet_id = "${oci_core_subnet.test_subnet.id}"
272+
database_edition = "ENTERPRISE_EDITION"
273+
disk_redundancy = "NORMAL"
274+
shape = "BM.DenseIO2.52"
275+
cpu_core_count = "2"
276+
ssh_public_keys = ["ssh-rsa KKKLK3NzaC1yc2EAAAADAQABAAABAQC+UC9MFNA55NIVtKPIBCNw7++ACXhD0hx+Zyj25JfHykjz/QU3Q5FAU3DxDbVXyubgXfb/GJnrKRY8O4QDdvnZZRvQFFEOaApThAmCAM5MuFUIHdFvlqP+0W+ZQnmtDhwVe2NCfcmOrMuaPEgOKO3DOW6I/qOOdO691Xe2S9NgT9HhN0ZfFtEODVgvYulgXuCCXsJs+NUqcHAOxxFUmwkbPvYi0P0e2DT8JKeiOOC8VKUEgvVx+GKmqasm+Y6zHFW7vv3g2GstE1aRs3mttHRoC/JPM86PRyIxeWXEMzyG5wHqUu4XZpDbnWNxi6ugxnAGiL3CrIFdCgRNgHz5qS1l MustWin"]
277+
domain = "${oci_core_subnet.test_subnet.subnet_domain_name}"
278+
hostname = "myOracleDB"
279+
data_storage_size_in_gb = "256"
280+
license_model = "LICENSE_INCLUDED"
281+
node_count = "1"
282+
display_name = "TFTestDbSystemBM2"
283+
db_home {
284+
db_version = "12.1.0.2"
285+
display_name = "TFTestDbHome1"
286+
database {
287+
admin_password = "BEstrO0ng_#11"
288+
db_name = "db2"
289+
}
290+
}
291+
}
292+
`
293+
DataGuardAssociationResourceDependenciesNewDbSystem = DatabaseDataGuardAssociationResourceDependenciesBase + `
294+
resource "oci_database_db_system" "test_db_system" {
295+
availability_domain = "${lower("${data.oci_identity_availability_domains.test_availability_domains.availability_domains.0.name}")}"
296+
compartment_id = "${var.compartment_id}"
297+
subnet_id = "${oci_core_subnet.test_subnet.id}"
298+
database_edition = "ENTERPRISE_EDITION"
299+
disk_redundancy = "NORMAL"
300+
shape = "VM.Standard2.2"
301+
cpu_core_count = "2"
302+
ssh_public_keys = ["ssh-rsa KKKLK3NzaC1yc2EAAAADAQABAAABAQC+UC9MFNA55NIVtKPIBCNw7++ACXhD0hx+Zyj25JfHykjz/QU3Q5FAU3DxDbVXyubgXfb/GJnrKRY8O4QDdvnZZRvQFFEOaApThAmCAM5MuFUIHdFvlqP+0W+ZQnmtDhwVe2NCfcmOrMuaPEgOKO3DOW6I/qOOdO691Xe2S9NgT9HhN0ZfFtEODVgvYulgXuCCXsJs+NUqcHAOxxFUmwkbPvYi0P0e2DT8JKeiOOC8VKUEgvVx+GKmqasm+Y6zHFW7vv3g2GstE1aRs3mttHRoC/JPM86PRyIxeWXEMzyG5wHqUu4XZpDbnWNxi6ugxnAGiL3CrIFdCgRNgHz5qS1l MustWin"]
303+
domain = "${oci_core_subnet.test_subnet.subnet_domain_name}"
304+
hostname = "myOracleDB"
305+
data_storage_size_in_gb = "256"
306+
license_model = "LICENSE_INCLUDED"
307+
node_count = "1"
308+
display_name = "TFTestDbSystemVM"
309+
db_home {
310+
db_version = "12.1.0.2"
311+
display_name = "TFTestDbHome1"
312+
database {
313+
admin_password = "BEstrO0ng_#11"
314+
db_name = "tfDbName"
315+
}
316+
}
317+
}
318+
`
234319
)
235320

236321
// issue-routing-tag: database/default
@@ -276,6 +361,10 @@ func TestDatabaseDataGuardAssociationResource_basic(t *testing.T) {
276361
resource.TestCheckResourceAttr(resourceName, "node_count", "1"),
277362
resource.TestCheckResourceAttr(resourceName, "private_ip", "10.0.2.223"),
278363
resource.TestCheckResourceAttr(resourceName, "time_zone", "US/Pacific"),
364+
resource.TestCheckResourceAttr(resourceName, "data_collection_options.#", "1"),
365+
resource.TestCheckResourceAttr(resourceName, "data_collection_options.0.is_diagnostics_events_enabled", "false"),
366+
resource.TestCheckResourceAttr(resourceName, "data_collection_options.0.is_health_monitoring_enabled", "false"),
367+
resource.TestCheckResourceAttr(resourceName, "data_collection_options.0.is_incident_logs_enabled", "false"),
279368

280369
func(s *terraform.State) (err error) {
281370
resId, err = acctest.FromInstanceState(s, resourceName, "id")

‎internal/integrationtest/database_db_system_resource_allvm_test.go‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,11 @@ func TestResourceDatabaseDBSystemAllVM(t *testing.T) {
8787
}
8888
}
8989
}
90+
data_collection_options {
91+
is_diagnostics_events_enabled = true
92+
is_health_monitoring_enabled = false
93+
is_incident_logs_enabled = true
94+
}
9095
db_system_options {
9196
storage_management = "LVM"
9297
}
@@ -168,6 +173,10 @@ func TestResourceDatabaseDBSystemAllVM(t *testing.T) {
168173
resource.TestCheckResourceAttr(ResourceDatabaseResourceName, "db_home.0.database.0.db_backup_config.0.recovery_window_in_days", "10"),
169174
resource.TestCheckResourceAttr(ResourceDatabaseResourceName, "db_home.0.database.0.defined_tags.example-tag-namespace-all.example-tag", "originalValue"),
170175
resource.TestCheckResourceAttr(ResourceDatabaseResourceName, "db_home.0.database.0.freeform_tags.Department", "Finance"),
176+
resource.TestCheckResourceAttr(ResourceDatabaseResourceName, "data_collection_options.#", "1"),
177+
resource.TestCheckResourceAttr(ResourceDatabaseResourceName, "data_collection_options.0.is_diagnostics_events_enabled", "true"),
178+
resource.TestCheckResourceAttr(ResourceDatabaseResourceName, "data_collection_options.0.is_health_monitoring_enabled", "false"),
179+
resource.TestCheckResourceAttr(ResourceDatabaseResourceName, "data_collection_options.0.is_incident_logs_enabled", "true"),
171180
resource.TestCheckResourceAttr(ResourceDatabaseResourceName, "db_system_options.0.storage_management", "LVM"),
172181
resource.TestCheckResourceAttrSet(ResourceDatabaseResourceName, "state"),
173182
resource.TestCheckResourceAttr(ResourceDatabaseResourceName, "freeform_tags.Department", "Finance"),
@@ -191,6 +200,7 @@ func TestResourceDatabaseDBSystemAllVM(t *testing.T) {
191200
resource.TestCheckResourceAttr("data.oci_database_db_systems.t", "db_systems.0.domain", "tfsubnet.tfvcn.oraclevcn.com"),
192201
resource.TestCheckResourceAttrSet("data.oci_database_db_systems.t", "db_systems.0.hostname"), // see comment in SetData fn as to why this is removed
193202
resource.TestCheckResourceAttr("data.oci_database_db_systems.t", "db_systems.0.db_system_options.#", "1"),
203+
resource.TestCheckResourceAttr("data.oci_database_db_systems.t", "db_systems.0.data_collection_options.#", "1"),
194204
resource.TestCheckResourceAttr("data.oci_database_db_systems.t", "db_systems.0.license_model", "LICENSE_INCLUDED"),
195205
resource.TestCheckResourceAttr("data.oci_database_db_systems.t", "db_systems.0.data_storage_size_in_gb", "256"),
196206
resource.TestCheckResourceAttr("data.oci_database_db_systems.t", "db_systems.0.data_storage_percentage", "80"),
@@ -484,6 +494,11 @@ func TestResourceDatabaseDBSystemAllVM(t *testing.T) {
484494
}
485495
}
486496
}
497+
data_collection_options {
498+
is_diagnostics_events_enabled = true
499+
is_health_monitoring_enabled = false
500+
is_incident_logs_enabled = true
501+
}
487502
db_system_options {
488503
storage_management = "LVM"
489504
}
@@ -564,6 +579,10 @@ func TestResourceDatabaseDBSystemAllVM(t *testing.T) {
564579
resource.TestCheckResourceAttr(ResourceDatabaseResourceName, "db_home.0.database.0.pdb_name", "pdbName"),
565580
resource.TestCheckResourceAttr(ResourceDatabaseResourceName, "db_home.0.database.0.db_backup_config.0.auto_backup_enabled", "false"),
566581
resource.TestCheckResourceAttr(ResourceDatabaseResourceName, "db_home.0.database.0.db_backup_config.0.recovery_window_in_days", "10"),
582+
resource.TestCheckResourceAttr(ResourceDatabaseResourceName, "data_collection_options.#", "1"),
583+
resource.TestCheckResourceAttr(ResourceDatabaseResourceName, "data_collection_options.0.is_diagnostics_events_enabled", "true"),
584+
resource.TestCheckResourceAttr(ResourceDatabaseResourceName, "data_collection_options.0.is_health_monitoring_enabled", "false"),
585+
resource.TestCheckResourceAttr(ResourceDatabaseResourceName, "data_collection_options.0.is_incident_logs_enabled", "true"),
567586
resource.TestCheckResourceAttr(ResourceDatabaseResourceName, "state", string(database.DbSystemLifecycleStateAvailable)),
568587
resource.TestCheckResourceAttr(ResourceDatabaseResourceName, "freeform_tags.Department", "Admin"),
569588
resource.TestCheckResourceAttr(ResourceDatabaseResourceName, "nsg_ids.#", "2"),

0 commit comments

Comments
 (0)