Merge branch 'main' into CHEF-28294

Author: jashaik

CHANGELOG.md

@@ -1,16 +1,17 @@
 # Chef Server Changelog
 <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 15.10.86 -->
-## [15.10.86](https://github.com/chef/chef-server/tree/15.10.86) (2025-12-02)
+<!-- latest_release 15.10.87 -->
+## [15.10.87](https://github.com/chef/chef-server/tree/15.10.87) (2025-12-09)
 
 #### Merged Pull Requests
-- Adding provision for Jira automation [#4125](https://github.com/chef/chef-server/pull/4125) ([talktovikas](https://github.com/talktovikas))
+- CHEF-26888 - Fix gather-logs openssl gem version conflict [#4127](https://github.com/chef/chef-server/pull/4127) ([kalroy](https://github.com/kalroy))
 <!-- latest_release -->
 
 <!-- release_rollup since=15.10.83 -->
 ### Changes since 15.10.83 release
 
 #### Merged Pull Requests
+- CHEF-26888 - Fix gather-logs openssl gem version conflict [#4127](https://github.com/chef/chef-server/pull/4127) ([kalroy](https://github.com/kalroy)) <!-- 15.10.87 -->
 - Adding provision for Jira automation [#4125](https://github.com/chef/chef-server/pull/4125) ([talktovikas](https://github.com/talktovikas)) <!-- 15.10.86 -->
 - Drop chef gem dependency from oc-chef-pedant [#4122](https://github.com/chef/chef-server/pull/4122) ([neha-p6](https://github.com/neha-p6)) <!-- 15.10.85 -->
 - Copilot Instructions for chef-server [#4118](https://github.com/chef/chef-server/pull/4118) ([jashaik](https://github.com/jashaik)) <!-- 15.10.84 -->

VERSION

@@ -1 +1 @@
-15.10.86
+15.10.87

omnibus/files/private-chef-scripts/gather-logs

@@ -184,7 +184,17 @@ ping -c 2 `hostname --fqdn` > ping_-c_2_fqdn.txt
 ping -c 2 `hostname` > ping_-c_2_hostname.txt
 
 # gather everything ohai knows
-/opt/opscode/bin/ohai > "$tmpdir/ohai.txt"
+# Use embedded ruby directly to avoid gem version conflicts (CHEF-26888)
+# The ohai binstub may have hardcoded gem version requirements that conflict
+# with already-loaded gems. By calling ruby directly and requiring ohai's
+# library, we let Ruby resolve gem versions naturally.
+if /opt/opscode/embedded/bin/ruby -rohai -e 'Ohai::System.new.all_plugins; puts Ohai::System.new.to_json' > "$tmpdir/ohai.txt" 2>&1; then
+    : # ohai data gathered successfully
+else
+    echo "Warning: Failed to gather ohai data, trying fallback method" >&2
+    # Fallback: try the original method in case the new approach fails
+    /opt/opscode/bin/ohai > "$tmpdir/ohai.txt" 2>&1 || echo "Failed to gather ohai data" > "$tmpdir/ohai.txt"
+fi
 
 if [[ -e /opt/opscode-manage/bin/opscode-manage-ctl ]]; then
     /opt/opscode-manage/bin/opscode-manage-ctl status > "$tmpdir/opscode-manage-ctl_status.txt"