foreman_rh_cloud 3.0.21 → 3.0.24

data/config/routes.rb

@@ -40,4 +40,23 @@ Rails.application.routes.draw do
       match '/*path', :constraints => lambda { |req| !req.path.include?('view/api') }, to: 'machine_telemetries#forward_request', via: [:get, :post, :delete,:put, :patch]
     end
   end
+
+  # API routes
+
+  namespace :api, :defaults => {:format => 'json'} do
+    scope '(:apiv)', :module => :v2, :defaults => {:apiv => 'v2'}, :apiv => /v1|v2/, :constraints => ApiConstraints.new(:version => 2, :default => true) do
+      resources :organizations, :only => [:show] do
+        namespace 'rh_cloud' do
+          get 'report', to: 'inventory#download_file'
+          post 'report', to: 'inventory#generate_report'
+
+          post 'inventory_sync', to: 'inventory#sync_inventory_status'
+        end
+      end
+
+      namespace 'rh_cloud' do
+        post 'enable_connector', to: 'inventory#enable_cloud_connector'
+      end
+    end
+  end
 end

data/lib/foreman_inventory_upload.rb

@@ -70,8 +70,16 @@ module ForemanInventoryUpload
     folder
   end
 
+  def self.inventory_base_url
+    ForemanRhCloud.base_url + "/api/inventory/v1/hosts"
+  end
+
   def self.inventory_export_url
     tags = URI.encode("satellite/satellite_instance_id=#{Foreman.instance_id}")
-    ForemanRhCloud.base_url + "/api/inventory/v1/hosts?tags=#{tags}"
+    inventory_base_url + "?tags=#{tags}"
+  end
+
+  def self.inventory_self_url
+    inventory_base_url + "?hostname_or_id=#{ForemanRhCloud.foreman_host.fqdn}"
   end
 end

data/lib/foreman_inventory_upload/generators/fact_helpers.rb

@@ -10,6 +10,8 @@ module ForemanInventoryUpload
       CLOUD_AZURE = 'azure'
       CLOUD_ALIBABA = 'alibaba'
 
+      UUID_REGEX = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i
+
       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]
@@ -104,6 +106,23 @@ module ForemanInventoryUpload
       def obfuscate_ip(ip, ips_dict)
         "10.230.230.#{ips_dict.count + 1}"
       end
+
+      def bios_uuid(host)
+        value = fact_value(host, 'dmi::system::uuid') || ''
+        uuid_value(value)
+      end
+
+      def uuid_value(value)
+        uuid_match = UUID_REGEX.match(value)
+        uuid_match&.to_s
+      end
+
+      def uuid_value!(value)
+        uuid = uuid_value(value)
+        raise Foreman::Exception.new(N_('Value %{value} is not a valid UUID') % {value: value}) if value && uuid.empty?
+
+        uuid
+      end
     end
   end
 end

data/lib/foreman_inventory_upload/generators/queries.rb

@@ -27,6 +27,7 @@ module ForemanInventoryUpload
               'insights_client::obfuscate_ip_enabled',
               'insights_client::hostname',
               'insights_client::ips',
+              'insights_id',
             ]).pluck(:name, :id)
           ]
       end

data/lib/foreman_inventory_upload/generators/slice.rb

@@ -25,7 +25,7 @@ module ForemanInventoryUpload
 
       def report_slice(hosts_batch)
         @stream.object do
-          @stream.simple_field('report_slice_id', @slice_id)
+          @stream.simple_field('report_slice_id', uuid_value!(@slice_id))
           @stream.array_field('hosts', :last) do
             first = true
             hosts_batch.each do |host|
@@ -45,10 +45,11 @@ module ForemanInventoryUpload
         @stream.object do
           @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.simple_field('subscription_manager_id', uuid_value!(host.subscription_facet&.uuid))
+          @stream.simple_field('satellite_id', uuid_value!(host.subscription_facet&.uuid))
+          @stream.simple_field('bios_uuid', bios_uuid(host))
+          @stream.simple_field('vm_uuid', uuid_value(fact_value(host, 'virt::uuid')))
+          @stream.simple_field('insights_id', uuid_value(fact_value(host, 'insights_id')))
           report_ip_addresses(host, host_ips_cache)
           report_mac_addresses(host)
           @stream.object_field('system_profile') do
@@ -85,7 +86,7 @@ module ForemanInventoryUpload
         @stream.object do
           @stream.simple_field('namespace', namespace)
           @stream.simple_field('key', key)
-          @stream.simple_field('value', value, :last)
+          @stream.simple_field('value', value.to_s, :last)
         end
         @stream.comma unless last
       end

data/lib/foreman_rh_cloud/engine.rb

@@ -6,6 +6,18 @@ module ForemanRhCloud
   class Engine < ::Rails::Engine
     engine_name 'foreman_rh_cloud'
 
+    def self.register_scheduled_task(task_class, cronline)
+      return if ForemanTasks::RecurringLogic.joins(:tasks)
+                .merge(ForemanTasks::Task.where(label: task_class.name))
+                .exists?
+
+      User.as_anonymous_admin do
+        recurring_logic = ForemanTasks::RecurringLogic.new_from_cronline(cronline)
+        recurring_logic.save!
+        recurring_logic.start(task_class)
+      end
+    end
+
     initializer 'foreman_rh_cloud.load_default_settings', :before => :load_config_initializers do
       require_dependency File.expand_path('../../app/models/setting/rh_cloud.rb', __dir__)
     end
@@ -83,6 +95,10 @@ module ForemanRhCloud
 
         subscribe 'host_created.event.foreman', ForemanRhCloud::InsightsSubscriber
 
+        describe_host do
+          overview_buttons_provider :insights_host_overview_buttons
+        end
+
         extend_page 'hosts/show' do |context|
           context.add_pagelet :main_tabs,
             partial: 'hosts/insights_tab',
@@ -133,14 +149,9 @@ module ForemanRhCloud
         )
         # skip object creation when admin user is not present, for example in test DB
         if User.unscoped.find_by_login(User::ANONYMOUS_ADMIN).present?
-          unless ForemanTasks::RecurringLogic.joins(:tasks).merge(
-            ForemanTasks::Task.where(label: 'InventorySync::Async::InventoryScheduledSync')
-          ).exists?
-            User.as_anonymous_admin do
-              recurring_logic = ForemanTasks::RecurringLogic.new_from_cronline("0 0 * * *")
-              recurring_logic.save!
-              recurring_logic.start(InventorySync::Async::InventoryScheduledSync)
-            end
+          ::ForemanTasks.dynflow.config.on_init(false) do |world|
+            ForemanRhCloud::Engine.register_scheduled_task(InventorySync::Async::InventoryScheduledSync, '0 0 * * *')
+            ForemanRhCloud::Engine.register_scheduled_task(InsightsCloud::Async::InsightsClientStatusAging, '0 0 * * *')
           end
         end
       end

data/lib/foreman_rh_cloud/version.rb

@@ -1,3 +1,3 @@
 module ForemanRhCloud
-  VERSION = '3.0.21'.freeze
+  VERSION = '3.0.24'.freeze
 end

data/lib/insights_cloud/async/insights_client_status_aging.rb

@@ -0,0 +1,17 @@
+module InsightsCloud
+  module Async
+    class InsightsClientStatusAging < ::Actions::EntryAction
+      include ::Actions::RecurringAction
+
+      def run
+        # update all stale records to "not reporting" counterpart
+        InsightsClientReportStatus.stale.reporting.update_all(status: InsightsClientReportStatus::NO_REPORT)
+        InsightsClientReportStatus.stale.not_managed_with_data.update_all(status: InsightsClientReportStatus::NOT_MANAGED)
+      end
+
+      def logger
+        action_logger
+      end
+    end
+  end
+end

data/lib/insights_cloud/async/insights_full_sync.rb

@@ -50,28 +50,18 @@ module InsightsCloud
       end
 
       def query_insights_hits
-        hits_response = RestClient::Request.execute(
+        hits_response = execute_cloud_request(
           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}",
-          }
+          url: InsightsCloud.hits_export_url
         )
 
         JSON.parse(hits_response)
       end
 
       def query_insights_rules
-        rules_response = RestClient::Request.execute(
+        rules_response = execute_cloud_request(
           method: :get,
-          url: InsightsCloud.rules_url,
-          verify_ssl: ForemanRhCloud.verify_ssl_method,
-          proxy: ForemanRhCloud.transformed_http_proxy_string(logger: logger),
-          headers: {
-            Authorization: "Bearer #{rh_credentials}",
-          }
+          url: InsightsCloud.rules_url
         )
 
         JSON.parse(rules_response)

data/lib/insights_cloud/async/insights_resolutions_sync.rb

@@ -22,14 +22,11 @@ module InsightsCloud
       private
 
       def query_insights_resolutions(rule_ids)
-        resolutions_response = RestClient::Request.execute(
+        resolutions_response = execute_cloud_request(
           method: :post,
           url: InsightsCloud.resolutions_url,
-          verify_ssl: ForemanRhCloud.verify_ssl_method,
-          proxy: ForemanRhCloud.transformed_http_proxy_string(logger: logger),
           headers: {
             content_type: :json,
-            Authorization: "Bearer #{rh_credentials}",
           },
           payload: {
             issues: rule_ids,

data/lib/insights_cloud/async/insights_rules_sync.rb

@@ -37,14 +37,9 @@ module InsightsCloud
       private
 
       def query_insights_rules(offset)
-        rules_response = RestClient::Request.execute(
+        rules_response = execute_cloud_request(
           method: :get,
-          url: InsightsCloud.rules_url(offset: offset),
-          verify_ssl: ForemanRhCloud.verify_ssl_method,
-          proxy: ForemanRhCloud.transformed_http_proxy_string(logger: logger),
-          headers: {
-            Authorization: "Bearer #{rh_credentials}",
-          }
+          url: InsightsCloud.rules_url(offset: offset)
         )
 
         JSON.parse(rules_response)

data/lib/inventory_sync/async/host_result.rb

@@ -1,6 +1,8 @@
 module InventorySync
   module Async
     class HostResult
+      attr_reader :uuid_by_fqdn
+
       def initialize(result)
         @total = result['total']
         @count = result['count']
@@ -8,6 +10,7 @@ module InventorySync
         @per_page = result['per_page']
         @sub_ids = result["results"].map { |host| host['subscription_manager_id'] }
         @uuid_by_sub_id = Hash[result["results"].map { |host| [host['subscription_manager_id'], host['id']] }]
+        @uuid_by_fqdn = Hash[result["results"].map { |host| [host['fqdn'].downcase, host['id']] }]
       end
 
       def status_hashes
@@ -19,6 +22,7 @@ module InventorySync
               host_id: host_id,
               status: InventorySync::InventoryStatus::SYNC,
               reported_at: DateTime.current,
+              type: InventorySync::InventoryStatus.name,
             }
           end
         end.compact

data/lib/inventory_sync/async/inventory_full_sync.rb

@@ -24,6 +24,7 @@ module InventorySync
 
         logger.debug("Synced hosts amount: #{host_statuses[:sync]}")
         logger.debug("Disconnected hosts amount: #{host_statuses[:disconnect]}")
+        output[:host_statuses] = host_statuses
       end
 
       def update_statuses_batch
@@ -53,7 +54,7 @@ module InventorySync
       end
 
       def host_statuses
-        output[:host_statuses] ||= {
+        @host_statuses ||= {
           sync: 0,
           disconnect: 0,
         }

data/lib/inventory_sync/async/inventory_hosts_sync.rb

@@ -4,6 +4,12 @@ module InventorySync
       set_callback :iteration, :around, :setup_facet_transaction
       set_callback :step, :around, :create_facets
 
+      def plan
+        # by default the tasks will be executed concurrently
+        plan_self
+        plan_self_host_sync
+      end
+
       def setup_facet_transaction
         InsightsFacet.transaction do
           yield
@@ -20,14 +26,22 @@ module InventorySync
       private
 
       def add_missing_insights_facets(uuids_hash)
-        existing_facets = InsightsFacet.where(host_id: uuids_hash.keys).pluck(:host_id)
-        missing_facets = uuids_hash.except(*existing_facets).map do |host_id, uuid|
+        existing_facets = InsightsFacet.where(host_id: uuids_hash.keys).pluck(:host_id, :uuid)
+        missing_facets = uuids_hash.except(*existing_facets.map(&:first)).map do |host_id, uuid|
           {
             host_id: host_id,
             uuid: uuid,
           }
         end
         InsightsFacet.create(missing_facets)
+
+        existing_facets.select { |host_id, uuid| uuid.empty? }.each do |host_id, _uuid|
+          InsightsFacet.where(host_id: host_id).update_all(uuid: uuids_hash[host_id])
+        end
+      end
+
+      def plan_self_host_sync
+        plan_action InventorySync::Async::InventorySelfHostSync
       end
     end
   end

data/lib/inventory_sync/async/inventory_scheduled_sync.rb

@@ -4,6 +4,14 @@ module InventorySync
       include ::Actions::RecurringAction
 
       def plan
+        unless Setting[:allow_auto_inventory_upload]
+          logger.debug(
+            'The scheduled process is disabled due to the "allow_auto_inventory_upload"
+            setting being set to false.'
+          )
+          return
+        end
+
         Organization.unscoped.each do |org|
           plan_org_sync(org)
         end
@@ -12,6 +20,10 @@ module InventorySync
       def plan_org_sync(org)
         plan_action InventoryFullSync, org
       end
+
+      def logger
+        action_logger
+      end
     end
   end
 end

data/lib/inventory_sync/async/inventory_self_host_sync.rb

@@ -0,0 +1,30 @@
+module InventorySync
+  module Async
+    class InventorySelfHostSync < QueryInventoryJob
+      set_callback :step, :around, :create_facets
+
+      def create_facets
+        # get the results from the event
+        results = yield
+
+        add_missing_insights_facet(results.uuid_by_fqdn) unless results.uuid_by_fqdn.empty?
+        results
+      end
+
+      private
+
+      def add_missing_insights_facet(uuids_hash)
+        facet = InsightsFacet.find_or_create_by(host_id: ForemanRhCloud.foreman_host.id) do |facet|
+          facet.uuid = uuids_hash.values.first
+        end
+
+        # fix empty uuid in case the facet already exists
+        facet.update(uuid: uuids_hash.values.first) unless facet.uuid
+      end
+
+      def request_url
+        ForemanInventoryUpload.inventory_self_url
+      end
+    end
+  end
+end

data/lib/inventory_sync/async/query_inventory_job.rb

@@ -29,13 +29,10 @@ module InventorySync
       private
 
       def query_inventory(page = 1)
-        hosts_inventory_response = RestClient::Request.execute(
+        hosts_inventory_response = execute_cloud_request(
           method: :get,
-          url: ForemanInventoryUpload.inventory_export_url,
-          verify_ssl: ForemanRhCloud.verify_ssl_method,
-          proxy: ForemanRhCloud.transformed_http_proxy_string(logger: logger),
+          url: request_url,
           headers: {
-            Authorization: "Bearer #{rh_credentials}",
             params: {
               per_page: 100,
               page: page,
@@ -49,6 +46,10 @@ module InventorySync
       def logger
         action_logger
       end
+
+      def request_url
+        ForemanInventoryUpload.inventory_export_url
+      end
     end
   end
 end

data/lib/tasks/rh_cloud_inventory.rake

@@ -23,8 +23,15 @@ namespace :rh_cloud_inventory do
       organizations = [ENV['organization_id']]
       base_folder = ENV['target'] || Dir.pwd
 
-      unless portal_user || organizations.empty?
+      unless File.writable?(base_folder)
+        puts "#{base_folder} is not writable by the current process"
+        base_folder = Dir.mktmpdir
+        puts "Using #{base_folder} for the output"
+      end
+
+      if portal_user.empty? && organizations.empty?
         puts "Must specify either portal_user or organization_id"
+        return
       end
 
       User.as_anonymous_admin do