Fixes #38888 - Add Cloud Provider Details card to Host Details page

app/models/concerns/hostext/search.rb

@@ -88,6 +88,14 @@ module Search
       scoped_search :relation => :reported_data, :on => :bios_vendor, :rename => 'reported.bios_vendor'
       scoped_search :relation => :reported_data, :on => :bios_release_date, :rename => 'reported.bios_release_date'
       scoped_search :relation => :reported_data, :on => :bios_version, :rename => 'reported.bios_version'
+      scoped_search :relation => :reported_data, :on => :cloud_provider, :rename => 'reported.cloud_provider', :complete_value => true
+      scoped_search :relation => :reported_data, :on => :aws_account_id, :rename => 'reported.aws_account_id', :only_explicit => true
+      scoped_search :relation => :reported_data, :on => :aws_region, :rename => 'reported.aws_region', :only_explicit => true
+      scoped_search :relation => :reported_data, :on => :aws_instance_id, :rename => 'reported.aws_instance_id', :only_explicit => true
+      scoped_search :relation => :reported_data, :on => :azure_subscription_id, :rename => 'reported.azure_subscription_id', :only_explicit => true
+      scoped_search :relation => :reported_data, :on => :azure_instance_id, :rename => 'reported.azure_instance_id', :only_explicit => true
+      scoped_search :relation => :reported_data, :on => :gcp_project_id, :rename => 'reported.gcp_project_id', :only_explicit => true
+      scoped_search :relation => :reported_data, :on => :gcp_instance_id, :rename => 'reported.gcp_instance_id', :only_explicit => true
 
       scoped_search :relation => :location, :on => :title, :rename => :location, :complete_value => true, :only_explicit => true
       scoped_search :on => :location_id, :complete_enabled => false, :only_explicit => true, :validator => ScopedSearch::Validators::INTEGER

app/models/host_facets/reported_data_facet.rb

@@ -13,6 +13,22 @@ def self.populate_fields_from_facts(host, parser, type, source_proxy)
         bios_vendor: parser.bios[:vendor],
         bios_release_date: parser.bios[:release_date],
         bios_version: parser.bios[:version],
+        cloud_provider: parser.cloud_provider,
+        aws_account_id: parser.aws_account_id,
+        aws_billing_products: parser.aws_billing_products,
+        aws_instance_id: parser.aws_instance_id,
+        aws_instance_type: parser.aws_instance_type,
+        aws_marketplace_product_codes: parser.aws_marketplace_product_codes,
+        aws_region: parser.aws_region,
+        azure_instance_id: parser.azure_instance_id,
+        azure_offer: parser.azure_offer,
+        azure_sku: parser.azure_sku,
+        azure_subscription_id: parser.azure_subscription_id,
+        gcp_instance_id: parser.gcp_instance_id,
+        gcp_license_codes: parser.gcp_license_codes,
+        gcp_project_id: parser.gcp_project_id,
+        gcp_project_number: parser.gcp_project_number,
+        gcp_zone: parser.gcp_zone,
       }.compact
       facet.save if facet.changed?
     end

app/services/ansible_fact_parser.rb

@@ -98,6 +98,74 @@ def bios
     facts.dig('facter_dmi', 'bios') || {}
   end
 
+  # Cloud provider identifier
+  def cloud_provider
+    facts['cloud_provider']
+  end
+
+  # AWS cloud billing fields
+  def aws_account_id
+    facts['aws_account_id']
+  end
+
+  def aws_billing_products
+    facts['aws_billing_products']
+  end
+
+  def aws_instance_id
+    facts['aws_instance_id']
+  end
+
+  def aws_instance_type
+    facts['aws_instance_type']
+  end
+
+  def aws_marketplace_product_codes
+    facts['aws_marketplace_product_codes']
+  end
+
+  def aws_region
+    facts['aws_region']
+  end
+
+  # Azure cloud billing fields
+  def azure_instance_id
+    facts['azure_instance_id']
+  end
+
+  def azure_offer
+    facts['azure_offer']
+  end
+
+  def azure_sku
+    facts['azure_sku']
+  end
+
+  def azure_subscription_id
+    facts['azure_subscription_id']
+  end
+
+  # GCP cloud billing fields
+  def gcp_instance_id
+    facts['gcp_instance_id']
+  end
+
+  def gcp_license_codes
+    facts['gcp_license_codes']
+  end
+
+  def gcp_project_id
+    facts['gcp_project_id']
+  end
+
+  def gcp_project_number
+    facts['gcp_project_number']
+  end
+
+  def gcp_zone
+    facts['gcp_zone']
+  end
+
   private
 
   def ansible_interfaces

app/services/fact_parser.rb

@@ -134,6 +134,54 @@ def bios
     {}
   end
 
+  # AWS cloud billing fields
+  def aws_account_id
+  end
+
+  def aws_billing_products
+  end
+
+  def aws_instance_id
+  end
+
+  def aws_instance_type
+  end
+
+  def aws_marketplace_product_codes
+  end
+
+  def aws_region
+  end
+
+  # Azure cloud billing fields
+  def azure_instance_id
+  end
+
+  def azure_offer
+  end
+
+  def azure_sku
+  end
+
+  def azure_subscription_id
+  end
+
+  # GCP cloud billing fields
+  def gcp_instance_id
+  end
+
+  def gcp_license_codes
+  end
+
+  def gcp_project_id
+  end
+
+  def gcp_project_number
+  end
+
+  def gcp_zone
+  end
+
   private
 
   def find_interface_by_name(host_name)

app/services/katello/rhsm_fact_parser.rb

@@ -131,6 +131,74 @@ def bios
       }
     end
 
+    # Cloud provider identifier
+    def cloud_provider
+      facts['cloud_provider']
+    end
+
+    # AWS cloud billing fields
+    def aws_account_id
+      facts['aws_account_id']
+    end
+
+    def aws_billing_products
+      facts['aws_billing_products']
+    end
+
+    def aws_instance_id
+      facts['aws_instance_id']
+    end
+
+    def aws_instance_type
+      facts['aws_instance_type']
+    end
+
+    def aws_marketplace_product_codes
+      facts['aws_marketplace_product_codes']
+    end
+
+    def aws_region
+      facts['aws_region']
+    end
+
+    # Azure cloud billing fields
+    def azure_instance_id
+      facts['azure_instance_id']
+    end
+
+    def azure_offer
+      facts['azure_offer']
+    end
+
+    def azure_sku
+      facts['azure_sku']
+    end
+
+    def azure_subscription_id
+      facts['azure_subscription_id']
+    end
+
+    # GCP cloud billing fields
+    def gcp_instance_id
+      facts['gcp_instance_id']
+    end
+
+    def gcp_license_codes
+      facts['gcp_license_codes']
+    end
+
+    def gcp_project_id
+      facts['gcp_project_id']
+    end
+
+    def gcp_project_number
+      facts['gcp_project_number']
+    end
+
+    def gcp_zone
+      facts['gcp_zone']
+    end
+
     private
 
     def get_rhsm_ip(interface)

app/services/puppet_fact_parser.rb

@@ -166,6 +166,83 @@ def bios
     {:vendor => facts.dig('dmi', 'bios', 'vendor') || facts['bios_vendor'], :version => facts.dig('dmi', 'bios', 'version') || facts['bios_version'], :release_date => facts.dig('dmi', 'bios', 'release_date') || facts['bios_release_date']}
   end
 
+  # Cloud provider identifier
+  def cloud_provider
+    facts.dig('cloud', 'provider') || facts['cloud_provider']
+  end
+
+  # AWS cloud billing fields
+  def aws_account_id
+    facts.dig('ec2_metadata', 'account-id') || facts.dig('ec2', 'metadata', 'account-id') || facts['aws_account_id']
+  end
+
+  def aws_billing_products
+    facts.dig('ec2_metadata', 'billing-products') || facts.dig('ec2', 'metadata', 'billing-products') || facts['aws_billing_products']
+  end
+
+  def aws_instance_id
+    facts.dig('ec2_metadata', 'instance-id') || facts.dig('ec2', 'metadata', 'instance-id') || facts['aws_instance_id']
+  end
+
+  def aws_instance_type
+    facts.dig('ec2_metadata', 'instance-type') || facts.dig('ec2', 'metadata', 'instance-type') || facts['aws_instance_type']
+  end
+
+  def aws_marketplace_product_codes
+    # marketplace-product-codes is an array in Facter, convert to comma-separated string
+    codes = facts.dig('ec2_metadata', 'marketplace-product-codes') || facts.dig('ec2', 'metadata', 'marketplace-product-codes')
+    codes = codes.join(',') if codes.is_a?(Array)
+    codes || facts['aws_marketplace_product_codes']
+  end
+
+  def aws_region
+    facts.dig('ec2_metadata', 'placement', 'region') || facts.dig('ec2', 'metadata', 'placement', 'region') || facts['aws_region']
+  end
+
+  # Azure cloud billing fields
+  def azure_instance_id
+    facts.dig('az_metadata', 'compute', 'vmId') || facts.dig('azure', 'metadata', 'compute', 'vmId') || facts['azure_instance_id']
+  end
+
+  def azure_offer
+    facts.dig('az_metadata', 'compute', 'offer') || facts.dig('azure', 'metadata', 'compute', 'offer') || facts['azure_offer']
+  end
+
+  def azure_sku
+    facts.dig('az_metadata', 'compute', 'sku') || facts.dig('azure', 'metadata', 'compute', 'sku') || facts['azure_sku']
+  end
+
+  def azure_subscription_id
+    facts.dig('az_metadata', 'compute', 'subscriptionId') || facts.dig('azure', 'metadata', 'compute', 'subscriptionId') || facts['azure_subscription_id']
+  end
+
+  # GCP cloud billing fields
+  def gcp_instance_id
+    facts.dig('gce', 'instance', 'id') || facts['gcp_instance_id']
+  end
+
+  def gcp_license_codes
+    # licenses is an array of objects with 'id' field in Facter, convert to comma-separated string
+    licenses = facts.dig('gce', 'instance', 'licenses')
+    if licenses.is_a?(Array)
+      licenses.map { |l| l.is_a?(Hash) ? l['id'] : l }.compact.join(',')
+    else
+      licenses || facts['gcp_license_codes']
+    end
+  end
+
+  def gcp_project_id
+    facts.dig('gce', 'project', 'projectId') || facts['gcp_project_id']
+  end
+
+  def gcp_project_number
+    facts.dig('gce', 'project', 'numericProjectId') || facts['gcp_project_number']
+  end
+
+  def gcp_zone
+    facts.dig('gce', 'zone') || facts['gcp_zone']
+  end
+
   private
 
   # remove when dropping support for facter < 3.0

app/views/api/v2/hosts/reported_data.json.rabl

@@ -3,5 +3,8 @@ glue(@facet) do
 end
 
 child(@facet => :reported_data) do
-  attributes :boot_time, :cores, :sockets, :ram, :disks_total, :kernel_version, :bios_vendor, :bios_release_date, :bios_version, :virtual
+  attributes :boot_time, :cores, :sockets, :ram, :disks_total, :kernel_version, :bios_vendor, :bios_release_date, :bios_version, :virtual,
+    :aws_account_id, :aws_billing_products, :aws_instance_id, :aws_instance_type, :aws_marketplace_product_codes, :aws_region,
+    :azure_instance_id, :azure_offer, :azure_sku, :azure_subscription_id,
+    :gcp_instance_id, :gcp_license_codes, :gcp_project_id, :gcp_project_number, :gcp_zone
 end

db/migrate/20251113120000_add_cloud_provider_to_reported_data.rb

@@ -0,0 +1,29 @@
+class AddCloudProviderToReportedData < ActiveRecord::Migration[6.1]
+  def change
+    change_table(:host_facets_reported_data_facets) do |t|
+      # Cloud provider identifier
+      t.column :cloud_provider, :string, :limit => 255
+
+      # AWS fields
+      t.column :aws_account_id, :string, :limit => 255
+      t.column :aws_billing_products, :string, :limit => 255
+      t.column :aws_instance_id, :string, :limit => 255
+      t.column :aws_instance_type, :string, :limit => 255
+      t.column :aws_marketplace_product_codes, :string, :limit => 255
+      t.column :aws_region, :string, :limit => 255
+
+      # Azure fields
+      t.column :azure_instance_id, :string, :limit => 255
+      t.column :azure_offer, :string, :limit => 255
+      t.column :azure_sku, :string, :limit => 255
+      t.column :azure_subscription_id, :string, :limit => 255
+
+      # GCP fields
+      t.column :gcp_instance_id, :string, :limit => 255
+      t.column :gcp_license_codes, :string, :limit => 255
+      t.column :gcp_project_id, :string, :limit => 255
+      t.column :gcp_project_number, :string, :limit => 255
+      t.column :gcp_zone, :string, :limit => 255
+    end
+  end
+end

webpack/assets/javascripts/react_app/components/HostDetails/Tabs/Details/CardRegistry.js

@@ -7,12 +7,14 @@ import NetworkingInterfaces from '../Details/Cards/NetworkingInterfaces';
 import TemplatesCard from '../Details/Cards/TemplatesCard';
 import ProvisioningCard from '../Details/Cards/Provisioning';
 import VirtualizationCard from '../Details/Cards/Virtualization';
+import CloudProviderCard from '../Details/Cards/CloudProvider';
 
 const cards = [
   { key: '[core] System properties', Component: Properties, weight: 4000 },
   { key: '[core] Operating systems', Component: OperatingSystem, weight: 3000 },
   { key: '[core] Provisioning', Component: ProvisioningCard, weight: 2900 },
   { key: '[core] BIOS', Component: Bios, weight: 2000 },
+  { key: '[core] Cloud Provider', Component: CloudProviderCard, weight: 1500 },
   { key: '[core] Virtualization', Component: VirtualizationCard, weight: 1000 },
   {
     key: '[core] Templates',