quixoten-puppetdb-terminus 3.0.2 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 438998f28102222deb2641b08ff6b354aaa7da63
-  data.tar.gz: 6bfd640fc4edbc50992fb0d8f3baa0534223e2f1
+  metadata.gz: ac6b5726f3765b6180cffb3d740bbc869c6962ac
+  data.tar.gz: 6bea52dcfb2b1d02124dd87f033cae351f63ebe4
 SHA512:
-  metadata.gz: fc074c80f0e704e27f3e66bd0e6f4c9d25c0359a129611227fed51aa5a2ad7bfacbb5945a0c0fced47df25737456d0960050443e70cd21408d803576d16cfc09
-  data.tar.gz: 906e0417ce93bce24ded64ccdd6d6878be761ba58805216166ae1a74e06268eda78d411b69ffa828d46f8875230a81a20a6cdd33388ff8372bcfc32598cc0611
+  metadata.gz: 8cc1bfbbb55221f0f35409e1c89fa2958936921ef36d8b2358db9c18df3531c2f04d2fd4cea0ed03c45e4e02206bbdc32bec17ab4cb3d30af9df1a5d5052679a
+  data.tar.gz: 16f1f3ce051a31dfda521d7d89b3d99e242c497ae55a040e7b46272819302c33d128c6ba84f0797c3349f5cd1d0f2c3f6ff1d384ecda0d40ff41849146951063

data/lib/puppet/reports/puppetdb.rb

@@ -19,7 +19,7 @@ Puppet::Reports.register_report(:puppetdb) do
   # @return [void]
   def process
     profile("report#process", [:puppetdb, :report, :process]) do
-      submit_command(self.host, report_to_hash, CommandStoreReport, 5)
+      submit_command(self.host, report_to_hash, CommandStoreReport, 6)
     end
 
     nil
@@ -37,8 +37,8 @@ Puppet::Reports.register_report(:puppetdb) do
         raise Puppet::Error, "Environment is nil, unable to submit report. This may be due a bug with Puppet. Ensure you are running the latest revision, see PUP-2508 for more details."
       end
 
-      resource_events = build_events_list
-      is_noop = resource_events.any? {|rs| rs["status"] == 'noop'} && resource_events.none? {|rs| rs["status"] == 'failed'}
+      resources = build_resources_list
+      is_noop = resources.any? { |rs| has_noop_event?(rs) } and resources.none? { |rs| has_failed_event?(rs) }
 
       {
         "certname"                => host,
@@ -48,31 +48,40 @@ Puppet::Reports.register_report(:puppetdb) do
         "producer_timestamp"      => Puppet::Util::Puppetdb.to_wire_time(Time.now),
         "start_time"              => Puppet::Util::Puppetdb.to_wire_time(time),
         "end_time"                => Puppet::Util::Puppetdb.to_wire_time(time + run_duration),
-        "resource_events"         => resource_events,
         "environment"             => environment,
         "transaction_uuid"        => transaction_uuid,
         "status"                  => status,
         "noop"                    => is_noop,
         "logs"                    => build_logs_list,
         "metrics"                 => build_metrics_list,
+        "resources"               => resources,
       }
     end
   end
 
+  # @return TrueClass
+  # @api private
+  def has_noop_event?(resource)
+    resource["events"].any? { |event| event["status"] == 'noop' }
+  end
+
+  # @return TrueClass
+  # @api private
+  def has_failed_event?(resource)
+    resource["events"].any? { |event| event["status"] == 'failed' }
+  end
+
   # @return Array[Hash]
   # @api private
-  def build_events_list
-    profile("Build events list (count: #{resource_statuses.count})",
-            [:puppetdb, :events_list, :build]) do
-      filter_events(resource_statuses.inject([]) do |events, status_entry|
-        _, status = *status_entry
-        if ! (status.events.empty?)
-          events.concat(status.events.map { |event| event_to_hash(status, event) })
-        elsif status.skipped
-          events.concat([fabricate_event(status, "skipped")])
-        end
-        events
-      end)
+  def build_resources_list
+    profile("Build resources list (count: #{resource_statuses.count})",
+            [:puppetdb, :resources_list, :build]) do
+      resources = resource_statuses.values.map { |resource| resource_status_to_hash(resource) }
+      if ! config.include_unchanged_resources?
+        resources.select{ |resource| (! resource["events"].empty?) or resource["skipped"] }
+      else
+        resources
+      end
     end
   end
 
@@ -134,57 +143,42 @@ Puppet::Reports.register_report(:puppetdb) do
   #
   # @return Hash[<String, Object>]
   # @api private
-  def event_to_hash(resource_status, event)
+  def event_to_hash(event)
     {
       "status"            => event.status,
       "timestamp"         => Puppet::Util::Puppetdb.to_wire_time(event.time),
-      "resource_type"     => resource_status.resource_type,
-      "resource_title"    => resource_status.title.to_s,
       "property"          => event.property,
       "new_value"         => event.desired_value,
       "old_value"         => event.previous_value,
       "message"           => event.message,
-      "file"              => resource_status.file,
-      "line"              => resource_status.line,
-      "containment_path"  => resource_status.containment_path,
     }
   end
 
-  # Given an instance of `Puppet::Resource::Status` and a status
-  # string, this method fabricates a PuppetDB event object with the
-  # provided `"status"`.
+  def build_events_list(events)
+    profile("Build events list (count: #{events.count})",
+            [:puppetdb, :events_list, :build]) do
+      events.map { |event| event_to_hash(event) }
+    end
+  end
+
+  # Convert an instance of `Puppet::Resource::Status` to a hash
+  # suitable for sending over the wire to PuppetDB
   #
+  # @return Hash[<String, Object>]
   # @api private
-  def fabricate_event(resource_status, event_status)
+  def resource_status_to_hash(resource_status)
     {
-      "status"            => event_status,
-      "timestamp"         => Puppet::Util::Puppetdb.to_wire_time(resource_status.time),
-      "resource_type"     => resource_status.resource_type,
-      "resource_title"    => resource_status.title.to_s,
-      "property"          => nil,
-      "new_value"         => nil,
-      "old_value"         => nil,
-      "message"           => nil,
-      "file"              => resource_status.file,
-      "line"              => resource_status.line,
+      "skipped"          => resource_status.skipped,
+      "timestamp"        => Puppet::Util::Puppetdb.to_wire_time(resource_status.time),
+      "resource_type"    => resource_status.resource_type,
+      "resource_title"   => resource_status.title.to_s,
+      "file"             => resource_status.file,
+      "line"             => resource_status.line,
       "containment_path" => resource_status.containment_path,
+      "events"           => build_events_list(resource_status.events),
     }
   end
 
-  # Filter out blacklisted events, if we're configured to do so
-  #
-  # @api private
-  def filter_events(events)
-    if config.ignore_blacklisted_events?
-      profile("Filter blacklisted events",
-              [:puppetdb, :events, :filter_blacklisted]) do
-        events.select { |e| ! config.is_event_blacklisted?(e) }
-      end
-    else
-      events
-    end
-  end
-
   # Helper method for accessing the puppetdb configuration
   #
   # @api private

data/lib/puppet/util/puppetdb/config.rb

@@ -1,5 +1,4 @@
 require 'puppet/util/puppetdb/command_names'
-require 'puppet/util/puppetdb/blacklist'
 require 'uri'
 
 module Puppet::Util::Puppetdb
@@ -13,8 +12,8 @@ module Puppet::Util::Puppetdb
         :server                    => "puppetdb",
         :port                      => 8081,
         :soft_write_failure        => false,
-        :ignore_blacklisted_events => true,
-        :server_url_timeout        => 30
+        :server_url_timeout        => 30,
+        :include_unchanged_resources => false,
       }
 
       config_file ||= File.join(Puppet[:confdir], "puppetdb.conf")
@@ -57,6 +56,7 @@ module Puppet::Util::Puppetdb
         !([:server,
            :port,
            :ignore_blacklisted_events,
+           :include_unchanged_resources,
            :soft_write_failure,
            :server_urls,
            :server_url_timeout].include?(k))
@@ -70,9 +70,9 @@ module Puppet::Util::Puppetdb
         config_hash[:server_urls] = ["https://#{config_hash[:server].strip}:#{config_hash[:port].to_s}"]
       end
       config_hash[:server_urls] = convert_and_validate_urls(config_hash[:server_urls])
-      
+
       config_hash[:server_url_timeout] = config_hash[:server_url_timeout].to_i
-      config_hash[:ignore_blacklisted_events] = Puppet::Util::Puppetdb.to_bool(config_hash[:ignore_blacklisted_events])
+      config_hash[:include_unchanged_resources] = Puppet::Util::Puppetdb.to_bool(config_hash[:include_unchanged_resources])
       config_hash[:soft_write_failure] = Puppet::Util::Puppetdb.to_bool(config_hash[:soft_write_failure])
 
       self.new(config_hash, uses_server_urls)
@@ -86,7 +86,6 @@ module Puppet::Util::Puppetdb
 
     def initialize(config_hash = {}, uses_server_urls=nil)
       @config = config_hash
-      initialize_blacklisted_events()
       if !uses_server_urls
         Puppet.warning("Specification of server and port in puppetdb.conf is deprecated. Use the setting server_urls.")
       end
@@ -110,12 +109,8 @@ module Puppet::Util::Puppetdb
       config[:server_url_timeout]
     end
 
-    def ignore_blacklisted_events?
-      config[:ignore_blacklisted_events]
-    end
-
-    def is_event_blacklisted?(event)
-      @blacklist.is_event_blacklisted? event
+    def include_unchanged_resources?
+      config[:include_unchanged_resources]
     end
 
     def soft_write_failure
@@ -128,13 +123,7 @@ module Puppet::Util::Puppetdb
     #   @api private
     attr_reader :config
 
-    Blacklist = Puppet::Util::Puppetdb::Blacklist
-
     # @api private
-    def initialize_blacklisted_events(events = Blacklist::BlacklistedEvents)
-      @blacklist = Blacklist.new(events)
-    end
-
     def self.convert_and_validate_urls(uri_strings)
       uri_strings.map do |uri_string|
 
@@ -152,7 +141,6 @@ module Puppet::Util::Puppetdb
           raise "PuppetDB 'server_urls' cannot contain URL paths, found '#{uri_string}'"
         end
         uri.path = ''
-        
         uri
       end
     end

data/lib/puppetdb/terminus/version.rb

@@ -1,6 +1,6 @@
 module PuppetDB
   module Terminus
-    VERSION          = "3.0.2"
+    VERSION          = "3.1.0"
     UPSTREAM_VERSION = VERSION.split(".")[0..2].join(".")
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: quixoten-puppetdb-terminus
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.1.0
 platform: ruby
 authors:
 - Devin Christensen
@@ -61,7 +61,6 @@ files:
 - lib/puppet/indirector/resource/puppetdb.rb
 - lib/puppet/reports/puppetdb.rb
 - lib/puppet/util/puppetdb.rb
-- lib/puppet/util/puppetdb/blacklist.rb
 - lib/puppet/util/puppetdb/char_encoding.rb
 - lib/puppet/util/puppetdb/command.rb
 - lib/puppet/util/puppetdb/command_names.rb

data/lib/puppet/util/puppetdb/blacklist.rb

@@ -1,35 +0,0 @@
-module Puppet::Util::Puppetdb
-  class Blacklist
-
-    BlacklistedEvent = Struct.new(:resource_type, :resource_title, :status, :property)
-
-    # Initialize our blacklist of events to filter out of reports.  This is needed
-    # because older versions of puppet always generate a swath of (meaningless)
-    # 'skipped' Schedule events on every agent run.  As of puppet 3.3, these
-    # events should no longer be generated, but this is here for backward compat.
-    BlacklistedEvents =
-        [BlacklistedEvent.new("Schedule", "never", "skipped", nil),
-         BlacklistedEvent.new("Schedule", "puppet", "skipped", nil),
-         BlacklistedEvent.new("Schedule", "hourly", "skipped", nil),
-         BlacklistedEvent.new("Schedule", "daily", "skipped", nil),
-         BlacklistedEvent.new("Schedule", "weekly", "skipped", nil),
-         BlacklistedEvent.new("Schedule", "monthly", "skipped", nil)]
-
-    def initialize(events)
-      @events = events.inject({}) do |m, e|
-        m[e.resource_type] ||= {}
-        m[e.resource_type][e.resource_title] ||= {}
-        m[e.resource_type][e.resource_title][e.status] ||= {}
-        m[e.resource_type][e.resource_title][e.status][e.property] = true
-        m
-      end
-    end
-
-    def is_event_blacklisted?(event)
-      @events.fetch(event["resource_type"], {}).
-        fetch(event["resource_title"], {}).
-        fetch(event["status"], {}).
-        fetch(event["property"], false)
-    end
-  end
-end