Merge branch 'main' of https://github.com/oracle-quickstart/oci-weblogic-server into main

Sarada Kommalapati · Sarada Kommalapati · commit 1fdc12f69a3f · 2025-07-20T22:46:08.000-07:00
diff --git a/terraform/images/mp_image_ee_byol.tfvars b/terraform/images/mp_image_ee_byol.tfvars
@@ -1,12 +1,13 @@
 # Copyright (c) 2023,2024, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
-tf_script_version        = "25.1.3-250310205030"
+tf_script_version        = "25.3.1-250719002626"
 use_marketplace_image    = true
 listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaawd5ti5ldjzdppppi675onvo3mvjcwt64jjey7rib3beau2ngkl2q"
-listing_resource_version = "25.1.3-ol8.8-23.12.13-250310-1"
-instance_image_id        = "ocid1.image.oc1..aaaaaaaa2vaqsz6evogb5jr2dhpdlbyqcnyydpcdljpi5plemo2roru6ld3a"
+listing_resource_version = "25.3.1-ol8.8-23.12.13-250719-1"
+instance_image_id        = "ocid1.image.oc1..aaaaaaaau76znd35hrciub7wfojcgfq435bqpehv4ry4fcmom74b7l7zw4ta"
 
 ucm_listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaa653zc2e4fsem5hhwinmfgnv3xp4dmbq6c6gvf45okxf6xz3smhiq"
-ucm_listing_resource_version = "25.1.3-ol8.8-23.12.13-250310-1"
-ucm_instance_image_id        = "ocid1.image.oc1..aaaaaaaat4dyc73wuxeccdsegmjgdbt7v3xxtdcwo6hgbvdep5xe2mybvmva"
+ucm_listing_resource_version = "25.3.1-ol8.8-23.12.13-250719-1"
+ucm_instance_image_id        = "ocid1.image.oc1..aaaaaaaajf5gc2zhxbzbfhvnujt6k2do3rd4wfjqspuq6gmtm2qhhberjttq"
+
diff --git a/terraform/images/mp_image_ee_ucm.tfvars b/terraform/images/mp_image_ee_ucm.tfvars
@@ -1,8 +1,9 @@
 # Copyright (c) 2023,2024, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
-tf_script_version        = "25.1.3-250310205030"
+tf_script_version        = "25.3.1-250719002626"
 use_marketplace_image    = true
 listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaa653zc2e4fsem5hhwinmfgnv3xp4dmbq6c6gvf45okxf6xz3smhiq"
-listing_resource_version = "25.1.3-ol8.8-23.12.13-250310-1"
-instance_image_id        = "ocid1.image.oc1..aaaaaaaat4dyc73wuxeccdsegmjgdbt7v3xxtdcwo6hgbvdep5xe2mybvmva"
+listing_resource_version = "25.3.1-ol8.8-23.12.13-250719-1"
+instance_image_id        = "ocid1.image.oc1..aaaaaaaajf5gc2zhxbzbfhvnujt6k2do3rd4wfjqspuq6gmtm2qhhberjttq"
+
diff --git a/terraform/images/mp_image_se_byol.tfvars b/terraform/images/mp_image_se_byol.tfvars
@@ -1,8 +1,8 @@
 # Copyright (c) 2023,2024, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
-tf_script_version        = "25.1.3-250310205030"
+tf_script_version        = "25.3.1-250719002626"
 use_marketplace_image    = true
 listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaaalcwal6mfwjbezzqyj3waoxrvigml4n3lcn3hfday3ozetjqn25a"
-listing_resource_version = "25.1.3-ol8.8-23.12.13-250310-1"
-instance_image_id        = "ocid1.image.oc1..aaaaaaaa3qzkazz7it2emgju5btaccnkro6wbz6mmbw7np3im6nky7srqsva"
+listing_resource_version = "25.3.1-ol8.8-23.12.13-250719-1"
+instance_image_id        = "ocid1.image.oc1..aaaaaaaajzkamkicy6azk2deaudb363i7z7elwniunootc3v6755p3kfjv3a"
diff --git a/terraform/images/mp_image_suite_byol.tfvars b/terraform/images/mp_image_suite_byol.tfvars
@@ -1,12 +1,12 @@
 # Copyright (c) 2023,2024, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
-tf_script_version        = "25.1.3-250310205030"
+tf_script_version        = "25.3.1-250719002626"
 use_marketplace_image    = true
 listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaajl5w3d76x5vdc4n7oqjpsxh4jtwivclvvp6gj4em3kufju6sftga"
-listing_resource_version = "25.1.3-ol8.8-23.12.13-250310-1"
-instance_image_id        = "ocid1.image.oc1..aaaaaaaa3qzkazz7it2emgju5btaccnkro6wbz6mmbw7np3im6nky7srqsva"
+listing_resource_version = "25.3.1-ol8.8-23.12.13-250719-1"
+instance_image_id        = "ocid1"
 
 ucm_listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaaq2vkow7zwkxg6ky4zxsnckdlfgtgmg7i4kkyev3y6zyo72mpkgza"
-ucm_listing_resource_version = "25.1.3-ol8.8-23.12.13-250310-1"
-ucm_instance_image_id        = "ocid1.image.oc1..aaaaaaaab346dek7j74rmxvm2hx2cquyncuvrxzwxyyswiqek4mwg52o4iia"
+ucm_listing_resource_version = "25.3.1-ol8.8-23.12.13-250719-1"
+ucm_instance_image_id        = "ocid1.image.oc1..aaaaaaaa45odr7hkyw7dm7x3ho2s57iywvwahf5654njhpb7f6fvziz4w42q"
diff --git a/terraform/images/mp_image_suite_ucm.tfvars b/terraform/images/mp_image_suite_ucm.tfvars
@@ -1,9 +1,8 @@
 # Copyright (c) 2023,2024, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
-tf_script_version        = "25.1.3-250310205030"
+tf_script_version        = "25.3.1-250719002626"
 use_marketplace_image    = true
 listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaaq2vkow7zwkxg6ky4zxsnckdlfgtgmg7i4kkyev3y6zyo72mpkgza"
-listing_resource_version = "25.1.3-ol8.8-23.12.13-250310-1"
-instance_image_id        = "ocid1.image.oc1..aaaaaaaab346dek7j74rmxvm2hx2cquyncuvrxzwxyyswiqek4mwg52o4iia"
-
+listing_resource_version = "25.3.1-ol8.8-23.12.13-250719-1"
+instance_image_id        = "ocid1.image.oc1..aaaaaaaa45odr7hkyw7dm7x3ho2s57iywvwahf5654njhpb7f6fvziz4w42q"
diff --git a/terraform/locals.tf b/terraform/locals.tf
@@ -190,6 +190,15 @@ locals {
   is_rms_private_endpoint_required  = var.is_rms_private_endpoint_required && var.wls_existing_vcn_id != "" && var.wls_subnet_id != "" && !local.assign_weblogic_public_ip ? true : false
   add_new_rms_private_endpoint      = local.is_rms_private_endpoint_required && var.add_rms_private_endpoint == "Create New Resource Manager Endpoint" ? true : false
   add_existing_rms_private_endpoint = local.is_rms_private_endpoint_required && var.add_rms_private_endpoint == "Use Existing Resource Manager Endpoint" ? true : false
+  
+  # OS Management Hub
+  enable_osmh                     = var.enable_osmh
+  select_existing_profile         = var.select_existing_profile
+  create_profile                  = (local.enable_osmh && !local.select_existing_profile) ? true : false
+  profile_ocid                    = local.select_existing_profile ? var.profile_ocid : ""
+  profile_compartment_id          = var.profile_compartment_id == "" ? var.compartment_ocid : var.profile_compartment_id
+  profile_name                    = var.profile_name == "" ? format("%s_profile", local.service_name_prefix) : var.profile_name
+
 
   # Secured Production Mode
   preserve_boot_properties          = var.configure_secure_mode ? var.preserve_boot_properties : true
diff --git a/terraform/main.tf b/terraform/main.tf
@@ -238,6 +238,9 @@ module "policies" {
   use_apm_service                  = local.use_apm_service
   apm_domain_compartment_id        = local.apm_domain_compartment_id
   use_autoscaling                  = var.use_autoscaling
+  enable_osmh                      = var.enable_osmh
+  profile_compartment_id           = var.profile_compartment_id
+
   ocir_auth_token_id               = var.ocir_auth_token_id
   add_fss                          = var.add_fss
   add_load_balancer                = local.add_load_balancer
@@ -483,6 +486,9 @@ module "validators" {
   wls_secondary_admin_password_id = local.wls_secondary_admin_password_id
   administration_port             = var.administration_port
   ms_administration_port          = var.ms_administration_port
+
+  profile_ocid            = local.profile_ocid
+  select_existing_profile = local.select_existing_profile
 }
 
 module "fss" {
@@ -588,6 +594,13 @@ module "observability-autoscaling" {
   }
 }
 
+module "observability-osmh"{
+  source              = "./modules/observability/osmh"
+  count               = local.create_profile ? 1 : 0
+  tenancy_id          = var.tenancy_ocid
+  display_name        = local.profile_name
+  compartment_id      = local.profile_compartment_id
+}
 
 module "compute" {
   source                 = "./modules/compute/wls_compute"
@@ -606,8 +619,7 @@ module "compute" {
   wls_subnet_id          = var.wls_subnet_id
   region                 = var.region
   ssh_public_key         = var.ssh_public_key
-  compute_nsg_ids        = local.compute_nsg_ids
-
+  compute_nsg_ids        = local.compute_nsg_ids  
   tenancy_id                = var.tenancy_ocid
   tf_script_version         = var.tf_script_version
   use_regional_subnet       = local.use_regional_subnet
@@ -632,6 +644,7 @@ module "compute" {
   wls_server_startup_args   = var.wls_server_startup_args
   wls_existing_vcn_id       = var.wls_existing_vcn_id
   create_policies           = var.create_policies
+  enable_osmh               = var.enable_osmh
   place_all_compute_in_same_ad = var.place_all_compute_in_same_ad
 
   # Secured Production Mode
@@ -704,6 +717,8 @@ module "compute" {
   log_group_id    = element(concat(module.observability-common[*].log_group_id, [""]), 0)
   use_oci_logging = var.use_oci_logging
 
+  profile_ocid = var.profile_ocid == "" ? (element(concat(module.observability-osmh[*].profile_ocid, [""]), 0)) : var.profile_ocid
+
   use_apm_service           = local.use_apm_service
   apm_domain_compartment_id = local.apm_domain_compartment_id
   apm_domain_id             = var.apm_domain_id
diff --git a/terraform/modules/compute/instance/instance.tf b/terraform/modules/compute/instance/instance.tf
@@ -59,6 +59,6 @@ resource "oci_core_instance" "these" {
   }
 
   lifecycle {
-    ignore_changes = [metadata, shape, shape_config, source_details, defined_tags, freeform_tags]
+    ignore_changes = [metadata, shape, shape_config, source_details, defined_tags, freeform_tags, agent_config]
   }
 }
diff --git a/terraform/modules/compute/wls_compute/idcs_variables.tf b/terraform/modules/compute/wls_compute/idcs_variables.tf
@@ -74,19 +74,19 @@ variable "idcs_cloudgate_config_file" {
 variable "idcs_cloudgate_docker_image_tar" {
   type        = string
   description = "Path of the binary file with the container image to run IDCS cloudgate container in the WebLogic VM"
-  default     = "/u01/zips/jcs/app_gateway_docker/23.4.44/app-gateway-docker-image.tar.gz"
+  default     = "/u01/zips/jcs/app_gateway_docker/25.1.03/app-gateway-docker-image.tar.gz"
 }
 
 variable "idcs_cloudgate_docker_image_version" {
   type        = string
   description = "Version of the container image to run IDCS cloudgate container in the WebLogic VM"
-  default     = "23.4.44-2310291619"
+  default     = "25.1.03-2501230623"
 }
 
 variable "idcs_cloudgate_docker_image_name" {
   type        = string
   description = "Name of the container image to run IDCS cloudgate container in the WebLogic VM"
-  default     = "idcs-appgateway-docker"
+  default     = "idcs-appgateway-docker_linux_x86_64"
 }
 
 variable "lbip" {
diff --git a/terraform/modules/compute/wls_compute/observability_variables.tf b/terraform/modules/compute/wls_compute/observability_variables.tf
@@ -88,3 +88,11 @@ variable "scaleout_notification_topic_id" {
   type        = string
   description = "The OCID of the notification topic for scale out operation"
 }
+variable "profile_ocid"{
+  type        = string
+  description = "The OCID of the created profile"
+}
+variable "enable_osmh"{
+  type        = bool
+  description = "Indicating that OSMH is enabled"
+}
diff --git a/terraform/modules/compute/wls_compute/variables.tf b/terraform/modules/compute/wls_compute/variables.tf
@@ -351,4 +351,5 @@ variable "certificate_id" {
   type        = string
   description = "The OCID of the SSL certificate to configure a secure WebLogic domain"
   default     = ""
-}
+}
+
diff --git a/terraform/modules/compute/wls_compute/wls_compute.tf b/terraform/modules/compute/wls_compute/wls_compute.tf
@@ -176,6 +176,9 @@ module "wls-instances" {
 
       log_group_id    = var.log_group_id
       use_oci_logging = var.use_oci_logging
+      
+      enable_osmh      = var.enable_osmh
+      profile_ocid     = var.profile_ocid
 
       mount_ip    = var.mount_ip
       mount_path  = var.mount_path
@@ -213,4 +216,3 @@ module "wls-instances" {
     }
   }
 }
-
diff --git a/terraform/modules/lb/backends/lb_backends.tf b/terraform/modules/lb/backends/lb_backends.tf
@@ -67,7 +67,7 @@ resource "oci_load_balancer_listener" "wls_lb_listener_https" {
   rule_set_names           = [oci_load_balancer_rule_set.SSL_headers[count.index].name]
 
   connection_configuration {
-    idle_timeout_in_seconds = "10"
+    idle_timeout_in_seconds = "300"
   }
   ssl_configuration {
     #Required
diff --git a/terraform/modules/observability/osmh/create_profile.tf b/terraform/modules/observability/osmh/create_profile.tf
@@ -0,0 +1,23 @@
+resource "oci_os_management_hub_software_source_change_availability_management" "software_source_change_availability_management" {
+   for_each = toset(local.filtered_sources)  
+
+  software_source_availabilities {
+    software_source_id  = each.value  
+    availability_at_oci = var.software_availabilty
+  }
+}
+
+resource "oci_os_management_hub_profile" "create_profile" {
+    compartment_id      = var.compartment_id
+    display_name        = var.display_name
+    profile_type        = var.profile_type
+    software_source_ids = local.filtered_sources
+    arch_type           = var.arch_type
+    is_default_profile  = var.is_default_profile
+    os_family           = var.os_family
+    registration_type   = var.registration_type
+    vendor_name         = var.vendor_name
+    depends_on = [
+    oci_os_management_hub_software_source_change_availability_management.software_source_change_availability_management
+  ]
+}
diff --git a/terraform/modules/observability/osmh/datasources.tf b/terraform/modules/observability/osmh/datasources.tf
@@ -0,0 +1,6 @@
+data "oci_identity_tenancy" "tenancy_info" {
+    tenancy_id = var.tenancy_id
+}
+data "oci_os_management_hub_software_sources" "all_tenancy_osmh_software_sources" {
+  compartment_id = data.oci_identity_tenancy.tenancy_info.id
+}
diff --git a/terraform/modules/observability/osmh/locals.tf b/terraform/modules/observability/osmh/locals.tf
@@ -0,0 +1,18 @@
+locals {
+  all_tenancy_osmh_software_sources = data.oci_os_management_hub_software_sources.all_tenancy_osmh_software_sources.software_source_collection[0].items
+  software_source_names = [
+    "ol8_addons-x86_64",
+    "ol8_appstream-x86_64",
+    "ol8_baseos_latest-x86_64",
+    "ol8_ksplice-x86_64",
+    "ol8_mysql80_connectors_community-x86_64",
+    "ol8_mysql80_tools_community-x86_64",
+    "ol8_uekr7-x86_64",
+    "ol8_mysql80_community-x86_64"
+  ]
+
+  filtered_sources = [
+    for src in local.all_tenancy_osmh_software_sources : src.id
+    if contains(local.software_source_names, src.display_name)
+  ]
+}
diff --git a/terraform/modules/observability/osmh/outputs.tf b/terraform/modules/observability/osmh/outputs.tf
@@ -0,0 +1,4 @@
+output "profile_ocid" {
+  value = oci_os_management_hub_profile.create_profile.id
+}
+
diff --git a/terraform/modules/observability/osmh/variables.tf b/terraform/modules/observability/osmh/variables.tf
@@ -0,0 +1,67 @@
+variable "display_name" {
+  description = "The display name for the profile"
+  type        = string
+}
+
+variable "profile_type" {
+  description = "The type of the profile (e.g., SOFTWARESOURCE)"
+  type        = string
+  default     = "SOFTWARESOURCE"
+}
+
+variable "arch_type" {
+  description = "The architecture type of the profile"
+  type        = string
+  default     = "X86_64"
+}
+
+variable "description" {
+  description = "A description for the profile"
+  type        = string
+  default     = ""
+}
+
+variable "os_family" {
+  description = "The operating system family for the profile (e.g., LINUX, WINDOWS)"
+  type        = string
+  default     = "ORACLE_LINUX_8"
+
+}
+
+variable "registration_type" {
+  description = "The registration type for the profile"
+  type        = string
+  default     = "OCI_LINUX"
+}
+
+variable "software_source_ids" {
+  description = "List of software source IDs associated with the profile"
+  type        = list(string)
+  default     = []
+}
+
+variable "vendor_name" {
+  description = "The vendor name for the profile"
+  type        = string
+  default     = "ORACLE"
+}
+
+variable "compartment_id" {
+  description = "The OCID of the compartment where the profile will be created"
+  type        = string
+}
+
+variable "is_default_profile" {
+  description = "Indicates whether this profile is the default profile"
+  type        = bool
+  default     = false
+}
+variable "tenancy_id" {
+  description = "The OCID of the tenancy"
+  type        = string
+}
+variable "software_availabilty" {
+  description = "Availability at OCI for the software sources"
+  type        = string
+  default     = "SELECTED"
+}
diff --git a/terraform/modules/observability/osmh/versions.tf b/terraform/modules/observability/osmh/versions.tf
@@ -0,0 +1,10 @@
+# Copyright (c) 2023, Oracle and/or its affiliates.
+# Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
+
+terraform {
+  required_providers {
+    oci = {
+      source = "oracle/oci"
+    }
+  }
+}
diff --git a/terraform/modules/policies/groups.tf b/terraform/modules/policies/groups.tf
@@ -3,7 +3,7 @@
 
 resource "oci_identity_dynamic_group" "wlsc_instance_principal_group" {
   compartment_id = var.tenancy_id
-  description    = "Dynamic group to allow access to resources with specific tags and allow instances to call osms services"
+  description    = "Dynamic group to allow access to resources with specific tags and allow instances to call oracle cloud agent services"
   matching_rule  = "ALL { ${local.compartment_rule}, ${var.dynamic_group_rule} }"
   name           = "${local.label_prefix}-wlsc-principal-group"
 
diff --git a/terraform/modules/policies/locals.tf b/terraform/modules/policies/locals.tf
diff --git a/terraform/modules/policies/variables.tf b/terraform/modules/policies/variables.tf
diff --git a/terraform/modules/validators/validators.tf b/terraform/modules/validators/validators.tf
diff --git a/terraform/modules/validators/variables.tf b/terraform/modules/validators/variables.tf
diff --git a/terraform/schema.yaml b/terraform/schema.yaml
diff --git a/terraform/schema_14110.yaml b/terraform/schema_14110.yaml
diff --git a/terraform/schema_14120.yaml b/terraform/schema_14120.yaml
diff --git a/terraform/variables.tf b/terraform/variables.tf
diff --git a/terraform/versions.tf b/terraform/versions.tf

Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,6 @@ resource "oci_core_instance" "these" {`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`lifecycle {`
`62`		`- ignore_changes = [metadata, shape, shape_config, source_details, defined_tags, freeform_tags]`
	`62`	`+ ignore_changes = [metadata, shape, shape_config, source_details, defined_tags, freeform_tags, agent_config]`
`63`	`63`	`}`
`64`	`64`	`}`