redhat_access 2.2.10 → 2.2.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67e8e666255e81f7ceb89434135c64a904a772adad60369a9d24e0770000c1ae
-  data.tar.gz: 99124c4b5f76163caff0d015f0d0344210283e40421a5175696419b3f297edfa
+  metadata.gz: e94c4f74c8bf19599836bcfa836469540b00cb9680dad9c9a21aaaddb2ef4c4f
+  data.tar.gz: ec9a734f1907e2ebe6317accdaaa5b23d218eddc60ac2730f38040bd6f204dad
 SHA512:
-  metadata.gz: 187cc7495cc438df0c718dcb0a809c4ec48170e3d1fee9afcf731d0734d67429a92ea615ee69a08815a8d4ce8d5b1722f148dd98c56388f0a2a48991824b04ec
-  data.tar.gz: '089e0155d72b586a7cb3b988842e07c05e160103e3620e33163ac875d22005ec5dfbe9079005b2e6c7cb44693270be91012b1360f3d519c74ffbef491554d267'
+  metadata.gz: 3119df6ee719a94587de96ed060c8f505fce193c9c40d67555471a8a3176a000501d96a1b725c1bac132fe3e6edd1d9c8ed6f2717982e509bc0974fa7b6e75b6
+  data.tar.gz: 180a8b8c3b4a528f4d16d7fa3b117851ce527ed646a51491c4928947136608799e49f8dd37858158e732125e5fa53256ac320dcced2e4b5407559d6f9ab965ec

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

@@ -42,8 +42,8 @@ module RedhatAccess
       end
 
       def proxy_upload
-        original_method  = request.method
-        original_params  = add_branch_to_params(request.query_parameters)
+        original_method = request.method
+        original_params = add_branch_to_params(request.query_parameters)
         original_payload = request.request_parameters[controller_name]
         if not params[:id] and params[:test]
           resource = "uploads/"
@@ -58,27 +58,31 @@ module RedhatAccess
           #Overwrite payload if sending a file
           original_payload = get_file_data(params)
         end
-        
+
         client = get_api_client
         Rails.logger.debug("Proxy upload original_payload : #{original_payload}")
         res = client.call_tapi(original_method, URI.escape(resource), original_params, original_payload, {timeout: get_upload_timeout}, use_subsets)
-        render status: res[:code] , json: res[:data]
+        render status: res[:code], json: res[:data]
       end
 
       def get_branch_info
         uuid = User.current.login
         begin
           org = get_organization(uuid)
-          major,minor,build = get_plugin_parent_version.scan(/\d+/)
-          client_id = {:remote_leaf => uuid ,
-                       :remote_branch => get_branch_id_for_uuid(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)
@@ -86,7 +90,6 @@ module RedhatAccess
       end
 
 
-
       protected
 
       def use_subsets
@@ -112,6 +115,91 @@ module RedhatAccess
       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/services/redhat_access/telemetry/look_ups.rb

@@ -168,8 +168,13 @@ module RedhatAccess
         get_branch_id_for_org org
       end
 
-      def get_organization(uuid)
-        system = get_content_host(uuid)
+      def get_organization(uuid_or_host)
+        # this takes either a host object or a uuid string
+        if uuid_or_host.is_a?(::Host::Managed)
+          return uuid_or_host.nil? ? nil : uuid_or_host.organization
+        end
+
+        system = get_content_host(uuid_or_host)
         system.nil? ? nil : system.organization
       end
 
@@ -191,12 +196,18 @@ module RedhatAccess
         end
       end
 
+      def get_foreman_instance_id
+        Foreman.respond_to?(:instance_id) ? Foreman.instance_id : nil
+      end
+
       def get_portal_http_proxy
         proxy = nil
         if SETTINGS[:katello][:cdn_proxy] && SETTINGS[:katello][:cdn_proxy][:host]
           proxy_config = SETTINGS[:katello][:cdn_proxy]
           scheme = URI.parse(proxy_config[:host]).scheme
           uri = URI('')
+          # Ruby's uri parser doesn't handle encoded characters so Katello added two new schemes to handle proxy
+          # passwords.  See https://github.com/Katello/katello/blob/master/app/lib/katello/util/proxy_uri.rb
           uri.scheme = 'proxy' if scheme == 'http'
           uri.scheme = 'proxys' if scheme == 'https'
           uri.host = URI.parse(proxy_config[:host]).host
@@ -239,6 +250,11 @@ 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/app/services/redhat_access/telemetry/messaging_service.rb

@@ -161,8 +161,8 @@ module RedhatAccess
         end
         res = new_api_client(add_user_header).call_tapi(options[:method],
                                                         URI.escape(options[:resource]),
-                                                        #{:branch_id => @branch_id}.merge(options[:params]),
-                                                        options[:params],
+                                                        {:branch_id => @branch_id}.merge(options[:params]),
+                                                        # options[:params],
                                                         options[:payload],
                                                         {timeout: get_tapi_timeout},
                                                         options[:use_subsets])

data/lib/redhat_access/version.rb

@@ -1,3 +1,3 @@
 module RedhatAccess
-  VERSION = "2.2.10"
+  VERSION = "2.2.11"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redhat_access
 version: !ruby/object:Gem::Version
-  version: 2.2.10
+  version: 2.2.11
 platform: ruby
 authors:
 - Lindani Phiri
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-27 00:00:00.000000000 Z
+date: 2020-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redhat_access_lib