foreman_rh_cloud 0.9.9 → 0.9.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '09f221b1f513c89b9aa56a858b920504335cc043e20fb9e97b7732ddd201b93d'
-  data.tar.gz: 6e8ec2007e1b38b6f2b086153196b22acb1ecd3ce682fad8981dfb0f2c21bc4c
+  metadata.gz: be1ed5e65ca0dd0c2515ab70dcffa4ba5bb480a822b822d122ab6b126a5ec242
+  data.tar.gz: 9e7f83b694de9ffe66da0f86c781f869161c93aa92c426a16bb319601bc407f0
 SHA512:
-  metadata.gz: 4e96b8f5252b7714775587e47b0dec32e36db70c5d972edd7e3a104e916a59750189aca04a9a0bb87d1287d2ac647df39ae2dd05176c5fa025c2bd1cfe8e16f9
-  data.tar.gz: f19b66899b1bbfb6bdb4eca3b998fb11f92099b7cae551d4bfda6a8ac84d64720fbc0a6c6580a454f03beb67a1a606c2b877ce48dd7e864eae89ababb280def5
+  metadata.gz: 33c3a9d35df67a9c7217d385ccb035673795ac0200c3aac6bc7695e28fd6360a737832ac929d010c866af71ab8e2a54ce11947c2aacd3135a1959326e1469ba2
+  data.tar.gz: e41fd42b654ba57a64fac11e6b77ab5caa55a511a3dfc5371ef329904f7c9989562aedb7d3f52044d28f744691f5795e4b45addbeba4015ae4094fb28942a0cc

data/app/controllers/foreman_inventory_upload/accounts_controller.rb

@@ -23,6 +23,7 @@ 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/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

@@ -6,6 +6,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'] 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/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/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

@@ -6,6 +6,7 @@ class Setting::RhCloud < Setting
     transaction do
       [
         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),
       ].each { |s| create! s.update(:category => 'Setting::RhCloud')}

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

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

data/config/routes.rb

@@ -8,10 +8,13 @@ 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'
+
+    resources :tasks, only: [:create]
   end
 
   namespace :insights_cloud do
     resources :tasks, only: [:create]
+    resource :settings, only: [:show, :update]
   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/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/generators/fact_helpers.rb

@@ -67,7 +67,7 @@ module ForemanInventoryUpload
       end
 
       def obfuscate_fqdn(fqdn)
-        Digest::SHA1.hexdigest(fqdn)
+        "#{Digest::SHA1.hexdigest(fqdn)}.example.com"
       end
     end
   end

data/lib/foreman_inventory_upload/generators/slice.rb

@@ -3,6 +3,8 @@ module ForemanInventoryUpload
     class Slice
       include FactHelpers
 
+      SATELLITE_NAMESPACE = 'satellite'
+
       attr_accessor :slice_id
       attr_reader :hosts_count
 
@@ -52,7 +54,7 @@ module ForemanInventoryUpload
           end
           @stream.array_field('facts') do
             @stream.object do
-              @stream.simple_field('namespace', 'satellite')
+              @stream.simple_field('namespace', SATELLITE_NAMESPACE)
               @stream.object_field('facts', :last) do
                 report_satellite_facts(host)
               end
@@ -60,8 +62,15 @@ module ForemanInventoryUpload
           end
 
           @stream.array_field('tags', :last) do
-            report_tag('satellite', 'satellite_instance_id', Foreman.instance_id) if Foreman.respond_to?(:instance_id)
-            report_tag('satellite', 'organization_id', host.organization_id.to_s, :last)
+            report_satellite_tag('satellite_instance_id', Foreman.instance_id) if Foreman.respond_to?(:instance_id)
+            report_satellite_tag('lifecycle_environment', host.lifecycle_environment&.name)
+            report_satellite_tag('content_view', host.content_view&.name)
+            report_satellite_tag('activation_key', host.activation_keys) { |key| key.name }
+            report_satellite_tag('host_collection', host.host_collections) { |collection| collection.name }
+            report_satellite_tag('location', host.location.name)
+            report_satellite_tag('organization', host.organization.name)
+            report_satellite_tag('hostgroup', host.hostgroup&.name)
+            report_satellite_tag('organization_id', host.organization_id.to_s, :last)
           end
         end
       end
@@ -75,6 +84,18 @@ module ForemanInventoryUpload
         @stream.comma unless last
       end
 
+      def report_satellite_tag(key, value, last = nil)
+        return if value.nil?
+
+        array_value = Array(value)
+        last_index = array_value.count - 1
+
+        array_value.each_with_index do |value, index|
+          value = yield(value) if block_given?
+          report_tag(SATELLITE_NAMESPACE, key, value, last && index == last_index)
+        end
+      end
+
       def report_system_profile(host)
         @stream.simple_field('number_of_cpus', fact_value(host, 'cpu::cpu(s)').to_i)
         @stream.simple_field('number_of_sockets', fact_value(host, 'cpu::cpu_socket(s)').to_i)
@@ -146,6 +167,7 @@ module ForemanInventoryUpload
         end
         @stream.simple_field('system_purpose_usage', host.subscription_facet.purpose_usage)
         @stream.simple_field('system_purpose_role', host.subscription_facet.purpose_role)
+        @stream.simple_field('system_purpose_sla', host.subscription_facet.service_level)
         @stream.simple_field('distribution_version', fact_value(host, 'distribution::version'))
         @stream.simple_field('satellite_instance_id', Foreman.try(:instance_id))
         @stream.simple_field('is_simple_content_access', golden_ticket?(host.organization))

data/lib/foreman_rh_cloud.rb

@@ -1,4 +1,17 @@
 require 'foreman_rh_cloud/engine.rb'
 
 module ForemanRhCloud
+  def self.base_url
+    # for testing set ENV to 'https://ci.cloud.redhat.com'
+    @base_url ||= ENV['SATELLITE_RH_CLOUD_URL'] || 'https://cloud.redhat.com'
+  end
+
+  def self.authentication_url
+    # https://sso.redhat.com/auth/realms/redhat-external/protocol/openid-connect/token
+    @authentication_url ||= ENV['SATELLITE_RH_CLOUD_SSO_URL'] || 'https://sso.redhat.com/auth/realms/redhat-external/protocol/openid-connect/token'
+  end
+
+  def self.verify_ssl_method
+    @verify_ssl_method ||= ENV['SATELLITE_RH_CLOUD_URL'] ? OpenSSL::SSL::VERIFY_NONE : OpenSSL::SSL::VERIFY_PEER
+  end
 end

data/lib/foreman_rh_cloud/engine.rb

@@ -57,8 +57,13 @@ module ForemanRhCloud
         menu :top_menu, :inventory_upload, :caption => N_('Inventory Upload'), :url_hash => { controller: :'foreman_rh_cloud/react', :action => :inventory_upload}, parent: :configure_menu
         menu :top_menu, :insights_hits_import, :caption => N_('Insights'), :url_hash => { controller: :'foreman_rh_cloud/react', :action => :insights_cloud }, parent: :configure_menu
 
-        register_facet InsightsFacet, :insights
+        register_facet InsightsFacet, :insights do
+          set_dependent_action :destroy
+        end
+
         register_global_js_file 'subscriptions_extension'
+
+        register_custom_status(InventorySync::InventoryStatus)
       end
 
       ::Katello::UINotifications::Subscriptions::ManifestImportSuccess.include ForemanInventoryUpload::Notifications::ManifestImportSuccessNotificationOverride if defined?(Katello)
@@ -68,6 +73,7 @@ module ForemanRhCloud
       unless Rails.env.test?
         ForemanTasks.dynflow.config.on_init do |world|
           ForemanInventoryUpload::Async::GenerateAllReportsJob.spawn_if_missing(world)
+          InsightsCloud::Async::InsightsScheduledSync.spawn_if_missing(world)
         end
       end
     end

data/lib/foreman_rh_cloud/version.rb

@@ -1,3 +1,3 @@
 module ForemanRhCloud
-  VERSION = '0.9.9'.freeze
+  VERSION = '0.9.10'.freeze
 end

data/lib/insights_cloud.rb

@@ -1,15 +1,15 @@
 module InsightsCloud
-  def self.base_url
-    # for testing set ENV to 'https://ci.cloud.redhat.com'
-    @base_url ||= ENV['SATELLITE_INSIGHTS_CLOUD_URL'] || 'https://cloud.redhat.com'
-  end
+  module WebUi
+    ADVISOR = 'advisor'
+    VULNERABILITY = 'vulnerability'
+    PATCH = 'patch'
 
-  def self.authentication_url
-    # https://sso.redhat.com/auth/realms/redhat-external/protocol/openid-connect/token
-    @authentication_url ||= ENV['SATELLITE_INSIGHTS_CLOUD_SSO_URL'] || 'https://sso.redhat.com/auth/realms/redhat-external/protocol/openid-connect/token'
+    def self.system_url(subsystem, host_uuid)
+      ForemanRhCloud.base_url + "/insights/#{subsystem}/systems/#{host_uuid}"
+    end
   end
 
   def self.hits_export_url
-    base_url + '/api/insights/v1/export/hits/'
+    ForemanRhCloud.base_url + '/api/insights/v1/export/hits/'
   end
 end

data/lib/insights_cloud/async/insights_full_sync.rb

@@ -3,13 +3,11 @@ require 'rest-client'
 module InsightsCloud
   module Async
     class InsightsFullSync < ::ApplicationJob
-      def perform(organization)
-        @organization = organization
-
+      def perform
         hits = query_insights_hits
 
-        host_names = hits.map { |hit| hit['hostname'] }.uniq
-        setup_host_names(host_names)
+        @hits_host_names = Hash[hits.map { |hit| [hit['hostname'], hit['uuid']] }]
+        setup_host_names(@hits_host_names.keys)
 
         replace_hits_data(hits)
       end
@@ -28,7 +26,7 @@ module InsightsCloud
         hits_response = RestClient::Request.execute(
           method: :get,
           url: InsightsCloud.hits_export_url,
-          verify_ssl: ENV['SATELLITE_INSIGHTS_CLOUD_URL'] ? OpenSSL::SSL::VERIFY_NONE : OpenSSL::SSL::VERIFY_PEER,
+          verify_ssl: ForemanRhCloud.verify_ssl_method,
           headers: {
             Authorization: "Bearer #{rh_credentials}",
           }
@@ -40,8 +38,8 @@ module InsightsCloud
       def query_refresh_token
         token_response = RestClient::Request.execute(
           method: :post,
-          url: InsightsCloud.authentication_url,
-          verify_ssl: ENV['SATELLITE_INSIGHTS_CLOUD_URL'] ? OpenSSL::SSL::VERIFY_NONE : OpenSSL::SSL::VERIFY_PEER,
+          url: ForemanRhCloud.authentication_url,
+          verify_ssl: ForemanRhCloud.verify_ssl_method,
           payload: {
             grant_type: 'refresh_token',
             client_id: 'rhsm-api',
@@ -57,7 +55,7 @@ module InsightsCloud
 
       def setup_host_names(host_names)
         @host_ids = Hash[
-          Host.where(name: host_names).pluck(:name, :id)
+          Host.unscoped.where(name: host_names).pluck(:name, :id)
         ]
       end
 
@@ -71,7 +69,16 @@ module InsightsCloud
           InsightsHit.create(hits.map { |hits_hash| to_model_hash(hits_hash) }.compact)
           # create new facets for hosts that are missing one
           hosts_with_existing_facets = InsightsFacet.where(host_id: @host_ids.values).pluck(:host_id)
-          InsightsFacet.create((@host_ids.values - hosts_with_existing_facets).map { |id| {host_id: id} })
+          InsightsFacet.create(
+            @host_ids.map do |host_name, host_id|
+              unless hosts_with_existing_facets.include?(host_id)
+                {
+                  host_id: host_id,
+                  uuid: @hits_host_names[host_name],
+                }
+              end
+            end.compact
+          )
         end
       end
 

data/lib/insights_cloud/async/insights_scheduled_sync.rb

@@ -0,0 +1,23 @@
+module InsightsCloud
+  module Async
+    class InsightsScheduledSync < ::ApplicationJob
+      def perform
+        unless Setting[:allow_auto_insights_sync]
+          logger.debug(
+            'The scheduled process is disabled due to the "allow_auto_insights_sync"
+            setting being set to false.'
+          )
+          return
+        end
+
+        InsightsFullSync.perform_later()
+      ensure
+        self.class.set(:wait => 24.hours).perform_later
+      end
+
+      def self.singleton_job_name
+        name
+      end
+    end
+  end
+end

data/lib/inventory_sync/async/host_result.rb

@@ -0,0 +1,50 @@
+module InventorySync
+  module Async
+    class HostResult
+      def initialize(result)
+        @total = result['total']
+        @count = result['count']
+        @page = result['page']
+        @per_page = result['per_page']
+        @fqdns = result["results"].map { |host| host['fqdn'] }
+      end
+
+      def status_hashes
+        @fqdns.map do |fqdn|
+          host_id = host_id(fqdn)
+          if host_id
+            touched << host_id
+            {
+              host_id: host_id,
+              status: InventorySync::InventoryStatus::SYNC,
+              reported_at: Time.current,
+            }
+          end
+        end.compact
+      end
+
+      def touched
+        @touched ||= []
+      end
+
+      def host_id(fqdn)
+        hosts[fqdn]
+      end
+
+      def hosts
+        @hosts ||= Hash[
+          Host.where(name: @fqdns).pluck(:name, :id)
+        ]
+      end
+
+      def percentage
+        ratio = @per_page * @page * 1.0 / @total * 100
+        (ratio > 100) ? 100 : ratio.truncate(2)
+      end
+
+      def last?
+        @total <= @per_page * @page
+      end
+    end
+  end
+end