foreman_rh_cloud 2.0.6 → 2.0.11

data/lib/foreman_inventory_upload/async/upload_report_job.rb

@@ -8,20 +8,38 @@ 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
 
       def command
-        File.join(File.dirname(@filename), ForemanInventoryUpload.upload_script_file)
+        ['/bin/bash', File.join(File.dirname(@filename), ForemanInventoryUpload.upload_script_file)]
       end
 
       def env
@@ -37,7 +55,10 @@ module ForemanInventoryUpload
       end
 
       def http_proxy_string
-        @http_proxy_string ||= HttpProxy.default_global_content_proxy&.full_url
+        @http_proxy_string ||=
+          HttpProxy.default_global_content_proxy&.full_url ||
+          cdn_proxy ||
+          global_foreman_proxy
       end
 
       def rh_credentials
@@ -49,6 +70,31 @@ module ForemanInventoryUpload
           }
         end
       end
+
+      def cdn_proxy
+        cdn_settings = SETTINGS[:katello][:cdn_proxy] || {}
+
+        return nil unless cdn_settings[:host]
+
+        proxy_uri = URI('')
+
+        original_uri = URI.parse(cdn_settings[:host])
+
+        proxy_uri.scheme = original_uri.scheme || 'http'
+        proxy_uri.host = original_uri.host || original_uri.path
+        proxy_uri.port = cdn_settings[:port]
+        proxy_uri.user = cdn_settings[:user]
+        proxy_uri.password = cdn_settings[:password]
+
+        proxy_uri.to_s
+      rescue URI::Error => e
+        logger.warn("cdn_proxy parsing failed: #{e}")
+        nil
+      end
+
+      def global_foreman_proxy
+        Setting[:http_proxy]
+      end
     end
   end
 end

data/lib/foreman_inventory_upload/generators/fact_helpers.rb

@@ -3,6 +3,11 @@ module ForemanInventoryUpload
     module FactHelpers
       extend ActiveSupport::Concern
 
+      CLOUD_AMAZON = 'aws'
+      CLOUD_GOOGLE = 'google'
+      CLOUD_AZURE = 'azure'
+      CLOUD_ALIBABA = 'alibaba'
+
       def fact_value(host, fact_name)
         value_record = host.fact_values.find do |fact_value|
           fact_value.fact_name_id == ForemanInventoryUpload::Generators::Queries.fact_names[fact_name]
@@ -26,6 +31,44 @@ module ForemanInventoryUpload
         @organization_golden_tickets ||= {}
         @organization_golden_tickets[organization.id] ||= result
       end
+
+      def cloud_provider(host)
+        bios_version = fact_value(host, 'dmi::bios::version')
+
+        if bios_version
+          return CLOUD_AMAZON if bios_version.downcase['amazon']
+          return CLOUD_GOOGLE if bios_version.downcase['google']
+        end
+
+        chassis_asset_tag = fact_value(host, 'dmi::chassis::asset_tag')
+        return CLOUD_AZURE if chassis_asset_tag && chassis_asset_tag['7783-7084-3265-9085-8269-3286-77']
+
+        system_manufacturer = fact_value(host, 'dmi::system::manufacturer')
+        return CLOUD_ALIBABA if system_manufacturer && system_manufacturer.downcase['alibaba cloud']
+
+        product_name = fact_value(host, 'dmi::system::product_name')
+        return CLOUD_ALIBABA if product_name && product_name.downcase['alibaba cloud ecs']
+
+        nil
+      end
+
+      def obfuscate_hostname?(host)
+        insights_client_setting = fact_value(host, 'insights_client::obfuscate_hostname_enabled')
+        insights_client_setting = ActiveModel::Type::Boolean.new.cast(insights_client_setting)
+        return insights_client_setting unless insights_client_setting.nil?
+
+        Setting[:obfuscate_inventory_hostnames]
+      end
+
+      def fqdn(host)
+        return host.fqdn unless obfuscate_hostname?(host)
+
+        fact_value(host, 'insights_client::hostname') || obfuscate_fqdn(host.fqdn)
+      end
+
+      def obfuscate_fqdn(fqdn)
+        "#{Digest::SHA1.hexdigest(fqdn)}.example.com"
+      end
     end
   end
 end

data/lib/foreman_inventory_upload/generators/json_stream.rb

@@ -36,6 +36,16 @@ module ForemanInventoryUpload
         @out << ',' unless last
       end
 
+      def string_array_value(name, value, last = false)
+        return if value.empty?
+
+        string_value = value.map { |v| stringify_value(v) }
+
+        array_field(name, last) do
+          raw(string_value.join(', '))
+        end
+      end
+
       def object_field(name, last = false, &block)
         @out << "\"#{name}\": "
         object(&block)

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

@@ -20,28 +20,31 @@ module ForemanInventoryUpload
               'distribution::version',
               'distribution::id',
               'virt::is_guest',
+              'dmi::system::manufacturer',
+              'dmi::system::product_name',
+              'dmi::chassis::asset_tag',
+              'insights_client::obfuscate_hostname_enabled',
+              'insights_client::hostname',
             ]).pluck(:name, :id)
           ]
       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_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
 
@@ -39,28 +41,20 @@ module ForemanInventoryUpload
 
       def report_host(host)
         @stream.object do
-          @stream.simple_field('fqdn', host.fqdn)
+          @stream.simple_field('fqdn', fqdn(host))
           @stream.simple_field('account', account_id(host.organization).to_s)
           @stream.simple_field('subscription_manager_id', host.subscription_facet&.uuid)
           @stream.simple_field('satellite_id', host.subscription_facet&.uuid)
           @stream.simple_field('bios_uuid', fact_value(host, 'dmi::system::uuid'))
           @stream.simple_field('vm_uuid', fact_value(host, 'virt::uuid'))
-          @stream.array_field('ip_addresses') do
-            @stream.raw(host.interfaces.map do |nic|
-              @stream.stringify_value(nic.ip) if nic.ip
-            end.compact.join(', '))
-          end
-          @stream.array_field('mac_addresses') do
-            @stream.raw(host.interfaces.map do |nic|
-              @stream.stringify_value(nic.mac) if nic.mac
-            end.compact.join(', '))
-          end
+          report_ip_addresses(host)
+          report_mac_addresses(host)
           @stream.object_field('system_profile') do
             report_system_profile(host)
           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
@@ -68,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
@@ -83,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)
@@ -126,6 +139,7 @@ module ForemanInventoryUpload
           'infrastructure_type',
           ActiveModel::Type::Boolean.new.cast(fact_value(host, 'virt::is_guest')) ? 'virtual' : 'physical'
         )
+        @stream.simple_field('cloud_provider', cloud_provider(host))
         unless (installed_products = host.subscription_facet&.installed_products).empty?
           @stream.array_field('installed_products') do
             @stream.raw(installed_products.map do |product|
@@ -153,12 +167,26 @@ 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))
+        @stream.simple_field('is_hostname_obfuscated', !!obfuscate_hostname?(host))
         @stream.simple_field('organization_id', host.organization_id, :last)
       end
 
+      def report_ip_addresses(host)
+        ip_addresses = host.interfaces.map { |nic| nic.ip }.compact
+
+        @stream.string_array_value('ip_addresses', ip_addresses)
+      end
+
+      def report_mac_addresses(host)
+        macs = host.interfaces.map { |nic| nic.mac }.compact
+
+        @stream.string_array_value('mac_addresses', macs)
+      end
+
       def os_release_value(name:, version:, codename:)
         "#{name} #{version} (#{codename})"
       end

data/lib/foreman_inventory_upload/notifications/manifest_import_success_notification_override.rb

@@ -0,0 +1,19 @@
+module ForemanInventoryUpload
+  module Notifications
+    module ManifestImportSuccessNotificationOverride
+      extend ActiveSupport::Concern
+
+      def actions
+        {
+          :links => [
+            {
+              :href => Rails.application.routes.url_helpers.foreman_rh_cloud_inventory_upload_path,
+              :title => _('Enable inventory upload'),
+              :external => false,
+            },
+          ],
+        }
+      end
+    end
+  end
+end

data/lib/foreman_inventory_upload/scripts/uploader.sh.erb

@@ -1,4 +1,4 @@
-#! /bin/sh
+#! /bin/bash
 
 DEST=<%= @upload_url %>
 RH_USERNAME=<%= @rh_username %>

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

@@ -30,23 +30,62 @@ module ForemanRhCloud
 
         # Add permissions
         security_block :foreman_rh_cloud do
-          permission :view_foreman_rh_cloud, :'foreman_rh_cloud/reports' => [:last]
+          permission(
+            :generate_foreman_rh_cloud,
+            'foreman_inventory_upload/reports': [:generate]
+          )
+          permission(
+            :view_foreman_rh_cloud,
+            'foreman_inventory_upload/accounts': [:index],
+            'foreman_inventory_upload/reports': [:last],
+            'foreman_inventory_upload/uploads': [:auto_upload, :show_auto_upload, :download_file, :last],
+            'foreman_rh_cloud/react': [:inventory_upload]
+          )
         end
 
-        # Add a new role called 'Discovery' if it doesn't exist
-        role 'ForemanRhCloud', [:view_foreman_rh_cloud]
+        plugin_permissions = [:view_foreman_rh_cloud, :generate_foreman_rh_cloud]
+
+        role 'ForemanRhCloud', plugin_permissions, 'Role granting permissions to view the hosts inventory,
+                                                    generate a report, upload it to the cloud and download it locally'
+
+        add_permissions_to_default_roles Role::ORG_ADMIN => plugin_permissions,
+                                         Role::MANAGER => plugin_permissions,
+                                         Role::SYSTEM_ADMIN => plugin_permissions
 
         # Adding a sub menu after hosts menu
-        sub_menu :top_menu, :foreman_rh_cloud, :caption => N_('RH Cloud'), :icon => 'fa fa-cloud-upload' do
-          menu :top_menu, :level1, :caption => N_('Inventory Upload'), :url_hash => { controller: :'foreman_inventory_upload/react', :action => :index}
+        divider :top_menu, caption: N_('RH Cloud'), parent: :configure_menu
+        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 do
+          configure_host do
+            set_dependent_action :destroy
+          end
+        end
+
+        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|
       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 = '2.0.6'.freeze
+  VERSION = '2.0.11'.freeze
 end

data/lib/insights_cloud.rb

@@ -0,0 +1,15 @@
+module InsightsCloud
+  module WebUi
+    ADVISOR = 'advisor'
+    VULNERABILITY = 'vulnerability'
+    PATCH = 'patch'
+
+    def self.system_url(subsystem, host_uuid)
+      ForemanRhCloud.base_url + "/insights/#{subsystem}/systems/#{host_uuid}"
+    end
+  end
+
+  def self.hits_export_url
+    ForemanRhCloud.base_url + '/api/insights/v1/export/hits/'
+  end
+end