Merge pull request #2069 from oracle/release_gh

Releasing version 5.34.0

Author: vsin12

CHANGELOG.md

@@ -12,7 +12,17 @@ variable "trace_trace_key" {
   default = "traceKey"
 }
 
+variable "trace_time_trace_started_greater_than_or_equal_to" {
+  default = "YYYY-MM-DDTHH:MM:SS.SSSZ"
+}
+
+variable "trace_time_trace_started_less_than" {
+  default = "YYYY-MM-DDTHH:MM:SS.SSSZ"
+}
 
+variable "trace_trace_namespace" {
+  default = "TRACES"
+}
 
 provider "oci" {
   tenancy_ocid     = var.tenancy_ocid
@@ -26,5 +36,11 @@ data "oci_apm_traces_trace" "test_trace" {
   #Required
   apm_domain_id = var.apm_domain_id
   trace_key     = var.trace_trace_key
+
+  #Optional
+  trace_namespace = var.trace_trace_namespace
+  time_trace_started_greater_than_or_equal_to = var.trace_time_trace_started_greater_than_or_equal_to
+  time_trace_started_less_than = var.trace_time_trace_started_less_than
+
 }
 

examples/apm/apm_traces/trace/trace.tf

@@ -12,6 +12,21 @@ variable "trace_aggregated_snapshot_data_trace_key" {
   default = "traceKey"
 }
 
+variable "trace_aggregated_snapshot_data_server_name" {
+  default = "serverName"
+}
+
+variable "trace_aggregated_snapshot_data_service_name" {
+  default = "serviceName"
+}
+
+variable "trace_aggregated_snapshot_data_span_key" {
+  default = "spanKey"
+}
+
+variable "trace_aggregated_snapshot_data_span_name" {
+  default = "spanName"
+}
 
 provider "oci" {
   tenancy_ocid     = var.tenancy_ocid
@@ -25,5 +40,11 @@ data "oci_apm_traces_trace_aggregated_snapshot_data" "test_trace_aggregated_snap
   #Required
   apm_domain_id = var.apm_domain_id
   trace_key     = var.trace_aggregated_snapshot_data_trace_key
+
+  #Optional
+  server_name = var.trace_aggregated_snapshot_data_server_name
+  service_name = var.trace_aggregated_snapshot_data_service_name
+  span_key = var.trace_aggregated_snapshot_data_span_key
+  span_name = var.trace_aggregated_snapshot_data_span_name
 }
 

examples/apm/apm_traces/trace_aggregated_snapshot_data/trace_aggregated_snapshot_data.tf

@@ -38,6 +38,16 @@ variable certificate_secret_id {
 variable domain_id {
   default = ""
 }
+
+variable subnet_id {
+  default = ""
+}
+
+variable nsg_id {
+  default = ""
+}
+
+
 provider "oci" {
   tenancy_ocid     = var.tenancy_ocid
   user_ocid        = var.user_ocid
@@ -49,10 +59,9 @@ provider "oci" {
 resource "oci_integration_integration_instance" "test_integration_instance" {
   #Required
   compartment_id            = var.compartment_id
-  display_name              = "instance4643"
   integration_instance_type = "STANDARDX"
   shape                     = "DEVELOPMENT"
-  # shape                     = "PRODUCTION"
+  display_name              = "displayName"
   is_byol                   = "false"
   message_packs             = "10"
   domain_id                 = var.domain_id
@@ -72,27 +81,14 @@ resource "oci_integration_integration_instance" "test_integration_instance" {
 #  is_file_server_enabled = true
 #  is_visual_builder_enabled = true
 #  state                  = "ACTIVE"
-
-# For stand / enterprise type only
-#  network_endpoint_details {
-#    allowlisted_http_ips = ["10.0.0.0/28"]
-#    allowlisted_http_vcns {
-#      allowlisted_ips = ["0.0.0.0/0"]
-#      id = "${var.allow_listed_http_vcn}"
-#    }
-#    is_integration_vcn_allowlisted = "false"
-#    network_endpoint_type = "PUBLIC"
-#  }
-
 }
 
 data "oci_integration_integration_instances" "test_integration_instances" {
   #Required
   compartment_id = var.compartment_id
 
-  #Optional
-#  display_name = "displayName"
-#  state        = "Active"
+  display_name = "displayName"
+  state        = "Active"
 }
 
 data "oci_integration_integration_instance" "test_integration_instance" {
@@ -111,3 +107,9 @@ resource "oci_integration_integration_instance" "test_integration_instance_idcs"
   message_packs             = "10"
   idcs_at                   = var.integration_instance_idcs_access_token
 }
+
+resource "oci_integration_private_endpoint_outbound_connection" "integration_private_endpoint" {
+  integration_instance_id = oci_integration_integration_instance.test_integration_instance.id
+  nsg_ids = [var.nsg_id]
+  subnet_id = var.subnet_id
+}