foreman_rh_cloud 1.0.10 → 1.0.14

data/lib/foreman_inventory_upload/generators/slice.rb

@@ -40,6 +40,7 @@ module ForemanInventoryUpload
       end
 
       def report_host(host)
+        host_ips_cache = host_ips(host)
         @stream.object do
           @stream.simple_field('fqdn', fqdn(host))
           @stream.simple_field('account', account_id(host.organization).to_s)
@@ -47,10 +48,10 @@ module ForemanInventoryUpload
           @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'))
-          report_ip_addresses(host)
+          report_ip_addresses(host, host_ips_cache)
           report_mac_addresses(host)
           @stream.object_field('system_profile') do
-            report_system_profile(host)
+            report_system_profile(host, host_ips_cache)
           end
           @stream.array_field('facts') do
             @stream.object do
@@ -96,17 +97,17 @@ module ForemanInventoryUpload
         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)
-        @stream.simple_field('cores_per_socket', fact_value(host, 'cpu::core(s)_per_socket').to_i)
-        @stream.simple_field('system_memory_bytes', kilobytes_to_bytes(fact_value(host, 'memory::memtotal').to_i))
+      def report_system_profile(host, host_ips_cache)
+        @stream.simple_field('number_of_cpus', fact_value(host, 'cpu::cpu(s)')) { |v| v.to_i }
+        @stream.simple_field('number_of_sockets', fact_value(host, 'cpu::cpu_socket(s)')) { |v| v.to_i }
+        @stream.simple_field('cores_per_socket', fact_value(host, 'cpu::core(s)_per_socket')) { |v| v.to_i }
+        @stream.simple_field('system_memory_bytes', fact_value(host, 'memory::memtotal')) { |v| kilobytes_to_bytes(v.to_i) }
         @stream.array_field('network_interfaces') do
           @stream.raw(host.interfaces.map do |nic|
             {
-              'ipv4_addresses': [nic.ip].compact,
+              'ipv4_addresses': [host_ips_cache[nic.ip]].compact,
               'ipv6_addresses': [nic.ip6].compact,
-              'mtu': nic.try(:mtu),
+              'mtu': nic.try(:mtu) && nic.mtu.to_i,
               'mac_address': nic.mac,
               'name': nic.identifier,
             }.compact.to_json
@@ -123,18 +124,16 @@ module ForemanInventoryUpload
           end
         end
         @stream.simple_field(
-          'os_release',
-          os_release_value(
-            name: fact_value(host, 'distribution::name'),
-            version: fact_value(host, 'distribution::version'),
-            codename: fact_value(host, 'distribution::id')
-          )
-        )
+          'os_release', [
+            fact_value(host, 'distribution::name'),
+            fact_value(host, 'distribution::version'),
+            fact_value(host, 'distribution::id'),
+          ]
+        ) { |v| os_release_value(*v) }
         @stream.simple_field('os_kernel_version', fact_value(host, 'uname::release'))
         @stream.simple_field('arch', host.architecture&.name)
         @stream.simple_field('subscription_status', host.subscription_status_label)
         @stream.simple_field('katello_agent_running', host.content_facet&.katello_agent_installed?)
-        @stream.simple_field('satellite_managed', true)
         @stream.simple_field(
           'infrastructure_type',
           ActiveModel::Type::Boolean.new.cast(fact_value(host, 'virt::is_guest')) ? 'virtual' : 'physical'
@@ -150,13 +149,16 @@ module ForemanInventoryUpload
             end.join(', '))
           end
         end
-        @stream.array_field('installed_packages', :last) do
-          first = true
-          host.installed_packages.each do |package|
-            @stream.raw("#{first ? '' : ', '}#{@stream.stringify_value(package.nvra)}")
-            first = false
+        unless Setting[:exclude_installed_packages]
+          @stream.array_field('installed_packages') do
+            first = true
+            host.installed_packages.each do |package|
+              @stream.raw("#{first ? '' : ', '}#{@stream.stringify_value(package.nvra)}")
+              first = false
+            end
           end
         end
+        @stream.simple_field('satellite_managed', true, :last)
       end
 
       def report_satellite_facts(host)
@@ -175,8 +177,8 @@ module ForemanInventoryUpload
         @stream.simple_field('organization_id', host.organization_id, :last)
       end
 
-      def report_ip_addresses(host)
-        ip_addresses = host.interfaces.map { |nic| nic.ip }.compact
+      def report_ip_addresses(host, host_ips_cache)
+        ip_addresses = host.interfaces.map { |nic| host_ips_cache[nic.ip] }.compact
 
         @stream.string_array_value('ip_addresses', ip_addresses)
       end
@@ -187,7 +189,7 @@ module ForemanInventoryUpload
         @stream.string_array_value('mac_addresses', macs)
       end
 
-      def os_release_value(name:, version:, codename:)
+      def os_release_value(name, version, codename)
         "#{name} #{version} (#{codename})"
       end
     end

data/lib/foreman_rh_cloud.rb

@@ -1,4 +1,6 @@
 require 'foreman_rh_cloud/engine.rb'
+require 'cgi'
+require 'uri'
 
 module ForemanRhCloud
   def self.base_url
@@ -14,4 +16,57 @@ module ForemanRhCloud
   def self.verify_ssl_method
     @verify_ssl_method ||= ENV['SATELLITE_RH_CLOUD_URL'] ? OpenSSL::SSL::VERIFY_NONE : OpenSSL::SSL::VERIFY_PEER
   end
+
+  def self.http_proxy_string(logger: Foreman::Logging.logger('background'))
+    ForemanRhCloud.proxy_setting(logger: logger)
+  end
+
+  def self.transformed_http_proxy_string(logger: Foreman::Logging.logger('background'))
+    ForemanRhCloud.transform_scheme(ForemanRhCloud.proxy_setting(logger: logger))
+  end
+
+  def self.proxy_setting(logger: Foreman::Logging.logger('background'))
+    HttpProxy.default_global_content_proxy&.full_url ||
+    ForemanRhCloud.cdn_proxy(logger: logger) ||
+    ForemanRhCloud.global_foreman_proxy ||
+    ''
+  end
+
+  def self.cdn_proxy(logger: Foreman::Logging.logger('app'))
+    proxy_config = SETTINGS[:katello][:cdn_proxy]
+    return nil unless proxy_config
+
+    uri = URI('')
+    uri.host = proxy_config[:host]
+    uri.port = proxy_config[:port]
+    uri.scheme = proxy_config[:scheme] || 'http'
+
+    if proxy_config[:user]
+      uri.user = CGI.escape(proxy_config[:user])
+      uri.password = CGI.escape(proxy_config[:password])
+    end
+    uri.to_s
+  rescue URI::Error => e
+    logger.warn("cdn_proxy parsing failed: #{e}")
+    nil
+  end
+
+  def self.global_foreman_proxy
+    Setting[:http_proxy]
+  end
+
+  # This method assumes uri_string contains uri-encoded username and p@$$word:
+  # http://user:p%40%24%24word@localhost:8888
+  def self.transform_scheme(uri_string)
+    transformed_uri = URI.parse(uri_string)
+
+    case transformed_uri.scheme
+    when "http"
+      transformed_uri.scheme = 'proxy'
+    when "https"
+      transformed_uri.scheme = 'proxys'
+    end
+
+    transformed_uri.to_s
+  end
 end

data/lib/foreman_rh_cloud/engine.rb

@@ -13,6 +13,7 @@ module ForemanRhCloud
     config.autoload_paths += Dir["#{config.root}/app/helpers/concerns"]
     config.autoload_paths += Dir["#{config.root}/app/models/concerns"]
     config.autoload_paths += Dir["#{config.root}/app/overrides"]
+    config.autoload_paths += Dir["#{config.root}/app/services"]
     config.autoload_paths += Dir["#{config.root}/lib"]
 
     config.eager_load_paths += Dir["#{config.root}/lib"]
@@ -54,8 +55,8 @@ module ForemanRhCloud
 
         # Adding a sub menu after hosts menu
         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
+        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
@@ -66,9 +67,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 = '1.0.10'.freeze
+  VERSION = '1.0.14'.freeze
 end

data/lib/insights_cloud/async/insights_full_sync.rb

@@ -3,6 +3,8 @@ require 'rest-client'
 module InsightsCloud
   module Async
     class InsightsFullSync < ::ApplicationJob
+      include ::ForemanRhCloud::CloudAuth
+
       def perform
         hits = query_insights_hits
 
@@ -16,10 +18,6 @@ module InsightsCloud
         Foreman::Logging.logger('background')
       end
 
-      def rh_credentials
-        @rh_credentials ||= query_refresh_token
-      end
-
       private
 
       def query_insights_hits
@@ -27,6 +25,7 @@ module InsightsCloud
           method: :get,
           url: InsightsCloud.hits_export_url,
           verify_ssl: ForemanRhCloud.verify_ssl_method,
+          proxy: ForemanRhCloud.transformed_http_proxy_string(logger: logger),
           headers: {
             Authorization: "Bearer #{rh_credentials}",
           }
@@ -35,24 +34,6 @@ module InsightsCloud
         JSON.parse(hits_response)
       end
 
-      def query_refresh_token
-        token_response = RestClient::Request.execute(
-          method: :post,
-          url: ForemanRhCloud.authentication_url,
-          verify_ssl: ForemanRhCloud.verify_ssl_method,
-          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
-
       def setup_host_names(host_names)
         @host_ids = Hash[
           Host.unscoped.where(name: host_names).pluck(:name, :id)
@@ -65,8 +46,6 @@ module InsightsCloud
 
       def replace_hits_data(hits)
         InsightsHit.transaction do
-          InsightsHit.delete_all
-          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(
@@ -79,6 +58,8 @@ module InsightsCloud
               end
             end.compact
           )
+          InsightsHit.delete_all
+          InsightsHit.create(hits.map { |hits_hash| to_model_hash(hits_hash) }.compact)
         end
       end
 

data/lib/inventory_sync/async/inventory_full_sync.rb

@@ -3,6 +3,8 @@ require 'rest-client'
 module InventorySync
   module Async
     class InventoryFullSync < ::ApplicationJob
+      include ::ForemanRhCloud::CloudAuth
+
       def perform(organization)
         @organization = organization
         @subscribed_hosts_ids = Set.new(
@@ -37,10 +39,6 @@ module InventorySync
         @host_statuses
       end
 
-      def rh_credentials
-        @rh_credentials ||= query_refresh_token
-      end
-
       private
 
       def update_hosts_status(status_hashes, touched)
@@ -65,6 +63,7 @@ module InventorySync
           method: :get,
           url: ForemanInventoryUpload.inventory_export_url,
           verify_ssl: ForemanRhCloud.verify_ssl_method,
+          proxy: ForemanRhCloud.transformed_http_proxy_string(logger: logger),
           headers: {
             Authorization: "Bearer #{rh_credentials}",
             params: {
@@ -76,24 +75,6 @@ module InventorySync
 
         JSON.parse(hosts_inventory_response)
       end
-
-      def query_refresh_token
-        token_response = RestClient::Request.execute(
-          method: :post,
-          url: ForemanRhCloud.authentication_url,
-          verify_ssl: ForemanRhCloud.verify_ssl_method,
-          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
 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/rh_cloud_inventory.rake

@@ -0,0 +1,37 @@
+require 'tempfile'
+
+namespace :rh_cloud_inventory do
+  namespace :report do
+    desc 'Generate inventory report to be sent to Red Hat cloud'
+    task generate: :environment do
+      portal_user = ENV['portal_user']
+      organizations = [ENV['organization_id']]
+      base_folder = ENV['target'] || Dir.pwd
+
+      unless portal_user || organizations.empty?
+        puts "Must specify either portal_user or organization_id"
+      end
+
+      User.as_anonymous_admin do
+        if portal_user
+          puts "Generating report for all organizations associated with #{portal_user}"
+          base_folder = File.join(base_folder, portal_user)
+          organizations = ForemanInventoryUpload::Generators::Queries.organizations_for_user(portal_user).pluck(:id)
+        end
+
+        organizations.each do |organization|
+          target = File.join(base_folder, ForemanInventoryUpload.facts_archive_name(organization))
+          archived_report_generator = ForemanInventoryUpload::Generators::ArchivedReport.new(target, Logger.new(STDOUT))
+          archived_report_generator.render(organization: organization)
+          puts "Successfully generated #{target} for organization id #{organization}"
+        end
+      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,6 +1,6 @@
 {
   "name": "foreman_rh_cloud",
-  "version": "0.0.1",
+  "version": "1.0.14",
   "description": "Inventory Upload =============",
   "main": "index.js",
   "scripts": {
@@ -47,6 +47,8 @@
     "eslint": "^4.10.0",
     "eslint-import-resolver-babel-module": "^4.0.0",
     "eslint-plugin-patternfly-react": "0.2.0",
+    "eslint-plugin-promise": "^4.2.1",
+    "eslint-plugin-spellcheck": "^0.0.17",
     "identity-obj-proxy": "^3.0.0",
     "jed": "^1.1.1",
     "jest-cli": "^23.6.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