foreman_rh_cloud 8.0.47 → 8.0.48

data/config/routes.rb

@@ -4,6 +4,7 @@ Rails.application.routes.draw do
     post ':organization_id/reports', to: 'reports#generate', constraints: { organization_id: %r{[^\/]+} }
     get ':organization_id/uploads/last', to: 'uploads#last', constraints: { organization_id: %r{[^\/]+} }
     get ':organization_id/uploads/file', to: 'uploads#download_file', constraints: { organization_id: %r{[^\/]+} }
+    get 'missing_hosts', to: 'missing_hosts#index'
     get 'accounts', to: 'accounts#index'
     get 'settings', to: 'uploads_settings#index'
     post 'setting', to: 'uploads_settings#set_advanced_setting'
@@ -50,10 +51,12 @@ Rails.application.routes.draw do
     scope '(:apiv)', :module => :v2, :defaults => {:apiv => 'v2'}, :apiv => /v1|v2/, :constraints => ApiConstraints.new(:version => 2, :default => true) do
       resources :organizations, :only => [:show] do
         namespace 'rh_cloud' do
+          get 'missing_hosts', to: 'inventory#get_hosts'
           get 'report', to: 'inventory#download_file'
           post 'report', to: 'inventory#generate_report'
 
           post 'inventory_sync', to: 'inventory#sync_inventory_status'
+          post 'missing_hosts', to: 'inventory#remove_hosts'
         end
       end
 

data/db/migrate/20230515140211_add_missing_hosts_table.foreman_rh_cloud.rb

@@ -3,8 +3,8 @@
 class AddMissingHostsTable < ActiveRecord::Migration[6.1]
   def change
     create_table :insights_missing_hosts do |t|
-      t.integer :organization_id
       t.string :name
+      t.integer :organization_id
       t.string :insights_id
       t.string :rhsm_id
       t.string :ip_address

data/lib/foreman_inventory_upload/generators/fact_helpers.rb

@@ -113,7 +113,7 @@ module ForemanInventoryUpload
         bash_hostname = `uname -n`.chomp
         foreman_hostname = ForemanRhCloud.foreman_host&.name
         if bash_hostname == foreman_hostname
-          fqdn(foreman_hostname)
+          fqdn(ForemanRhCloud.foreman_host)
         elsif Setting[:obfuscate_inventory_hostnames]
           obfuscate_fqdn(bash_hostname)
         else

data/lib/foreman_rh_cloud/engine.rb

@@ -52,9 +52,10 @@ module ForemanRhCloud
             :generate_foreman_rh_cloud,
             'foreman_inventory_upload/reports': [:generate],
             'foreman_inventory_upload/tasks': [:create],
-            'api/v2/rh_cloud/inventory': [:sync_inventory_status, :download_file, :generate_report, :enable_cloud_connector],
+            'api/v2/rh_cloud/inventory': [:get_hosts, :remove_hosts, :sync_inventory_status, :download_file, :generate_report, :enable_cloud_connector],
             'foreman_inventory_upload/uploads': [:enable_cloud_connector],
             'foreman_inventory_upload/uploads_settings': [:set_advanced_setting],
+            'foreman_inventory_upload/missing_hosts': [:remove_hosts],
             'insights_cloud/settings': [:update],
             'insights_cloud/tasks': [:create]
           )
@@ -66,6 +67,7 @@ module ForemanRhCloud
             'foreman_inventory_upload/tasks': [:show],
             'foreman_inventory_upload/cloud_status': [:index],
             'foreman_inventory_upload/uploads_settings': [:index],
+            'foreman_inventory_upload/missing_hosts': [:index],
             'react': [:index]
           )
           permission(

data/lib/foreman_rh_cloud/version.rb

@@ -1,3 +1,3 @@
 module ForemanRhCloud
-  VERSION = '8.0.47'.freeze
+  VERSION = '8.0.48'.freeze
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "foreman_rh_cloud",
-  "version": "8.0.47",
+  "version": "8.0.48",
   "description": "Inventory Upload =============",
   "main": "index.js",
   "scripts": {
@@ -9,10 +9,7 @@
     "test": "tfm-test --plugin",
     "test:watch": "tfm-test --plugin --watchAll",
     "test:current": "tfm-test --plugin --watch",
-    "publish-coverage": "tfm-publish-coverage",
-    "stories": "tfm-stories --plugin",
-    "stories:build": "tfm-build-stories --plugin",
-    "stories:deploy": "surge --project .storybook-dist"
+    "publish-coverage": "tfm-publish-coverage"
   },
   "repository": {
     "type": "git",
@@ -27,7 +24,6 @@
   "devDependencies": {
     "@babel/core": "~7.7.0",
     "@theforeman/builder": ">= 10.1.1",
-    "@theforeman/stories": ">= 10.1.1",
     "@theforeman/test": ">= 10.1.1",
     "@theforeman/eslint-plugin-foreman": ">= 10.1.1",
     "babel-eslint": "~10.0.0",

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

@@ -31,7 +31,7 @@ exports[`PageTitle rendering render without Props 1`] = `
             Actions history
           </DropdownItem>,
           <DropdownItem
-            href="/links/manual/+?root_url=https%3A%2F%2Faccess.redhat.com%2Fproducts%2Fsubscription-central"
+            href="/links/manual/?root_url=https%3A%2F%2Faccess.redhat.com%2Fproducts%2Fsubscription-central"
             rel="noopener noreferrer"
             target="_blank"
           >

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

@@ -2,28 +2,44 @@ import React from 'react';
 import { Text } from '@patternfly/react-core';
 
 import { translate as __ } from 'foremanReact/common/I18n';
+import { FormattedMessage } from 'react-intl';
 
 export const PageDescription = () => (
   <div id="inventory_page_description">
     <Text>
       {__(
-        'Red Hat Insights is a set of cloud services which provide unified subscription reporting, predictive analysis and remediation of issues through 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 Satellite instance.'
       )}
     </Text>
     <Text>
       {__(
-        'You can toggle the Auto upload switch to the ON position to enable Satellite to automatically upload your host inventory once a day.'
+        '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.'
       )}
     </Text>
     <Text>
-      {__(
-        'Click Restart to upload your host inventory to Red Hat Insights. Perform this step for each organization from which you want to manually upload a host inventory.'
-      )}
+      <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.'
+        )}
+        values={{
+          uploadButtonName: <strong>{__('Automatic inventory upload')}</strong>,
+        }}
+      />
     </Text>
     <Text>
-      {__(
-        'Enabling inventory uploads is required by subscription watch. For more information about subscription watch see link:'
-      )}
+      <FormattedMessage
+        id="restart-button-hint"
+        defaultMessage={__(
+          'To manually upload the data for a specific organization, select an organization and click {restartButtonName}.'
+        )}
+        values={{
+          restartButtonName: <strong>{__('Restart')}</strong>,
+        }}
+      />
+    </Text>
+    <Text>
+      {__('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"
@@ -34,7 +50,7 @@ export const PageDescription = () => (
       </a>
     </Text>
     <Text>
-      {__('For more information about Insights and Cloud Connector read')}
+      {__('For more information about Insights and Cloud Connector, see:')}
       &nbsp;
       <a
         href="https://console.redhat.com/security/insights/"

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

@@ -5,16 +5,39 @@ exports[`PageDescription rendering render without Props 1`] = `
   id="inventory_page_description"
 >
   <Text>
-    Red Hat Insights is a set of cloud services which provide unified subscription reporting, predictive analysis and remediation of issues through 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 Satellite instance.
   </Text>
   <Text>
-    You can toggle the Auto upload switch to the ON position to enable Satellite to automatically upload your host inventory once a day.
+    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.
   </Text>
   <Text>
-    Click Restart to upload your host inventory to Red Hat Insights. Perform this step for each organization from which you want to manually upload a host inventory.
+    <FormattedMessage
+      defaultMessage="To enable this reporting for all Satellite organizations, set {uploadButtonName} to on. The data will be reported automatically once per day."
+      id="enable-upload-hint"
+      values={
+        Object {
+          "uploadButtonName": <strong>
+            Automatic inventory upload
+          </strong>,
+        }
+      }
+    />
   </Text>
   <Text>
-    Enabling inventory uploads is required by subscription watch. For more information about subscription watch see link:
+    <FormattedMessage
+      defaultMessage="To manually upload the data for a specific organization, select an organization and click {restartButtonName}."
+      id="restart-button-hint"
+      values={
+        Object {
+          "restartButtonName": <strong>
+            Restart
+          </strong>,
+        }
+      }
+    />
+  </Text>
+  <Text>
+    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"
@@ -25,7 +48,7 @@ exports[`PageDescription rendering render without Props 1`] = `
     </a>
   </Text>
   <Text>
-    For more information about Insights and Cloud Connector read
+    For more information about Insights and Cloud Connector, see:
      
     <a
       href="https://console.redhat.com/security/insights/"

data/webpack/ForemanInventoryUpload/ForemanInventoryHelpers.js

@@ -6,7 +6,7 @@ export const inventoryUrl = path =>
 
 export const getInventoryDocsUrl = () =>
   foremanUrl(
-    `/links/manual/+?root_url=${URI.encode(
+    `/links/manual/?root_url=${URI.encode(
       'https://access.redhat.com/products/subscription-central'
     )}`
   );

data/webpack/ForemanInventoryUpload/__tests__/__snapshots__/ForemanInventoryHelpers.test.js.snap

@@ -2,4 +2,4 @@
 
 exports[`ForemanInventoryUpload helpers should return inventory Url 1`] = `"/foreman_inventory_upload/test_path"`;
 
-exports[`ForemanInventoryUpload helpers should return inventory docs url 1`] = `"/links/manual/+?root_url=https%3A%2F%2Faccess.redhat.com%2Fproducts%2Fsubscription-central"`;
+exports[`ForemanInventoryUpload helpers should return inventory docs url 1`] = `"/links/manual/?root_url=https%3A%2F%2Faccess.redhat.com%2Fproducts%2Fsubscription-central"`;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_rh_cloud
 version: !ruby/object:Gem::Version
-  version: 8.0.47
+  version: 8.0.48
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-20 00:00:00.000000000 Z
+date: 2023-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: katello
@@ -126,6 +126,7 @@ files:
 - app/controllers/concerns/inventory_upload/task_actions.rb
 - app/controllers/foreman_inventory_upload/accounts_controller.rb
 - app/controllers/foreman_inventory_upload/cloud_status_controller.rb
+- app/controllers/foreman_inventory_upload/missing_hosts_controller.rb
 - app/controllers/foreman_inventory_upload/reports_controller.rb
 - app/controllers/foreman_inventory_upload/tasks_controller.rb
 - app/controllers/foreman_inventory_upload/uploads_controller.rb