quixoten-puppetdb-terminus 4.1.4 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c979a664e0ae9fde455ab3266b9d24119ce36d0
-  data.tar.gz: 67df011009b136ab2f3bb30f5456f5ee2e7211fc
+  metadata.gz: 93220f6328754655b285f6d872685c35ea0ff0cf
+  data.tar.gz: 2f6c23b5d200ebe83820bf8ec508f802a87dbccb
 SHA512:
-  metadata.gz: e60b39c6042a2dec6fc0501bada19f2825d12a645b7127b56e5125188351b5196ed9b99304b49ec96315f82c570e1a322fc1de3ded542abd55b009165964d5aa
-  data.tar.gz: b510d00965fc5847dbdc058d7789940c3c70cdf078b183502f57456924cf2fbeeca9c9ba181c53e5ee7a7c08e8c847d5a4efaa0b1ec23055688f876b7209ce3b
+  metadata.gz: bfff5198cfe35a6d3a8265dc268baf0ce60f9b65f52a76eca95efd2a8682324c1c7832484ebe546f58cc86ba9cf2cd72931be945abf18ecfb4951a5dd457ce16
+  data.tar.gz: fef9494f3a6ed3c6868f09c3b12c1301dc17422c8b7c2d42d0b1c397ca8bf897ea855daef3d39a601c3c318d34b48be0a90d67e4760223a4bc5dee7ca3ea37fd

data/lib/puppet/indirector/catalog/puppetdb.rb

@@ -10,7 +10,7 @@ class Puppet::Resource::Catalog::Puppetdb < Puppet::Indirector::REST
   def save(request)
     profile("catalog#save", [:puppetdb, :catalog, :save, request.key]) do
       catalog = munge_catalog(request.instance, extract_extra_request_data(request))
-      submit_command(request.key, catalog, CommandReplaceCatalog, 8)
+      submit_command(request.key, catalog, CommandReplaceCatalog, 9)
     end
   end
 
@@ -53,6 +53,7 @@ class Puppet::Resource::Catalog::Puppetdb < Puppet::Indirector::REST
       add_transaction_uuid(data, extra_request_data[:transaction_uuid])
       add_environment(data, extra_request_data[:environment])
       add_producer_timestamp(data, extra_request_data[:producer_timestamp])
+      add_producer(data, Puppet[:node_name_value])
 
       data
     end
@@ -142,6 +143,18 @@ class Puppet::Resource::Catalog::Puppetdb < Puppet::Indirector::REST
     hash
   end
 
+  # Include producer in hash, returning the complete hash.
+  #
+  # @param hash [Hash] original data hash
+  # @param producer [String or nil] producer
+  # @return [Hash] returns original hash augmented with producer
+  # @api private
+  def add_producer(hash, producer)
+    hash['producer'] = producer
+
+    hash
+  end
+
   # Version is an integer (time since epoch in millis). The wire
   # format specifies version should be a string
   #

data/lib/puppet/indirector/facts/puppetdb.rb

@@ -31,10 +31,11 @@ class Puppet::Node::Facts::Puppetdb < Puppet::Indirector::REST
           # legacy storeconfigs.
           "environment" => request.options[:environment] || request.environment.to_s,
           "producer_timestamp" => request.options[:producer_timestamp] || Time.now.iso8601(5),
+          "producer" => Puppet[:node_name_value]
         }
       end
 
-      submit_command(request.key, payload, CommandReplaceFacts, 4)
+      submit_command(request.key, payload, CommandReplaceFacts, 5)
     end
   end
 

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, 7)
+      submit_command(self.host, report_to_hash, CommandStoreReport, 8)
     end
 
     nil
@@ -38,12 +38,14 @@ Puppet::Reports.register_report(:puppetdb) do
       end
 
       resources = build_resources_list
-      is_noop = resources.any? { |rs| has_noop_event?(rs) } && resources.none? { |rs| has_enforcement_event?(rs) }
-
+      is_noop = defined?(noop) ? noop : resources.any? { |rs| has_noop_event?(rs) } && resources.none? { |rs| has_enforcement_event?(rs) }
 
       defaulted_catalog_uuid = defined?(catalog_uuid) ? catalog_uuid : transaction_uuid
       defaulted_code_id = defined?(code_id) ? code_id : nil
       defaulted_cached_catalog_status = defined?(cached_catalog_status) ? cached_catalog_status : nil
+      defaulted_noop_pending = defined?(noop_pending) ? noop_pending : nil
+      defaulted_corrective_change = defined?(corrective_change) ? corrective_change : nil
+
       {
         "certname" => host,
         "puppet_version" => puppet_version,
@@ -56,12 +58,15 @@ Puppet::Reports.register_report(:puppetdb) do
         "transaction_uuid" => transaction_uuid,
         "status" => status,
         "noop" => is_noop,
+        "noop_pending" => defaulted_noop_pending,
+        "corrective_change" => defaulted_corrective_change,
         "logs" => build_logs_list,
         "metrics" => build_metrics_list,
         "resources" => resources,
         "catalog_uuid" => defaulted_catalog_uuid,
         "code_id" => defaulted_code_id,
         "cached_catalog_status" => defaulted_cached_catalog_status,
+        "producer" => Puppet[:node_name_value]
       }
     end
   end
@@ -151,12 +156,14 @@ Puppet::Reports.register_report(:puppetdb) do
   # @return Hash[<String, Object>]
   # @api private
   def event_to_hash(event)
+    corrective_change = defined?(event.corrective_change) ? event.corrective_change : nil
     {
       "status"            => event.status,
       "timestamp"         => Puppet::Util::Puppetdb.to_wire_time(event.time),
       "property"          => event.property,
       "new_value"         => event.desired_value,
       "old_value"         => event.previous_value,
+      "corrective_change" => corrective_change,
       "message"           => event.message,
     }
   end
@@ -174,15 +181,17 @@ Puppet::Reports.register_report(:puppetdb) do
   # @return Hash[<String, Object>]
   # @api private
   def resource_status_to_hash(resource_status)
+    defaulted_corrective_change = defined?(resource_status.corrective_change) ? resource_status.corrective_change : nil
     {
-      "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),
+      "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,
+      "corrective_change" => defaulted_corrective_change,
+      "events"            => build_events_list(resource_status.events),
     }
   end
 

data/lib/puppetdb/terminus/version.rb

@@ -1,6 +1,6 @@
 module PuppetDB
   module Terminus
-    VERSION          = "4.1.4"
+    VERSION          = "4.2.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: 4.1.4
+  version: 4.2.0
 platform: ruby
 authors:
 - Devin Christensen