redhat_access 2.8.1 → 2.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 89c6bc366a2f296b03f0026ba83aab427386bed63bf90b830317c230e055bd16
-  data.tar.gz: 9d0adc8be6158e6f777a8d46c9e0bed874b2deae99d9c259c508b12a8ea3d544
+  metadata.gz: d5fac7b0590ca10422d21dd457a0638e986d8881b08f0216b5730c46059a1636
+  data.tar.gz: 8635c591b5bc4ee8ed53474a83b4a62706d67943b78464fc5fcc5663932e031d
 SHA512:
-  metadata.gz: fdba6f8c40db6c5c181b05ed62c8c9b71e4f0ac799c8460b3b01ffe798d8e7b77d0158ce833afdf00621f9331669c4c698a0f51c97f544a634fd3bcf0eca49fe
-  data.tar.gz: 3b188cb73fe6a1f289973719f37c59728d12b72ba1e4d9357bd661005f731a82f9b2e84fbbb51967986788a2986f8c3622fd2a7ad1e92b8a32ca0b8fea94061c
+  metadata.gz: bf437bf35adc8ef7660dd6120319c5557227844ba0d491d37d1776a269c9afa6bd8ea8dab440fcb7b8c8d596bf783fabf74694699463cf591ee7c466ae765f44
+  data.tar.gz: 45346558889b5e81168512981e4b56a51ead1d5f465b36d3a6013668c126b4dce5dd6a1874770de704a61ad86c774c9d37d1c258da48ca8d760ee52d07810cfd

data/app/controllers/redhat_access/api/machine_telemetry_api_controller.rb

@@ -65,31 +65,6 @@ module RedhatAccess
         render status: res[:code], json: res[:data]
       end
 
-      def get_branch_info
-        uuid = User.current.login
-        begin
-          org = get_organization(uuid)
-          labels = get_labels_for_host(uuid)
-          major, minor, build = get_plugin_parent_version.scan(/\d+/)
-          client_id = {:remote_leaf => uuid,
-                       :remote_branch => get_branch_id_for_org(org),
-                       :display_name => org.name,
-                       :hostname => request.host,
-                       :product => {:type => get_plugin_parent_name,
-                                    :major_version => major,
-                                    :minor_version => minor
-                       },
-                       :organization_id => org.id,
-                       :satellite_instance_id => get_foreman_instance_id,
-                       :labels => labels
-          }
-          render :json => client_id.to_json
-        rescue RedhatAccess::Telemetry::LookUps::RecordNotFound => e
-          http_error_response(e.message, 400)
-        end
-      end
-
-
       protected
 
       def use_subsets
@@ -110,96 +85,6 @@ module RedhatAccess
         client_user_agent = request.env['HTTP_USER_AGENT']
         "#{base_user_agent};#{client_user_agent}"
       end
-
-
-      def get_branch_id
-        get_branch_id_for_uuid(User.current.login)
-      end
-
-      def get_labels_for_host(uuid)
-        host = get_content_host(uuid)
-        org = get_organization(host)
-
-        # get organization
-        labels = [{
-                      :namespace => "Satellite",
-                      :key => "Organization",
-                      :value => org.name
-                  }]
-
-        # get locations - one tag for each location element
-        location = host.location
-        unless location.nil?
-          location.title.split('/').each do |title|
-            labels += [{
-                           :namespace => "Satellite",
-                           :key => "Location",
-                           :value => title
-                       }]
-          end
-        end
-
-        # get hostgroup and config groups
-        hostgroup = host.hostgroup_id.nil? ? nil : ::Hostgroup.unscoped.find(host.hostgroup_id)
-        unless hostgroup.nil?
-          hostgroup.title.split('/').each do |title|
-            labels += [{
-                           :namespace => "Satellite",
-                           :key => "Host Group",
-                           :value => title
-                       }]
-          end
-
-          # We're leaving these out for the moment....
-
-          # # seems like this is missing parent config groups...
-          # hostgroup.all_config_groups.each do |config_group|
-          #   labels += [{
-          #                  :namespace => "Satellite",
-          #                  :key => "Config Group",
-          #                  :value => config_group.name
-          #              }]
-          # end
-        end
-
-        # get host_collections
-        host.host_collections.each do |collection|
-          labels += [{
-                         :namespace => "Satellite",
-                         :key => "Host Collection",
-                         :value => collection.name
-                     }]
-        end
-
-        # get parameters - perhaps we should only include parameter.searchable_value == true?
-        include_parameter_tags = get_include_parameter_tags # true, false or list
-        if include_parameter_tags
-          host.host_inherited_params_objects.each do |parameter|
-            # check to see if parameter.name is in list (if it *is* a list...)
-            if include_parameter_tags.respond_to?(:none?)
-              # skip tag if no match in list
-              next if include_parameter_tags.none? do |pattern|
-                begin
-                  parameter.name.match?(pattern)
-                rescue RegexpError => e
-                  Rails.logger.debug("Skipping bad parameter expression: #{e}")
-                  # remove the bad pattern from the list so we don't keep iterating over it
-                  include_parameter_tags.delete(pattern)
-                  next
-                end
-              end
-            end
-            # add tag to list of labels
-            labels += [{
-                           :namespace => "SatelliteParameter",
-                           :key => parameter.name,
-                           :value => parameter.value
-                       }]
-          end
-        end
-
-        return labels
-      end
     end
   end
 end

data/app/models/redhat_access/concerns/host_managed_extensions.rb

@@ -12,8 +12,10 @@ module RedhatAccess
         def search_by_plan_id(key, operator, value)
           insights_plan_runner = ForemanAnsible::InsightsPlanRunner.new(Organization.current, value.to_i)
           hostname_rules_relation = insights_plan_runner.hostname_rules(insights_plan_runner.playbook)
-          host_ids = Host::Managed.where(:name => hostname_rules_relation.keys.map{|h| h.downcase}).pluck(:id)
-          { :conditions => " hosts.id IN(#{host_ids.join(',')})" }
+          hostnames = hostname_rules_relation.keys.map{|h| h.downcase}
+          hostnames.map! { |hname| hname.split('.').first } if Setting[:use_shortname_for_vms]
+          conditions = hostnames.empty? ? ' 0 = 1' : sanitize_sql_array([' hosts.name IN (?)', hostnames])
+          { :conditions => conditions }
         end
       end
     end

data/app/services/redhat_access/telemetry/look_ups.rb

@@ -196,10 +196,6 @@ module RedhatAccess
         end
       end
 
-      def get_foreman_instance_id
-        Foreman.respond_to?(:instance_id) ? Foreman.instance_id : nil
-      end
-
       def get_portal_http_proxy
         begin
           @http_proxy_string ||=
@@ -279,11 +275,6 @@ module RedhatAccess
         REDHAT_ACCESS_CONFIG[:telemetry_upload_timeout_s] || 120
       end
 
-      # list of parameters to include as tags (or 'true' for all of them)
-      def get_include_parameter_tags
-        REDHAT_ACCESS_CONFIG[:include_parameter_tags] || false
-      end
-
       def user_login_to_hash(login)
         Digest::SHA1.hexdigest(login)
       end

data/config/routes.rb

@@ -13,11 +13,9 @@ RedhatAccess::Engine.routes.draw do
     get "/insights/templates/:page" => "analytics_dashboard#template"  # hack to get around angular-rails-templates bug
     scope '/r/insights' do
       get   '/',                    to: 'api/machine_telemetry_api#api_connection_test'
-      get   '/v1/branch_info',      to: 'api/machine_telemetry_api#get_branch_info'
       post  '/uploads/(:id)',       to: 'api/machine_telemetry_api#proxy_upload'
       get '/view/api/:v/me' ,   to: 'api/telemetry_api#connection_status', :constraints => {:v =>/(v[0-9]|latest)/}
       match '/view/api/:path',      to: 'api/telemetry_api#proxy', :constraints => {:path => /.*/} ,via: [:get, :post, :delete,:put, :patch]
-      match '/:path',               to: 'api/machine_telemetry_api#proxy', :constraints => {:path => /.*/}, via: [:get, :post, :delete,:put, :patch]
     end
     get 'insights', to: 'analytics_dashboard#index'
     get 'analytics_configuration', to: 'telemetry_configuration#index'

data/lib/redhat_access/version.rb

@@ -1,3 +1,3 @@
 module RedhatAccess
-  VERSION = "2.8.1"
+  VERSION = "2.9.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redhat_access
 version: !ruby/object:Gem::Version
-  version: 2.8.1
+  version: 2.9.1
 platform: ruby
 authors:
 - Lindani Phiri