foreman_rh_cloud 2.0.10 → 2.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a340f8085bfc6d4d08048369230ab9b90a392cc460b86d53c30bbe8a90ed3c86
-  data.tar.gz: dd76bc695e8d183ac9b9afd05e84ca8650730584919243f9b99d10da522dd707
+  metadata.gz: beb9afa713376417b3673803766cb7502efeabb52640e5d4a392eadf75b0f1b3
+  data.tar.gz: 1ee3c8b02c4748412ebdbc1547278460d19ced4fddfb55c913ecc38e07e71d2b
 SHA512:
-  metadata.gz: dbd457318e1c1b23db3e5d2e9a71974f30f6d089fa7df5af02d4b6fbce6487c8b3cedd0749da05d76b32aa5af22a2a1cc99ffaef3d141c77a1edffd838d8bc70
-  data.tar.gz: 7269c01c4e2599456f4d340425ad60b56a9f65749642d0e5cbda9c2217fd792b8cf1d61808a787c36a644d0f785e7c623a22d47b58af83e693530acbb77824fd
+  metadata.gz: 650e22398af35c4cc866c53d33988ca02d1c30909e62b6b9b6839c0c354d6d2ab56c6928b839b490119c350246520f9c8ca3d2aacc6c05d23bf7fbd22d6fd8e5
+  data.tar.gz: 8a501092f95cbb44def78a581fa70fff1d245b72af0332362c5efe3de2f3cc3db70e4842111644d0ed27c0e96a9458e28e0fbc8850e810efe4660a9bce39cb0c

data/README.md

@@ -13,11 +13,36 @@ for how to install Foreman plugins
 
 ### In Satellite
 
-Normally you run it via UI in RH Cloud -> Inventory Upload -> Restart, but if you need to run from command-line for some reason:
+#### 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 foreman_inventory_upload:report:generate
+    /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
 

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), *preprocess_command(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), *preprocess_command(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 = '2.0.10'.freeze
+  VERSION = '2.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,10 +1,11 @@
 {
   "name": "foreman_rh_cloud",
-  "version": "0.0.1",
+  "version": "2.0.11",
   "description": "Inventory Upload =============",
   "main": "index.js",
   "scripts": {
     "lint": "tfm-lint --plugin -d /webpack",
+    "lint:spelling": "eslint ./",
     "test": "tfm-test --plugin",
     "test:watch": "tfm-test --plugin --watchAll",
     "test:current": "tfm-test --plugin --watch",
@@ -32,6 +33,7 @@
     "@theforeman/eslint-plugin-foreman": "^4.0.2",
     "babel-eslint": "^10.0.0",
     "eslint": "^6.7.2",
+    "eslint-plugin-spellcheck": "^0.0.17",
     "prettier": "^1.13.5",
     "raf": "^3.4.0",
     "stylelint": "^9.3.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/InventoryFilterReducer.js

@@ -1,5 +1,8 @@
 import Immutable from 'seamless-immutable';
-import { LAYOUT_CHANGE_ORG } from 'foremanReact/components/Layout/LayoutConstants';
+import {
+  LAYOUT_CHANGE_ORG,
+  LAYOUT_INITIALIZE,
+} from 'foremanReact/components/Layout/LayoutConstants';
 import {
   INVENTORY_FILTER_UPDATE,
   INVENTORY_FILTER_CLEAR,
@@ -12,7 +15,7 @@ const initialState = Immutable({
 
 export default (
   state = initialState,
-  { type, payload: { filterTerm, org } = {} }
+  { type, payload: { filterTerm, org, organization } = {} }
 ) => {
   switch (type) {
     case INVENTORY_FILTER_UPDATE:
@@ -30,6 +33,14 @@ export default (
         filterTerm: term,
       });
     }
+    case LAYOUT_INITIALIZE: {
+      // Layout action changed in Jul 20 2020 - https://github.com/theforeman/foreman/commit/e4c39a7d8f8b50ba45ef63e46f6f6914b69f247a
+      const { title } = organization; // org was renamed
+      const term = title === ANY_ORGANIZATION ? '' : title;
+      return state.merge({
+        filterTerm: term,
+      });
+    }
     default:
       return state;
   }

data/webpack/ForemanInventoryUpload/Components/InventoryFilter/__tests__/InventoryFilterReducer.test.js

@@ -1,5 +1,8 @@
 import { testReducerSnapshotWithFixtures } from '@theforeman/test';
-import { LAYOUT_CHANGE_ORG } from 'foremanReact/components/Layout/LayoutConstants';
+import {
+  LAYOUT_CHANGE_ORG,
+  LAYOUT_INITIALIZE,
+} from 'foremanReact/components/Layout/LayoutConstants';
 import reducer from '../InventoryFilterReducer';
 import { filterTerm, org } from '../InventoryFilter.fixtures';
 import {
@@ -29,6 +32,12 @@ const fixtures = {
       payload: { org },
     },
   },
+  'should handle LAYOUT_INITIALIZE': {
+    action: {
+      type: LAYOUT_INITIALIZE,
+      payload: { organization: org },
+    },
+  },
 };
 
 describe('AccountList reducer', () =>