dropsonde 0.0.5 → 0.0.6

data/lib/dropsonde.rb

@@ -1,26 +1,57 @@
+# frozen_string_literal: true
+
 require 'json'
 require 'httpclient'
 require 'puppetdb'
 require 'inifile'
 require 'puppet'
 
+# This class handles caching module process, generate reports,
+# fetchs all plugins defined in lib/dropsonde/metrics and also
+# handle connection and request to PuppetDB.
 class Dropsonde
   require 'dropsonde/cache'
   require 'dropsonde/metrics'
   require 'dropsonde/monkeypatches'
   require 'dropsonde/version'
 
-  Puppet.initialize_settings
+  def self.puppet_settings_overrides
+    overrides = []
+    if (confdir = ENV['PUPPET_CONFDIR'])
+      overrides << '--confdir'
+      overrides << confdir
+    end
+
+    if (codedir = ENV['PUPPET_CODEDIR'])
+      overrides << '--codedir'
+      overrides << codedir
+    end
+
+    if (vardir = ENV['PUPPET_VARDIR'])
+      overrides << '--vardir'
+      overrides << vardir
+    end
+
+    if (logdir = ENV['PUPPET_LOGDIR'])
+      overrides << '--logdir'
+      overrides << logdir
+    end
 
-  @@pdbclient = nil
-  @@settings  = {}
+    overrides
+  end
+
+  Puppet.initialize_settings(puppet_settings_overrides)
+
+  @pdbclient = nil
+  @settings  = {}
   def self.settings=(arg)
     raise "Requires a Hash to set all settings at once, not a #{arg.class}" unless arg.is_a? Hash
-    @@settings = arg
+
+    @settings = arg
   end
 
-  def self.settings
-    @@settings
+  class << self
+    attr_reader :settings
   end
 
   def self.generate_schema
@@ -32,24 +63,32 @@ class Dropsonde
     puts Dropsonde::Metrics.new.list
   end
 
-  def self.generate_report(format)
+  def self.generate_report(format, puppetdb_session = nil)
     case format
     when 'json'
-      puts JSON.pretty_generate(Dropsonde::Metrics.new.report)
+      puts JSON.pretty_generate(Dropsonde::Metrics.new.report(puppetdb_session))
     when 'human'
       puts
-      puts Dropsonde::Metrics.new.preview
+      puts Dropsonde::Metrics.new.preview(puppetdb_session)
     else
-      raise "unknown format"
+      raise 'unknown format'
     end
   end
 
   def self.submit_report(endpoint, port)
-    client = HTTPClient.new()
+    client = HTTPClient.new
+
+    # The httpclient gem ships with some expired CA certificates.
+    # This causes us to load the certs shipped with whatever
+    # Ruby is used to execute this gem's commands, which are generally
+    # more up-to-date, especially if using puppet-agent's Ruby.
+    #
+    # Note that this is no-op with Windows system Ruby.
+    client.ssl_config.set_default_paths
+
     result = client.post("#{endpoint}:#{port}",
-                  :header => {'Content-Type' => 'application/json'},
-                  :body   => Dropsonde::Metrics.new.report.to_json
-                )
+                         header: { 'Content-Type' => 'application/json' },
+                         body: Dropsonde::Metrics.new.report.to_json)
 
     if result.status == 200
       data = JSON.parse(result.body)
@@ -69,15 +108,15 @@ class Dropsonde
   def self.generate_example(size, filename)
     metrics = Dropsonde::Metrics.new
     File.open(filename, 'w') do |file|
-      for i in 0...size
+      (0...size).each do |_i|
         file.write(metrics.example.to_json)
         file.write("\n")
       end
     end
   end
 
-  def self.puppetDB
-    return @@pdbclient if @@pdbclient
+  def puppet_db
+    return @pdbclient if @pdbclient
 
     config = File.join(Puppet.settings[:confdir], 'puppetdb.conf')
 
@@ -85,14 +124,13 @@ class Dropsonde
 
     server = IniFile.load(config)['main']['server_urls'].split(',').first
 
-    @@pdbclient = PuppetDB::Client.new({
-      :server => server,
-      :pem    => {
-          'key'     => Puppet.settings[:hostprivkey],
-          'cert'    => Puppet.settings[:hostcert],
-          'ca_file' => Puppet.settings[:localcacert],
-      }
-    })
+    @pdbclient = PuppetDB::Client.new({
+                                        server: server,
+                                        pem: {
+                                          'key' => Puppet.settings[:hostprivkey],
+                                          'cert' => Puppet.settings[:hostcert],
+                                          'ca_file' => Puppet.settings[:localcacert],
+                                        },
+                                      })
   end
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dropsonde
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Ben Ford
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-11 00:00:00.000000000 Z
+date: 2021-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -161,7 +161,7 @@ files:
 - lib/dropsonde/version.rb
 homepage: https://github.com/puppetlabs/dropsonde
 licenses:
-- Apache 2
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -178,7 +178,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: A simple telemetry probe for gathering usage information about Puppet infrastructures.