dropsonde 0.0.8 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 05a4a694cd3915ec7c3683c7c8250fd1f857d07ef8fb6cae80c832404b35e3ce
-  data.tar.gz: 95245d11a85ef50539f86182cc458246178ffb24ff409bd04fbef9a0a23342ef
+  metadata.gz: 91f1b98200a2be8ff60cd36c8f8c3f8186505ddf78642baa92e9a3f964de7018
+  data.tar.gz: a930895cae5b9a4c93ce563394d11f1dce7b9de73365983ce5d9ca0f253d99f6
 SHA512:
-  metadata.gz: a8eed2636ad7735accf3e3f6bacbcb16bae84514b3503e718eb96426ca0bbe6a39a06a9ea06727714b6e578ac4a3bd9ddd6fe76f9bebb4c1d63c084b3503c44b
-  data.tar.gz: 2d1c1cf87cef36cdcb196cab0c135970020389462b99b0ff8447dcefe3ae1f381da31a93ad29a34fedbfd6134eeba2b8c58a3ee30069021c74e3972a857f5950
+  metadata.gz: d50ad9535e6b36eefb147ffeadfbe91db4ade2bbf78be6a0ec42a6c9343f2528396ff619a1ce2414f6e7ea27df770e0e691aadf0f5cac79bb10c3cbba5c2b558
+  data.tar.gz: 7978033d3e0a99dda1837d4de3e5f88e8a7a23d0577f7c0e3a281cb3c2cb3d733fb724c5f2488f5b1222601127cb87448cb2f0a4480ebe523b4a1ee9e55d307e

data/CHANGELOG.md

@@ -1,6 +1,25 @@
 # Changelog
 
-## [0.0.8](https://github.com/puppetlabs/dropsonde/tree/0.0.8) (2022-08-29)
+## [0.1.0](https://github.com/OpenVoxProject/dropsonde/tree/0.1.0) (2025-06-10)
+
+[Full Changelog](https://github.com/OpenVoxProject/dropsonde/compare/v0.0.8...0.1.0)
+
+**Breaking changes:**
+
+- remove and abstract Puppet dependency; manually require the gem you want to use [\#1](https://github.com/OpenVoxProject/dropsonde/pull/1) ([binford2k](https://github.com/binford2k))
+
+**Fixed bugs:**
+
+- Fix a couple nil references [\#5](https://github.com/OpenVoxProject/dropsonde/pull/5) ([binford2k](https://github.com/binford2k))
+- fix broken acceptance test [\#4](https://github.com/OpenVoxProject/dropsonde/pull/4) ([binford2k](https://github.com/binford2k))
+
+**Merged pull requests:**
+
+- dependabot: check for github actions and bundler [\#6](https://github.com/OpenVoxProject/dropsonde/pull/6) ([bastelfreak](https://github.com/bastelfreak))
+- workflow housekeeping [\#3](https://github.com/OpenVoxProject/dropsonde/pull/3) ([binford2k](https://github.com/binford2k))
+- No need to run specs nightly [\#2](https://github.com/OpenVoxProject/dropsonde/pull/2) ([binford2k](https://github.com/binford2k))
+
+## [v0.0.8](https://github.com/puppetlabs/dropsonde/tree/0.0.8) (2022-08-29)
 
 [Full Changelog](https://github.com/puppetlabs/dropsonde/compare/v0.0.7...0.0.8)
 

data/bin/dropsonde

@@ -69,14 +69,14 @@ class Dropsonde
   desc 'Submit a telemetry report'
   command :submit do |c|
     c.desc 'Telemetry endpoint'
-    c.flag [:endpoint], :default_value => 'https://updates.puppet.com'
+    c.flag [:endpoint]
 
     c.desc 'Telemetry port'
-    c.flag [:port], :default_value => 443, :type => Integer
+    c.flag [:port], :type => Integer
 
     c.action do |global, options, args|
       @cache.autoupdate
-      Dropsonde.submit_report(options[:endpoint], options[:port])
+      Dropsonde.submit_report(options)
     end
   end
 

data/lib/dropsonde/metrics/modules.rb

@@ -128,7 +128,7 @@ class Dropsonde::Metrics::Modules
       end
     }.flatten.compact.uniq
 
-    if puppetdb_session
+    if puppetdb_session&.puppet_db
       # classes and how many nodes they're enforced on
       results = puppetdb_session.puppet_db.request('', 'resources[type, title] { type = "Class" }').data
 

data/lib/dropsonde/metrics/platforms.rb

@@ -54,7 +54,7 @@ class Dropsonde::Metrics::Platforms
 
   def self.run(puppetdb_session = nil)
     # skip this metric if we don't have an active PuppetDB connection
-    return unless puppetdb_session
+    return unless puppetdb_session&.puppet_db
 
     classes = puppetdb_session.puppet_db.request('', 'resources[certname, title] { type = "Class" }').data
     facts   = puppetdb_session.puppet_db.request('', 'facts[certname, value] { name = "osfamily" }').data

data/lib/dropsonde/metrics.rb

@@ -52,7 +52,7 @@ class Dropsonde::Metrics
 
   def schema
     schema = skeleton_schema
-    Dropsonde::Metrics.plugins.each do |_name, plugin|
+    Dropsonde::Metrics.plugins.each_value do |plugin|
       schema.concat(sanity_check_schema(plugin))
     end
     check_for_duplicates(schema)
@@ -62,7 +62,7 @@ class Dropsonde::Metrics
   def preview(puppetdb_session = nil)
     str = "                      Puppet Telemetry Report Preview\n"
     str += "                      ===============================\n\n"
-    Dropsonde::Metrics.plugins.each do |_name, plugin|
+    Dropsonde::Metrics.plugins.each_value do |plugin|
       schema = plugin.schema
 
       plugin.setup if plugin.respond_to? :setup
@@ -91,7 +91,7 @@ class Dropsonde::Metrics
 
   def report(puppetdb_session = nil)
     snapshots = {}
-    Dropsonde::Metrics.plugins.each do |_name, plugin|
+    Dropsonde::Metrics.plugins.each_value do |plugin|
       plugin.setup
       sanity_check_data(plugin, plugin.run(puppetdb_session)).each do |row|
         snapshots[row.keys.first] = {
@@ -115,7 +115,7 @@ class Dropsonde::Metrics
     results[:ip]         = IPAddr.new(rand(2**32), Socket::AF_INET)
     results.delete(:'self-service-analytics')
 
-    Dropsonde::Metrics.plugins.each do |_name, plugin|
+    Dropsonde::Metrics.plugins.each_value do |plugin|
       sanity_check_data(plugin, plugin.example).each do |row|
         results.merge!(row)
       end

data/lib/dropsonde/submitter/dujour.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+# This uses Puppet's standard Dujour telemetry endpoint.
+# It currently expects a report formatted precisely to meet Dujour's odd schema.
+# At some point, we'll define our own report format and this submitter will
+# transform it to meet the expected schema.
+#
+# This is currently the only operational submitter.
+class Dropsonde::Submitter::Dujour
+  def self.submit_report(options)
+    client = HTTPClient.new
+
+    endpoint = options[:endpoint] || Dropsonde.settings[:endpoint] || 'https://updates.puppet.com'
+    port     = options[:port]     || Dropsonde.settings[:port]     || 443
+
+    # 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)
+
+    if result.status == 200
+      data = JSON.parse(result.body)
+      if data['newer']
+        puts 'A newer version of the telemetry client is available:'
+        puts "  -- #{data['link']}"
+      else
+        puts data['message']
+      end
+    else
+      puts 'Failed to submit report'
+      puts JSON.pretty_generate(result.body) if Dropsonde.settings[:verbose]
+      exit 1
+    end
+  end
+end

data/lib/dropsonde/submitter/open_telemetry.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+# This currently doesn't actually exist.
+# It's just a placeholder for someday when it does exist!
+class Dropsonde::Submitter::OpenTelemetry
+  def self.submit_report(options)
+    puts 'When Vox Pupuli has its own telemetry server, this will post there.'
+    puts options.inspect
+  end
+end

data/lib/dropsonde/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class Dropsonde
-  VERSION = '0.0.8'
+  VERSION = '0.1.0'
 end

data/lib/dropsonde.rb

@@ -4,7 +4,12 @@ require 'json'
 require 'httpclient'
 require 'puppetdb'
 require 'inifile'
-require 'puppet'
+
+begin
+  require 'puppet'
+rescue LoadError
+  raise 'Please install either Puppet or OpenVox gem to use this tool.'
+end
 
 # This class handles caching module process, generate reports,
 # fetchs all plugins defined in lib/dropsonde/metrics and also
@@ -15,6 +20,9 @@ class Dropsonde
   require 'dropsonde/monkeypatches'
   require 'dropsonde/version'
 
+  # This class abstracts the endpoint we submit to.
+  class Dropsonde::Submitter; end
+
   def self.puppet_settings_overrides
     overrides = []
     if (confdir = ENV['PUPPET_CONFDIR'])
@@ -75,33 +83,13 @@ class Dropsonde
     end
   end
 
-  def self.submit_report(endpoint, port)
-    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)
-
-    if result.status == 200
-      data = JSON.parse(result.body)
-      if data['newer']
-        puts 'A newer version of the telemetry client is available:'
-        puts "  -- #{data['link']}"
-      else
-        puts data['message']
-      end
+  def self.submit_report(options)
+    if Puppet.respond_to?(:implementation) && Puppet.implementation == 'openvox'
+      require 'dropsonde/submitter/open_telemetry'
+      Dropsonde::Submitter::OpenTelemetry.submit_report(options)
     else
-      puts 'Failed to submit report'
-      puts JSON.pretty_generate(result.body) if Dropsonde.settings[:verbose]
-      exit 1
+      require 'dropsonde/submitter/dujour'
+      Dropsonde::Submitter::Dujour.submit_report(options)
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dropsonde
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.1.0
 platform: ruby
 authors:
 - Ben Ford
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-29 00:00:00.000000000 Z
+date: 2025-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -66,20 +66,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: puppet
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: puppet_forge
   requirement: !ruby/object:Gem::Requirement
@@ -140,7 +126,7 @@ description: |
   Dropsonde is a simple telemetry probe designed to run as a regular cron job. It
   will gather metrics defined by self-contained plugins that each defines its own
   partial schema and then gathers the data to meet that schema.
-email: ben.ford@puppet.com
+email: binford2k@overlookinfratech.com
 executables:
 - dropsonde
 extensions: []
@@ -159,12 +145,16 @@ files:
 - lib/dropsonde/metrics/platforms.rb
 - lib/dropsonde/metrics/puppetfiles.rb
 - lib/dropsonde/monkeypatches.rb
+- lib/dropsonde/submitter/dujour.rb
+- lib/dropsonde/submitter/open_telemetry.rb
 - lib/dropsonde/version.rb
-homepage: https://github.com/puppetlabs/dropsonde
+homepage: https://github.com/OpenVoxProject/dropsonde
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message: |
+  For portability reasons, this gem no longer depends on Puppet. You will need to
+  install either Puppet or OpenVox gems manually.
 rdoc_options: []
 require_paths:
 - lib
@@ -179,8 +169,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.4.19
+signing_key:
 specification_version: 4
-summary: A simple telemetry probe for gathering usage information about Puppet infrastructures.
+summary: A simple telemetry probe for gathering usage information about OpenVox and
+  Puppet infrastructures.
 test_files: []