foreman_rh_cloud 11.0.1 → 11.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ad60942e47521d64a7a896a330d8d03471fc7d6fc6f54e29937fa619614846e
-  data.tar.gz: 66e1f83283d36cf8e9d48d7719411c99cf027643453924fd7792580030c7e7ae
+  metadata.gz: 9feba25e71b2e6db50de3b2f32665a4889dce130fa44dcc7ef461116ba2abf62
+  data.tar.gz: ec6ce86e970247fab7b565831b414b2a15cb3e2e7ac2f678ccbbd2a43b6692d9
 SHA512:
-  metadata.gz: 25b4d4e6a5503ae59fafd7c4a9d2ab61391a6fc7df458415f3b28eb19a9da411d086693aa1f130a97dd814ee4c3e1292628e82eff12f333b146eb2ecec930741
-  data.tar.gz: a7327156fe02cd95ce112d1a3a8d4260f99cdca7af1e101f2b77a44d422d24be4424f873ac0da8e342f9b1d1e42b66d004404819addd8940da1d242386b4ce93
+  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/config/initializers/zeitwerk.rb

@@ -1,3 +1,5 @@
+require "#{ForemanRhCloud::Engine.root}/lib/foreman_rh_cloud/version"
+
 Rails.autoloaders.main.ignore(
   ForemanRhCloud::Engine.root.join('lib/foreman_rh_cloud/version.rb')
 )

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.1'.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.1",
+  "version": "11.0.3",
   "description": "Inventory Upload =============",
   "main": "index.js",
   "scripts": {
@@ -22,12 +22,11 @@
     "@theforeman/vendor": ">= 10.1.1"
   },
   "devDependencies": {
-    "@babel/core": "~7.7.0",
+    "@babel/core": "^7.7.0",
     "@theforeman/builder": ">= 10.1.1",
     "@theforeman/test": ">= 10.1.1",
     "@theforeman/eslint-plugin-foreman": ">= 10.1.1",
     "babel-eslint": "~10.0.0",
-    "cosmiconfig-typescript-loader": "~4.3.0",
     "eslint": "~6.7.2",
     "eslint-plugin-spellcheck": "~0.0.17",
     "jed": "~1.1.1",

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

@@ -8,19 +8,19 @@ export const PageDescription = () => (
   <div id="inventory_page_description">
     <Text>
       {__(
-        'The Red Hat Hybrid Cloud Console provides a set of cloud services, including Red Hat Insights and Subscriptions, that provide predictive analysis, remediation of issues, and unified subscription reporting for this Satellite instance.'
+        'The Red Hat Hybrid Cloud Console provides a set of cloud services, including Red Hat Insights and Subscriptions, that provide predictive analysis, remediation of issues, and unified subscription reporting for this Foreman instance.'
       )}
     </Text>
     <Text>
       {__(
-        'The Satellite inventory upload plugin automatically uploads Satellite host inventory data to the Inventory service of Insights, where it can also be used by the Subscriptions service for subscription reporting. If you use the Subscriptions service, enabling inventory uploads is required.'
+        'The Foreman inventory upload plugin automatically uploads Foreman host inventory data to the Inventory service of Insights, where it can also be used by the Subscriptions service for subscription reporting. If you use the Subscriptions service, enabling inventory uploads is required.'
       )}
     </Text>
     <Text>
       <FormattedMessage
         id="enable-upload-hint"
         defaultMessage={__(
-          'To enable this reporting for all Satellite organizations, set {uploadButtonName} to on. The data will be reported automatically once per day.'
+          'To enable this reporting for all Foreman organizations, set {uploadButtonName} to on. The data will be reported automatically once per day.'
         )}
         values={{
           uploadButtonName: <strong>{__('Automatic inventory upload')}</strong>,
@@ -42,7 +42,7 @@ export const PageDescription = () => (
       {__('For more information about the Subscriptions service, see:')}
       &nbsp;
       <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

@@ -5,14 +5,14 @@ exports[`PageDescription rendering render without Props 1`] = `
   id="inventory_page_description"
 >
   <Text>
-    The Red Hat Hybrid Cloud Console provides a set of cloud services, including Red Hat Insights and Subscriptions, that provide predictive analysis, remediation of issues, and unified subscription reporting for this Satellite instance.
+    The Red Hat Hybrid Cloud Console provides a set of cloud services, including Red Hat Insights and Subscriptions, that provide predictive analysis, remediation of issues, and unified subscription reporting for this Foreman instance.
   </Text>
   <Text>
-    The Satellite inventory upload plugin automatically uploads Satellite host inventory data to the Inventory service of Insights, where it can also be used by the Subscriptions service for subscription reporting. If you use the Subscriptions service, enabling inventory uploads is required.
+    The Foreman inventory upload plugin automatically uploads Foreman host inventory data to the Inventory service of Insights, where it can also be used by the Subscriptions service for subscription reporting. If you use the Subscriptions service, enabling inventory uploads is required.
   </Text>
   <Text>
     <FormattedMessage
-      defaultMessage="To enable this reporting for all Satellite organizations, set {uploadButtonName} to on. The data will be reported automatically once per day."
+      defaultMessage="To enable this reporting for all Foreman organizations, set {uploadButtonName} to on. The data will be reported automatically once per day."
       id="enable-upload-hint"
       values={
         Object {
@@ -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/ForemanRhCloudFills.js

@@ -2,7 +2,8 @@ import React from 'react';
 import { addGlobalFill } from 'foremanReact/components/common/Fill/GlobalFill';
 import InventoryAutoUploadSwitcher from './ForemanInventoryUpload/SubscriptionsPageExtension/InventoryAutoUpload';
 import NewHostDetailsTab from './InsightsHostDetailsTab/NewHostDetailsTab';
-import InsightsTotalRiskCard from './InsightsHostDetailsTab/InsightsTotalRiskChart';
+import { InsightsTotalRiskChartWrapper } from './InsightsHostDetailsTab/InsightsTotalRiskChartWrapper';
+import { isNotRhelHost } from './ForemanRhCloudHelpers';
 
 const fills = [
   {
@@ -16,22 +17,27 @@ const fills = [
     name: 'Insights',
     component: props => <NewHostDetailsTab {...props} />,
     weight: 400,
+    metadata: {
+      hideTab: isNotRhelHost,
+    },
   },
   {
     slot: 'host-overview-cards',
     name: 'insights-total-risk-chart',
-    component: props => <InsightsTotalRiskCard {...props} />,
+    component: props => <InsightsTotalRiskChartWrapper {...props} />,
     weight: 2800,
   },
 ];
 
 export const registerFills = () => {
-  fills.forEach(({ slot, name, component: Component, weight }, index) =>
-    addGlobalFill(
-      slot,
-      name,
-      <Component key={`rh-cloud-fill-${index}`} />,
-      weight
-    )
+  fills.forEach(
+    ({ slot, name, component: Component, weight, metadata }, index) =>
+      addGlobalFill(
+        slot,
+        name,
+        <Component key={`rh-cloud-fill-${index}`} />,
+        weight,
+        metadata
+      )
   );
 };

data/webpack/ForemanRhCloudHelpers.js

@@ -4,3 +4,10 @@
  * should be imported once core moves it to the ReactApp folder.
  */
 export const foremanUrl = path => `${window.URL_PREFIX}${path}`;
+
+export const isNotRhelHost = ({ hostDetails }) =>
+  // 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

@@ -0,0 +1,23 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import InsightsTotalRiskChart from './InsightsTotalRiskChart';
+import { isNotRhelHost } from '../ForemanRhCloudHelpers';
+
+export const InsightsTotalRiskChartWrapper = props => {
+  if (props.status === 'RESOLVED') {
+    return (
+      !isNotRhelHost(props) && <InsightsTotalRiskChart {...props} /> // check for RHEL hosts
+    );
+  }
+  return null;
+};
+
+InsightsTotalRiskChartWrapper.propTypes = {
+  status: PropTypes.string,
+  hostDetails: PropTypes.object,
+};
+
+InsightsTotalRiskChartWrapper.defaultProps = {
+  status: 'PENDING',
+  hostDetails: {},
+};

data/webpack/InsightsHostDetailsTab/NewHostDetailsTab.js

@@ -37,7 +37,7 @@ const NewHostDetailsTab = ({ hostName, router }) => {
 
   const dropdownItems = [
     <DropdownItem key="insights-link" ouiaId="insights-link">
-      <a onClick={onSatInsightsClick}>{__('Go to Satellite Insights page')}</a>
+      <a onClick={onSatInsightsClick}>{__('Go to Foreman Insights page')}</a>
     </DropdownItem>,
   ];
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_rh_cloud
 version: !ruby/object:Gem::Version
-  version: 11.0.1
+  version: 11.0.3
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-25 00:00:00.000000000 Z
+date: 2024-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman_ansible
@@ -585,6 +585,7 @@ files:
 - webpack/InsightsHostDetailsTab/InsightsTabReducer.js
 - webpack/InsightsHostDetailsTab/InsightsTabSelectors.js
 - webpack/InsightsHostDetailsTab/InsightsTotalRiskChart.js
+- webpack/InsightsHostDetailsTab/InsightsTotalRiskChartWrapper.js
 - webpack/InsightsHostDetailsTab/NewHostDetailsTab.js
 - webpack/InsightsHostDetailsTab/__tests__/InsightsTab.fixtures.js
 - webpack/InsightsHostDetailsTab/__tests__/InsightsTab.test.js
@@ -639,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
@@ -657,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: