Skip to content

Commit 7061503

Browse files
authored
Merge pull request #2160 from oracle/release_gh
Releasing version 6.4.0
2 parents f7bee92 + e96f135 commit 7061503

File tree

525 files changed

+25496
-623
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

525 files changed

+25496
-623
lines changed

CHANGELOG.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
## 6.4.0 (July 24, 2024)
2+
3+
### Added
4+
- Support for APM - Synthetics - SQL Monitor Type Support
5+
- Support for Oracle Sharded Database
6+
- Support for ADB-S: Licenses Input option for better BYOL flexibility
7+
- Support for Data Safe - Usability enhancements to data discovery feature
8+
- Support for Operations Insights : MYSQL Analytics
9+
- Support for [Add subscriptionId attribute support for AutonomousDatabase resource] Terraform Setup
10+
- Support for Add subscriptionId attribute support for Cloud Exa Infra/VM Cluster
11+
- Support for ExaDB-C@C OKV Integration Phase 2 with EXACC to Manage TDE Keys Dataguard / Create DB
12+
### Bug Fix
13+
- Terraform bug fixes - Data safe Audit (Provider-Only)
14+
115
## 6.3.0 (July 16, 2024)
216

317
### Deprecation

examples/README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,8 @@ This directory contains Terraform configuration files showing how to create spec
103103
[![Deploy to Oracle Cloud](https://oci-resourcemanager-plugin.plugins.oci.oraclecloud.com/latest/deploy-to-oracle-cloud.svg)](https://cloud.oracle.com/resourcemanager/stacks/create?zipUrl=https://github.com/oracle/terraform-provider-oci/raw/master/examples/zips/fusionapps.zip)
104104
- generative_ai
105105
[![Deploy to Oracle Cloud](https://oci-resourcemanager-plugin.plugins.oci.oraclecloud.com/latest/deploy-to-oracle-cloud.svg)](https://cloud.oracle.com/resourcemanager/stacks/create?zipUrl=https://github.com/oracle/terraform-provider-oci/raw/master/examples/zips/generative_ai.zip)
106+
- globally_distributed_database
107+
[![Deploy to Oracle Cloud](https://oci-resourcemanager-plugin.plugins.oci.oraclecloud.com/latest/deploy-to-oracle-cloud.svg)](https://cloud.oracle.com/resourcemanager/stacks/create?zipUrl=https://github.com/oracle/terraform-provider-oci/raw/master/examples/zips/globally_distributed_database.zip)
106108
- goldengate
107109
[![Deploy to Oracle Cloud](https://oci-resourcemanager-plugin.plugins.oci.oraclecloud.com/latest/deploy-to-oracle-cloud.svg)](https://cloud.oracle.com/resourcemanager/stacks/create?zipUrl=https://github.com/oracle/terraform-provider-oci/raw/master/examples/zips/goldengate.zip)
108110
- health_checks
Lines changed: 212 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,212 @@
1+
// Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
2+
// Licensed under the Mozilla Public License v2.0
3+
4+
variable "tenancy_ocid" {}
5+
variable "user_ocid" {}
6+
variable "fingerprint" {}
7+
variable "private_key_path" {}
8+
variable "region" {}
9+
variable "compartment_ocid" {}
10+
variable "apm_domain_id" {}
11+
12+
variable "apm_domain_description" {
13+
default = "description"
14+
}
15+
16+
variable "apm_domain_display_name" {
17+
default = "displayName"
18+
}
19+
20+
variable "apm_domain_freeform_tags" {
21+
default = { "Department" = "Finance" }
22+
}
23+
24+
variable "apm_domain_is_free_tier" {
25+
default = false
26+
}
27+
28+
variable "apm_domain_state" {
29+
default = "ACTIVE"
30+
}
31+
32+
variable "data_key_data_key_type" {
33+
default = "PRIVATE"
34+
}
35+
36+
variable "monitor_configuration_config_type" {
37+
default = "FTP_CONFIG"
38+
}
39+
40+
variable "monitor_configuration_query" {
41+
default = "query"
42+
}
43+
44+
variable "monitor_configuration_is_failure_retried" {
45+
default = false
46+
}
47+
48+
variable "monitor_configuration_ftp_protocol" {
49+
default = "FTP"
50+
}
51+
52+
variable "monitor_configuration_ftp_request_type" {
53+
default = "LIST"
54+
}
55+
56+
variable "monitor_configuration_ftp_basic_authentication_details_username" {
57+
default = "username"
58+
}
59+
60+
variable "monitor_configuration_ftp_basic_authentication_details_password_password_type" {
61+
default = "IN_TEXT"
62+
}
63+
64+
variable "monitor_configuration_ftp_basic_authentication_details_password_password" {
65+
default = "BEstrO0ng_#11"
66+
}
67+
68+
variable "monitor_display_name" {
69+
default = "displayName"
70+
}
71+
72+
variable "monitor_freeform_tags" {
73+
default = { "bar-key" = "value" }
74+
}
75+
76+
variable "monitor_monitor_type" {
77+
default = "FTP"
78+
}
79+
80+
variable "monitor_repeat_interval_in_seconds" {
81+
default = 600
82+
}
83+
84+
variable "monitor_is_run_once" {
85+
default = false
86+
}
87+
88+
variable "monitor_is_run_now" {
89+
default = false
90+
}
91+
92+
variable "monitor_scheduling_policy" {
93+
default = "ALL"
94+
}
95+
96+
variable "monitor_status" {
97+
default = "ENABLED"
98+
}
99+
100+
variable "monitor_target" {
101+
default = "www.oracle.com:80"
102+
}
103+
104+
variable "monitor_timeout_in_seconds" {
105+
default = 60
106+
}
107+
108+
variable "monitor_tag_name" {
109+
default = "tagName"
110+
}
111+
112+
variable "monitor_tag_value" {
113+
default = "tagValue"
114+
}
115+
116+
variable "monitor_availability_configuration_max_allowed_failures_per_interval" {
117+
default = 0
118+
}
119+
120+
variable "monitor_availability_configuration_min_allowed_runs_per_interval" {
121+
default = 1
122+
}
123+
124+
variable "monitor_maintenance_window_schedule_time_ended" {
125+
default = "2025-02-12T22:47:12.613Z"
126+
}
127+
128+
variable "monitor_maintenance_window_schedule_time_started" {
129+
default = "2024-12-18T22:47:12.654Z"
130+
}
131+
132+
variable "monitor_vantage_points_name" {
133+
default = "us-phoenix-internal"
134+
}
135+
136+
provider "oci" {
137+
tenancy_ocid = var.tenancy_ocid
138+
user_ocid = var.user_ocid
139+
fingerprint = var.fingerprint
140+
private_key_path = var.private_key_path
141+
region = var.region
142+
}
143+
144+
resource "oci_apm_synthetics_monitor" "test_monitor" {
145+
#Required
146+
apm_domain_id = oci_apm_apm_domain.test_apm_domain.id
147+
display_name = var.monitor_display_name
148+
monitor_type = var.monitor_monitor_type
149+
repeat_interval_in_seconds = var.monitor_repeat_interval_in_seconds
150+
vantage_points {
151+
#Required
152+
name = var.monitor_vantage_points_name
153+
}
154+
155+
configuration {
156+
157+
config_type = var.monitor_configuration_config_type
158+
is_failure_retried = var.monitor_configuration_is_failure_retried
159+
ftp_protocol = var.monitor_configuration_ftp_protocol
160+
ftp_request_type = var.monitor_configuration_ftp_request_type
161+
162+
ftp_basic_authentication_details {
163+
username = var.monitor_configuration_ftp_basic_authentication_details_username
164+
password {
165+
password = var.monitor_configuration_ftp_basic_authentication_details_password_password
166+
password_type = var.monitor_configuration_ftp_basic_authentication_details_password_password_type
167+
}
168+
}
169+
170+
}
171+
freeform_tags = var.monitor_freeform_tags
172+
173+
status = var.monitor_status
174+
target = var.monitor_target
175+
timeout_in_seconds = var.monitor_timeout_in_seconds
176+
is_run_once = var.monitor_is_run_once
177+
is_run_now = var.monitor_is_run_now
178+
scheduling_policy = var.monitor_scheduling_policy
179+
#Optional
180+
availability_configuration {
181+
max_allowed_failures_per_interval = var.monitor_availability_configuration_max_allowed_failures_per_interval
182+
min_allowed_runs_per_interval = var.monitor_availability_configuration_min_allowed_runs_per_interval
183+
}
184+
maintenance_window_schedule {
185+
time_ended = var.monitor_maintenance_window_schedule_time_ended
186+
time_started = var.monitor_maintenance_window_schedule_time_started
187+
}
188+
}
189+
190+
data "oci_apm_synthetics_monitors" "test_monitors" {
191+
#Required
192+
apm_domain_id = oci_apm_apm_domain.test_apm_domain.id
193+
194+
#Optional
195+
display_name = var.monitor_display_name
196+
monitor_type = var.monitor_monitor_type
197+
status = var.monitor_status
198+
}
199+
200+
201+
resource "oci_apm_apm_domain" "test_apm_domain" {
202+
#Required
203+
compartment_id = var.compartment_ocid
204+
display_name = var.apm_domain_display_name
205+
206+
#Optional
207+
description = var.apm_domain_description
208+
freeform_tags = var.apm_domain_freeform_tags
209+
is_free_tier = var.apm_domain_is_free_tier
210+
}
211+
212+

examples/apm/apm_synthetics/monitors/network_monitor/monitor.tf

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -81,14 +81,6 @@ variable "monitor_scheduling_policy" {
8181
default = "ALL"
8282
}
8383

84-
variable "monitor_script_parameters_param_name" {
85-
default = "testName"
86-
}
87-
88-
variable "monitor_script_parameters_param_value" {
89-
default = "myTest1"
90-
}
91-
9284
variable "monitor_status" {
9385
default = "ENABLED"
9486
}
@@ -207,12 +199,7 @@ resource "oci_apm_synthetics_monitor" "test_monitor" {
207199
override_dns_ip = var.monitor_configuration_dns_configuration_override_dns_ip
208200
}
209201
}
210-
freeform_tags = var.monitor_freeform_tags
211-
script_parameters {
212-
#Required
213-
param_name = var.monitor_script_parameters_param_name
214-
param_value = var.monitor_script_parameters_param_value
215-
}
202+
freeform_tags = var.monitor_freeform_tags
216203
status = var.monitor_status
217204
target = var.monitor_target
218205
timeout_in_seconds = var.monitor_timeout_in_seconds
21.6 KB
Binary file not shown.

0 commit comments

Comments
 (0)