Merge pull request #2044 from oracle/release_gh

Releasing version 5.29.0

Author: tf-oci-pub

CHANGELOG.md

@@ -1,3 +1,12 @@
+## 5.29.0 (February 14, 2024)
+
+### Added
+- Support for ADB-S: Replicating backups across regions for Cross-Region DR
+- Support for Logging Analytics Hemlock Release
+- Support for Network Path Analyzer: Support Overlapping Cidr
+### Bug Fix
+- Fix Addon Configuration Update
+
 ## 5.28.0 (February 07, 2024)
 
 ### Added

examples/container_engine/addons/main.tf

@@ -1,39 +1,22 @@
 // Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
 // Licensed under the Mozilla Public License v2.0
-variable "user_ocid" {
-}
-
-variable "fingerprint" {
-}
-
-variable "private_key_path" {
-}
-
 variable "region" {
   default = "us-ashburn-1"
 }
 
-
 variable "tenancy_ocid" {
 }
 
-variable "cluster_id" {
-
-}
-
-variable "kubernetes_version" {
-
+variable "config_file_profile" {
 }
 
 variable "compartment_ocid" {
 }
 
 provider "oci" {
-  region           = var.region
-  tenancy_ocid     = var.tenancy_ocid
-  user_ocid        = var.user_ocid
-  fingerprint      = var.fingerprint
-  private_key_path = var.private_key_path
+  region              = var.region
+  auth                = "SecurityToken"
+  config_file_profile = var.config_file_profile
 }
 
 /*
@@ -142,6 +125,7 @@ data "oci_containerengine_cluster_option" "test_cluster_option" {
 
 data "oci_containerengine_node_pool_option" "test_node_pool_option" {
   node_pool_option_id = "all"
+  compartment_id = var.compartment_ocid
 }
 
 data "oci_core_images" "shape_specific_images" {

examples/database/adb/adb_dr/adb_cross_region_dr.tf

@@ -0,0 +1,66 @@
+// Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+// Licensed under the Mozilla Public License v2.0
+
+resource "random_string" "autonomous_database_admin_password" {
+  length      = 16
+  min_numeric = 1
+  min_lower   = 1
+  min_upper   = 1
+  min_special = 1
+}
+resource "time_sleep" "wait_300_seconds" {
+  destroy_duration = "5m"
+  depends_on = [oci_database_autonomous_database.autonomous_database_cross_region_dr_primary]
+}
+
+resource "oci_database_autonomous_database" "autonomous_database_cross_region_dr_primary" {
+  admin_password           = random_string.autonomous_database_admin_password.result
+  compartment_id           = var.compartment_id
+  cpu_core_count           = "1"
+  data_storage_size_in_tbs = "1"
+  db_name                  = "adbdb11ff2"
+  db_version               = "19c"
+  license_model            = "LICENSE_INCLUDED"
+  is_free_tier             = "false"
+}
+
+resource "oci_database_autonomous_database" "autonomous_database_cross_region_dr_standby" {
+  #Note: this should be provisioned in another region as the source database.
+  provider = oci.peer_region
+
+  #Required for cross-region standby
+  compartment_id           = var.compartment_id
+  source    = "CROSS_REGION_DISASTER_RECOVERY"
+  source_id = oci_database_autonomous_database.autonomous_database_cross_region_dr_primary.id
+  db_name = oci_database_autonomous_database.autonomous_database_cross_region_dr_primary.db_name
+  is_replicate_automatic_backups = "true"
+}
+
+data "oci_database_autonomous_databases" "autonomous_databases" {
+  filter {
+    name   = "id"
+    values = [oci_database_autonomous_database.autonomous_database_cross_region_dr_standby.id]
+  }
+
+  filter {
+    name   = "peer_db_ids"
+    values = [oci_database_autonomous_database.autonomous_database_cross_region_dr_primary.id]
+  }
+
+  filter {
+    name   = "role"
+    values = ["STANDBY"]
+  }
+
+  #Required
+  compartment_id = var.compartment_id
+
+  #Optional
+  display_name = oci_database_autonomous_database.autonomous_database_cross_region_dr_standby.display_name
+}
+
+output "autonomous_databases" {
+  value = data.oci_database_autonomous_databases.autonomous_databases.autonomous_databases
+}
+
+

examples/database/adb/adb_dr/provider.tf

@@ -0,0 +1,42 @@
+// Copyright (c) 2017, 2022, 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" {
+  default = "us-phoenix-1"
+}
+
+variable "peer_region" {
+  default = "us-ashburn-1"
+}
+
+variable "compartment_id" {
+}
+
+provider "oci" {
+  region           = var.region
+  tenancy_ocid     = var.tenancy_ocid
+  user_ocid        = var.user_ocid
+  fingerprint      = var.fingerprint
+  private_key_path = var.private_key_path
+}
+
+provider "oci" {
+  alias            = "peer_region"
+  region           = var.peer_region
+  tenancy_ocid     = var.tenancy_ocid
+  user_ocid        = var.user_ocid
+  fingerprint      = var.fingerprint
+  private_key_path = var.private_key_path
+}

examples/log_analytics/entity.tf renamed to examples/log_analytics/entity/entity.tf

@@ -29,6 +29,19 @@ resource "oci_log_analytics_log_analytics_entity" "entityOptional" {
   entity_type_name        = "Host (Linux)"
   management_agent_id     = var.managed_agent_id
   hostname                = "aa.domainname.com"
+  time_last_discovered    = "2023-09-12T20:30:00.006Z"
+  metadata {
+    items {
+      name      = "environment1"
+      type     = "infrastructure1"
+      value    = "test1"
+    } 
+    items {
+      name      = "environment2"
+      type     = "infrastructure2"
+      value    = "test2"
+    }
+  }
   timezone_region         = "PST8PDT"
   properties              = tomap({"JAVA_HOME" = "/usr/java/jdk1.8.0_202-amd64", "version" = "OEL-7uek"})
   freeform_tags           = tomap({"servicegroup" = "test", "Dept" = "Devops"})

examples/log_analytics/entity_topology/entity_topology.tf renamed to examples/log_analytics/entity/entity_topology.tf

@@ -26,7 +26,7 @@ data "oci_objectstorage_namespace" "ns" {
 }
 
 # Sample create entity with required parameters.
-resource "oci_log_analytics_log_analytics_entity" "entityRequired" {
+resource "oci_log_analytics_log_analytics_entity" "entityTopologyRequired" {
   compartment_id          = var.compartment_ocid
   namespace               = data.oci_objectstorage_namespace.ns.namespace
   name                    = "tf-entity-example-topo-req"
@@ -36,12 +36,27 @@ resource "oci_log_analytics_log_analytics_entity" "entityRequired" {
 # Get entity topo details of above created entity with required parameters
 data "oci_log_analytics_log_analytics_entity_topology" "entityTopoRequiredDetails" {
   namespace               = data.oci_objectstorage_namespace.ns.namespace
-  log_analytics_entity_id = oci_log_analytics_log_analytics_entity.entityRequired.id
+  log_analytics_entity_id = oci_log_analytics_log_analytics_entity.entityTopologyRequired.id
 }
 
 # Get entity topo details of above created entity with required parameters
 data "oci_log_analytics_log_analytics_entity_topology" "entityTopoOptionalDetails" {
   namespace               = data.oci_objectstorage_namespace.ns.namespace
-  log_analytics_entity_id = oci_log_analytics_log_analytics_entity.entityRequired.id
+  log_analytics_entity_id = oci_log_analytics_log_analytics_entity.entityTopologyRequired.id
   state                   = "ACTIVE"
 }
+
+# Sample create entity with optional parameters
+resource "oci_log_analytics_log_analytics_entity" "entityTopologyOptional" {
+  compartment_id          = var.compartment_ocid
+  namespace               = data.oci_objectstorage_namespace.ns.namespace
+  name                    = "tf-entity-example-opt"
+  entity_type_name        = "Host (Linux)"
+  metadata {
+    items {
+      name      = "environment"
+      type     = "infrastructure"
+      value    = "test"
+    }
+  }
+}

examples/log_analytics/ingest_time_rules/ingest_time_rule.tf

@@ -98,8 +98,6 @@ resource "oci_log_analytics_namespace_ingest_time_rules_management" "ingest_time
 data "oci_log_analytics_namespace_ingest_time_rule" "ingest_time_rule" {
   namespace        = data.oci_objectstorage_namespace.ns.namespace
   ingest_time_rule_id = oci_log_analytics_namespace_ingest_time_rule.ingest_time_rule_full.id
-
-  depends_on = [oci_log_analytics_namespace_ingest_time_rule.ingest_time_rule_full]
 }
 
 # Fetch all ingest time rules in a compartment (with options and filter)
@@ -116,8 +114,6 @@ data "oci_log_analytics_namespace_ingest_time_rules" "ingest_time_rules" {
     name = "id"
     values = [oci_log_analytics_namespace_ingest_time_rule.ingest_time_rule_full.id]
   }
-
-  depends_on = [oci_log_analytics_namespace_ingest_time_rule.ingest_time_rule_minimal, oci_log_analytics_namespace_ingest_time_rule.ingest_time_rule_full]
 }
 
 # Fetch all rules (INGEST_TIME and/or SAVED_SEARCH) in a compartment
@@ -127,14 +123,20 @@ data "oci_log_analytics_namespace_rules" "rules" {
   display_name     = "displayName"
   kind             = "INGEST_TIME"
   state            = "ACTIVE"
+}
 
-  depends_on = [oci_log_analytics_namespace_ingest_time_rule.ingest_time_rule_minimal, oci_log_analytics_namespace_ingest_time_rule.ingest_time_rule_full]
+# Fetch all rules (INGEST_TIME and/or SAVED_SEARCH) in a compartment with target_service=MONITORING
+data "oci_log_analytics_namespace_rules" "rules_target_monitoring" {
+  compartment_id   = var.compartment_ocid
+  namespace        = data.oci_objectstorage_namespace.ns.namespace
+  display_name     = "displayName"
+  kind             = "INGEST_TIME"
+  target_service   = "MONITORING"
+  state            = "ACTIVE"
 }
 
 # Fetch rules summary
 data "oci_log_analytics_namespace_rules_summary" "rules_summary" {
   compartment_id   = var.compartment_ocid
   namespace        = data.oci_objectstorage_namespace.ns.namespace
-
-  depends_on = [oci_log_analytics_namespace_ingest_time_rule.ingest_time_rule_minimal, oci_log_analytics_namespace_ingest_time_rule.ingest_time_rule_full]
-}
+}

examples/log_analytics/object_collection_rule/object_collection_rule.tf

@@ -28,13 +28,20 @@ data "oci_objectstorage_namespace" "ns" {
 variable "log_analytics_log_group_id" {}
 variable "log_analytics_entity_id" {}
 variable "object_collection_rule_bucket_name" {}
+variable "object_collection_rule_bucket_name_log_events" {}
 
 variable "object_collection_rule_name" {
   default = "tf-obj-coll-example-opt"
 }
+variable "object_collection_rule_name_log_events" {
+  default = "tf-obj-coll-example-log-events"
+}
 variable "object_collection_rule_freeform_tags" {
   default = { "servicegroup" = "test", "Dept" = "Devops" }
 }
+variable "object_collection_rule_log_type" {
+  default = "LOG"
+}
 variable "object_collection_rule_log_source_name" {
   default = "LinuxSyslogSource"
 }
@@ -44,6 +51,9 @@ variable "object_collection_rule_description" {
 variable "object_collection_rule_collection_type" {
   default = "HISTORIC"
 }
+variable "object_collection_rule_is_force_historic_collection" {
+  default = "false"
+}
 variable "object_collection_rule_poll_since" {
   default = "2020-04-01T00:00:00.000Z"
 }
@@ -107,11 +117,13 @@ resource "oci_log_analytics_log_analytics_object_collection_rule" "objectCollect
   namespace                  = data.oci_objectstorage_namespace.ns.namespace
   name                       = var.object_collection_rule_name
   log_group_id               = var.log_analytics_log_group_id
+  log_type                   = var.object_collection_rule_log_type
   log_source_name            = var.object_collection_rule_log_source_name
   os_bucket_name             = var.object_collection_rule_bucket_name
   os_namespace               = data.oci_objectstorage_namespace.ns.namespace
   description                = var.object_collection_rule_description
   collection_type            = var.object_collection_rule_collection_type
+  is_force_historic_collection = var.object_collection_rule_is_force_historic_collection
   log_set                    = var.object_collection_rule_log_set
   log_set_ext_regex          = var.object_collection_rule_log_set_ext_regex
   log_set_key                = var.object_collection_rule_log_set_key
@@ -136,6 +148,24 @@ resource "oci_log_analytics_log_analytics_object_collection_rule" "objectCollect
   is_enabled = var.object_collection_rule_is_enabled
 }
 
+# Create a object collection rule with optional parameters
+resource "oci_log_analytics_log_analytics_object_collection_rule" "objectCollectionRuleLogEventsType" {
+  compartment_id             = var.compartment_ocid
+  namespace                  = data.oci_objectstorage_namespace.ns.namespace
+  name                       = var.object_collection_rule_name_log_events
+  log_group_id               = var.log_analytics_log_group_id
+  log_source_name            = var.object_collection_rule_log_source_name
+  os_bucket_name             = var.object_collection_rule_bucket_name_log_events
+  os_namespace               = data.oci_objectstorage_namespace.ns.namespace
+  collection_type            = var.object_collection_rule_collection_type
+  log_set                    = var.object_collection_rule_log_set
+  poll_since                 = var.object_collection_rule_poll_since
+  poll_till                  = var.object_collection_rule_poll_till
+  freeform_tags              = var.object_collection_rule_freeform_tags
+  log_type                   = "LOG_EVENTS"
+  is_enabled = var.object_collection_rule_is_enabled
+}
+
 # Get details of above created object collection rule with optional parameters
 data "oci_log_analytics_log_analytics_object_collection_rule" "objectCollectionRuleOptionalDetails" {
   namespace                  = data.oci_objectstorage_namespace.ns.namespace

examples/log_analytics/storage_recall/recall.tf

@@ -76,6 +76,22 @@ output "overlapping_recalls_all_status" {
   value = data.oci_log_analytics_namespace_storage_overlapping_recalls.overlapping_recalls_all.overlapping_recall_collection[0].items[0].status
 }
 
+output "overlapping_recalls_all_collection_id" {
+  value = data.oci_log_analytics_namespace_storage_overlapping_recalls.overlapping_recalls_all.overlapping_recall_collection[0].items[0].collection_id
+}
+
+output "overlapping_recalls_all_recall_id" {
+  value = data.oci_log_analytics_namespace_storage_overlapping_recalls.overlapping_recalls_all.overlapping_recall_collection[0].items[0].recall_id
+}
+
 output "overlapping_recalls_range_status" {
   value = data.oci_log_analytics_namespace_storage_overlapping_recalls.overlapping_recalls_range.overlapping_recall_collection[0].items[0].status
-}
+}
+
+output "overlapping_recalls_range_collection_id" {
+  value = data.oci_log_analytics_namespace_storage_overlapping_recalls.overlapping_recalls_range.overlapping_recall_collection[0].items[0].collection_id
+}
+
+output "overlapping_recalls_range_recall_id" {
+  value = data.oci_log_analytics_namespace_storage_overlapping_recalls.overlapping_recalls_range.overlapping_recall_collection[0].items[0].recall_id
+}