foreman_rh_cloud 2.0.9 → 2.0.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c164b990c325cd1f5e90004585c0074c558ee29ece8b687d37115d88f278274d
-  data.tar.gz: 01f04d99170a49224c7687949acff8d7171ce73d0d620343ce348c324b2b6040
+  metadata.gz: aef13982f858bea42312ee1495b628b86c789e54d81ad939853f0657dbd0d5ad
+  data.tar.gz: 0e9e278c013651e9407d56cc0a85d3c923e28718b91d40a626cb395de572c702
 SHA512:
-  metadata.gz: dc211d399ff2f518b47ccfe76e8a569cac8b3356bab5dc6f2dabfc8c0a3de2926dd8fe99f2a84ea8dba9e4dea3b871cdd3380dfebb48e51cdcb1198dbac16bc8
-  data.tar.gz: 622e9894c0bef62e38f25b687d2acb0c5db74cf8e299e5a327f102052704324e2aafaee71fa30b595de66a29124789a815899e3f324000c559e3c75ce2ce401c
+  metadata.gz: c923cf6e37a14a608601f343dfed4184b8d22a4356372a65bfd3b94fc6aa451848d50952b54adad6cada51af4a7452af3554b9f2ccd325f6b530b51f2fa3b272
+  data.tar.gz: 28b1eb1031ce920dfe66e379c52f0ea7c4799114b6d84104df47b005d722caa08b5ae930fed87de0762ac0fe9a25a83c1fc40c7abc1147ed0da36723ce4eed76

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/foreman_inventory_upload/accounts_controller.rb

@@ -23,6 +23,9 @@ module ForemanInventoryUpload
       render json: {
         autoUploadEnabled: Setting[:allow_auto_inventory_upload],
         hostObfuscationEnabled: Setting[:obfuscate_inventory_hostnames],
+        ipsObfuscationEnabled: Setting[:obfuscate_inventory_ips],
+        cloudToken: Setting[:rh_cloud_token],
+        excludePackages: Setting[:exclude_installed_packages],
         accounts: accounts,
       }, status: :ok
     end

data/app/controllers/foreman_inventory_upload/tasks_controller.rb

@@ -0,0 +1,25 @@
+module ForemanInventoryUpload
+  class TasksController < ::ApplicationController
+    def create
+      selected_org = Organization.current
+      subscribed_hosts_ids = Set.new(
+        ForemanInventoryUpload::Generators::Queries.for_slice(
+          Host.unscoped.where(organization: selected_org)
+        ).pluck(:id)
+      )
+
+      if subscribed_hosts_ids.empty?
+        return render json: {
+          message: N_('Nothing to sync, there are no hosts with subscription for this organization.'),
+        }, status: :method_not_allowed
+      else
+        host_statuses = InventorySync::Async::InventoryFullSync.perform_now(selected_org)
+      end
+
+      render json: {
+        syncHosts: host_statuses[:sync],
+        disconnectHosts: host_statuses[:disconnect],
+      }, status: :ok
+    end
+  end
+end

data/app/controllers/foreman_inventory_upload/uploads_controller.rb

@@ -46,6 +46,24 @@ module ForemanInventoryUpload
       ActiveModel::Type::Boolean.new.cast(params.require(:value))
     end
 
+    def installed_packages_inclusion
+      Setting[:exclude_installed_packages] = host_obfuscation_params
+      render_setting(:excludePackages, :exclude_installed_packages)
+    end
+
+    def installed_packages_inclusion_params
+      ActiveModel::Type::Boolean.new.cast(params.require(:value))
+    end
+
+    def ips_obfuscation
+      Setting[:obfuscate_inventory_ips] = ips_obfuscation_params
+      render_setting(:ipsObfuscationEnabled, :obfuscate_inventory_ips)
+    end
+
+    def ips_obfuscation_params
+      ActiveModel::Type::Boolean.new.cast(params.require(:value))
+    end
+
     private
 
     def render_setting(node_name, setting)

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/controllers/insights_cloud/settings_controller.rb

@@ -0,0 +1,24 @@
+module InsightsCloud
+  class SettingsController < ::ApplicationController
+    def show
+      render_setting(:insightsSyncEnabled, :allow_auto_insights_sync)
+    end
+
+    def update
+      Setting[:allow_auto_insights_sync] = settings_params
+      render_setting(:insightsSyncEnabled, :allow_auto_insights_sync)
+    end
+
+    private
+
+    def render_setting(node_name, setting)
+      render json: {
+        node_name => Setting[setting],
+      }
+    end
+
+    def settings_params
+      ActiveModel::Type::Boolean.new.cast(params.require(:insightsSyncEnabled))
+    end
+  end
+end

data/app/controllers/insights_cloud/tasks_controller.rb

@@ -1,8 +1,7 @@
 module InsightsCloud
   class TasksController < ::ApplicationController
     def create
-      selected_org = Organization.current
-      InsightsCloud::Async::InsightsFullSync.perform_now(selected_org)
+      InsightsCloud::Async::InsightsFullSync.perform_now
     end
   end
 end

data/app/helpers/foreman_inventory_upload_host_helper.rb

@@ -5,7 +5,15 @@ module ForemanInventoryUploadHostHelper
 
   def hits_counts_cell(host)
     host_hits = hits_counts[host.id]
-    content = n_('One recommendation', '%{hits} recommendations', host_hits) % { hits: host_hits } if host_hits
-    tag.td content, class: ['hidden-xs', 'ellipsis']
+    tag.td class: ['hidden-xs', 'ellipsis', 'text-center'] do
+      if host_hits
+        link_to(
+          host_hits,
+          InsightsCloud::WebUi.system_url(InsightsCloud::WebUi::ADVISOR, host.insights.uuid),
+          :rel => 'external noopener noreferrer',
+          :target => '_blank'
+        )
+      end
+    end
   end
 end

data/app/models/concerns/rh_cloud_host.rb

@@ -0,0 +1,15 @@
+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
+    )
+
+    has_many :insights_hits, through: :insights, source: :hits
+    scoped_search :relation => :insights, :on => :hits_count, :only_explicit => true, :rename => :insights_recommendations_count
+  end
+end

data/app/models/insights_facet.rb

@@ -1,3 +1,7 @@
 class InsightsFacet < HostFacets::Base
-  has_many :hits, foreign_key: :host_id, primary_key: :host_id, class_name: 'InsightsHit'
+  has_many :hits,
+    foreign_key: :host_id,
+    primary_key: :host_id,
+    class_name: 'InsightsHit',
+    dependent: :destroy
 end

data/app/models/insights_hit.rb

@@ -2,5 +2,5 @@ class InsightsHit < ApplicationRecord
   has_one :host
   # since the facet is one-to-one association with a host, we can connect
   # through host_id column on both this model and facet.
-  has_one :insights_facet, foreign_key: 'host_id', primary_key: 'host_id'
+  belongs_to :insights_facet, foreign_key: 'host_id', primary_key: 'host_id', counter_cache: :hits_count
 end

data/app/models/inventory_sync/inventory_status.rb

@@ -0,0 +1,30 @@
+module InventorySync
+  class InventoryStatus < HostStatus::Status
+    DISCONNECT = 0
+    SYNC = 1
+
+    def self.status_name
+      N_('Inventory')
+    end
+
+    def to_global(_options = {})
+      case status
+      when DISCONNECT
+        ::HostStatus::Global::WARN
+      when SYNC
+        ::HostStatus::Global::OK
+      else
+        ::HostStatus::Global::WARN
+      end
+    end
+
+    def to_label
+      case status
+        when DISCONNECT
+          N_('Host was not uploaded to your RH cloud inventory')
+        when SYNC
+          N_('Successfully uploaded to your RH cloud inventory')
+      end
+    end
+  end
+end

data/app/models/setting/rh_cloud.rb

@@ -4,8 +4,11 @@ class Setting::RhCloud < Setting
     return unless super
     [
       set('allow_auto_inventory_upload', N_('Allow automatic upload of the host inventory to the Red Hat cloud'), false),
+      set('allow_auto_insights_sync', N_('Allow recommendations synchronization from Red Hat cloud'), false),
       set('obfuscate_inventory_hostnames', N_('Obfuscate host names sent to Red Hat cloud'), false),
+      set('obfuscate_inventory_ips', N_('Obfuscate ip addresses sent to Red Hat cloud'), false),
       set('rh_cloud_token', N_('Authentication token to Red Hat cloud services. Used to authenticate requests to cloud APIs'), 'DEFAULT', N_('Red Hat Cloud token'), nil, encrypted: true),
+      set('exclude_installed_packages', N_('Exclude installed packages from Red Hat cloud inventory report'), false),
     ]
   end
 

data/app/overrides/hosts_list.rb

@@ -2,7 +2,7 @@ Deface::Override.new(
   virtual_path: 'hosts/_list',
   name: 'insights_hits_header',
   insert_before: 'thead tr th.hidden-xs:first-of-type',
-  text: '<th class="hidden-xs" width="10%"><%= _("Insights")%></th>'
+  text: '<th class="hidden-xs ellipsis" width="12%"><%= sort :insights_recommendations_count, :as => _("Recommendations")%></th>'
 )
 
 Deface::Override.new(

data/app/services/foreman_rh_cloud/cloud_auth.rb

@@ -0,0 +1,28 @@
+module ForemanRhCloud
+  module CloudAuth
+    extend ActiveSupport::Concern
+
+    def rh_credentials
+      @rh_credentials ||= query_refresh_token
+    end
+
+    def query_refresh_token
+      token_response = RestClient::Request.execute(
+        method: :post,
+        url: ForemanRhCloud.authentication_url,
+        verify_ssl: ForemanRhCloud.verify_ssl_method,
+        proxy: ForemanRhCloud.transformed_http_proxy_string(logger: logger),
+        payload: {
+          grant_type: 'refresh_token',
+          client_id: 'rhsm-api',
+          refresh_token: Setting[:rh_cloud_token],
+        }
+      )
+
+      JSON.parse(token_response)['access_token']
+    rescue RestClient::ExceptionWithResponse => e
+      Foreman::Logging.exception('Unable to authenticate using rh_cloud_token setting', e)
+      raise ::Foreman::WrappedException.new(e, N_('Unable to authenticate using rh_cloud_token setting'))
+    end
+  end
+end

data/app/views/foreman_rh_cloud/react/insights_cloud.html.erb

@@ -1,6 +1 @@
-<%= mount_react_component(
-'InsightsCloudSync',
-'#ForemanRhCloudReactRoot',
-{
-  settingsUrl: settings_url(search: 'name = rh_cloud_token')
-}.to_json) %>
+<%= react_component('InsightsCloudSync', { settingsUrl: settings_url(search: 'name = rh_cloud_token') }) %>

data/app/views/foreman_rh_cloud/react/inventory_upload.html.erb

@@ -1 +1 @@
-<%= mount_react_component("ForemanInventoryUpload", '#ForemanRhCloudReactRoot') %>
+<%= react_component('ForemanInventoryUpload') %>

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

@@ -0,0 +1,9 @@
+<% content_for(:javascripts) do %>
+  <%= webpacked_plugins_js_for :'foreman_rh_cloud' %>
+<% end %>
+
+<% content_for(:stylesheets) do %>
+    <%= webpacked_plugins_css_for :'foreman_rh_cloud' %>
+<% end %>
+
+<%= react_component('InsightsHostDetailsTab', { hostID: host.id }) %>

data/app/views/layouts/foreman_rh_cloud/application.html.erb

@@ -10,7 +10,6 @@
   <%= notifications %>
   <div id="organization-id" data-id="<%= Organization.current.id if Organization.current %>" ></div>
   <div id="user-id" data-id="<%= User.current.id if User.current %>" ></div>
-  <div id="ForemanRhCloudReactRoot"></div>
   <%= yield %>
 <% end %>
 <%= render file: "layouts/base" %>

data/config/routes.rb

@@ -8,10 +8,16 @@ Rails.application.routes.draw do
     get 'auto_upload', to: 'uploads#show_auto_upload'
     post 'auto_upload', to: 'uploads#auto_upload'
     post 'host_obfuscation', to: 'uploads#host_obfuscation'
+    post 'installed_packages_inclusion', to: 'uploads#installed_packages_inclusion'
+    post 'ips_obfuscation', to: 'uploads#ips_obfuscation'
+
+    resources :tasks, only: [:create]
   end
 
   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/db/migrate/20200727111529_add_uuid_column_to_insights_facets.foreman_rh_cloud.rb

@@ -0,0 +1,5 @@
+class AddUuidColumnToInsightsFacets < ActiveRecord::Migration[5.2]
+  def change
+    add_column :insights_facets, :uuid, :string
+  end
+end

data/db/migrate/20201007115752_add_hits_count_to_insights_facets_table.foreman_rh_cloud.rb

@@ -0,0 +1,5 @@
+class AddHitsCountToInsightsFacetsTable < ActiveRecord::Migration[5.0]
+  def change
+    add_column :insights_facets, :hits_count, :integer
+  end
+end

data/db/migrate/20201007121540_setup_hits_count_cache.foreman_rh_cloud.rb

@@ -0,0 +1,10 @@
+class SetupHitsCountCache < ActiveRecord::Migration[5.0]
+  def up
+    ActiveRecord::Base.connection.execute <<-SQL.squish
+    UPDATE insights_facets
+    SET hits_count = (SELECT count(1)
+                              FROM insights_hits
+                              WHERE insights_hits.host_id = insights_facets.host_id)
+    SQL
+  end
+end

data/lib/foreman_inventory_upload.rb

@@ -60,4 +60,8 @@ module ForemanInventoryUpload
     FileUtils.mkdir_p(folder)
     folder
   end
+
+  def self.inventory_export_url
+    ForemanRhCloud.base_url + '/api/inventory/v1/hosts'
+  end
 end

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
 
@@ -29,6 +47,8 @@ module ForemanInventoryUpload
           'FILES' => @filename,
           'CER_PATH' => @cer_path
         )
+
+        http_proxy_string = ForemanRhCloud.http_proxy_string(logger: logger)
         if http_proxy_string
           env_vars['http_proxy'] = http_proxy_string
           env_vars['https_proxy'] = http_proxy_string
@@ -36,10 +56,6 @@ module ForemanInventoryUpload
         env_vars
       end
 
-      def http_proxy_string
-        @http_proxy_string ||= HttpProxy.default_global_content_proxy&.full_url
-      end
-
       def rh_credentials
         @rh_credentials ||= begin
           candlepin_id_certificate = @organization.owner_details['upstreamConsumer']['idCert']