foreman_rh_cloud 2.0.6 → 2.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f497849e8c31b5ca95c689315cd88222097b769c1cf41d9f3ebf89f9cd64febf
-  data.tar.gz: deca6935796bd48f87e1bd6820deb732dc589dd6704fbd923270847be3d46984
+  metadata.gz: beb9afa713376417b3673803766cb7502efeabb52640e5d4a392eadf75b0f1b3
+  data.tar.gz: 1ee3c8b02c4748412ebdbc1547278460d19ced4fddfb55c913ecc38e07e71d2b
 SHA512:
-  metadata.gz: 4c0407bf3aa9d3ce7d3abc86ed6c82182024a68f7b370ba4b406d19924697a8af5c404bf4e361e638821f98a63cc81867c46d8aa6d3af9a8da0c774c33829b14
-  data.tar.gz: 5f4de6af57144fa3e22f10ea1d25269fe309a268bb71b8b677cfcd606f1a507fec9b02ce744e7f184fe74f56b95ed7b6b9c5110d56f0e495d217afb573b6e3cb
+  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/foreman_inventory_upload/accounts_controller.rb

@@ -1,12 +1,8 @@
 module ForemanInventoryUpload
   class AccountsController < ::ApplicationController
-    # override default "welcome screen behavior, since we don't have a model"
-    def welcome
-      true
-    end
-
     def index
-      labels = Organization.all.pluck(:id, :name)
+      organizations = User.current.my_organizations
+      labels = organizations.pluck(:id, :name)
 
       accounts = Hash[
         labels.map do |id, label|
@@ -26,6 +22,8 @@ module ForemanInventoryUpload
 
       render json: {
         autoUploadEnabled: Setting[:allow_auto_inventory_upload],
+        hostObfuscationEnabled: Setting[:obfuscate_inventory_hostnames],
+        cloudToken: Setting[:rh_cloud_token],
         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

@@ -26,13 +26,32 @@ module ForemanInventoryUpload
 
     def auto_upload
       Setting[:allow_auto_inventory_upload] = auto_upload_params
-      render json: {
-        autoUploadEnabled: Setting[:allow_auto_inventory_upload],
-      }
+      render_setting(:autoUploadEnabled, :allow_auto_inventory_upload)
+    end
+
+    def show_auto_upload
+      render_setting(:autoUploadEnabled, :allow_auto_inventory_upload)
     end
 
     def auto_upload_params
       ActiveModel::Type::Boolean.new.cast(params.require(:value))
     end
+
+    def host_obfuscation
+      Setting[:obfuscate_inventory_hostnames] = host_obfuscation_params
+      render_setting(:hostObfuscationEnabled, :obfuscate_inventory_hostnames)
+    end
+
+    def host_obfuscation_params
+      ActiveModel::Type::Boolean.new.cast(params.require(:value))
+    end
+
+    private
+
+    def render_setting(node_name, setting)
+      render json: {
+        node_name => Setting[setting],
+      }
+    end
   end
 end

data/app/controllers/foreman_rh_cloud/react_controller.rb

@@ -0,0 +1,11 @@
+module ForemanRhCloud
+  class ReactController < ::ApplicationController
+    layout "foreman_rh_cloud/application"
+
+    def inventory_upload
+    end
+
+    def insights_cloud
+    end
+  end
+end

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

@@ -0,0 +1,7 @@
+module InsightsCloud
+  class TasksController < ::ApplicationController
+    def create
+      InsightsCloud::Async::InsightsFullSync.perform_now
+    end
+  end
+end

data/app/helpers/foreman_inventory_upload_host_helper.rb

@@ -0,0 +1,20 @@
+module ForemanInventoryUploadHostHelper
+  def hits_counts
+    @hits_counts ||= InsightsHit.where(host_id: @hosts).group(:host_id).count
+  end
+
+  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 class: ['hidden-xs', 'ellipsis'] do
+      if host_hits
+        link_to(
+          content,
+          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,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/models/insights_facet.rb

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

data/app/models/insights_hit.rb

@@ -0,0 +1,6 @@
+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'
+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

@@ -3,7 +3,10 @@ class Setting::RhCloud < Setting
     return unless ActiveRecord::Base.connection.table_exists?('settings')
     return unless super
     [
-      set('allow_auto_inventory_upload', N_('Allow automatic upload of the host inventory to the Red Hat cloud'), true),
+      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('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),
     ]
   end
 

data/app/overrides/hosts_list.rb

@@ -0,0 +1,13 @@
+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>'
+)
+
+Deface::Override.new(
+  virtual_path: 'hosts/_list',
+  name: 'insights_hits_cells',
+  insert_before: 'tbody tr td.hidden-xs:first-of-type',
+  text: '<%= hits_counts_cell(host) %>'
+)

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

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

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

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

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/app/views/{foreman_inventory_upload/layouts/react.html.erb → layouts/foreman_rh_cloud/application.html.erb}

@@ -10,7 +10,7 @@
   <%= 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="ForemanInventoryUploadReactRoot"></div>
+  <div id="ForemanRhCloudReactRoot"></div>
+  <%= yield %>
 <% end %>
 <%= render file: "layouts/base" %>
-<%= mount_react_component('ForemanInventoryUpload', '#ForemanInventoryUploadReactRoot') %>

data/config/routes.rb

@@ -1,11 +1,25 @@
 Rails.application.routes.draw do
   namespace :foreman_inventory_upload do
-    get 'index', to: 'react#index'
     get ':organization_id/reports/last', to: 'reports#last', constraints: { organization_id: %r{[^\/]+} }
     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 'accounts', to: 'accounts#index'
+    get 'auto_upload', to: 'uploads#show_auto_upload'
     post 'auto_upload', to: 'uploads#auto_upload'
+    post 'host_obfuscation', to: 'uploads#host_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
+    get 'inventory_upload', to: 'react#inventory_upload'
+    get 'insights_cloud', to: 'react#insights_cloud'
   end
 end

data/db/migrate/20191215104806_create_insights_hits.foreman_inventory_upload.rb

@@ -0,0 +1,14 @@
+class CreateInsightsHits < ActiveRecord::Migration[5.2]
+  def change
+    create_table :insights_hits do |t|
+      t.references :host, foreign_key: true, null: false
+      t.datetime :last_seen
+      t.string :title
+      t.string :solution_url
+      t.integer :total_risk
+      t.integer :likelihood
+      t.datetime :publish_date
+      t.string :results_url
+    end
+  end
+end

data/db/migrate/20191216062008_create_insights_facets.foreman_inventory_upload.rb

@@ -0,0 +1,7 @@
+class CreateInsightsFacets < ActiveRecord::Migration[5.2]
+  def change
+    create_table :insights_facets do |t|
+      t.references :host, foreign_key: true, null: false
+    end
+  end
+end

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/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), 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
@@ -33,6 +39,12 @@ module ForemanInventoryUpload
       def logger
         Foreman::Logging.logger('background')
       end
+
+      private
+
+      def preprocess_command(command)
+        command.kind_of?(Array) ? command : [command]
+      end
     end
   end
 end