Skip to content

Commit a0b36c0

Browse files
sagarp337sagarp337
authored
Merge pull request #2377 from oracle/release_gh
Releasing version 7.0.0
2 parents 2306968 + f2e18db commit a0b36c0

File tree

1,040 files changed

+38642
-76897
lines changed

Some content is hidden

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

1,040 files changed

+38642
-76897
lines changed

‎CHANGELOG.md‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
## 7.0.0 (May 06, 2025)
2+
3+
### Added
4+
- deprecated service mesh
5+
- deprecated OS Management Service
6+
- filter to ListSystemVersions api to get Latest Versions only
7+
- Support for Logging Analytics Ironwood Release
8+
- Support for new migration phase to current list
9+
110
## 6.37.0 (April 30, 2025)
211

312
### Added

‎examples/databasemigration/job/issue_action.tf‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,15 @@
1-
variable "job_ocid" {}
1+
variable "job_ocid" {
2+
default = ""
3+
}
24

35
variable "job_id" {
46
default = ""
57
}
68

9+
variable "migration_id" {
10+
default = ""
11+
}
12+
713
variable "tenancy_ocid" {
814
default = ""
915
}
@@ -30,4 +36,8 @@ provider "oci" {
3036
}
3137
data "oci_database_migration_job" "test_job" {
3238
job_id = var.job_id
39+
}
40+
41+
output "phase_list" {
42+
value = data.oci_database_migration_job.test_job.progress
3343
}

‎examples/log_analytics/categories/catgories.tf‎

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
1+
// Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
22
// Licensed under the Mozilla Public License v2.0
33

44
/*
@@ -53,7 +53,7 @@ resource "oci_log_analytics_log_analytics_resource_categories_management" "VCN_D
5353
namespace = data.oci_objectstorage_namespace.ns.namespace
5454
resource_id = "VCN_DB1"
5555
resource_type = "DASHBOARD"
56-
resource_categories = ["oracle", "oci", "network"]
56+
resource_categories = ["oracle", "linux", "database"]
5757
}
5858

5959
# Fetch all category assignments of dashboard named VCN_DB1
@@ -62,4 +62,31 @@ data "oci_log_analytics_log_analytics_resource_categories_list" "VCN_DB1_categor
6262
namespace = data.oci_objectstorage_namespace.ns.namespace
6363
resource_ids = "VCN_DB1"
6464
resource_types = "DASHBOARD"
65+
}
66+
67+
# Create a lookup with categories
68+
resource "oci_log_analytics_namespace_lookup" "TFLookup" {
69+
compartment_id = var.compartment_ocid
70+
namespace = data.oci_objectstorage_namespace.ns.namespace
71+
lookup_name = "TFLookup"
72+
type = "Lookup"
73+
description = "A simple lookup"
74+
register_lookup_file = "./files/vendor.csv"
75+
76+
categories {
77+
name = "database"
78+
type = "TIER"
79+
}
80+
81+
categories {
82+
name = "oracle"
83+
type = "VENDOR"
84+
}
85+
}
86+
87+
# Fetch all category assignments in compartment
88+
data "oci_log_analytics_log_analytics_resource_categories_list" "compartment_resource_categories_list" {
89+
depends_on = [oci_log_analytics_namespace_lookup.TFLookup]
90+
namespace = data.oci_objectstorage_namespace.ns.namespace
91+
compartment_id = var.compartment_ocid
6592
}

‎examples/log_analytics/categories/files/vendor.csv‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
id,name,city,profitmodel
2+
V001,711 LLC,Hartford,5050
3+
V002,Electra Corp,New Jersey,6040
4+
V003,Mutual Smiles LLC,Greenfield,7030
5+
V004,La Marvella,Hershire,5050
6+
V005,Cuppa Coffee,New Jersey,5050

‎examples/log_analytics/fields/field.tf‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
// Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
2+
// Licensed under the Mozilla Public License v2.0
3+
4+
/*
5+
* This example shows how to use terraform feature of fields
6+
*/
7+
8+
variable "tenancy_ocid" {}
9+
variable "user_ocid" {}
10+
variable "fingerprint" {}
11+
variable "private_key_path" {}
12+
variable "compartment_ocid" {}
13+
variable "region" {}
14+
15+
provider "oci" {
16+
tenancy_ocid = var.tenancy_ocid
17+
user_ocid = var.user_ocid
18+
fingerprint = var.fingerprint
19+
private_key_path = var.private_key_path
20+
region = var.region
21+
}
22+
23+
# Fetch namespace name from object store GET /n
24+
data "oci_objectstorage_namespace" "ns" {
25+
compartment_id = var.compartment_ocid
26+
}
27+
28+
# Fetch usages of a field named "actn"
29+
data "oci_log_analytics_namespace_field_usage" "actn_field_usage" {
30+
namespace = data.oci_objectstorage_namespace.ns.namespace
31+
field_name = "actn"
32+
}

‎examples/log_analytics/lookups/files/append.csv‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
id,name,city,profitmodel
2+
V008,Roebeck Hills,Orlando,8020
3+
V009,Phoenix LLC,La Brea,5050

‎examples/log_analytics/lookups/files/update.csv‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
id,name,city,profitmodel
2+
V001,711 LLC,Hartford,5050
3+
V002,Electra Corp,New Jersey,6040
4+
V003,Mutual Smiles LLC,Greenfield,7030
5+
V004,La Marvella,Hershire,5050
6+
V005,Cuppa Coffee,New Jersey,5050
7+
V006,Limelight Inc,Washington,7525
8+
V007,Purple Meadows,Detroit,6040

‎examples/log_analytics/lookups/files/vendor.csv‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
id,name,city,profitmodel
2+
V001,711 LLC,Hartford,5050
3+
V002,Electra Corp,New Jersey,6040
4+
V003,Mutual Smiles LLC,Greenfield,7030
5+
V004,La Marvella,Hershire,5050
6+
V005,Cuppa Coffee,New Jersey,5050

‎examples/log_analytics/lookups/lookup.tf‎

Lines changed: 122 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,122 @@
1+
// Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
2+
// Licensed under the Mozilla Public License v2.0
3+
4+
/*
5+
* This example shows how to manage log analytics lookup resource
6+
*/
7+
8+
variable "tenancy_ocid" {}
9+
variable "user_ocid" {}
10+
variable "fingerprint" {}
11+
variable "private_key_path" {}
12+
variable "compartment_ocid" {}
13+
variable "region" {}
14+
15+
provider "oci" {
16+
tenancy_ocid = var.tenancy_ocid
17+
user_ocid = var.user_ocid
18+
fingerprint = var.fingerprint
19+
private_key_path = var.private_key_path
20+
region = var.region
21+
}
22+
23+
# Fetch namespace name from object store GET /n
24+
data "oci_objectstorage_namespace" "ns" {
25+
compartment_id = var.compartment_ocid
26+
}
27+
28+
// Create a simple lookup
29+
resource "oci_log_analytics_namespace_lookup" "TFLookup" {
30+
compartment_id = var.tenancy_ocid
31+
namespace = data.oci_objectstorage_namespace.ns.namespace
32+
lookup_name = "TFLookup"
33+
type = "Lookup"
34+
register_lookup_file = "./files/vendor.csv"
35+
36+
description = "A simple lookup"
37+
char_encoding = "UTF-8"
38+
is_hidden = false
39+
freeform_tags = {"servicegroup" = "test", "Dept" = "Devops"}
40+
defined_tags = {"Oracle-Recommended-Tags.ResourceAuthorizedUser" = "test"}
41+
}
42+
43+
# Create a simple lookup with tags
44+
resource "oci_log_analytics_namespace_lookup" "TFLookupWithTags" {
45+
compartment_id = var.tenancy_ocid
46+
namespace = data.oci_objectstorage_namespace.ns.namespace
47+
lookup_name = "TFLookupWithTags"
48+
type = "Lookup"
49+
register_lookup_file = "./files/vendor.csv"
50+
51+
description = "A simple lookup with tags"
52+
freeform_tags = {"servicegroup" = "test", "Dept" = "Devops"}
53+
defined_tags = {"Oracle-Recommended-Tags.ResourceAuthorizedUser" = "test"}
54+
}
55+
56+
# Create a simple lookup with all attributes like categories and fields
57+
resource "oci_log_analytics_namespace_lookup" "TFLookupAll" {
58+
compartment_id = var.tenancy_ocid
59+
namespace = data.oci_objectstorage_namespace.ns.namespace
60+
lookup_name = "TFLookupAll"
61+
type = "Lookup"
62+
register_lookup_file = "./files/vendor.csv"
63+
64+
description = "A simple lookup with all attributes"
65+
freeform_tags = {"servicegroup" = "test", "Dept" = "Devops"}
66+
defined_tags = {"Oracle-Recommended-Tags.ResourceAuthorizedUser" = "test"}
67+
68+
char_encoding = "UTF-8"
69+
default_match_value = "WILDCARD"
70+
is_hidden = false
71+
max_matches = 25
72+
73+
categories {
74+
name = "database"
75+
type = "TIER"
76+
}
77+
78+
categories {
79+
name = "oracle"
80+
type = "VENDOR"
81+
}
82+
83+
fields {
84+
name = "name"
85+
match_operator = "WILDCARD"
86+
}
87+
88+
fields {
89+
name = "profitmodel"
90+
match_operator = "WILDCARD"
91+
}
92+
93+
lifecycle {
94+
ignore_changes = [
95+
fields, defined_tags
96+
]
97+
}
98+
}
99+
100+
# Append data to a lookup
101+
resource "oci_log_analytics_namespace_lookups_append_data_management" "appendData" {
102+
namespace = data.oci_objectstorage_namespace.ns.namespace
103+
lookup_name = oci_log_analytics_namespace_lookup.TFLookup.lookup_name
104+
append_lookup_file = "./files/append.csv"
105+
106+
depends_on = [oci_log_analytics_namespace_lookup.TFLookup]
107+
}
108+
109+
# Update data of a lookup
110+
resource "oci_log_analytics_namespace_lookups_update_data_management" "updateData" {
111+
namespace = data.oci_objectstorage_namespace.ns.namespace
112+
lookup_name = oci_log_analytics_namespace_lookup.TFLookup.lookup_name
113+
update_lookup_file = "./files/update.csv"
114+
115+
depends_on = [oci_log_analytics_namespace_lookups_append_data_management.appendData]
116+
}
117+
118+
# Get details of a lookup
119+
data "oci_log_analytics_namespace_lookup" "BEALookup" {
120+
namespace = data.oci_objectstorage_namespace.ns.namespace
121+
lookup_name = "omc_beaerrmsgs"
122+
}

‎examples/log_analytics/object_collection_rule/object_collection_rule.tf‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ variable "log_analytics_log_group_id" {}
2929
variable "log_analytics_entity_id" {}
3030
variable "object_collection_rule_bucket_name" {}
3131
variable "object_collection_rule_bucket_name_log_events" {}
32+
variable "object_collection_stream_id" {}
3233

3334
variable "object_collection_rule_name" {
3435
default = "tf-obj-coll-example-opt"
@@ -103,6 +104,7 @@ resource "oci_log_analytics_log_analytics_object_collection_rule" "objectCollect
103104
log_source_name = "LinuxSyslogSource"
104105
os_bucket_name = var.object_collection_rule_bucket_name
105106
os_namespace = data.oci_objectstorage_namespace.ns.namespace
107+
stream_id = var.object_collection_stream_id
106108
}
107109

108110
# Get details of above created object collection rule with required parameters
@@ -154,7 +156,6 @@ resource "oci_log_analytics_log_analytics_object_collection_rule" "objectCollect
154156
namespace = data.oci_objectstorage_namespace.ns.namespace
155157
name = var.object_collection_rule_name_log_events
156158
log_group_id = var.log_analytics_log_group_id
157-
log_source_name = var.object_collection_rule_log_source_name
158159
os_bucket_name = var.object_collection_rule_bucket_name_log_events
159160
os_namespace = data.oci_objectstorage_namespace.ns.namespace
160161
collection_type = var.object_collection_rule_collection_type

0 commit comments

Comments
 (0)