foreman_rh_cloud 4.0.24 → 4.0.26

data/config/rh_cert-api_chain.pem

@@ -0,0 +1,74 @@
+-----BEGIN CERTIFICATE-----
+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
+Kg6Ay0rrsi4nw1JHue2GvdjdfVOaWSWC
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIFfTCCA2WgAwIBAgIJAJGKz8qFAAADMA0GCSqGSIb3DQEBBQUAMIGwMQswCQYD
+VQQGEwJVUzEXMBUGA1UECAwOTm9ydGggQ2Fyb2xpbmExEDAOBgNVBAcMB1JhbGVp
+Z2gxFjAUBgNVBAoMDVJlZCBIYXQsIEluYy4xGDAWBgNVBAsMD1JlZCBIYXQgTmV0
+d29yazEeMBwGA1UEAwwVRW50aXRsZW1lbnQgTWFzdGVyIENBMSQwIgYJKoZIhvcN
+AQkBFhVjYS1zdXBwb3J0QHJlZGhhdC5jb20wHhcNMTUwNTA1MTMwMzQ4WhcNMjUw
+NTAyMTMwMzQ4WjCBiTELMAkGA1UEBhMCVVMxFzAVBgNVBAgTDk5PUlRIIENBUk9M
+SU5BMRAwDgYDVQQHEwdSYWxlaWdoMRAwDgYDVQQKEwdSZWQgSGF0MRgwFgYDVQQL
+Ew9SZWQgSGF0IE5ldHdvcmsxIzAhBgNVBAMTGmNlcnQtYXBpLmFjY2Vzcy5yZWRo
+YXQuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA9hTNMtZMa7Kg
+Jlux6pnuUinP0Rv0aiiPFr7qNHFore4loGrPlpzUvQbUByy3xm7lhf4R4qbINCls
+veWg6HDidvQr174RXb5YLMXuBrYAiPWQTrRRLNuvXFHKzREghRWTv48IXTIDEo0G
+fZJUO+myY2RfwqugZKic5dR6ZakHSSpQO70O6H5R0eHlKa13k4eEpG2fVY/xqFto
+WkfZyEmSacZpqxp7gIjZqreLc4MFwpiVjGFrK3Jk+Px1Z6J94LTLx2SxrYzWIeUs
+5j+lceQOvpV4/pkClnRCW1pkCKTccjFKQkpNPGwdIusRXUGl9IYc20Fa/7g9iUQc
+5fXu9EAzfwIDAQABo4G+MIG7MAkGA1UdEwQCMAAwEQYJYIZIAYb4QgEBBAQDAgZA
+MAsGA1UdDwQEAwIF4DATBgNVHSUEDDAKBggrBgEFBQcDATA5BglghkgBhvhCAQ0E
+LBYqTWFuYWdlZCBieSBSZWQgSGF0IChjYS1zdXBwb3J0QHJlZGhhdC5jb20pMB0G
+A1UdDgQWBBRfgCjd8aXf0U4VX8DKTVIn+paGBzAfBgNVHSMEGDAWgBSIS6ZFxEbs
+j9bPpvYazyY8kMx/FzANBgkqhkiG9w0BAQUFAAOCAgEAlC+r6UEEp5BUkI0Rj2T+
+1PH7oUCaGQeQoyVbGddz/WUcBk/lMMtyCEoxU+3tTwNWmCWWjYXtjoL9MlSAC/q+
+NZfBi1iq0uuSus9JI/Uu8aRhoxTK56qGRed/JNixOHEmFn891cahIPpF0exWwtYD
+ThwXo7Z6PI7t8EMKdSrGTOowp58yho8xYFL/Z7JmjL55Pf85GIrdiniNZd4i178J
+07R9zsiLvdXq9mT33iJwkm+uhO+FA9d8OE3ji21pBbGUAQSWOdkemvUCsy8zANW9
+fT+dBrMr5Buk7eaBBJ2PxECNiWLCRQJWmyff1O5zMT0daS2lBdEGUNhBZ0hnX13Q
+kabUp0bxRrNRq+WkomP7onZhfZS6SjKm0UmwoV6o3V1ED6y7muQNRmgDpA5PcbvO
+gl7OexNL4zcpyfMdAmTYf5yTRSvB42Yg5hVfuzPEnOIqupwES3mWkEHRlqbMUkHw
+qIQAxIwQqZd5PdPpElQ/6j/ZT9DwW/I6zgndX2rsS0oGYcwFTkSj0/rKKkC13hk7
+LchXMZu5ckdustM79U6OZIBairrJaL2OpR08un2nwIjgEGqhVFYc44UK1VpkE8mr
+qvqJS6OHVlTlKcEDnhVkPS3i5qjuS/PtSq0CwH8bzYKFJayLDY/z36Zv6PdttzmU
+Yb1NSDcJejHJ80pMINutyYQ=
+-----END CERTIFICATE-----

data/config/routes.rb

@@ -11,6 +11,8 @@ Rails.application.routes.draw do
     post 'cloud_connector', to: 'uploads#enable_cloud_connector'
 
     resources :tasks, only: [:create, :show]
+
+    get 'status', to: 'cloud_status#index'
   end
 
   namespace :insights_cloud do
@@ -37,7 +39,7 @@ Rails.application.routes.draw do
     end
 
     scope '/r/insights' do
-      match '/*path', :constraints => lambda { |req| !req.path.include?('view/api') }, to: 'machine_telemetries#forward_request', via: [:get, :post, :delete,:put, :patch]
+      match '(/*path)(/)', :constraints => lambda { |req| !req.path.include?('view/api') }, to: 'machine_telemetries#forward_request', via: [:get, :post, :delete,:put, :patch]
     end
   end
 

data/db/migrate/20210720000001_remove_old_insights_statuses.foreman_rh_cloud.rb

@@ -0,0 +1,6 @@
+class RemoveOldInsightsStatuses < ActiveRecord::Migration[5.2]
+  def up
+    InsightsClientReportStatus.where(status: 2).update_all(status: InsightsClientReportStatus::NO_REPORT)
+    InsightsClientReportStatus.where(status: 3).update_all(status: InsightsClientReportStatus::REPORTING)
+  end
+end

data/lib/foreman_inventory_upload/generators/queries.rb

@@ -45,26 +45,10 @@ module ForemanInventoryUpload
           )
       end
 
-      def self.for_report(portal_user)
-        org_ids = organizations_for_user(portal_user).pluck(:id)
-        for_org(org_ids)
-      end
-
       def self.for_org(organization_id, use_batches: true)
         base_query = for_slice(Host.unscoped.where(organization_id: organization_id))
         use_batches ? base_query.in_batches(of: ForemanInventoryUpload.slice_size) : base_query
       end
-
-      def self.organizations_for_user(portal_user)
-        Organization
-          .joins(:telemetry_configuration)
-          .where(
-            redhat_access_telemetry_configurations: {
-              portal_user: portal_user,
-              enable_telemetry: true,
-            }
-          )
-      end
     end
   end
 end

data/lib/foreman_inventory_upload/generators/tags.rb

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

data/lib/foreman_rh_cloud/engine.rb

@@ -1,5 +1,4 @@
 require 'katello'
-require 'redhat_access'
 require 'foreman_ansible'
 
 module ForemanRhCloud
@@ -43,6 +42,8 @@ module ForemanRhCloud
       Foreman::Plugin.register :foreman_rh_cloud do
         requires_foreman '>= 2.3'
 
+        apipie_documented_controllers ["#{ForemanRhCloud::Engine.root}/app/controllers/api/v2/**/*.rb"]
+
         # Add permissions
         security_block :foreman_rh_cloud do
           permission(
@@ -93,8 +94,6 @@ module ForemanRhCloud
         register_custom_status InventorySync::InventoryStatus
         register_custom_status InsightsClientReportStatus
 
-        subscribe 'host_created.event.foreman', ForemanRhCloud::InsightsSubscriber
-
         describe_host do
           overview_buttons_provider :insights_host_overview_buttons
         end

data/lib/foreman_rh_cloud/version.rb

@@ -1,3 +1,3 @@
 module ForemanRhCloud
-  VERSION = '4.0.24'.freeze
+  VERSION = '4.0.26'.freeze
 end

data/lib/foreman_rh_cloud.rb

@@ -100,4 +100,8 @@ module ForemanRhCloud
   def self.foreman_host
     @foreman_host ||= ::Host.unscoped.friendly.find(ENV['SATELLITE_RH_CLOUD_FOREMAN_HOST'] || ::SmartProxy.default_capsule.name)
   end
+
+  def self.legacy_insights_ca
+    "#{ForemanRhCloud::Engine.root}/config/rh_cert-api_chain.pem"
+  end
 end

data/lib/insights_cloud/async/insights_client_status_aging.rb

@@ -4,14 +4,24 @@ module InsightsCloud
       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)
+        host_ids = InsightsClientReportStatus.stale.reporting.pluck(:host_id)
+
+        # update all stale records
+        InsightsClientReportStatus.where(host_id: host_ids).update_all(status: InsightsClientReportStatus::NO_REPORT)
+
+        # refresh global status
+        Host.where(id: host_ids).preload(:host_statuses).find_in_batches do |hosts|
+          hosts.each { |host| host.refresh_global_status! }
+        end
       end
 
       def logger
         action_logger
       end
+
+      def rescue_strategy_for_self
+        Dynflow::Action::Rescue::Fail
+      end
     end
   end
 end

data/lib/insights_cloud/async/insights_full_sync.rb

@@ -6,6 +6,11 @@ module InsightsCloud
       include ::ForemanRhCloud::CloudAuth
 
       def plan
+        unless cloud_auth_available?
+          logger.debug('Cloud authentication is not available, skipping insights sync')
+          return
+        end
+
         sequence do
           # This can be turned off when we enable automatic status syncs
           # This step will query cloud inventory to retrieve inventory uuids for each host
@@ -113,6 +118,10 @@ module InsightsCloud
 
         match || { id: nil }
       end
+
+      def rescue_strategy_for_self
+        Dynflow::Action::Rescue::Fail
+      end
     end
   end
 end

data/lib/insights_cloud/async/insights_generate_notifications.rb

@@ -53,6 +53,10 @@ module InsightsCloud
           }
         )
       end
+
+      def rescue_strategy_for_self
+        Dynflow::Action::Rescue::Fail
+      end
     end
   end
 end

data/lib/insights_cloud/async/insights_resolutions_sync.rb

@@ -7,11 +7,21 @@ module InsightsCloud
 
       RULE_ID_REGEX = /[^:]*:(?<id>.*)/
 
+      def plan
+        unless cloud_auth_available?
+          logger.debug('Cloud authentication is not available, skipping resolutions sync')
+          return
+        end
+
+        plan_self
+      end
+
       def run
         InsightsResolution.transaction do
           InsightsResolution.delete_all
-          api_response = query_insights_resolutions(relevant_rules)
-          write_resolutions(api_response)
+          rule_ids = relevant_rules
+          api_response = query_insights_resolutions(rule_ids) unless rule_ids.empty?
+          write_resolutions(api_response) if api_response
         end
       end
 
@@ -61,6 +71,10 @@ module InsightsCloud
       def to_rule_id(resolution_rule_id)
         RULE_ID_REGEX.match(resolution_rule_id).named_captures.fetch('id', resolution_rule_id)
       end
+
+      def rescue_strategy_for_self
+        Dynflow::Action::Rescue::Fail
+      end
     end
   end
 end

data/lib/insights_cloud/async/insights_rules_sync.rb

@@ -6,8 +6,17 @@ module InsightsCloud
       include ::ForemanRhCloud::CloudAuth
 
       def plan
-        plan_self
-        plan_resolutions
+        unless cloud_auth_available?
+          logger.debug('Cloud authentication is not available, skipping rules sync')
+          return
+        end
+
+        # since the tasks are not connected, we need to force sequence execution here
+        # to make sure we don't run resolutions until we synced all our rules
+        sequence do
+          plan_self
+          plan_resolutions
+        end
       end
 
       def plan_resolutions
@@ -66,6 +75,10 @@ module InsightsCloud
           rating:  rule_hash['rating'],
         }
       end
+
+      def rescue_strategy_for_self
+        Dynflow::Action::Rescue::Fail
+      end
     end
   end
 end

data/lib/insights_cloud.rb

@@ -28,4 +28,8 @@ module InsightsCloud
   def self.remediation_rule_id(rule_id)
     "advisor:#{rule_id}"
   end
+
+  def self.enable_client_param
+    'host_registration_insights'
+  end
 end

data/lib/inventory_sync/async/inventory_full_sync.rb

@@ -5,6 +5,11 @@ module InventorySync
       set_callback :step, :around, :update_statuses_batch
 
       def plan(organization)
+        unless cloud_auth_available?
+          logger.debug('Cloud authentication is not available, skipping inventory hosts sync')
+          return
+        end
+
         plan_self(organization_id: organization.id)
       end
 
@@ -34,6 +39,10 @@ module InventorySync
         host_statuses[:sync] += results.touched.size
       end
 
+      def rescue_strategy_for_self
+        Dynflow::Action::Rescue::Fail
+      end
+
       private
 
       def update_hosts_status(status_hashes, touched)

data/lib/inventory_sync/async/inventory_hosts_sync.rb

@@ -5,6 +5,11 @@ module InventorySync
       set_callback :step, :around, :create_facets
 
       def plan
+        unless cloud_auth_available?
+          logger.debug('Cloud authentication is not available, skipping inventory hosts sync')
+          return
+        end
+
         # by default the tasks will be executed concurrently
         plan_self
         plan_self_host_sync
@@ -23,6 +28,10 @@ module InventorySync
         results
       end
 
+      def rescue_strategy_for_self
+        Dynflow::Action::Rescue::Fail
+      end
+
       private
 
       def add_missing_insights_facets(uuids_hash)

data/lib/inventory_sync/async/inventory_scheduled_sync.rb

@@ -24,6 +24,10 @@ module InventorySync
       def logger
         action_logger
       end
+
+      def rescue_strategy_for_self
+        Dynflow::Action::Rescue::Fail
+      end
     end
   end
 end

data/lib/inventory_sync/async/inventory_self_host_sync.rb

@@ -3,6 +3,15 @@ module InventorySync
     class InventorySelfHostSync < QueryInventoryJob
       set_callback :step, :around, :create_facets
 
+      def plan
+        unless cloud_auth_available?
+          logger.debug('Cloud authentication is not available, skipping self host sync')
+          return
+        end
+
+        plan_self
+      end
+
       def create_facets
         # get the results from the event
         results = yield
@@ -11,6 +20,10 @@ module InventorySync
         results
       end
 
+      def rescue_strategy_for_self
+        Dynflow::Action::Rescue::Fail
+      end
+
       private
 
       def add_missing_insights_facet(uuids_hash)

data/lib/inventory_sync/async/query_inventory_job.rb

@@ -50,6 +50,10 @@ module InventorySync
       def request_url
         ForemanInventoryUpload.inventory_export_url
       end
+
+      def rescue_strategy_for_self
+        Dynflow::Action::Rescue::Fail
+      end
     end
   end
 end

data/lib/tasks/insights.rake

@@ -4,4 +4,19 @@ namespace :rh_cloud_insights do
     ForemanTasks.sync_task(InsightsCloud::Async::InsightsFullSync)
     puts "Synchronized Insights hosts hits data"
   end
+
+  desc "Remove insights client report statuses by searching on host criteria"
+  task clean_statuses: [:environment] do
+    hosts_search = ENV['SEARCH']
+
+    if hosts_search.empty?
+      puts 'Must specify SEARCH= criteria for hosts search'
+      next
+    end
+
+    cleaner = ForemanRhCloud::InsightsStatusCleaner.new
+    deleted_count = cleaner.clean(hosts_search)
+
+    puts "Deleted #{deleted_count} insights statuses"
+  end
 end

data/lib/tasks/rh_cloud_inventory.rake

@@ -19,7 +19,6 @@ namespace :rh_cloud_inventory do
     end
     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
 
@@ -29,18 +28,12 @@ namespace :rh_cloud_inventory do
         puts "Using #{base_folder} for the output"
       end
 
-      if portal_user.empty? && organizations.empty?
-        puts "Must specify either portal_user or organization_id"
+      if organizations.empty?
+        puts "Must specify organization_id"
         return
       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))