foreman_rh_cloud 3.0.18.1 → 4.0.21.1

data/lib/insights_cloud/async/insights_resolutions_sync.rb

@@ -0,0 +1,69 @@
+require 'rest-client'
+
+module InsightsCloud
+  module Async
+    class InsightsResolutionsSync < ::Actions::EntryAction
+      include ::ForemanRhCloud::CloudAuth
+
+      RULE_ID_REGEX = /[^:]*:(?<id>.*)/
+
+      def run
+        InsightsResolution.transaction do
+          InsightsResolution.delete_all
+          api_response = query_insights_resolutions(relevant_rules)
+          write_resolutions(api_response)
+        end
+      end
+
+      def logger
+        action_logger
+      end
+
+      private
+
+      def query_insights_resolutions(rule_ids)
+        resolutions_response = RestClient::Request.execute(
+          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,
+          }.to_json
+        )
+
+        JSON.parse(resolutions_response)
+      end
+
+      def relevant_rules
+        InsightsRule.all.pluck(:rule_id).map { |id| InsightsCloud.remediation_rule_id(id) }
+      end
+
+      def to_resolution_hash(rule_id, resolution_hash)
+        {
+          rule_id: rule_id,
+          description: resolution_hash['description'],
+          resolution_type: resolution_hash['id'],
+          needs_reboot: resolution_hash['needs_reboot'],
+          resolution_risk: resolution_hash['resolution_risk'],
+        }
+      end
+
+      def write_resolutions(response)
+        all_resolutions = response.map do |rule_id, rule_details|
+          rule_details['resolutions'].map { |resolution| to_resolution_hash(to_rule_id(rule_id), resolution) }
+        end.flatten
+
+        InsightsResolution.create(all_resolutions)
+      end
+
+      def to_rule_id(resolution_rule_id)
+        RULE_ID_REGEX.match(resolution_rule_id).named_captures.fetch('id', resolution_rule_id)
+      end
+    end
+  end
+end

data/lib/insights_cloud/async/insights_rules_sync.rb

@@ -2,13 +2,21 @@ require 'rest-client'
 
 module InsightsCloud
   module Async
-    class InsightsRulesSync < ::ApplicationJob
+    class InsightsRulesSync < ::Actions::EntryAction
       include ::ForemanRhCloud::CloudAuth
 
-      def perform
+      def plan
+        plan_self
+        plan_resolutions
+      end
+
+      def plan_resolutions
+        plan_action InsightsResolutionsSync
+      end
+
+      def run
         offset = 0
         InsightsRule.transaction do
-          InsightsResolution.delete_all
           InsightsRule.delete_all
           loop do
             api_response = query_insights_rules(offset)
@@ -16,13 +24,14 @@ module InsightsCloud
             logger.debug("Downloaded #{offset + results.count} of #{results.total}")
             write_rules_page(results.rules)
             offset += results.count
+            output[:rules_count] = results.total
             break if offset >= results.total
           end
         end
       end
 
       def logger
-        Foreman::Logging.logger('background')
+        action_logger
       end
 
       private
@@ -43,12 +52,8 @@ module InsightsCloud
 
       def write_rules_page(rules)
         rules_attributes = rules.map { |rule| to_rule_hash(rule) }
-        resolutions_attributes = rules.map do |rule|
-          rule['resolution_set'].map { |resolution| to_resolution_hash(rule['rule_id'], resolution) }
-        end.flatten
 
         InsightsRule.create(rules_attributes)
-        InsightsResolution.create(resolutions_attributes)
       end
 
       def to_rule_hash(rule_hash)
@@ -66,15 +71,6 @@ module InsightsCloud
           rating:  rule_hash['rating'],
         }
       end
-
-      def to_resolution_hash(rule_id, resolution_hash)
-        {
-          rule_id: rule_id,
-          system_type: resolution_hash['system_type'],
-          resolution: resolution_hash['resolution'],
-          has_playbook: resolution_hash['has_playbook'],
-        }
-      end
     end
   end
 end

data/lib/insights_cloud/async/insights_scheduled_sync.rb

@@ -10,7 +10,7 @@ module InsightsCloud
           return
         end
 
-        InsightsFullSync.perform_later()
+        ForemanTasks.async_task InsightsFullSync
       ensure
         self.class.set(:wait => 24.hours).perform_later
       end

data/lib/inventory_sync/async/host_result.rb

@@ -6,12 +6,13 @@ module InventorySync
         @count = result['count']
         @page = result['page']
         @per_page = result['per_page']
-        @fqdns = result["results"].map { |host| host['fqdn'] }
+        @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']] }]
       end
 
       def status_hashes
-        @fqdns.map do |fqdn|
-          host_id = host_id(fqdn)
+        @sub_ids.map do |sub_id|
+          host_id = host_id(sub_id)
           if host_id
             touched << host_id
             {
@@ -27,16 +28,20 @@ module InventorySync
         @touched ||= []
       end
 
-      def host_id(fqdn)
-        hosts[fqdn]
+      def host_id(sub_id)
+        hosts[sub_id]
       end
 
       def hosts
         @hosts ||= Hash[
-          Host.where(name: @fqdns).pluck(:name, :id)
+          Katello::Host::SubscriptionFacet.where(uuid: @sub_ids).pluck(:uuid, :host_id)
         ]
       end
 
+      def host_uuids
+        @host_uuids ||= Hash[@sub_ids.map { |sub_id| [host_id(sub_id), @uuid_by_sub_id[sub_id]] }].except(nil)
+      end
+
       def percentage
         ratio = @per_page * @page * 1.0 / @total * 100
         ratio > 100 ? 100 : ratio.truncate(2)

data/lib/inventory_sync/async/inventory_full_sync.rb

@@ -1,42 +1,36 @@
-require 'rest-client'
-
 module InventorySync
   module Async
-    class InventoryFullSync < ::ApplicationJob
-      include ::ForemanRhCloud::CloudAuth
+    class InventoryFullSync < InventoryHostsSync
+      set_callback :iteration, :around, :setup_statuses
+      set_callback :step, :around, :update_statuses_batch
+
+      def plan(organization)
+        plan_self(organization_id: organization.id)
+      end
 
-      def perform(organization)
-        @organization = organization
+      def setup_statuses
         @subscribed_hosts_ids = Set.new(
           ForemanInventoryUpload::Generators::Queries.for_slice(
-            Host.unscoped.where(organization: organization)
+            Host.unscoped.where(organization: input[:organization_id])
           ).pluck(:id)
         )
-        @host_statuses = {
-          sync: 0,
-          disconnect: 0,
-        }
 
         InventorySync::InventoryStatus.transaction do
           InventorySync::InventoryStatus.where(host_id: @subscribed_hosts_ids).delete_all
-          page = 1
-          loop do
-            api_response = query_inventory(page)
-            results = HostResult.new(api_response)
-            logger.debug("Downloading cloud inventory data: #{results.percentage}%")
-            update_hosts_status(results.status_hashes, results.touched)
-            @host_statuses[:sync] += results.touched.size
-            page += 1
-            break if results.last?
-          end
+          yield
           add_missing_hosts_statuses(@subscribed_hosts_ids)
-          @host_statuses[:disconnect] += @subscribed_hosts_ids.size
+          host_statuses[:disconnect] += @subscribed_hosts_ids.size
         end
 
-        logger.debug("Synced hosts amount: #{@host_statuses[:sync]}")
-        logger.debug("Disconnected hosts amount: #{@host_statuses[:disconnect]}")
+        logger.debug("Synced hosts amount: #{host_statuses[:sync]}")
+        logger.debug("Disconnected hosts amount: #{host_statuses[:disconnect]}")
+      end
+
+      def update_statuses_batch
+        results = yield
 
-        @host_statuses
+        update_hosts_status(results.status_hashes, results.touched)
+        host_statuses[:sync] += results.touched.size
       end
 
       private
@@ -58,22 +52,11 @@ module InventorySync
         )
       end
 
-      def query_inventory(page = 1)
-        hosts_inventory_response = RestClient::Request.execute(
-          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: {
-              per_page: 100,
-              page: page,
-            },
-          }
-        )
-
-        JSON.parse(hosts_inventory_response)
+      def host_statuses
+        output[:host_statuses] ||= {
+          sync: 0,
+          disconnect: 0,
+        }
       end
     end
   end

data/lib/inventory_sync/async/inventory_hosts_sync.rb

@@ -0,0 +1,34 @@
+module InventorySync
+  module Async
+    class InventoryHostsSync < QueryInventoryJob
+      set_callback :iteration, :around, :setup_facet_transaction
+      set_callback :step, :around, :create_facets
+
+      def setup_facet_transaction
+        InsightsFacet.transaction do
+          yield
+        end
+      end
+
+      def create_facets
+        # get the results from the event
+        results = yield
+        add_missing_insights_facets(results.host_uuids)
+        results
+      end
+
+      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|
+          {
+            host_id: host_id,
+            uuid: uuid,
+          }
+        end
+        InsightsFacet.create(missing_facets)
+      end
+    end
+  end
+end

data/lib/inventory_sync/async/inventory_scheduled_sync.rb

@@ -0,0 +1,17 @@
+module InventorySync
+  module Async
+    class InventoryScheduledSync < ::Actions::EntryAction
+      include ::Actions::RecurringAction
+
+      def plan
+        Organization.unscoped.each do |org|
+          plan_org_sync(org)
+        end
+      end
+
+      def plan_org_sync(org)
+        plan_action InventoryFullSync, org
+      end
+    end
+  end
+end

data/lib/inventory_sync/async/query_inventory_job.rb

@@ -0,0 +1,54 @@
+require 'rest-client'
+
+module InventorySync
+  module Async
+    class QueryInventoryJob < ::Actions::EntryAction
+      include ActiveSupport::Callbacks
+      include ::ForemanRhCloud::CloudAuth
+
+      define_callbacks :iteration, :step
+
+      def run
+        run_callbacks :iteration do
+          page = 1
+          loop do
+            api_response = query_inventory(page)
+            results = HostResult.new(api_response)
+            logger.debug("Downloaded cloud inventory data: #{results.percentage}%")
+
+            run_callbacks :step do
+              results
+            end
+
+            page += 1
+            break if results.last?
+          end
+        end
+      end
+
+      private
+
+      def query_inventory(page = 1)
+        hosts_inventory_response = RestClient::Request.execute(
+          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: {
+              per_page: 100,
+              page: page,
+            },
+          }
+        )
+
+        JSON.parse(hosts_inventory_response)
+      end
+
+      def logger
+        action_logger
+      end
+    end
+  end
+end

data/lib/tasks/insights.rake

@@ -1,15 +1,7 @@
 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
+  desc "Synchronize Insights hosts hits"
+  task sync: [:environment, 'dynflow:client'] do
+    ForemanTasks.sync_task(InsightsCloud::Async::InsightsFullSync)
+    puts "Synchronized Insights hosts hits data"
   end
 end

data/lib/tasks/rh_cloud_inventory.rake

@@ -52,9 +52,17 @@ namespace :rh_cloud_inventory do
     end
   end
 
-  desc "Synchronize Insights hosts hits"
-  task sync: :environment do
-    InsightsCloud::Async::InsightsFullSync.perform_now()
-    puts "Synchronized Insights hosts hits data"
+  desc "Synchronize Hosts inventory"
+  task sync: [:environment, 'dynflow:client'] do
+    if ! ENV['organization_id'].nil?
+      organizations = [ Organization.where(:id => ENV['organization_id']).first ]
+    else
+      organizations = Organization.all
+    end
+
+    organizations.each do |organization|
+      ForemanTasks.async_task(InventorySync::Async::InventoryFullSync, organization)
+      puts "Synchronized inventory for organization '#{organization.name}'"
+    end
   end
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "foreman_rh_cloud",
-  "version": "3.0.18.1",
+  "version": "4.0.21.1",
   "description": "Inventory Upload =============",
   "main": "index.js",
   "scripts": {

data/test/factories/insights_factories.rb

@@ -19,6 +19,28 @@ FactoryBot.define do
     sequence(:results_url) { |n| "https://cloud.redhat.com/insights/overview/stability/test_rule%7CTEST_RULE/accdf444-5628-451d-bf3e-cf909ad7275#{n}/" }
     rule_id { "test_rule|TEST_RULE" }
   end
+
+  factory :insights_rule do
+    sequence(:rule_id) { |n| "test_rule#{n}|TEST_RULE#{n}" }
+    description { 'test rule description' }
+    category_name { 'Testing' }
+    impact_name { 'Testing error' }
+    summary { 'Testing summary' }
+    generic { 'Testing generic' }
+    reason { 'No apparent reason' }
+    total_risk { -1 }
+    reboot_required { true }
+    more_info { 'more test info' }
+    rating { 0 }
+  end
+
+  factory :insights_resolution do
+    sequence(:rule_id) { |n| "test_rule#{n}|TEST_RULE#{n}" }
+    description { 'fix the issue on the fly' }
+    needs_reboot { false }
+    resolution_risk { 1 }
+    resolution_type { 'fix' }
+  end
 end
 
 FactoryBot.modify do