foreman_rh_cloud 11.0.2 → 11.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f59aefea33a7933386cdc77e326b13ceca715d51f4fdf3c02905896363bcc33
-  data.tar.gz: 95b711179cb036dbfcb8a6261db1f6c9911ff931807a4a0d9765440534c30c8f
+  metadata.gz: 9feba25e71b2e6db50de3b2f32665a4889dce130fa44dcc7ef461116ba2abf62
+  data.tar.gz: ec6ce86e970247fab7b565831b414b2a15cb3e2e7ac2f678ccbbd2a43b6692d9
 SHA512:
-  metadata.gz: 4bf762fb0c67730e9317948e6ca74921717d8699fb532b4f3c196049ac38f5ba145d7a9a54122f9c18710e4ede293c4d35beb3e3b462b20e936acd8c5547ed8f
-  data.tar.gz: 91e0dceccebc4fb48d93c7916f0a229a0b1d2077f0319e67fa014ecb29f0adade7c28e6af1ac717d0b12488065031b37ecf20b84c816086d260385211d15e468
+  metadata.gz: d98ca68b9fde700bbc66dd6bdfad34bbd50d8d9b6558e47f9f2c13a538330b53bea3b319e4e9861c41884f9c6397b21c882de7a255bffab45c3a157196fe60e4
+  data.tar.gz: bbafd13720bb8e60ae2e9c2af9d8888cc231fcba509f046f76d5b3c560cb78642c7f8a12fbe6d9feb489fb6a11d955739568f9effb9447201e8411980f7a6989

data/app/services/foreman_rh_cloud/cloud_request_forwarder.rb

@@ -33,7 +33,8 @@ module ForemanRhCloud
           }
         ),
       }
-      base_params.merge(path_params(original_request.path, certs))
+      requested_url = original_request.original_fullpath.end_with?('/') ? original_request.path + '/' : original_request.path
+      base_params.merge(path_params(requested_url, certs))
     end
 
     def prepare_forward_payload(original_request, controller_name)

data/lib/foreman_inventory_upload/async/shell_process.rb

@@ -7,6 +7,7 @@ module ForemanInventoryUpload
       include ::ForemanRhCloud::Async::ExponentialBackoff
 
       def plan(instance_label, more_inputs = {})
+        clear_task_output(instance_label)
         inputs = more_inputs.merge(instance_label: instance_label)
         plan_self(inputs)
       end
@@ -53,6 +54,11 @@ module ForemanInventoryUpload
         Dynflow::Action::Rescue::Fail
       end
 
+      def clear_task_output(label)
+        TaskOutputLine.where(label: label).delete_all
+        TaskOutputStatus.where(label: label).delete_all
+      end
+
       private
 
       def preprocess_command(command)

data/lib/foreman_inventory_upload/generators/queries.rb

@@ -28,6 +28,16 @@ module ForemanInventoryUpload
               'insights_client::hostname',
               'insights_client::ips',
               'insights_id',
+              'conversions::activity',
+              'conversions::packages::0::nevra',
+              'conversions::packages::0::signature',
+              'conversions::activity_started',
+              'conversions::activity_ended',
+              'conversions::success',
+              'conversions::source_os::name',
+              'conversions::source_os::version',
+              'conversions::target_os::name',
+              'conversions::target_os::version',
             ]).pluck(:name, :id)
           ]
       end

data/lib/foreman_inventory_upload/generators/slice.rb

@@ -40,6 +40,16 @@ module ForemanInventoryUpload
         end
       end
 
+      def report_conversions(host)
+        @stream.simple_field('convert2rhel_through_foreman', host.subscription_facet&.convert2rhel_through_foreman)
+        @stream.simple_field('activity', fact_value(host, 'conversions::activity'))
+        @stream.simple_field('packages_0_nevra', fact_value(host, 'conversions::packages::0::nevra'))
+        @stream.simple_field('packages_0_signature', fact_value(host, 'conversions::packages::0::signature'))
+        @stream.simple_field('activity_started', fact_value(host, 'conversions::activity_started'))
+        @stream.simple_field('activity_ended', fact_value(host, 'conversions::activity_ended'))
+        @stream.simple_field('success', fact_value(host, 'conversions::success') || false, :last)
+      end
+
       def report_host(host)
         host_ips_cache = host_ips(host)
         @stream.object do
@@ -47,7 +57,19 @@ module ForemanInventoryUpload
           @stream.simple_field('account', account_id(host.organization).to_s)
           @stream.simple_field('subscription_manager_id', uuid_value!(host.subscription_facet&.uuid))
           @stream.simple_field('satellite_id', uuid_value!(host.subscription_facet&.uuid))
-          @stream.simple_field('convert2rhel_through_foreman', host.subscription_facet&.convert2rhel_through_foreman)
+          if host.subscription_facet&.convert2rhel_through_foreman.present?
+            @stream.object_field('conversions') do
+              @stream.object_field('source_os') do
+                @stream.simple_field('name', fact_value(host, 'conversions::source_os::name'))
+                @stream.simple_field('version', fact_value(host, 'conversions::source_os::version') || 'Unknown - Fact not reported', :last)
+              end
+              @stream.object_field('target_os') do
+                @stream.simple_field('name', fact_value(host, 'conversions::target_os::name'))
+                @stream.simple_field('version', fact_value(host, 'conversions::target_os::version') || 'Unknown - Fact not reported', :last)
+              end
+              report_conversions(host)
+            end
+          end
           @stream.simple_field('bios_uuid', bios_uuid(host))
           @stream.simple_field('vm_uuid', uuid_value(fact_value(host, 'virt::uuid')))
           @stream.simple_field('insights_id', uuid_value(fact_value(host, 'insights_id')))

data/lib/foreman_rh_cloud/version.rb

@@ -1,3 +1,3 @@
 module ForemanRhCloud
-  VERSION = '11.0.2'.freeze
+  VERSION = '11.0.3'.freeze
 end

data/lib/inventory_sync/async/inventory_full_sync.rb

@@ -28,6 +28,16 @@ module InventorySync
         output[:host_statuses] = host_statuses
       end
 
+      def clear_inventory_statuses_for_hosts_with_insights_false
+        host_ids_to_delete = Host.joins(:host_parameters).where(id: InventorySync::InventoryStatus.select(:host_id), host_parameters: { name: 'host_registration_insights', value: false })
+        if host_ids_to_delete.present?
+          InventorySync::InventoryStatus.where(host_id: host_ids_to_delete).delete_all
+          Host.where(id: host_ids_to_delete).find_each(&:refresh_global_status!)
+        else
+          logger.debug('No hosts with host_registration_insights set to false found')
+        end
+      end
+
       def update_statuses_batch
         results = yield
 

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "foreman_rh_cloud",
-  "version": "11.0.2",
+  "version": "11.0.3",
   "description": "Inventory Upload =============",
   "main": "index.js",
   "scripts": {

data/webpack/ForemanInventoryUpload/Components/PageHeader/components/PageDescription/PageDescription.js

@@ -42,7 +42,7 @@ export const PageDescription = () => (
       {__('For more information about the Subscriptions service, see:')}
        
       <a
-        href="https://access.redhat.com/documentation/en-us/subscription_central/2020-04/html/getting_started_with_subscription_watch/assembly-about-subscriptionwatch"
+        href="https://docs.redhat.com/en/documentation/subscription_central/1-latest/html/getting_started_with_the_subscriptions_service/index"
         target="_blank"
         rel="noopener noreferrer"
       >

data/webpack/ForemanInventoryUpload/Components/PageHeader/components/PageDescription/__tests__/__snapshots__/PageDescription.test.js.snap

@@ -40,7 +40,7 @@ exports[`PageDescription rendering render without Props 1`] = `
     For more information about the Subscriptions service, see:
      
     <a
-      href="https://access.redhat.com/documentation/en-us/subscription_central/2020-04/html/getting_started_with_subscription_watch/assembly-about-subscriptionwatch"
+      href="https://docs.redhat.com/en/documentation/subscription_central/1-latest/html/getting_started_with_the_subscriptions_service/index"
       rel="noopener noreferrer"
       target="_blank"
     >

data/webpack/ForemanRhCloudHelpers.js

@@ -6,5 +6,8 @@
 export const foremanUrl = path => `${window.URL_PREFIX}${path}`;
 
 export const isNotRhelHost = ({ hostDetails }) =>
-  // eslint-disable-next-line camelcase
-  !new RegExp('red\\s?hat', 'i').test(hostDetails?.operatingsystem_name);
+  // This regex tries matches sane variations of "RedHat", "RHEL" and "RHCOS"
+  !new RegExp('red[\\s\\-]?hat|rh[\\s\\-]?el|rhc[\\s\\-]?os', 'i').test(
+    // eslint-disable-next-line camelcase
+    hostDetails?.operatingsystem_name
+  );

data/webpack/InsightsHostDetailsTab/InsightsTotalRiskChartWrapper.js

@@ -6,7 +6,7 @@ import { isNotRhelHost } from '../ForemanRhCloudHelpers';
 export const InsightsTotalRiskChartWrapper = props => {
   if (props.status === 'RESOLVED') {
     return (
-      !isNotRhelHost(props.hostDetails) && <InsightsTotalRiskChart {...props} /> // check for RHEL hosts
+      !isNotRhelHost(props) && <InsightsTotalRiskChart {...props} /> // check for RHEL hosts
     );
   }
   return null;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_rh_cloud
 version: !ruby/object:Gem::Version
-  version: 11.0.2
+  version: 11.0.3
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-29 00:00:00.000000000 Z
+date: 2024-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman_ansible
@@ -640,7 +640,7 @@ homepage: https://github.com/theforeman/foreman_rh_cloud
 licenses:
 - GPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -658,8 +658,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.27
-signing_key: 
+rubygems_version: 3.2.33
+signing_key:
 specification_version: 4
 summary: Summary of ForemanRhCloud.
 test_files: