redhat_access 2.2.18 → 2.2.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86bd04f9f04b00a09726b0e76ed2c668b84efdf2bb9cf8dc70a030c22ec0beb8
-  data.tar.gz: abb8e439938a3148d4b99fae335b28253a88e13156d2a50fb57cd15dadaf2c8c
+  metadata.gz: 22973a0685c5aeb9b9683037f930a2afb7ec325c145c5d7e3dc97e2cac4429c2
+  data.tar.gz: 46d2f9bf710bc14f1d528cc6c2c2e8c2f6c52c1c856c3047424190bb5d5a4e9e
 SHA512:
-  metadata.gz: c9bd5b013607f4cfc490c71990b1e7dbc9bc2f8fc54e14f7a957736b31c462db18a0a94afb73e9835915d69179f9b8a5f063c5b24f359e9e94345fd262e2e33e
-  data.tar.gz: 645ac25141593cbb13a20c01ef389264548f08d309d8615004e275ec27e81500b3bc9bc031cddf1add4192224d6d4d099c6e88011a3f5c8c002316d6c8a95d0f
+  metadata.gz: bacad0f960e2003ef1b2da974e549e0962e6f961ea87d641148e7fe4b2c48acf98f795ad09aac713b70591056f4d5d125325d05b834298da684f058e88c8bea0
+  data.tar.gz: af0704351dac7f9d830f25af9de20cd53ff53aa8117ae65e322db6c869c1d98fba1b7160585c73fb52df05aa0bb66df7a5a90e0ffba4aa5661f25978b61c2909

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,108 +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)
-
-        # {
-        #     "Satellite":  {
-        #         "Organization": ["Insights"],
-        #         "Location": ["North America", "RTP"]
-        #     },
-        #
-        #     "SatelliteParameter": {
-        #         "parameter_1": ["value_1"],
-        #         "parameter_2": ["value_2"]
-        #     }
-        # }
-
-        # 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,9 @@ 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' : " hosts.name IN(#{hostnames.join(',')})") }
         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.2.18"
+  VERSION = "2.2.19"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redhat_access
 version: !ruby/object:Gem::Version
-  version: 2.2.18
+  version: 2.2.19
 platform: ruby
 authors:
 - Lindani Phiri
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-14 00:00:00.000000000 Z
+date: 2021-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redhat_access_lib