foreman_rh_cloud 1.0.10 → 1.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb457584e95614e52c7026cb963409b2a2ea645b082315c0004b787db6ecf028
-  data.tar.gz: 6352df86d12f35dbdc4d90538c1604aa00e1c4710f09c6deb0066efce8a48277
+  metadata.gz: f2b89191efb4cb97cec7c9e2a2d1cc41e255f02f7c04e95ecf7c1753e3b718ed
+  data.tar.gz: 38846a43180f47c4ebf888b8af0624a3edf460a10b0e3f02eca17bdd074f5142
 SHA512:
-  metadata.gz: 1299b5836e5bf30151c690e5c222c67d34f351b0e5ffbd4e3ffeead0109457adce46279a1ddb550f3468aac4439c1050e366bf831dfb3c84b3e021e5cc2d9dd3
-  data.tar.gz: edc7f560cd4ed663a07535bc247b0d5baf7e5755a50f002e9c752116cda93b729a15cc7b4452c12a95d9cee542d7201f900142f408abfa43a8e308d390305aa2
+  metadata.gz: 1d1fd157774d8b4d2007ea0139b05c6d39a749d432f6e1bcdb3d5efa5f39480743e1220434037131ccf65486edcd1fde24de39ed165653aa074062131d957394
+  data.tar.gz: 531cc12e64d7a4f8957029f7d7517dd80d30758c9ba070dd2603c5e64f324d399484824cc160dca8bef53810fa44aaeaf77e92e6a2d6ffdeb1f634b316a2af6e

data/README.md

@@ -11,6 +11,39 @@ for how to install Foreman plugins
 
 *Usage here*
 
+### In Satellite
+
+#### Inventory upload
+
+In UI: Configure -> Inventory Upload -> Restart
+
+From command-line:
+
+    export organization_id=1
+    export target=/var/lib/foreman/red_hat_inventory/generated_reports/
+    /usr/sbin/foreman-rake rh_cloud_inventory:report:generate
+
+#### Fetch hosts remediation data
+
+In UI: Configure -> Insights -> Sync now
+
+From command-line:
+
+    /usr/sbin/foreman-rake rh_cloud_inventory:sync
+
+#### Synchronize inventory status
+
+In UI: Configure -> Inventory Upload -> Sync inventory status
+
+From command-line:
+
+    # all organizations
+    /usr/sbin/foreman-rake rh_cloud_insights:sync
+    
+    # specific organization with id 1
+    export organization_id=1
+    /usr/sbin/foreman-rake rh_cloud_insights:sync
+
 ## TODO
 
 *Todo list here*

data/app/controllers/insights_cloud/hits_controller.rb

@@ -0,0 +1,17 @@
+module InsightsCloud
+  class HitsController < ::ApplicationController
+    def index
+      host = Host.where(id: host_id_param).first
+
+      render json: {
+        hits: host.insights.hits,
+      }, status: :ok
+    end
+
+    private
+
+    def host_id_param
+      params.require(:host_id)
+    end
+  end
+end

data/app/models/concerns/rh_cloud_host.rb

@@ -0,0 +1,12 @@
+module RhCloudHost
+  extend ActiveSupport::Concern
+
+  included do
+    has_many(
+      :inventory_upload_facts,
+      -> { where(fact_name_id: ForemanInventoryUpload::Generators::Queries.fact_names.values) },
+      class_name: 'FactValue',
+      :foreign_key => :host_id
+    )
+  end
+end

data/app/views/hosts/_insights_tab.html.erb

@@ -0,0 +1,15 @@
+<% content_for(:javascripts) do %>
+  <%= webpacked_plugins_js_for :'foreman_rh_cloud' %>
+<% end %>
+
+<% content_for(:stylesheets) do %>
+    <%= webpacked_plugins_css_for :'foreman_rh_cloud' %>
+<% end %>
+
+<div id="host_details_insights_react_container"></div>
+<%= mount_react_component(
+  'InsightsHostDetailsTab',
+  '#host_details_insights_react_container',
+  { hostID: host.id }.to_json,
+  flatten_data: true
+) %>

data/config/routes.rb

@@ -15,6 +15,7 @@ Rails.application.routes.draw do
   namespace :insights_cloud do
     resources :tasks, only: [:create]
     resource :settings, only: [:show, :update]
+    get 'hits/:host_id', to: 'hits#index'
   end
 
   namespace :foreman_rh_cloud do

data/lib/foreman_inventory_upload/async/generate_report_job.rb

@@ -23,7 +23,7 @@ module ForemanInventoryUpload
       end
 
       def command
-        "#{rake_prefix}rake foreman_inventory_upload:report:generate"
+        "#{rake_prefix}rake rh_cloud_inventory:report:generate"
       end
 
       def env

data/lib/foreman_inventory_upload/async/shell_process.rb

@@ -8,24 +8,30 @@ module ForemanInventoryUpload
       def perform(instance_label)
         klass_name = self.class.name
         logger.debug("Starting #{klass_name} with label #{instance_label}")
-        progress_output = ProgressOutput.register(instance_label)
-        Open3.popen2e(hash_to_s(env), command) do |_stdin, stdout_stderr, wait_thread|
-          progress_output.status = "Running in pid #{wait_thread.pid}"
+        progress_output_for(instance_label) do |progress_output|
+          Open3.popen2e(hash_to_s(env), command) do |_stdin, stdout_stderr, wait_thread|
+            progress_output.status = "Running in pid #{wait_thread.pid}"
 
-          stdout_stderr.each do |out_line|
-            progress_output.write_line(out_line)
-          end
+            stdout_stderr.each do |out_line|
+              progress_output.write_line(out_line)
+            end
 
-          progress_output.status = wait_thread.value.to_s
+            progress_output.status = wait_thread.value.to_s
+          end
         end
         logger.debug("Finished job #{klass_name} with label #{instance_label}")
-      ensure
-        progress_output.close
       end
 
       def command
       end
 
+      def progress_output_for(instance_label)
+        progress_output = ProgressOutput.register(instance_label)
+        yield(progress_output)
+      ensure
+        progress_output.close
+      end
+
       def env
         {}
       end

data/lib/foreman_inventory_upload/async/upload_report_job.rb

@@ -8,15 +8,33 @@ module ForemanInventoryUpload
       end
 
       def perform(filename, organization_id)
+        label = UploadReportJob.output_label(organization_id)
         @filename = filename
         @organization = Organization.find(organization_id)
 
+        if Setting[:content_disconnected]
+          progress_output_for(label) do |progress_output|
+            progress_output.write_line('Upload was stopped since disconnected mode setting is enabled for content on this instance.')
+            progress_output.status = "Task aborted, exit 1"
+          end
+          return
+        end
+
+        unless @organization.owner_details&.fetch('upstreamConsumer')&.fetch('idCert')
+          logger.info("Skipping organization '#{@organization}', no candlepin certificate defined.")
+          progress_output_for(label) do |progress_output|
+            progress_output.write_line("Skipping organization #{@organization}, no candlepin certificate defined.")
+            progress_output.status = "Task aborted, exit 1"
+          end
+          return
+        end
+
         Tempfile.create([@organization.name, '.pem']) do |cer_file|
           cer_file.write(rh_credentials[:cert])
           cer_file.write(rh_credentials[:key])
           cer_file.flush
           @cer_path = cer_file.path
-          super(UploadReportJob.output_label(organization_id))
+          super(label)
         end
       end
 

data/lib/foreman_inventory_upload/generators/metadata.rb

@@ -21,6 +21,9 @@ module ForemanInventoryUpload
       private
 
       def render_report(metadata)
+        metadata ||= {}
+        metadata['foreman_rh_cloud_version'] = ForemanRhCloud::VERSION
+
         @stream.object do
           @stream.simple_field('report_id', Foreman.uuid)
           @stream.simple_field('host_inventory_api_version', '1.0')

data/lib/foreman_inventory_upload/generators/queries.rb

@@ -30,23 +30,21 @@ module ForemanInventoryUpload
       end
 
       def self.for_slice(base)
-        fact_values = FactValue.where(fact_name_id: fact_names.values)
         base
           .joins(:subscription_facet)
-          .eager_load(:fact_values)
           .preload(
             :interfaces,
             :installed_packages,
             :content_facet,
             :host_statuses,
+            :inventory_upload_facts,
             subscription_facet: [:pools, :installed_products, :hypervisor_host]
           )
-          .merge(fact_values)
       end
 
       def self.for_report(portal_user)
         org_ids = organizations_for_user(portal_user).pluck(:id)
-        for_slice(Host.unscoped.where(organization_id: org_ids)).in_batches(of: 1_000)
+        for_org(org_ids)
       end
 
       def self.for_org(organization_id)

data/lib/foreman_rh_cloud/engine.rb

@@ -66,9 +66,19 @@ module ForemanRhCloud
         register_global_js_file 'subscriptions_extension'
 
         register_custom_status(InventorySync::InventoryStatus)
+
+        extend_page 'hosts/show' do |context|
+          context.add_pagelet :main_tabs,
+            partial: 'hosts/insights_tab',
+            name: _('Insights'),
+            onlyif: proc { |host| host.insights }
+        end
       end
 
       ::Katello::UINotifications::Subscriptions::ManifestImportSuccess.include ForemanInventoryUpload::Notifications::ManifestImportSuccessNotificationOverride if defined?(Katello)
+
+      ::Host::Managed.include RhCloudHost
+      ::Host::Base.include RhCloudHost
     end
 
     initializer "foreman_rh_cloud.set_dynflow.config.on_init", :before => :finisher_hook do |_app|

data/lib/foreman_rh_cloud/version.rb

@@ -1,3 +1,3 @@
 module ForemanRhCloud
-  VERSION = '1.0.10'.freeze
+  VERSION = '1.0.11'.freeze
 end

data/lib/tasks/insights.rake

@@ -0,0 +1,15 @@
+namespace :rh_cloud_insights do
+  desc "Synchronize Insights inventory"
+  task sync: :environment do
+    if ! ENV['organization_id'].nil?
+      organizations = [ Organization.where(:id => ENV['organization_id']).first ]
+    else
+      organizations = Organization.all
+    end
+
+    organizations.each do |organization|
+      InventorySync::Async::InventoryFullSync.perform_now(organization)
+      puts "Synchronized inventory for organization '#{organization.name}'"
+    end
+  end
+end

data/lib/tasks/{generator.rake → rh_cloud_inventory.rake}

@@ -1,6 +1,6 @@
 require 'tempfile'
 
-namespace :foreman_inventory_upload do
+namespace :rh_cloud_inventory do
   namespace :report do
     desc 'Generate inventory report to be sent to Red Hat cloud'
     task generate: :environment do
@@ -26,4 +26,10 @@ namespace :foreman_inventory_upload do
       end
     end
   end
+
+  desc "Synchronize Insights hosts hits"
+  task sync: :environment do
+    InsightsCloud::Async::InsightsFullSync.perform_now()
+    puts "Synchronized Insights hosts hits data"
+  end
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "foreman_rh_cloud",
-  "version": "0.0.1",
+  "version": "1.0.11",
   "description": "Inventory Upload =============",
   "main": "index.js",
   "scripts": {
@@ -47,6 +47,8 @@
     "eslint": "^4.10.0",
     "eslint-import-resolver-babel-module": "^4.0.0",
     "eslint-plugin-patternfly-react": "0.2.0",
+    "eslint-plugin-promise": "^4.2.1",
+    "eslint-plugin-spellcheck": "^0.0.17",
     "identity-obj-proxy": "^3.0.0",
     "jed": "^1.1.1",
     "jest-cli": "^23.6.0",

data/test/jobs/upload_report_job_test.rb

@@ -0,0 +1,34 @@
+require 'test_plugin_helper'
+
+class UploadReportJobTest < ActiveJob::TestCase
+  include FolderIsolation
+
+  test 'returns aborted state when disconnected' do
+    organization = FactoryBot.create(:organization)
+    Organization.any_instance.stubs(:owner_details).returns(
+      'upstreamConsumer' => {
+        'idCert' => 'TEST_CERT',
+      }
+    )
+    FactoryBot.create(:setting, :name => 'content_disconnected', :value => true)
+
+    ForemanInventoryUpload::Async::UploadReportJob.perform_now('', organization.id)
+
+    label = ForemanInventoryUpload::Async::UploadReportJob.output_label(organization.id)
+    progress_output = ForemanInventoryUpload::Async::ProgressOutput.get(label)
+    assert_match(/Upload was stopped/, progress_output.full_output)
+    assert_match(/exit 1/, progress_output.status)
+  end
+
+  test 'returns aborted state when no certificate defined on organization' do
+    organization = FactoryBot.create(:organization)
+    Organization.any_instance.expects(:owner_details).returns(nil)
+
+    ForemanInventoryUpload::Async::UploadReportJob.perform_now('', organization.id)
+
+    label = ForemanInventoryUpload::Async::UploadReportJob.output_label(organization.id)
+    progress_output = ForemanInventoryUpload::Async::ProgressOutput.get(label)
+    assert_match(/Skipping organization/, progress_output.full_output)
+    assert_match(/exit 1/, progress_output.status)
+  end
+end

data/test/unit/metadata_generator_test.rb

@@ -13,6 +13,8 @@ class MetadataGeneratorTest < ActiveSupport::TestCase
 
     assert_not_nil actual['report_id']
     assert_equal 'Satellite', actual['source']
+    assert_not_nil (actual_metadata = actual['source_metadata'])
+    assert_equal ForemanRhCloud::VERSION, actual_metadata['foreman_rh_cloud_version']
     assert_equal({}, actual['report_slices'])
   end
 

data/test/unit/slice_generator_test.rb

@@ -9,6 +9,7 @@ class ReportGeneratorTest < ActiveSupport::TestCase
 
     @host = FactoryBot.create(
       :host,
+      :redhat,
       :with_subscription,
       :with_content,
       content_view: cv.first,
@@ -264,6 +265,22 @@ class ReportGeneratorTest < ActiveSupport::TestCase
     assert_equal 1, generator.hosts_count
   end
 
+  test 'include also hosts with non-redhat OS' do
+    os = @host.operatingsystem
+    os.name = 'Centos'
+    os.save!
+
+    # make a_host last
+    batch = ForemanInventoryUpload::Generators::Queries.for_org(@host.organization_id).first
+    generator = create_generator(batch)
+
+    json_str = generator.render
+    actual = JSON.parse(json_str.join("\n"))
+
+    assert_equal 'slice_123', actual['report_slice_id']
+    assert_equal 1, generator.hosts_count
+  end
+
   test 'shows system_memory_bytes in bytes' do
     FactoryBot.create(:fact_value, fact_name: fact_names['memory::memtotal'], value: '1', host: @host)
 

data/webpack/ForemanInventoryUpload/Components/InventoryFilter/__tests__/__snapshots__/integration.test.js.snap

@@ -19,6 +19,9 @@ Object {
           "insightsSyncEnabled": false,
         },
       },
+      "hostInsights": Object {
+        "hits": Array [],
+      },
       "inventoryUpload": Object {
         "accountsList": Object {
           "accounts": Object {},

data/webpack/ForemanInventoryUpload/Components/PageHeader/components/SyncButton/components/Toast.js

@@ -8,7 +8,7 @@ const Toast = ({ syncHosts, disconnectHosts }) => {
   return (
     <span>
       <p>
-        {__("Total org's hosts with subscriprion: ")}
+        {__('Hosts with subscription in organization: ')}
         <strong>{totalHosts}</strong>
       </p>
       <p>

data/webpack/ForemanInventoryUpload/Components/StatusChart/StatusChart.js

@@ -27,7 +27,7 @@ const StatusChart = ({ completed }) => {
     <Grid.Col sm={4}>
       <div className="status-chart">
         <DonutChart
-          id="donunt-chart-1"
+          id="donut-chart-1"
           size={{
             width: 210,
             height: 210,

data/webpack/ForemanInventoryUpload/Components/StatusChart/__tests__/__snapshots__/StatusChart.test.js.snap

@@ -43,7 +43,7 @@ exports[`StatusChart rendering render without Props 1`] = `
           "width": 11,
         }
       }
-      id="donunt-chart-1"
+      id="donut-chart-1"
       legend={
         Object {
           "show": false,

data/webpack/ForemanInventoryUpload/Components/TabContainer/tabContainer.scss

@@ -1,4 +1,4 @@
-.tab-content {
+.dashboard .tab-content {
   padding: 20px;
   min-height: 0;
 

data/webpack/ForemanRhCloudPages.js

@@ -1,7 +1,9 @@
 import ForemanInventoryUpload from './ForemanInventoryUpload';
 import InsightsCloudSync from './InsightsCloudSync';
+import InsightsHostDetailsTab from './InsightsHostDetailsTab';
 
 export default [
   { name: 'ForemanInventoryUpload', type: ForemanInventoryUpload },
   { name: 'InsightsCloudSync', type: InsightsCloudSync },
+  { name: 'InsightsHostDetailsTab', type: InsightsHostDetailsTab },
 ];

data/webpack/ForemanRhCloudReducers.js

@@ -1,10 +1,12 @@
 import { combineReducers } from 'redux';
 import inventoryUploadReducers from './ForemanInventoryUpload/ForemanInventoryUploadReducers';
 import insightsReducers from './InsightsCloudSync/InsightsCloudSyncReducers';
+import { hostInsightsReducers } from './InsightsHostDetailsTab';
 
 export default {
   ForemanRhCloud: combineReducers({
     ...inventoryUploadReducers,
     ...insightsReducers,
+    ...hostInsightsReducers,
   }),
 };

data/webpack/ForemanRhCloudSelectors.js

@@ -1,5 +1,10 @@
 export const selectForemanRhCloud = state => state.ForemanRhCloud;
+
 export const selectForemanInventoryUpload = state =>
   selectForemanRhCloud(state).inventoryUpload;
+
 export const selectInsightsCloudSync = state =>
   selectForemanRhCloud(state).InsightsCloudSync;
+
+export const selectHostInsights = state =>
+  selectForemanRhCloud(state).hostInsights;

data/webpack/ForemanRhCloudTestHelpers.js

@@ -1,10 +1,12 @@
 export const rhCloudStateWrapper = (
   inventoryState = {},
-  insightsState = {}
+  insightsState = {},
+  hostInsightsState = {}
 ) => ({
   ForemanRhCloud: {
     inventoryUpload: { ...inventoryState },
     InsightsCloudSync: { ...insightsState },
+    hostInsights: { ...hostInsightsState },
   },
 });
 
@@ -13,3 +15,6 @@ export const inventoryStateWrapper = innerState =>
 
 export const insightsStateWrapper = innerState =>
   rhCloudStateWrapper({}, innerState);
+
+export const hostInsightsStateWrapper = innerState =>
+  rhCloudStateWrapper({}, {}, innerState);

data/webpack/InsightsHostDetailsTab/InsightsTab.js

@@ -0,0 +1,64 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { orderBy } from 'lodash';
+import { Grid, ListView, noop } from 'patternfly-react';
+import ListItem from './components/ListItem';
+import './InsightsTab.scss';
+
+class InsightsHostDetailsTab extends React.Component {
+  componentDidMount() {
+    const { fetchHits, hostID } = this.props;
+    fetchHits(hostID);
+  }
+
+  render() {
+    const { hits } = this.props;
+
+    if (!hits.length) {
+      return <h2>No recommendations were found for this host!</h2>;
+    }
+    const hitsSorted = orderBy(hits, ['insights_hit.total_risk'], ['desc']);
+    const items = hitsSorted.map(
+      (
+        {
+          insights_hit: {
+            title,
+            total_risk: totalRisk,
+            results_url: resultsUrl,
+            solution_url: solutionUrl,
+          },
+        },
+        index
+      ) => (
+        <ListItem
+          key={index}
+          title={title}
+          totalRisk={totalRisk}
+          resultsUrl={resultsUrl}
+          solutionUrl={solutionUrl}
+        />
+      )
+    );
+    return (
+      <Grid.Row>
+        <Grid.Col xs={12}>
+          <h2>Recommendations</h2>
+          <ListView id="hits_list">{items}</ListView>
+        </Grid.Col>
+      </Grid.Row>
+    );
+  }
+}
+
+InsightsHostDetailsTab.propTypes = {
+  hostID: PropTypes.number.isRequired,
+  fetchHits: PropTypes.func,
+  hits: PropTypes.array,
+};
+
+InsightsHostDetailsTab.defaultProps = {
+  fetchHits: noop,
+  hits: [],
+};
+
+export default InsightsHostDetailsTab;

data/webpack/InsightsHostDetailsTab/InsightsTab.scss

@@ -0,0 +1,86 @@
+#host_details_insights_react_container {
+  #btn_toolbar {
+    float: right;
+  }
+
+  #btn_fullscreen {
+    margin-left: 5px;
+
+    .fa-arrows-alt {
+      margin-left: 5px;
+    }
+  }
+
+  h2 {
+    margin-top: 5px;
+  }
+
+  #hits_list {
+    max-height: 650px;
+    overflow-y: scroll;
+    overflow-x: hidden;
+    margin-top: 15px;
+
+    .list-view-pf-expand {
+      padding: 0;
+    }
+
+    .list-group-item-header {
+      .list-view-pf-expand .fa-angle-right {
+        margin-top: 6px;
+      }
+
+      .list-view-pf-main-info .list-view-pf-description {
+        width: 83%;
+
+        .list-group-item-heading {
+          width: 375px;
+        }
+
+        p {
+          margin: 0;
+          font-size: 14px;
+        }
+      }
+
+      .list-view-pf-additional-info {
+        .risk-label {
+          padding: 5px 8px;
+          border-radius: 12px;
+
+          &.Low {
+            background-color: #e7f1fa;
+          }
+
+          &.Moderate {
+            background-color: #fdf7e7;
+          }
+
+          &.Important {
+            background-color: #f9dddd;
+          }
+
+          &.Critical {
+            background-color: #ffecec;
+          }
+
+          p {
+            margin: 0;
+          }
+        }
+      }
+    }
+
+    &::-webkit-scrollbar {
+      width: 12px;
+      height: 12px;
+    }
+
+    &::-webkit-scrollbar-thumb {
+      background: #0e0e0e6e;
+      border-radius: 6px;
+      border: 3px solid transparent;
+      background-clip: content-box;
+    }
+  }
+}

data/webpack/InsightsHostDetailsTab/InsightsTabActions.js

@@ -0,0 +1,30 @@
+import API from 'foremanReact/API';
+import { insightsCloudUrl } from '../InsightsCloudSync/InsightsCloudSyncHelpers';
+import {
+  INSIGHTS_HITS_REQUEST,
+  INSIGHTS_HITS_SUCCESS,
+  INSIGHTS_HITS_FAILURE,
+} from './InsightsTabConstants';
+
+export const fetchHits = hostID => async dispatch => {
+  try {
+    dispatch({
+      type: INSIGHTS_HITS_REQUEST,
+      payload: {},
+    });
+    const {
+      data: { hits },
+    } = await API.get(insightsCloudUrl(`hits/${hostID}`));
+    dispatch({
+      type: INSIGHTS_HITS_SUCCESS,
+      payload: { hits },
+    });
+  } catch (error) {
+    dispatch({
+      type: INSIGHTS_HITS_FAILURE,
+      payload: {
+        error: error.message,
+      },
+    });
+  }
+};

data/webpack/InsightsHostDetailsTab/InsightsTabConstants.js

@@ -0,0 +1,3 @@
+export const INSIGHTS_HITS_REQUEST = 'INSIGHTS_HITS_REQUEST';
+export const INSIGHTS_HITS_SUCCESS = 'INSIGHTS_HITS_SUCCESS';
+export const INSIGHTS_HITS_FAILURE = 'INSIGHTS_HITS_FAILURE';

data/webpack/InsightsHostDetailsTab/InsightsTabReducer.js

@@ -0,0 +1,26 @@
+import Immutable from 'seamless-immutable';
+import {
+  INSIGHTS_HITS_SUCCESS,
+  INSIGHTS_HITS_FAILURE,
+} from './InsightsTabConstants';
+
+const initialState = Immutable({
+  hits: [],
+});
+
+export default (state = initialState, action) => {
+  const { payload: { hits, error } = {} } = action;
+
+  switch (action.type) {
+    case INSIGHTS_HITS_SUCCESS:
+      return state.merge({
+        hits,
+      });
+    case INSIGHTS_HITS_FAILURE:
+      return state.merge({
+        error,
+      });
+    default:
+      return state;
+  }
+};

data/webpack/InsightsHostDetailsTab/InsightsTabSelectors.js

@@ -0,0 +1,3 @@
+import { selectHostInsights } from '../ForemanRhCloudSelectors';
+
+export const selectHits = state => selectHostInsights(state).hits;

data/webpack/InsightsHostDetailsTab/__tests__/InsightsTab.fixtures.js

@@ -0,0 +1,25 @@
+export const hostID = 1234;
+
+export const hits = [
+  {
+    insights_hit: {
+      hostname: 'my-host.example.com',
+      rhel_version: '7.8',
+      uuid: '4739b323-a343-4e89-b71b-81991b8dc656',
+      last_seen: '2020-08-19T04:43:09.068706Z',
+      title:
+        'New Ansible Engine packages are inaccessible when dedicated Ansible repo is not enabled',
+      solution_url: 'https://access.redhat.com/node/3359651',
+      total_risk: 2,
+      likelihood: 2,
+      publish_date: '2018-04-16T10:03:16Z',
+      results_url:
+        'https://cloud.redhat.com/insights/advisor/recommendations/ansible_deprecated_repo%7CANSIBLE_DEPRECATED_REPO/4739b323-a343-4e89-b71b-81991b8dc656/',
+    },
+  },
+];
+
+export const props = {
+  hostID,
+  hits,
+};

data/webpack/InsightsHostDetailsTab/__tests__/InsightsTab.test.js

@@ -0,0 +1,13 @@
+import { testComponentSnapshotsWithFixtures } from 'react-redux-test-utils';
+
+import InsightsTab from '../InsightsTab';
+import { props } from './InsightsTab.fixtures';
+
+const fixtures = {
+  'render with props': props,
+};
+
+describe('InsightsTab', () => {
+  describe('rendering', () =>
+    testComponentSnapshotsWithFixtures(InsightsTab, fixtures));
+});

data/webpack/InsightsHostDetailsTab/__tests__/InsightsTabActions.test.js

@@ -0,0 +1,13 @@
+import { testActionSnapshotWithFixtures } from 'react-redux-test-utils';
+import API from 'foremanReact/API';
+import { fetchHits } from '../InsightsTabActions';
+import { hostID, hits } from './InsightsTab.fixtures';
+
+jest.mock('foremanReact/API');
+API.get.mockImplementation(async () => hits);
+
+const fixtures = {
+  'should fetchHits': () => fetchHits(hostID),
+};
+
+describe('InsightsTab actions', () => testActionSnapshotWithFixtures(fixtures));

data/webpack/InsightsHostDetailsTab/__tests__/InsightsTabIntegration.test.js

@@ -0,0 +1,17 @@
+import React from 'react';
+import { IntegrationTestHelper } from 'react-redux-test-utils';
+
+import InsightsTab from '../index';
+import reducers from '../../ForemanRhCloudReducers';
+import { hostID } from './InsightsTab.fixtures';
+
+describe('InsightsTab integration test', () => {
+  it('should flow', async () => {
+    const integrationTestHelper = new IntegrationTestHelper(reducers);
+    const component = integrationTestHelper.mount(
+      <InsightsTab hostID={hostID} />
+    );
+    component.update();
+    /** Create a Flow test */
+  });
+});

data/webpack/InsightsHostDetailsTab/__tests__/InsightsTabReducer.test.js

@@ -0,0 +1,35 @@
+import { testReducerSnapshotWithFixtures } from 'react-redux-test-utils';
+import reducer from '../InsightsTabReducer';
+import { hits } from './InsightsTab.fixtures';
+import {
+  INSIGHTS_HITS_REQUEST,
+  INSIGHTS_HITS_SUCCESS,
+  INSIGHTS_HITS_FAILURE,
+} from '../InsightsTabConstants';
+
+const fixtures = {
+  'should return the initial state': {},
+  'should handle INSIGHTS_HITS_REQUEST': {
+    action: {
+      type: INSIGHTS_HITS_REQUEST,
+      payload: {},
+    },
+  },
+  'should handle INSIGHTS_HITS_SUCCESS': {
+    action: {
+      type: INSIGHTS_HITS_SUCCESS,
+      payload: { hits },
+    },
+  },
+  'should handle INSIGHTS_HITS_FAILURE': {
+    action: {
+      type: INSIGHTS_HITS_FAILURE,
+      payload: {
+        error: 'some-error',
+      },
+    },
+  },
+};
+
+describe('AccountList reducer', () =>
+  testReducerSnapshotWithFixtures(reducer, fixtures));

data/webpack/InsightsHostDetailsTab/__tests__/InsightsTabSelectors.test.js

@@ -0,0 +1,13 @@
+import { testSelectorsSnapshotWithFixtures } from 'react-redux-test-utils';
+import { hostInsightsStateWrapper } from '../../ForemanRhCloudTestHelpers';
+import { hits } from './InsightsTab.fixtures';
+import { selectHits } from '../InsightsTabSelectors';
+
+const state = hostInsightsStateWrapper({ hits });
+
+const fixtures = {
+  'should return hits': () => selectHits(state),
+};
+
+describe('InsightsTab selectors', () =>
+  testSelectorsSnapshotWithFixtures(fixtures));

data/webpack/InsightsHostDetailsTab/__tests__/__snapshots__/InsightsTab.test.js.snap

@@ -0,0 +1,30 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`InsightsTab rendering render with props 1`] = `
+<Row
+  bsClass="row"
+  componentClass="div"
+>
+  <Col
+    bsClass="col"
+    componentClass="div"
+    xs={12}
+  >
+    <h2>
+      Recommendations
+    </h2>
+    <ListView
+      className=""
+      id="hits_list"
+    >
+      <ListItem
+        key="0"
+        resultsUrl="https://cloud.redhat.com/insights/advisor/recommendations/ansible_deprecated_repo%7CANSIBLE_DEPRECATED_REPO/4739b323-a343-4e89-b71b-81991b8dc656/"
+        solutionUrl="https://access.redhat.com/node/3359651"
+        title="New Ansible Engine packages are inaccessible when dedicated Ansible repo is not enabled"
+        totalRisk={2}
+      />
+    </ListView>
+  </Col>
+</Row>
+`;

data/webpack/InsightsHostDetailsTab/__tests__/__snapshots__/InsightsTabActions.test.js.snap

@@ -0,0 +1,20 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`InsightsTab actions should fetchHits 1`] = `
+Array [
+  Array [
+    Object {
+      "payload": Object {},
+      "type": "INSIGHTS_HITS_REQUEST",
+    },
+  ],
+  Array [
+    Object {
+      "payload": Object {
+        "error": "Cannot read property 'hits' of undefined",
+      },
+      "type": "INSIGHTS_HITS_FAILURE",
+    },
+  ],
+]
+`;

data/webpack/InsightsHostDetailsTab/__tests__/__snapshots__/InsightsTabReducer.test.js.snap

@@ -0,0 +1,41 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`AccountList reducer should handle INSIGHTS_HITS_FAILURE 1`] = `
+Object {
+  "error": "some-error",
+  "hits": Array [],
+}
+`;
+
+exports[`AccountList reducer should handle INSIGHTS_HITS_REQUEST 1`] = `
+Object {
+  "hits": Array [],
+}
+`;
+
+exports[`AccountList reducer should handle INSIGHTS_HITS_SUCCESS 1`] = `
+Object {
+  "hits": Array [
+    Object {
+      "insights_hit": Object {
+        "hostname": "my-host.example.com",
+        "last_seen": "2020-08-19T04:43:09.068706Z",
+        "likelihood": 2,
+        "publish_date": "2018-04-16T10:03:16Z",
+        "results_url": "https://cloud.redhat.com/insights/advisor/recommendations/ansible_deprecated_repo%7CANSIBLE_DEPRECATED_REPO/4739b323-a343-4e89-b71b-81991b8dc656/",
+        "rhel_version": "7.8",
+        "solution_url": "https://access.redhat.com/node/3359651",
+        "title": "New Ansible Engine packages are inaccessible when dedicated Ansible repo is not enabled",
+        "total_risk": 2,
+        "uuid": "4739b323-a343-4e89-b71b-81991b8dc656",
+      },
+    },
+  ],
+}
+`;
+
+exports[`AccountList reducer should return the initial state 1`] = `
+Object {
+  "hits": Array [],
+}
+`;

data/webpack/InsightsHostDetailsTab/__tests__/__snapshots__/InsightsTabSelectors.test.js.snap

@@ -0,0 +1,20 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`InsightsTab selectors should return hits 1`] = `
+Array [
+  Object {
+    "insights_hit": Object {
+      "hostname": "my-host.example.com",
+      "last_seen": "2020-08-19T04:43:09.068706Z",
+      "likelihood": 2,
+      "publish_date": "2018-04-16T10:03:16Z",
+      "results_url": "https://cloud.redhat.com/insights/advisor/recommendations/ansible_deprecated_repo%7CANSIBLE_DEPRECATED_REPO/4739b323-a343-4e89-b71b-81991b8dc656/",
+      "rhel_version": "7.8",
+      "solution_url": "https://access.redhat.com/node/3359651",
+      "title": "New Ansible Engine packages are inaccessible when dedicated Ansible repo is not enabled",
+      "total_risk": 2,
+      "uuid": "4739b323-a343-4e89-b71b-81991b8dc656",
+    },
+  },
+]
+`;

data/webpack/InsightsHostDetailsTab/components/ListItem/ListItem.js

@@ -0,0 +1,69 @@
+import React, { Fragment } from 'react';
+import { ListView, Icon } from 'patternfly-react';
+import PropTypes from 'prop-types';
+
+const labelMapper = {
+  1: 'Low',
+  2: 'Moderate',
+  3: 'Important',
+  4: 'Critical',
+};
+
+const ListItem = ({ title, totalRisk, resultsUrl, solutionUrl }) => {
+  const heading = (
+    <p className="ellipsis list-item-heading" title={title}>
+      {title}
+    </p>
+  );
+
+  const riskLabel = labelMapper[totalRisk];
+  const additionalInfo = [
+    <span key={`risk-info-${title}`} className={`risk-label ${riskLabel}`}>
+      <p>{riskLabel}</p>
+    </span>,
+  ];
+
+  const knowledgebaseLink = solutionUrl && (
+    <p>
+      <a href={solutionUrl} target="_blank" rel="noopener noreferrer">
+        Knowledgebase article <Icon name="external-link" />
+      </a>
+    </p>
+  );
+
+  const insightsCloudLink = resultsUrl && (
+    <p>
+      <a href={resultsUrl} target="_blank" rel="noopener noreferrer">
+        Read more about it in RH cloud insights <Icon name="external-link" />
+      </a>
+    </p>
+  );
+
+  return (
+    <ListView.Item
+      heading={heading}
+      additionalInfo={additionalInfo}
+      hideCloseIcon
+    >
+      <Fragment>
+        <p>{title}</p>
+        {knowledgebaseLink}
+        {insightsCloudLink}
+      </Fragment>
+    </ListView.Item>
+  );
+};
+
+ListItem.propTypes = {
+  title: PropTypes.string.isRequired,
+  totalRisk: PropTypes.number.isRequired,
+  resultsUrl: PropTypes.string,
+  solutionUrl: PropTypes.string,
+};
+
+ListItem.defaultProps = {
+  resultsUrl: '',
+  solutionUrl: '',
+};
+
+export default ListItem;

data/webpack/InsightsHostDetailsTab/components/ListItem/index.js

@@ -0,0 +1 @@
+export { default } from './ListItem';

data/webpack/InsightsHostDetailsTab/index.js

@@ -0,0 +1,20 @@
+import { bindActionCreators } from 'redux';
+import { connect } from 'react-redux';
+import InsightsTab from './InsightsTab';
+import * as actions from './InsightsTabActions';
+import reducer from './InsightsTabReducer';
+import { selectHits } from './InsightsTabSelectors';
+
+// map state to props
+const mapStateToProps = state => ({
+  hits: selectHits(state),
+});
+
+// map action dispatchers to props
+const mapDispatchToProps = dispatch => bindActionCreators(actions, dispatch);
+
+// export reducers
+export const hostInsightsReducers = { hostInsights: reducer };
+
+// export connected component
+export default connect(mapStateToProps, mapDispatchToProps)(InsightsTab);

data/webpack/__tests__/__snapshots__/ForemanRhCloudSelectors.test.js.snap

@@ -11,6 +11,7 @@ Object {
   "InsightsCloudSync": Object {
     "insightsChild": Object {},
   },
+  "hostInsights": Object {},
   "inventoryUpload": Object {
     "inventoryChild": Object {},
   },

data/webpack/__tests__/__snapshots__/ForemanRhCloudTestHelpers.test.js.snap

@@ -6,6 +6,7 @@ Object {
     "InsightsCloudSync": Object {
       "insightsChild": Object {},
     },
+    "hostInsights": Object {},
     "inventoryUpload": Object {},
   },
 }
@@ -15,6 +16,7 @@ exports[`ForemanRhCloud helpers should return inventory wrapper 1`] = `
 Object {
   "ForemanRhCloud": Object {
     "InsightsCloudSync": Object {},
+    "hostInsights": Object {},
     "inventoryUpload": Object {
       "inventoryChild": Object {},
     },
@@ -28,6 +30,7 @@ Object {
     "InsightsCloudSync": Object {
       "insightsChild": Object {},
     },
+    "hostInsights": Object {},
     "inventoryUpload": Object {
       "inventoryChild": Object {},
     },

data/webpack/stories/decorators/withCardsDecorator.js

@@ -4,7 +4,7 @@ export const withCardsDecorator = storyFn => (
   <div
     style={{
       width: '100%',
-      height: '100vh',
+      height: '100%',
       backgroundColor: '#F5F5F5',
       padding: '50px',
     }}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_rh_cloud
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.0.11
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-04 00:00:00.000000000 Z
+date: 2020-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: katello
@@ -109,10 +109,12 @@ files:
 - app/controllers/foreman_inventory_upload/tasks_controller.rb
 - app/controllers/foreman_inventory_upload/uploads_controller.rb
 - app/controllers/foreman_rh_cloud/react_controller.rb
+- app/controllers/insights_cloud/hits_controller.rb
 - app/controllers/insights_cloud/settings_controller.rb
 - app/controllers/insights_cloud/tasks_controller.rb
 - app/helpers/foreman_inventory_upload_helper.rb
 - app/helpers/foreman_inventory_upload_host_helper.rb
+- app/models/concerns/rh_cloud_host.rb
 - app/models/insights_facet.rb
 - app/models/insights_hit.rb
 - app/models/inventory_sync/inventory_status.rb
@@ -120,6 +122,7 @@ files:
 - app/overrides/hosts_list.rb
 - app/views/foreman_rh_cloud/react/insights_cloud.html.erb
 - app/views/foreman_rh_cloud/react/inventory_upload.html.erb
+- app/views/hosts/_insights_tab.html.erb
 - app/views/layouts/foreman_rh_cloud/application.html.erb
 - config/routes.rb
 - db/migrate/20191215104806_create_insights_hits.foreman_inventory_upload.rb
@@ -150,7 +153,8 @@ files:
 - lib/inventory_sync/async/host_result.rb
 - lib/inventory_sync/async/inventory_full_sync.rb
 - lib/tasks/foreman_rh_cloud_tasks.rake
-- lib/tasks/generator.rake
+- lib/tasks/insights.rake
+- lib/tasks/rh_cloud_inventory.rake
 - locale/Makefile
 - locale/en/foreman_rh_cloud.po
 - locale/foreman_rh_cloud.pot
@@ -164,6 +168,7 @@ files:
 - test/factories/inventory_upload_factories.rb
 - test/jobs/insights_full_sync_test.rb
 - test/jobs/inventory_full_sync_test.rb
+- test/jobs/upload_report_job_test.rb
 - test/test_plugin_helper.rb
 - test/unit/archived_report_generator_test.rb
 - test/unit/fact_helpers_test.rb
@@ -458,6 +463,25 @@ files:
 - webpack/InsightsCloudSync/__tests__/InsightsCloudSyncHelpers.test.js
 - webpack/InsightsCloudSync/__tests__/__snapshots__/InsightsCloudSyncHelpers.test.js.snap
 - webpack/InsightsCloudSync/index.js
+- webpack/InsightsHostDetailsTab/InsightsTab.js
+- webpack/InsightsHostDetailsTab/InsightsTab.scss
+- webpack/InsightsHostDetailsTab/InsightsTabActions.js
+- webpack/InsightsHostDetailsTab/InsightsTabConstants.js
+- webpack/InsightsHostDetailsTab/InsightsTabReducer.js
+- webpack/InsightsHostDetailsTab/InsightsTabSelectors.js
+- webpack/InsightsHostDetailsTab/__tests__/InsightsTab.fixtures.js
+- webpack/InsightsHostDetailsTab/__tests__/InsightsTab.test.js
+- webpack/InsightsHostDetailsTab/__tests__/InsightsTabActions.test.js
+- webpack/InsightsHostDetailsTab/__tests__/InsightsTabIntegration.test.js
+- webpack/InsightsHostDetailsTab/__tests__/InsightsTabReducer.test.js
+- webpack/InsightsHostDetailsTab/__tests__/InsightsTabSelectors.test.js
+- webpack/InsightsHostDetailsTab/__tests__/__snapshots__/InsightsTab.test.js.snap
+- webpack/InsightsHostDetailsTab/__tests__/__snapshots__/InsightsTabActions.test.js.snap
+- webpack/InsightsHostDetailsTab/__tests__/__snapshots__/InsightsTabReducer.test.js.snap
+- webpack/InsightsHostDetailsTab/__tests__/__snapshots__/InsightsTabSelectors.test.js.snap
+- webpack/InsightsHostDetailsTab/components/ListItem/ListItem.js
+- webpack/InsightsHostDetailsTab/components/ListItem/index.js
+- webpack/InsightsHostDetailsTab/index.js
 - webpack/__mocks__/foremanReact/API.js
 - webpack/__mocks__/foremanReact/common/I18n.js
 - webpack/__mocks__/foremanReact/common/helpers.js
@@ -498,23 +522,24 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Summary of ForemanRhCloud.
 test_files:
-- test/controllers/uploads_controller_test.rb
-- test/controllers/insights_sync/settings_controller_test.rb
-- test/controllers/accounts_controller_test.rb
-- test/controllers/reports_controller_test.rb
 - test/test_plugin_helper.rb
-- test/jobs/insights_full_sync_test.rb
-- test/jobs/inventory_full_sync_test.rb
 - test/factories/inventory_upload_factories.rb
 - test/factories/insights_factories.rb
-- test/unit/shell_process_job_test.rb
+- test/controllers/reports_controller_test.rb
+- test/controllers/uploads_controller_test.rb
+- test/controllers/accounts_controller_test.rb
+- test/controllers/insights_sync/settings_controller_test.rb
+- test/unit/slice_generator_test.rb
 - test/unit/metadata_generator_test.rb
+- test/unit/shell_process_job_test.rb
 - test/unit/insights_facet_test.rb
-- test/unit/fact_helpers_test.rb
 - test/unit/archived_report_generator_test.rb
-- test/unit/slice_generator_test.rb
+- test/unit/fact_helpers_test.rb
+- test/jobs/inventory_full_sync_test.rb
+- test/jobs/insights_full_sync_test.rb
+- test/jobs/upload_report_job_test.rb