chef_handler_foreman 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff449b460fdcac91441b8f199bc24d174e6d23cd
-  data.tar.gz: c1374baaabfc94f7955c52ee08cdfbf29239344a
+  metadata.gz: ecef7de2520fb70bd3f7d4b579c7a953db128417
+  data.tar.gz: 3cacd14b60b411734c1a6d49fa77626d0c96b6a0
 SHA512:
-  metadata.gz: fb3a44d51c5ca0fb6008a065afaaad83c7d0ecab78ae4c8c8f97ddab89e7e14745b9428daf18a19ef499d1a5b9aac3f93be7b7425fa63bd8ba4ecc76acc48d5b
-  data.tar.gz: f22c3644b943f482834f11dd7eaccca53313f915ed7f95c76740bc47557500b14c8b500144ebadb4eee73becacf7a62821968a6b6fabb258a820679226b62bdd
+  metadata.gz: b4b9e301496e3e0a361dbf031615cc7d47ddac35504c8d3eb8cfffbe9d8eb9a3b5d11208e5ce8bbe8b3f1c001dce42327281af2c2b9077bb889e1cf912fe6c9b
+  data.tar.gz: ab96a0a8bbad7f0afdfd5cc080f7ca0a6adf0534c7fb9243f12d8d24ff6d97d1806ebac491dd9d3fc51ef476dd70a3de4fe67a52bb0973a18e6ecafb6813ccc1

data/README.md

@@ -24,6 +24,8 @@ foreman_server_options  :url => 'http://your.server/foreman'
 foreman_facts_upload    true
 # add following line if you want to upload reports
 foreman_reports_upload  true
+# add following line to manage reports verbosity. Allowed values are debug, notice and error
+reports_log_level       "notice"
 ```
 
 You can also specify a second argument to foreman_reports_upload which is a number:

data/lib/chef_handler_foreman/foreman_hooks.rb

@@ -9,14 +9,18 @@ module ChefHandlerForeman
     def foreman_server_options(options)
       options = { :client_key => client_key || '/etc/chef/client.pem' }.merge(options)
       @foreman_uploader = ForemanUploader.new(options)
+      # set uploader if handlers are already created
+      @foreman_facts_handler.uploader = @foreman_uploader if @foreman_facts_handler
+      @foreman_report_handler.uploader = @foreman_uploader if @foreman_report_handler
+      @foreman_reporter.uploader = @foreman_uploader if @foreman_reporter
     end
 
     def foreman_facts_upload(upload)
       if upload
-        foreman_facts_handler          = ForemanFacts.new
-        foreman_facts_handler.uploader = @foreman_uploader
-        report_handlers << foreman_facts_handler
-        exception_handlers << foreman_facts_handler
+        @foreman_facts_handler          = ForemanFacts.new
+        @foreman_facts_handler.uploader = @foreman_uploader
+        report_handlers << @foreman_facts_handler
+        exception_handlers << @foreman_facts_handler
       end
     end
 
@@ -24,22 +28,33 @@ module ChefHandlerForeman
       if upload
         case mode
           when 1
-            foreman_reporter          = ForemanResourceReporter.new(nil)
-            foreman_reporter.uploader = @foreman_uploader
+            @foreman_reporter           = ForemanResourceReporter.new(nil)
+            @foreman_reporter.uploader  = @foreman_uploader
+            @foreman_reporter.log_level = @foreman_reports_log_level
             if Chef::Config[:event_handlers].is_a?(Array)
-              Chef::Config[:event_handlers].push foreman_reporter
+              Chef::Config[:event_handlers].push @foreman_reporter
             else
-              Chef::Config[:event_handlers] = [foreman_reporter]
+              Chef::Config[:event_handlers] = [@foreman_reporter]
             end
           when 2
-            foreman_handler          = ForemanReporting.new
-            foreman_handler.uploader = uploader
-            report_handlers << foreman_handler
-            exception_handlers << foreman_handler
+            @foreman_report_handler          = ForemanReporting.new
+            @foreman_report_handler.uploader = uploader
+            report_handlers << @foreman_report_handler
+            exception_handlers << @foreman_report_handler
           else
             raise ArgumentError, 'unknown mode: ' + mode.to_s
         end
       end
     end
+
+    # level can be string error notice debug
+    def reports_log_level(level)
+      raise ArgumentError, 'unknown level: ' + level.to_s unless %w(error notice debug).include?(level)
+
+      @foreman_reports_log_level = level
+      if @foreman_reporter
+        @foreman_reporter.log_level = level
+      end
+    end
   end
 end

data/lib/chef_handler_foreman/foreman_resource_reporter.rb

@@ -1,6 +1,6 @@
 module ChefHandlerForeman
   class ForemanResourceReporter < ::Chef::ResourceReporter
-    attr_accessor :uploader
+    attr_accessor :uploader, :log_level
 
     def initialize(*args)
       @total_up_to_date     = 0
@@ -100,7 +100,7 @@ module ChefHandlerForeman
           "time"      => resources_per_time
       }
 
-      run_data["logs"] = resources_logs + [chef_log]
+      run_data["logs"] = filter_logs(resources_logs + [chef_log])
       run_data
     end
 
@@ -126,15 +126,41 @@ module ChefHandlerForeman
       @all_resources.map do |resource|
         action  = resource.new_resource.action
         message = action.is_a?(Array) ? action.first.to_s : action.to_s
+        message = format_message(message, resource.new_resource)
         message += " (#{resource.exception.class} #{resource.exception.message})" unless resource.exception.nil?
+        level   =  resource_level(resource)
         { "log" => {
             "sources"  => { "source" => resource.new_resource.to_s },
             "messages" => { "message" => message },
-            "level"    => resource.exception.nil? ? "notice" : 'err'
+            "level"    => level
         } }
       end
     end
 
+    def format_message(message, resource)
+      case resource.resource_name.to_s
+        when 'template', 'cookbook_file'
+          unless resource.diff.nil?
+            message += " with diff " + resource.diff.gsub('\\n', "\n")
+          end
+        when 'package'
+          message += " package in #{resource.version}" unless resource.version.nil?
+        else
+          message = resource.action.to_s
+      end
+      message
+    end
+
+    def resource_level(resource)
+      if ! resource.exception.nil?
+        return 'err'
+      elsif resource.new_resource.updated
+        return 'notice'
+      else
+        return 'debug'
+      end
+    end
+
     def chef_log
       message = 'run'
       if @status == 'success' && exception.nil?
@@ -151,5 +177,20 @@ module ChefHandlerForeman
       } }
     end
 
+    # currently we support only three log levels:
+    #  'debug' means do not filter,
+    #  'notice' updated resources and errors
+    #  '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| ['err','notice'].include? log['log']['level'] }
+      else
+        logs
+      end
+    end
+
   end
 end

data/lib/chef_handler_foreman/version.rb

@@ -1,3 +1,3 @@
 module ChefHandlerForeman
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef_handler_foreman
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Marek Hulan