Skip to content

Commit 4a274b2

Browse files
tf-oci-pubtf-oci-pub
authored
Merge pull request #2423 from oracle/release_gh
Releasing version 7.12.0
2 parents 5e0783e + 72032e9 commit 4a274b2

File tree

381 files changed

+32695
-1794
lines changed

Some content is hidden

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

381 files changed

+32695
-1794
lines changed

‎CHANGELOG.md‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
## 7.12.0 (July 30, 2025)
2+
3+
### Added
4+
- Support for ODSC - Enable Burstable for Data Science Notebooks, ML Jobs, and ML Pipeline
5+
- Support for APM - Scheduled Backend Queries - UI & API
6+
- Support for Ops Insights support for ADB@ExaCC
7+
- oprional parameters to import
8+
- Support for API Platform Cloud Service
9+
- Support for OCI Data Science Multi Model Deployment Experience
10+
- Support for Design/Implement CPU architecture agnostic configurations
11+
- Support for Secrets in Vault - Cross Region Replication Feature
12+
- Support for APM - Agent & Configurations Updates
13+
14+
### Bug Fix
15+
- Update domain override logic to get realm domain from oci-go-sdk instead of using regex to extract realmn domain
16+
- Fix for VCN is_ipv6enabled plan drift on apply.
17+
- ed - Pagination for resource discovery of private zones
18+
119
## 7.11.0 (July 23, 2025)
220

321
### Added

‎examples/api_platform/api_platform_instance/main.tf‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
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_id" {}
10+
11+
variable "api_platform_instance_description" {
12+
default = "description"
13+
}
14+
15+
variable "api_platform_instance_freeform_tags" {
16+
default = { "bar-key" = "value" }
17+
}
18+
19+
variable "api_platform_instance_name" {
20+
default = "name"
21+
}
22+
23+
variable "api_platform_instance_state" {
24+
default = "ACTIVE"
25+
}
26+
27+
28+
provider "oci" {
29+
tenancy_ocid = var.tenancy_ocid
30+
user_ocid = var.user_ocid
31+
fingerprint = var.fingerprint
32+
private_key_path = var.private_key_path
33+
region = var.region
34+
}
35+
36+
resource "oci_api_platform_api_platform_instance" "test_api_platform_instance" {
37+
#Required
38+
compartment_id = var.compartment_id
39+
name = var.api_platform_instance_name
40+
41+
#Optional
42+
defined_tags = { "example-tag-namespace-all.example-tag" = "value" }
43+
description = var.api_platform_instance_description
44+
freeform_tags = var.api_platform_instance_freeform_tags
45+
}
46+
47+
data "oci_api_platform_api_platform_instances" "test_api_platform_instances" {
48+
#Required
49+
compartment_id = var.compartment_id
50+
51+
#Optional
52+
id = oci_api_platform_api_platform_instance.test_api_platform_instance.id
53+
name = var.api_platform_instance_name
54+
state = var.api_platform_instance_state
55+
}
56+
57+
data "oci_api_platform_api_platform_instance" "test_api_platform_instance_data" {
58+
#Required
59+
api_platform_instance_id = oci_api_platform_api_platform_instance.test_api_platform_instance.id
60+
}

‎examples/apm/apm_config/agent_config/main.tf‎

Lines changed: 130 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,130 @@
1+
// Copyright (c) 2025, 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+
11+
variable "config_config_type" {
12+
default = "AGENT"
13+
}
14+
15+
variable "config_defined_tags_value" {
16+
default = "value"
17+
}
18+
19+
variable "configMapFileName" {
20+
default = "fileName"
21+
}
22+
23+
variable "configMapBody" {
24+
default = "Y29tLm9yYWNsZS5hcG0uYWdlbnQudHJhY2VyLmVuYWJsZS5qZnIgPSB7eyBpc0pmckVuYWJsZWQgfCBkZWZhdWx0IGZhbHNlIH19"
25+
}
26+
27+
variable "configMapContentType" {
28+
default = "charset=utf-8"
29+
}
30+
31+
variable "overrideListAgentFilter" {
32+
default = "Component='Server'"
33+
}
34+
35+
variable "overrideListOverrideMap" {
36+
default = {
37+
isJfrEnabled= "true"
38+
}
39+
}
40+
41+
variable "match_agents_with_attribute_value" {
42+
default = "value1"
43+
}
44+
45+
variable "config_freeform_tags" {
46+
default = { "bar-key" = "value" }
47+
}
48+
49+
variable "apm_domain_description" {
50+
default = "description"
51+
}
52+
53+
variable "apm_domain_display_name" {
54+
default = "displayName"
55+
}
56+
57+
variable "apm_domain_freeform_tags" {
58+
default = { "Department" = "Finance" }
59+
}
60+
61+
variable "apm_domain_is_free_tier" {
62+
default = false
63+
}
64+
65+
variable "apm_domain_state" {
66+
default = "ACTIVE"
67+
}
68+
69+
variable "data_key_data_key_type" {
70+
default = "PRIVATE"
71+
}
72+
73+
provider "oci" {
74+
tenancy_ocid = var.tenancy_ocid
75+
user_ocid = var.user_ocid
76+
fingerprint = var.fingerprint
77+
private_key_path = var.private_key_path
78+
region = var.region
79+
}
80+
81+
resource "oci_apm_apm_domain" "test_apm_domain" {
82+
#Required
83+
compartment_id = var.compartment_ocid
84+
display_name = var.apm_domain_display_name
85+
86+
#Optional
87+
description = var.apm_domain_description
88+
freeform_tags = var.apm_domain_freeform_tags
89+
is_free_tier = var.apm_domain_is_free_tier
90+
}
91+
92+
93+
resource "oci_apm_config_config" "test_config" {
94+
#Required
95+
apm_domain_id = oci_apm_apm_domain.test_apm_domain.id
96+
config_type = var.config_config_type
97+
match_agents_with_attribute_value = var.match_agents_with_attribute_value
98+
99+
#Optional
100+
config {
101+
config_map {
102+
file_name = var.configMapFileName
103+
body = var.configMapBody
104+
content_type = var.configMapContentType
105+
}
106+
107+
# config_map {
108+
# // Second config map
109+
# }
110+
}
111+
112+
overrides {
113+
override_list {
114+
agent_filter = var.overrideListAgentFilter
115+
override_map = var.overrideListOverrideMap
116+
}
117+
118+
# override_list {
119+
# // Second override list
120+
# }
121+
}
122+
}
123+
124+
data "oci_apm_config_configs" "test_configs" {
125+
#Required
126+
apm_domain_id = oci_apm_apm_domain.test_apm_domain.id
127+
128+
#Optional
129+
config_type = var.config_config_type
130+
}

‎examples/apm/apm_config/macs_apm_extension/main.tf‎

Lines changed: 113 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,113 @@
1+
// Copyright (c) 2025, 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 "management_agent_ocid" { }
11+
12+
variable "config_config_type" {
13+
default = "MACS_APM_EXTENSION"
14+
}
15+
16+
variable "process_filter" {
17+
default = [".*org.apache.catalina.startup.Bootstrap.*", ".*jetty.*"]
18+
}
19+
20+
variable "run_as_user" {
21+
default = "tomcat"
22+
}
23+
24+
variable "service_name" {
25+
default = "Tomcat"
26+
}
27+
28+
variable "agent_version" {
29+
default = "1.16.0.585"
30+
}
31+
32+
variable "attach_install_dir" {
33+
default = "/opt/oracle/apm_attach_process"
34+
}
35+
36+
variable "display_name" {
37+
default = "Display name"
38+
}
39+
40+
variable "config_defined_tags_value" {
41+
default = "value"
42+
}
43+
44+
variable "config_freeform_tags" {
45+
default = { "bar-key" = "value" }
46+
}
47+
48+
variable "apm_domain_description" {
49+
default = "description"
50+
}
51+
52+
variable "apm_domain_display_name" {
53+
default = "displayName"
54+
}
55+
56+
variable "apm_domain_freeform_tags" {
57+
default = { "Department" = "Finance" }
58+
}
59+
60+
variable "apm_domain_is_free_tier" {
61+
default = false
62+
}
63+
64+
variable "apm_domain_state" {
65+
default = "ACTIVE"
66+
}
67+
68+
variable "data_key_data_key_type" {
69+
default = "PRIVATE"
70+
}
71+
72+
provider "oci" {
73+
tenancy_ocid = var.tenancy_ocid
74+
user_ocid = var.user_ocid
75+
fingerprint = var.fingerprint
76+
private_key_path = var.private_key_path
77+
region = var.region
78+
}
79+
80+
resource "oci_apm_apm_domain" "test_apm_domain" {
81+
#Required
82+
compartment_id = var.compartment_ocid
83+
display_name = var.apm_domain_display_name
84+
85+
#Optional
86+
description = var.apm_domain_description
87+
freeform_tags = var.apm_domain_freeform_tags
88+
is_free_tier = true
89+
}
90+
91+
92+
resource "oci_apm_config_config" "test_config" {
93+
#Required
94+
apm_domain_id = oci_apm_apm_domain.test_apm_domain.id
95+
config_type = var.config_config_type
96+
management_agent_id = var.management_agent_ocid
97+
process_filter = var.process_filter
98+
run_as_user = var.run_as_user
99+
service_name = var.service_name
100+
agent_version = var.agent_version
101+
attach_install_dir = var.attach_install_dir
102+
103+
#Optional
104+
display_name = var.display_name
105+
}
106+
107+
data "oci_apm_config_configs" "test_configs" {
108+
#Required
109+
apm_domain_id = oci_apm_apm_domain.test_apm_domain.id
110+
111+
#Optional
112+
config_type = var.config_config_type
113+
}

‎examples/apm/apm_traces/attribute/main.tf‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
// Copyright (c) 2017, 2025, 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 "apm_domain_id" {}
10+
11+
variable "attribute_auto_activate_status_data_key_type" {
12+
default = "PRIVATE_DATA_KEY"
13+
}
14+
15+
16+
17+
provider "oci" {
18+
tenancy_ocid = var.tenancy_ocid
19+
user_ocid = var.user_ocid
20+
fingerprint = var.fingerprint
21+
private_key_path = var.private_key_path
22+
region = var.region
23+
}
24+
25+
data "oci_apm_traces_attribute_auto_activate_status" "test_attribute_auto_activate_status" {
26+
#Required
27+
apm_domain_id = var.apm_domain_id
28+
data_key_type = var.attribute_auto_activate_status_data_key_type
29+
}

‎examples/apm/apm_traces/log/main.tf‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
// Copyright (c) 2017, 2025, 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 "apm_domain_id" {}
10+
11+
variable "log_log_key" {
12+
default = "logKey"
13+
}
14+
15+
variable "log_time_log_ended_less_than" {
16+
default = "2025-05-23T00:00:00Z"
17+
}
18+
19+
variable "log_time_log_started_greater_than_or_equal_to" {
20+
default = "2025-05-18T00:00:00Z"
21+
}
22+
23+
24+
25+
provider "oci" {
26+
tenancy_ocid = var.tenancy_ocid
27+
user_ocid = var.user_ocid
28+
fingerprint = var.fingerprint
29+
private_key_path = var.private_key_path
30+
region = var.region
31+
}
32+
33+
data "oci_apm_traces_log" "test_log" {
34+
#Required
35+
apm_domain_id = var.apm_domain_id
36+
log_key = var.log_log_key
37+
time_log_ended_less_than = var.log_time_log_ended_less_than
38+
time_log_started_greater_than_or_equal_to = var.log_time_log_started_greater_than_or_equal_to
39+
}

0 commit comments

Comments
 (0)