foreman_rh_cloud 3.0.25 → 4.0.21.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fcdeab4d9295cecfb21182db7a6d67616a89ccf47a1a49b290058bcdfbc0f990
-  data.tar.gz: 0524546fe41d9ca57ce8a881dc011c8d0973a0900c79bdbf51a5ef69577d11c4
+  metadata.gz: 97882071192995f2da93032050b9ecdfa616dba407c8d032bfd29f6741ea9d56
+  data.tar.gz: 88bca49cea9ee2abac2d2dc9d608a33329ad9e214d57035424e8e24984691537
 SHA512:
-  metadata.gz: 129e721b9ff7701d391189631a4782bccabd38d22e1d8bbf25093c9fda21c00d1c260489621a6f42b06dc2357e09cfc126f41deda9d367b931a082548bcb9665
-  data.tar.gz: 4544b0097e5131166c03cd68a35b9320f7ffbe770da6db99edc7693d2da3aafa4eb845a17de8d37bf7635038a8e9b7b26fb87e747317f82032459e4d8d7306e7
+  metadata.gz: 67dd2ada55ac862b2d57ddf893e7408d002c40c2f89a141e6bf8c115d6eeee32d19b156e7668751f591665f948fa04d628719e5f6f5ab9e4609c02f0a14a93f4
+  data.tar.gz: 54ded7bb163e4a38cd3fa4a62dfe101484b98e87c016514b985190f77a07c7556e980dd8574dc5fb70cacb3fcc521a37a1f4f2325e5360cdbb2ddd6f38816804

data/app/controllers/foreman_inventory_upload/reports_controller.rb

@@ -2,8 +2,6 @@
 
 module ForemanInventoryUpload
   class ReportsController < ::ApplicationController
-    include InventoryUpload::ReportActions
-
     def last
       label = ForemanInventoryUpload::Async::GenerateReportJob.output_label(params[:organization_id])
       output = ForemanInventoryUpload::Async::ProgressOutput.get(label)&.full_output
@@ -22,7 +20,7 @@ module ForemanInventoryUpload
     def generate
       organization_id = params[:organization_id]
 
-      start_report_generation(organization_id)
+      ForemanInventoryUpload::Async::GenerateReportJob.perform_later(ForemanInventoryUpload.generated_reports_folder, organization_id)
 
       render json: {
         action_status: 'success',

data/app/controllers/foreman_inventory_upload/tasks_controller.rb

@@ -1,17 +1,25 @@
 module ForemanInventoryUpload
   class TasksController < ::ApplicationController
-    include InventoryUpload::TaskActions
-
     def create
       selected_org = Organization.current
+      subscribed_hosts_ids = Set.new(
+        ForemanInventoryUpload::Generators::Queries.for_slice(
+          Host.unscoped.where(organization: selected_org)
+        ).pluck(:id)
+      )
 
-      task = start_inventory_sync(selected_org)
+      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
+        task = ForemanTasks.async_task(InventorySync::Async::InventoryFullSync, selected_org)
+      end
+      return render json: { message: N_('there was an issue triggering the task') }, status: :internal_server_error unless task
 
       render json: {
         task: task,
       }, status: :ok
-    rescue InventoryUpload::TaskActions::NothingToSyncError => error
-      render json: { message: error.message }, status: :internal_server_error
     end
 
     def show

data/app/controllers/foreman_inventory_upload/uploads_controller.rb

@@ -1,7 +1,5 @@
 module ForemanInventoryUpload
   class UploadsController < ::ApplicationController
-    include InventoryUpload::ReportActions
-
     def last
       label = ForemanInventoryUpload::Async::UploadReportJob.output_label(params[:organization_id])
       output = ForemanInventoryUpload::Async::ProgressOutput.get(label)&.full_output
@@ -12,9 +10,11 @@ module ForemanInventoryUpload
     end
 
     def download_file
-      filename, file = report_file(params[:organization_id])
+      filename = ForemanInventoryUpload.facts_archive_name(params[:organization_id])
+      files = Dir["{#{ForemanInventoryUpload.uploads_file_path(filename)},#{ForemanInventoryUpload.done_file_path(filename)}}"]
 
-      send_file file, disposition: 'attachment', filename: filename
+      return send_file files.first, disposition: 'attachment', filename: filename unless files.empty?
+      raise ::Foreman::Exception.new("The report file doesn't exist")
     end
 
     def enable_cloud_connector

data/app/controllers/insights_cloud/api/machine_telemetries_controller.rb

@@ -5,7 +5,6 @@ module InsightsCloud::Api
     include ::InsightsCloud::ClientAuthentication
     include ::InsightsCloud::CandlepinCache
 
-    before_action :set_admin_user, only: [:forward_request]
     before_action :cert_uuid, :ensure_org, :ensure_branch_id, :only => [:forward_request, :branch_info]
     before_action :ensure_telemetry_enabled_for_consumer, :only => [:forward_request]
 
@@ -76,11 +75,9 @@ module InsightsCloud::Api
       return unless request.path == '/redhat_access/r/insights/platform/ingress/v1/upload' ||
                     request.path.include?('/redhat_access/r/insights/uploads/')
 
-      return unless @cloud_response.code.to_s.start_with?('2')
-
-      # create insights status if it wasn't there in the first place and refresh its reporting date
-      @host.get_status(InsightsClientReportStatus).refresh!
-      @host.refresh_global_status!
+      data = @cloud_response.code.to_s.start_with?('2')
+      host_status = @host.get_status(InsightsClientReportStatus)
+      host_status.update(reported_at: Time.now.utc, status: host_status.to_status(data: data))
     end
   end
 end

data/app/controllers/insights_cloud/hits_controller.rb

@@ -3,7 +3,7 @@ module InsightsCloud
     include Foreman::Controller::AutoCompleteSearch
 
     def index
-      hits = resource_base_search_and_page.preload(:host, :rule)
+      hits = resource_base_search_and_page.where(host: Host.authorized).preload(:host, :rule)
 
       render json: {
         hasToken: !Setting[:rh_cloud_token].empty?,
@@ -23,9 +23,9 @@ module InsightsCloud
 
     def resolutions
       if remediation_all_selected_param
-        hits = resource_base.with_playbook.search_for(params[:query])
+        hits = InsightsHit.with_playbook.search_for(params[:query])
       else
-        hits = resource_base_search_and_page.with_playbook.where(id: remediation_ids_param)
+        hits = resource_base_search_and_page.where(id: remediation_ids_param)
       end
 
       hits.preload(:host, rule: :resolutions)
@@ -74,9 +74,5 @@ module InsightsCloud
     def remediation_all_selected_param
       ActiveModel::Type::Boolean.new.cast(params[:isAllSelected])
     end
-
-    def resource_base
-      super.where(host: Host.authorized)
-    end
   end
 end

data/app/models/insights_client_report_status.rb

@@ -1,11 +1,10 @@
 class InsightsClientReportStatus < HostStatus::Status
   REPORT_INTERVAL = 48.hours
 
-  REPORTING             = 0
-  NO_REPORT             = 1
-
-  scope :stale, -> { where.not(reported_at: (Time.now - REPORT_INTERVAL)..Time.now) }
-  scope :reporting, -> { where(status: REPORTING) }
+  REPORTING             = 0 # host_registration_insights = true & getting data
+  NO_REPORT             = 1 # host_registration_insights = true & not getting data
+  NOT_MANAGED           = 2 # host_registration_insights = false
+  NOT_MANAGED_WITH_DATA = 3 # host_registration_insights = false & getting data
 
   def self.status_name
     N_('Insights')
@@ -17,6 +16,10 @@ class InsightsClientReportStatus < HostStatus::Status
         N_('Reporting')
       when NO_REPORT
         N_('Not reporting')
+      when NOT_MANAGED
+        N_('Not reporting (not set by registration)')
+      when NOT_MANAGED_WITH_DATA
+        N_('Reporting (not set by registration)')
     end
   end
 
@@ -26,16 +29,20 @@ class InsightsClientReportStatus < HostStatus::Status
         ::HostStatus::Global::OK
       when NO_REPORT
         ::HostStatus::Global::ERROR
+      when NOT_MANAGED
+        ::HostStatus::Global::OK
+      when NOT_MANAGED_WITH_DATA
+        ::HostStatus::Global::WARN
     end
   end
 
-  def to_status
-    in_interval? ? REPORTING : NO_REPORT
-  end
+  def to_status(data: false)
+    if insights_param
+      return REPORTING if data
+      return in_interval? ? REPORTING : NO_REPORT
+    end
 
-  # prevent creation of the status on global refresh, but show it if the record already exists
-  def relevant?(_options = {})
-    persisted?
+    data ? NOT_MANAGED_WITH_DATA : NOT_MANAGED
   end
 
   private
@@ -44,4 +51,8 @@ class InsightsClientReportStatus < HostStatus::Status
     return false unless reported_at
     (Time.now.utc - reported_at).to_i < REPORT_INTERVAL.to_i
   end
+
+  def insights_param
+    host.host_params_hash.dig('host_registration_insights', :value)
+  end
 end

data/app/services/foreman_rh_cloud/cloud_auth.rb

@@ -2,12 +2,6 @@ module ForemanRhCloud
   module CloudAuth
     extend ActiveSupport::Concern
 
-    include CloudRequest
-
-    def cloud_auth_available?
-      Setting[:rh_cloud_token].present?
-    end
-
     def rh_credentials
       @rh_credentials ||= query_refresh_token
     end
@@ -30,15 +24,5 @@ module ForemanRhCloud
       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 execute_cloud_request(params)
-      final_params = {
-        headers: {
-          Authorization: "Bearer #{rh_credentials}",
-        },
-      }.deep_merge(params)
-
-      super(final_params)
-    end
   end
 end

data/app/services/foreman_rh_cloud/cloud_request_forwarder.rb

@@ -2,7 +2,7 @@ require 'rest-client'
 
 module ForemanRhCloud
   class CloudRequestForwarder
-    include ForemanRhCloud::CloudRequest
+    include ::ForemanRhCloud::CloudAuth
 
     def forward_request(original_request, controller_name, branch_id, certs)
       forward_params = prepare_forward_params(original_request, branch_id)
@@ -22,6 +22,7 @@ module ForemanRhCloud
     def prepare_request_opts(original_request, forward_payload, forward_params, certs)
       base_params = {
         method: original_request.method,
+        verify_ssl: ForemanRhCloud.verify_ssl_method,
         payload: forward_payload,
         headers: {
           params: forward_params,
@@ -32,6 +33,10 @@ module ForemanRhCloud
       base_params.merge(path_params(original_request.path, certs))
     end
 
+    def execute_cloud_request(request_opts)
+      RestClient::Request.execute request_opts
+    end
+
     def prepare_forward_payload(original_request, controller_name)
       forward_payload = original_request.request_parameters[controller_name]
 
@@ -56,6 +61,10 @@ module ForemanRhCloud
 
     def path_params(request_path, certs)
       case request_path
+      when metadata_request?
+        {
+          url: ForemanRhCloud.base_url + request_path.sub('/redhat_access/r/insights', '/api'),
+        }
       when platform_request?
         {
           url: ForemanRhCloud.cert_base_url + request_path.sub('/redhat_access/r/insights/platform', '/api'),
@@ -72,6 +81,10 @@ module ForemanRhCloud
       end
     end
 
+    def metadata_request?
+      ->(request_path) { request_path.include? '/static' }
+    end
+
     def platform_request?
       ->(request_path) { request_path.include? '/platform' }
     end

data/app/services/foreman_rh_cloud/remediations_retriever.rb

@@ -12,11 +12,6 @@ module ForemanRhCloud
     end
 
     def create_playbook
-      unless cloud_auth_available?
-        logger.debug('Cloud authentication is not available, cannot continue')
-        return
-      end
-
       response = query_playbook
 
       logger.debug("Got playbook response: #{response.body}")
@@ -67,11 +62,14 @@ module ForemanRhCloud
     end
 
     def query_playbook
-      execute_cloud_request(
+      RestClient::Request.execute(
         method: :post,
         url: InsightsCloud.playbook_url,
+        verify_ssl: ForemanRhCloud.verify_ssl_method,
+        proxy: ForemanRhCloud.transformed_http_proxy_string(logger: logger),
         headers: {
           content_type: :json,
+          Authorization: "Bearer #{rh_credentials}",
         },
         payload: playbook_request.to_json
       )

data/app/subscribers/foreman_rh_cloud/insights_subscriber.rb

@@ -0,0 +1,9 @@
+module ForemanRhCloud
+  class InsightsSubscriber < ::Foreman::BaseSubscriber
+    def call(*args)
+      host = args.first.payload[:object]
+      host_status = host.get_status(InsightsClientReportStatus)
+      host_status.update(status: host_status.to_status)
+    end
+  end
+end

data/config/routes.rb

@@ -40,23 +40,4 @@ 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/generators/fact_helpers.rb

@@ -10,8 +10,6 @@ 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]
@@ -106,23 +104,6 @@ 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,7 +27,6 @@ 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', uuid_value!(@slice_id))
+          @stream.simple_field('report_slice_id', @slice_id)
           @stream.array_field('hosts', :last) do
             first = true
             hosts_batch.each do |host|
@@ -45,11 +45,10 @@ 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', 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')))
+          @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'))
           report_ip_addresses(host, host_ips_cache)
           report_mac_addresses(host)
           @stream.object_field('system_profile') do

data/lib/foreman_inventory_upload/generators/tags.rb

@@ -19,9 +19,7 @@ module ForemanInventoryUpload
       def generate_parameters
         return [] unless Setting[:include_parameter_tags]
 
-        (@host.host_inherited_params_objects || [])
-          .map { |item| [item.name, item.value] }
-          .select { |_name, value| value.present? || value.is_a?(FalseClass) }
+        (@host.host_inherited_params_objects || []).map { |item| [item.name, item.value] }
       end
 
       private

data/lib/foreman_inventory_upload.rb

@@ -70,16 +70,8 @@ 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}")
-    inventory_base_url + "?tags=#{tags}"
-  end
-
-  def self.inventory_self_url
-    inventory_base_url + "?hostname_or_id=#{ForemanRhCloud.foreman_host.fqdn}"
+    ForemanRhCloud.base_url + "/api/inventory/v1/hosts?tags=#{tags}"
   end
 end

data/lib/foreman_rh_cloud/engine.rb

@@ -6,18 +6,6 @@ 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
@@ -93,9 +81,7 @@ module ForemanRhCloud
         register_custom_status InventorySync::InventoryStatus
         register_custom_status InsightsClientReportStatus
 
-        describe_host do
-          overview_buttons_provider :insights_host_overview_buttons
-        end
+        subscribe 'host_created.event.foreman', ForemanRhCloud::InsightsSubscriber
 
         extend_page 'hosts/show' do |context|
           context.add_pagelet :main_tabs,
@@ -148,8 +134,15 @@ 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?
           ::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 * * *')
+            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
+            end
           end
         end
       end