Skip to content

Commit

Permalink
Merge pull request #2160 from oracle/release_gh
Browse files Browse the repository at this point in the history
Releasing version 6.4.0
  • Loading branch information
srinioci authored Jul 24, 2024
2 parents f7bee92 + e96f135 commit 7061503
Show file tree
Hide file tree
Showing 525 changed files with 25,496 additions and 623 deletions.
14 changes: 14 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
## 6.4.0 (July 24, 2024)

### Added
- Support for APM - Synthetics - SQL Monitor Type Support
- Support for Oracle Sharded Database
- Support for ADB-S: Licenses Input option for better BYOL flexibility
- Support for Data Safe - Usability enhancements to data discovery feature
- Support for Operations Insights : MYSQL Analytics
- Support for [Add subscriptionId attribute support for AutonomousDatabase resource] Terraform Setup
- Support for Add subscriptionId attribute support for Cloud Exa Infra/VM Cluster
- Support for ExaDB-C@C OKV Integration Phase 2 with EXACC to Manage TDE Keys Dataguard / Create DB
### Bug Fix
- Terraform bug fixes - Data safe Audit (Provider-Only)

## 6.3.0 (July 16, 2024)

### Deprecation
Expand Down
2 changes: 2 additions & 0 deletions examples/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,8 @@ This directory contains Terraform configuration files showing how to create spec
[![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)
- generative_ai
[![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)
- globally_distributed_database
[![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)
- goldengate
[![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)
- health_checks
Expand Down
212 changes: 212 additions & 0 deletions examples/apm/apm_synthetics/monitors/ftp_monitor/monitor.tf
Original file line number Diff line number Diff line change
@@ -0,0 +1,212 @@
// Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
// Licensed under the Mozilla Public License v2.0

variable "tenancy_ocid" {}
variable "user_ocid" {}
variable "fingerprint" {}
variable "private_key_path" {}
variable "region" {}
variable "compartment_ocid" {}
variable "apm_domain_id" {}

variable "apm_domain_description" {
default = "description"
}

variable "apm_domain_display_name" {
default = "displayName"
}

variable "apm_domain_freeform_tags" {
default = { "Department" = "Finance" }
}

variable "apm_domain_is_free_tier" {
default = false
}

variable "apm_domain_state" {
default = "ACTIVE"
}

variable "data_key_data_key_type" {
default = "PRIVATE"
}

variable "monitor_configuration_config_type" {
default = "FTP_CONFIG"
}

variable "monitor_configuration_query" {
default = "query"
}

variable "monitor_configuration_is_failure_retried" {
default = false
}

variable "monitor_configuration_ftp_protocol" {
default = "FTP"
}

variable "monitor_configuration_ftp_request_type" {
default = "LIST"
}

variable "monitor_configuration_ftp_basic_authentication_details_username" {
default = "username"
}

variable "monitor_configuration_ftp_basic_authentication_details_password_password_type" {
default = "IN_TEXT"
}

variable "monitor_configuration_ftp_basic_authentication_details_password_password" {
default = "BEstrO0ng_#11"
}

variable "monitor_display_name" {
default = "displayName"
}

variable "monitor_freeform_tags" {
default = { "bar-key" = "value" }
}

variable "monitor_monitor_type" {
default = "FTP"
}

variable "monitor_repeat_interval_in_seconds" {
default = 600
}

variable "monitor_is_run_once" {
default = false
}

variable "monitor_is_run_now" {
default = false
}

variable "monitor_scheduling_policy" {
default = "ALL"
}

variable "monitor_status" {
default = "ENABLED"
}

variable "monitor_target" {
default = "www.oracle.com:80"
}

variable "monitor_timeout_in_seconds" {
default = 60
}

variable "monitor_tag_name" {
default = "tagName"
}

variable "monitor_tag_value" {
default = "tagValue"
}

variable "monitor_availability_configuration_max_allowed_failures_per_interval" {
default = 0
}

variable "monitor_availability_configuration_min_allowed_runs_per_interval" {
default = 1
}

variable "monitor_maintenance_window_schedule_time_ended" {
default = "2025-02-12T22:47:12.613Z"
}

variable "monitor_maintenance_window_schedule_time_started" {
default = "2024-12-18T22:47:12.654Z"
}

variable "monitor_vantage_points_name" {
default = "us-phoenix-internal"
}

provider "oci" {
tenancy_ocid = var.tenancy_ocid
user_ocid = var.user_ocid
fingerprint = var.fingerprint
private_key_path = var.private_key_path
region = var.region
}

resource "oci_apm_synthetics_monitor" "test_monitor" {
#Required
apm_domain_id = oci_apm_apm_domain.test_apm_domain.id
display_name = var.monitor_display_name
monitor_type = var.monitor_monitor_type
repeat_interval_in_seconds = var.monitor_repeat_interval_in_seconds
vantage_points {
#Required
name = var.monitor_vantage_points_name
}

configuration {

config_type = var.monitor_configuration_config_type
is_failure_retried = var.monitor_configuration_is_failure_retried
ftp_protocol = var.monitor_configuration_ftp_protocol
ftp_request_type = var.monitor_configuration_ftp_request_type

ftp_basic_authentication_details {
username = var.monitor_configuration_ftp_basic_authentication_details_username
password {
password = var.monitor_configuration_ftp_basic_authentication_details_password_password
password_type = var.monitor_configuration_ftp_basic_authentication_details_password_password_type
}
}

}
freeform_tags = var.monitor_freeform_tags

status = var.monitor_status
target = var.monitor_target
timeout_in_seconds = var.monitor_timeout_in_seconds
is_run_once = var.monitor_is_run_once
is_run_now = var.monitor_is_run_now
scheduling_policy = var.monitor_scheduling_policy
#Optional
availability_configuration {
max_allowed_failures_per_interval = var.monitor_availability_configuration_max_allowed_failures_per_interval
min_allowed_runs_per_interval = var.monitor_availability_configuration_min_allowed_runs_per_interval
}
maintenance_window_schedule {
time_ended = var.monitor_maintenance_window_schedule_time_ended
time_started = var.monitor_maintenance_window_schedule_time_started
}
}

data "oci_apm_synthetics_monitors" "test_monitors" {
#Required
apm_domain_id = oci_apm_apm_domain.test_apm_domain.id

#Optional
display_name = var.monitor_display_name
monitor_type = var.monitor_monitor_type
status = var.monitor_status
}


resource "oci_apm_apm_domain" "test_apm_domain" {
#Required
compartment_id = var.compartment_ocid
display_name = var.apm_domain_display_name

#Optional
description = var.apm_domain_description
freeform_tags = var.apm_domain_freeform_tags
is_free_tier = var.apm_domain_is_free_tier
}


15 changes: 1 addition & 14 deletions examples/apm/apm_synthetics/monitors/network_monitor/monitor.tf
Original file line number Diff line number Diff line change
Expand Up @@ -81,14 +81,6 @@ variable "monitor_scheduling_policy" {
default = "ALL"
}

variable "monitor_script_parameters_param_name" {
default = "testName"
}

variable "monitor_script_parameters_param_value" {
default = "myTest1"
}

variable "monitor_status" {
default = "ENABLED"
}
Expand Down Expand Up @@ -207,12 +199,7 @@ resource "oci_apm_synthetics_monitor" "test_monitor" {
override_dns_ip = var.monitor_configuration_dns_configuration_override_dns_ip
}
}
freeform_tags = var.monitor_freeform_tags
script_parameters {
#Required
param_name = var.monitor_script_parameters_param_name
param_value = var.monitor_script_parameters_param_value
}
freeform_tags = var.monitor_freeform_tags
status = var.monitor_status
target = var.monitor_target
timeout_in_seconds = var.monitor_timeout_in_seconds
Expand Down
Binary file not shown.
Loading

0 comments on commit 7061503

Please sign in to comment.