lrc_handler 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 737fa2ad6b5b97e3cd79363e0e7429b575b37e78
-  data.tar.gz: ddeaf8c06ae83ec8313d2292b002942034e0ab2c
+  metadata.gz: b26c6c4d52ceefdd8d519142f5230e5ee4b3436e
+  data.tar.gz: 8aff525c170fe6dc141edfcae3ecb297c53e2477
 SHA512:
-  metadata.gz: bb97900a9be6dd451700827e9abe744bbd8631ccf497d8562b3fdd10a7c7a4c5fe2d0df0e3e688fef13a4dc7e1e985445dbde3d669072dbb19398a177129b821
-  data.tar.gz: 7ef8f62349e2974de5b079636d7cc48098d5cf196fc787b6e923219a71b41de49602cd0baa065b8debe0c1ba2225137d9e6f6b3ba8ae6c0005fbd9361b7ff985
+  metadata.gz: 6ea58873681971f39ff5e49153daa2dd699c4ab46aa432c0a52c947f123386deca48157d88495c69d8b67513a8f3078acfbbfa1d4dc4a9518622e9f777a639d2
+  data.tar.gz: 5a35e052299efaf82172c2b453244d8059d0b951e5315890722b1093e06b4e1ccc17a01018a4094915e8b0a7f978c9cf29adbb83cdc823a17bf3d67be42dd042

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # changelog
 
+## v 0.1.3
+
+- fix ruby syntax (rubocop compliant)
+- remove debug informations
+- add version chef in report
+
 ## v 0.1.2
 
 - fix HTTPS capability

data/README.md

@@ -24,4 +24,17 @@ lrc_server_options  :url => 'https://lrc.lbn.fr'
 lrc_reports_upload  true
 # add following line to manage reports verbosity. Allowed values are debug, notice and error
 lrc_reports_level       "notice"
-```
+```
+
+## packaging
+
+Edit the `lib\lbn_report_chef\version.rb` with a new version
+
+run the following command:
+
+```sh
+gem build lrc_handler.gemspec
+gem push lrc_handler-x.x.x.gem
+```
+
+gem push require that you can login to rubygems.org

data/lib/lbn_report_chef/lrc_hooks.rb

@@ -1,3 +1,4 @@
+# import files
 require "#{File.dirname(__FILE__)}/lrc_reporting"
 require "#{File.dirname(__FILE__)}/lrc_resource_reporter"
 require "#{File.dirname(__FILE__)}/lrc_uploader"
@@ -15,32 +16,30 @@ module ChefHandlerLrc
     def lrc_server_options(options = {})
       options[:client_key] = client_key || '/etc/chef/client.pem' unless options[:client_key]
       raise 'No LRC URL! Please provide a URL' unless options[:url]
-      @lrc_uploader = LrcUploader.new(options)
-      # set uploader if handlers are already created
-      @lrc_report_handler.uploader = @lrc_uploader if @lrc_report_handler
-      @lrc_reporter.uploader = @lrc_uploader if @lrc_reporter
+      @lrc_uploader                 = LrcUploader.new(options)
+      @lrc_report_handler.uploader  = @lrc_uploader if @lrc_report_handler
+      @lrc_reporter.uploader        = @lrc_uploader if @lrc_reporter
     end
 
     def lrc_reports_upload(upload, mode = 1)
-      if upload
-        case mode
-        when 1
-          @lrc_reporter           = LrcResourceReporter.new(nil)
-          @lrc_reporter.uploader  = @lrc_uploader
-          @lrc_reporter.log_level = @lrc_reports_level
-          if Chef::Config[:event_handlers].is_a?(Array)
-            Chef::Config[:event_handlers].push @lrc_reporter
-          else
-            Chef::Config[:event_handlers] = [@lrc_reporter]
-          end
-        when 2
-          @lrc_report_handler          = LrcReporting.new
-          @lrc_report_handler.uploader = @lrc_uploader
-          report_handlers << @lrc_report_handler
-          exception_handlers << @lrc_report_handler
+      return unless upload
+      case mode
+      when 1
+        @lrc_reporter                   = LrcResourceReporter.new(nil)
+        @lrc_reporter.uploader          = @lrc_uploader
+        @lrc_reporter.log_level         = @lrc_reports_level
+        if Chef::Config[:event_handlers].is_a?(Array)
+          Chef::Config[:event_handlers].push @lrc_reporter
         else
-          raise ArgumentError, 'unknown mode: ' + mode.to_s
+          Chef::Config[:event_handlers] = [@lrc_reporter]
         end
+      when 2
+        @lrc_report_handler          = LrcReporting.new
+        @lrc_report_handler.uploader = @lrc_uploader
+        report_handlers << @lrc_report_handler
+        exception_handlers << @lrc_report_handler
+      else
+        raise ArgumentError, 'unknown mode: ' + mode.to_s
       end
     end
 
@@ -48,9 +47,8 @@ module ChefHandlerLrc
     def reports_log_level(level)
       raise ArgumentError, 'unknown level: ' + level.to_s unless %w(error notice debug).include?(level)
       @lrc_reports_level = level
-      if @lrc_reporter
-        @lrc_reporter.log_level = level
-      end
+      return unless @lrc_reporter
+      @lrc_reporter.log_level = level
     end
   end
 end

data/lib/lbn_report_chef/lrc_reporting.rb

@@ -24,7 +24,7 @@ module ChefHandlerLrc
           times[resource_name] += resource.elapsed_time
         end
       end
-      metrics['time']   = times.merge!({ 'total' => run_status.elapsed_time })
+      metrics['time']   = times.merge!('total' => run_status.elapsed_time)
       report['metrics'] = metrics
 
       logs = []
@@ -41,7 +41,6 @@ module ChefHandlerLrc
         end
         l['log']['messages']['message'] = message
         l['log']['sources']['source']   = [resource.resource_name.to_s, resource.name].join(' ')
-        # Chef::Log.info("Diff is #{l['log']['messages']['message']}")
         logs << l
       end
 
@@ -52,7 +51,7 @@ module ChefHandlerLrc
             'sources'  => { 'source' => 'chef' },
             'messages' => { 'message' => run_status.exception },
             'level'    => 'err',
-          }
+          },
         }
       end
 
@@ -68,7 +67,7 @@ module ChefHandlerLrc
       if uploader
         uploader.foreman_request('/report', report, node.name)
       else
-        Chef::Log.error 'No uploader registered for foreman reporting, skipping report upload'
+        Chef::Log.error 'No uploader registered for lrc reporting, skipping report upload'
       end
     end
   end

data/lib/lbn_report_chef/lrc_resource_reporter.rb

@@ -27,9 +27,8 @@ module ChefHandlerLrc
       @status    = 'failure'
       # If we failed before we received the run_started callback, there's not much we can do
       # in terms of reporting
-      if @run_status
-        post_reporting_data
-      end
+      return unless @run_status
+      post_reporting_data
     end
 
     def resource_current_state_loaded(new_resource, action, current_resource)
@@ -60,14 +59,13 @@ module ChefHandlerLrc
     end
 
     def resource_completed(new_resource)
-      if @pending_update && !nested_resource?(new_resource)
-        @pending_update.finish
-        @updated_resources << @pending_update
-        @pending_update = nil
-      end
+      return unless @pending_update && !nested_resource?(new_resource)
+      @pending_update.finish
+      @updated_resources << @pending_update
+      @pending_update = nil
     end
 
-    def resource_bypassed(*args)
+    def resource_bypassed(*)
       @why_run = true
     end
 
@@ -79,7 +77,7 @@ module ChefHandlerLrc
         begin
           Chef::Log.debug('Sending data to report API ...')
           if uploader
-            uploader.lrc_request('/report', { 'report' => run_data })
+            uploader.lrc_request('/report', 'report' => run_data)
           else
             Chef::Log.error 'No uploader registered for LRC reporting, skipping report upload'
           end
@@ -130,10 +128,10 @@ module ChefHandlerLrc
     end
 
     def resources_per_time
-      @run_status.all_resources.inject({}) do |memo, resource|
-        name, time = resource.resource_name.to_s, resource.elapsed_time || 0
+      @run_status.all_resources.each_with_object({}) do |resource, memo|
+        name = resource.resource_name.to_s
+        time = resource.elapsed_time || 0
         memo[name] = memo[name] ? memo[name] + time : time
-        memo
       end
     end
 
@@ -168,16 +166,16 @@ module ChefHandlerLrc
 
     def resource_level(resource)
       if !resource.exception.nil?
-        return 'err'
+        'err'
       elsif resource.new_resource.updated
-        return 'notice'
+        'notice'
       else
-        return 'debug'
+        'debug'
       end
     end
 
     def chef_log
-      message = 'run'
+      message = 'chef-client run'
       if @status == 'success' && exception.nil?
         level = 'notice'
       else
@@ -186,7 +184,7 @@ module ChefHandlerLrc
       end
 
       { 'log' => {
-        'sources'  => { 'source' => 'Chef' },
+        'sources'  => { 'source' => "chef-client #{Chef::VERSION}" },
         'messages' => { 'message' => message },
         'level'    => level,
       } }
@@ -198,13 +196,7 @@ module ChefHandlerLrc
     #  'error' means only errors
 
     def filter_logs(logs)
-      if log_level == 'error'
-        logs.select { |log| log['log']['level'] == 'err' }
-      elsif log_level == 'notice'
-        logs.select { |log| %w(err,notice).include? log['log']['level'] }
-      else
-        logs
-      end
+      logs.select { |log| ['err','notice'].include? log['log']['level'] }
     end
   end
 end

data/lib/lbn_report_chef/lrc_uploader.rb

@@ -12,15 +12,15 @@ module ChefHandlerLrc
     def lrc_request(path, body, method = 'post')
       uri  = URI.parse(options[:url])
       http = Net::HTTP.new(uri.host, uri.port)
-	  http.use_ssl = true
-	  http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+      http.use_ssl = true
+      http.verify_mode = OpenSSL::SSL::VERIFY_PEER
       req = Net::HTTP.const_get(method.capitalize).new("#{uri}#{path}")
-      req.add_field('Accept','application/json')
-      req.add_field('Content-Type','application/json')
+      req.add_field('Accept', 'application/json')
+      req.add_field('Content-Type', 'application/json')
       req.body = body.to_json
       response = http.request(req)
       Chef::Log.info("The report API has return: #{response.inspect} from #{uri}#{path}")
-	  Chef::Log.debug("Report Content: #{body.to_json}")
+      Chef::Log.debug("Report Content: #{body.to_json}")
     end
   end
 end

data/lib/lbn_report_chef/version.rb

@@ -1,3 +1,3 @@
 module ChefHandlerLrc
-  VERSION = '0.1.2'.freeze
+  VERSION = '0.1.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lrc_handler
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - team-chef
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-09 00:00:00.000000000 Z
+date: 2017-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler