Merge pull request #191 from m0dular/SUP-3521-legacy_code

(SUP-3521) Remove legacy code

Author: MartyEwings

files/json2timeseriesdb

@@ -1,165 +1,123 @@
-#!/opt/puppetlabs/puppet/bin/ruby
-
-require 'net/https'
 require 'json'
 require 'uri'
 require 'time'
 require 'optparse'
 require 'yaml'
-
-options = {}
-
-OptionParser.new { |opts|
-  opts.banner = "Usage: #{File.basename(__FILE__)} [options]"
-  opts.on('-p', '--[no-]print', 'Print to STDOUT') { |p| options[:print] = p }
-  opts.on('-m [TYPE]', '--metrics_type [TYPE]', 'Type of metrics to collect') { |v| options[:metrics_type] = v }
-  opts.on('-o [DIR]', '--output_dir [DIR]', 'Directory to save output to') { |o| options[:output_dir] = o }
-  opts.on('--metrics_port [PORT]', 'The port the metrics service runs on') { |port| options[:metrics_port] = port }
-  opts.on('--[no-]ssl', 'Use SSL when collecting metrics') { |ssl| options[:ssl] = ssl }
-}.parse!
-
-if options[:metrics_type].nil?
-  STDERR.puts '--metrics_type (-m) is a required argument'
-  exit 1
-end
-
-# Allow scripts that require this script to access the options hash.
-OPTIONS = options
-
-config_file = File.expand_path("../../config/#{options[:metrics_type]}.yaml", __FILE__)
-config = YAML.load_file(config_file)
-
-def coalesce(higher_precedence, lower_precedence, default = nil)
-  [higher_precedence, lower_precedence, default].find { |x| !x.nil? }
-end
-
-METRICS_TYPE       = options[:metrics_type]
-OUTPUT_DIR         = options[:output_dir]
-PE_VERSION         = config['pe_version']
-CERTNAME           = config['clientcert']
-HOSTS              = config['hosts']
-PORT               = coalesce(options[:metrics_port], config['metrics_port'])
-USE_SSL            = coalesce(options[:ssl], config['ssl'], true)
-EXCLUDES           = config['excludes']
-ADDITIONAL_METRICS = config['additional_metrics']
-REMOTE_METRICS_ENABLED = config['remote_metrics_enabled']
-
-# Metrics endpoints for our Puma services require a client certificate with SSL.
-# Metrics endpoints for our Trapper Keeper services do not require a client certificate.
-
-if USE_CLIENTCERT
-  SSLDIR = `/opt/puppetlabs/bin/puppet config print ssldir`.chomp
-end
-
-$error_array = []
-
-def generate_host_url(host, port, use_ssl)
-  protocol = use_ssl ? 'https' : 'http'
-
-  host_url = "#{protocol}://#{host}:#{port}"
-end
-
-def setup_connection(url, use_ssl)
-  uri  = URI.parse(url)
-  http = Net::HTTP.new(uri.host, uri.port)
-
-  if use_ssl
-    http.use_ssl = true
-    http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-
-    if USE_SSL && USE_CLIENTCERT
-      # PE Puma services serve metrics from endpoints requiring a client certificate.
-      # If https://github.com/puma/puma/pull/2098 is merged into the Puma used by PE,
-      # we can collect metrics from /stats and /gc-stats without a client certificate.
-      http.ca_path = "#{SSLDIR}/ca"
-      http.ca_file = "#{SSLDIR}/certs/ca.pem"
-      http.cert    = OpenSSL::X509::Certificate.new(File.read("#{SSLDIR}/certs/#{CERTNAME}.pem"))
-      http.key     = OpenSSL::PKey::RSA.new(File.read("#{SSLDIR}/private_keys/#{CERTNAME}.pem"))
-    end
-  end
-
-  [http, uri]
-end
-
-def get_endpoint(url, use_ssl)
-  http, uri = setup_connection(url, use_ssl)
-
-  endpoint_data = JSON.parse(http.get(uri.request_uri).body)
-  if endpoint_data.key?('status')
-    if endpoint_data['status'] == 200
-      endpoint_data = endpoint_data['value']
-    else
-      $error_array << "HTTP Error #{endpoint_data['status']} for #{url}"
-      endpoint_data = {}
+require 'puppet'
+require 'puppet/http'
+
+module PuppetX
+  module Puppetlabs
+    # Mixin module to provide instance variables and methods to the tk_metris script
+    module PuppetMetricsCollector
+      attr_accessor :client, :metrics_type, :output_dir, :certname, :hosts, :port, :excludes, :additional_metrics, :print, :errors
+
+      def metrics_collector_setup
+        # The Puppet HTTP client takes care of connection pooling, client cert auth, and more for us
+        @client ||= Puppet.runtime[:http]
+        @errors ||= []
+
+        OptionParser.new { |opts|
+          opts.banner = "Usage: #{File.basename(__FILE__)} [options]"
+          opts.on('-p', '--[no-]print', 'Print to STDOUT') { |p| @print = p }
+          opts.on('-m [TYPE]', '--metrics_type [TYPE]', 'Type of metrics to collect') { |v| @metrics_type = v }
+          opts.on('-o [DIR]', '--output_dir [DIR]', 'Directory to save output to') { |o| @output_dir = o }
+          opts.on('--metrics_port [PORT]', 'The port the metrics service runs on') { |port| @metrics_port = port }
+        }.parse!
+        if @metrics_type.nil?
+          STDERR.puts '--metrics_type (-m) is a required argument'
+          exit 1
+        end
+
+        config_file = File.expand_path("../../config/#{@metrics_type}.yaml", __FILE__)
+        config = YAML.load_file(config_file)
+
+        @certname = config['certname']
+        @hosts = config['hosts']
+        @excludes = config['excludes']
+        @additional_metrics = config['additional_metrics']
+        @port = @metrics_port ? @metrics_port : config['metrics_port']
+      rescue StandardError => e
+        STDERR.puts "Failed to load config for #{@metrics_type}: #{e.message}"
+        STDERR.puts e.backtrace
+        nil
+      end
+
+      def get_endpoint(url)
+        response = @client.get(url)
+
+        if response.success?
+          JSON.parse(response.body)
+        else
+          STDERR.puts "Received HTTP code '#{response.code}' with message '#{response.reason}' for #{url}"
+          @errors << "HTTP Error #{response.code} for #{url}"
+          {}
+        end
+      rescue StandardError => e
+        STDERR.puts "Failed to query #{url}: #{e.message}"
+        STDERR.puts e.backtrace
+
+        @errors << e.to_s
+        {}
+      end
+
+      def post_endpoint(url, body)
+        response = @client.post(url, body, headers: { 'Content-Type' => 'application/json' })
+        if response.success?
+          JSON.parse(response.body)
+        else
+          STDERR.puts "Received HTTP code '#{response.code}' with message '#{response.reason}' for #{url}"
+          @errors << "HTTP Error #{response.code} for #{url}"
+          {}
+        end
+      rescue StandardError => e
+        STDERR.puts "Failed to post to #{url}: #{e.message}"
+        STDERR.puts e.backtrace
+
+        @errors << e.to_s
+        {}
+      end
+
+      def retrieve_additional_metrics(url, _metrics_type, metrics)
+        metrics_output = post_endpoint(url, metrics.to_json)
+        return [] if metrics_output.empty?
+
+        # For a status other than 200 or 404, add the HTTP code to the error array
+        metrics_output.select { |m| m.key?('status') and ![200, 404].include?(m['status']) }.each do |m|
+          @errors << "HTTP Error #{m['status']} for #{m['request']['mbean']}"
+        end
+
+        # Select metrics output that has a 'status' key
+        metrics_output.select { |m| m.key?('status') }.map do |m|
+          # Then merge the corresponding 'metrics' hash
+          # e.g. for a metrics_output entry of
+          #   {"request"=>{"mbean"=>"puppetlabs.puppetdb.mq:name=global.command-parse-time", "type"=>"read"}, "value" => ...}
+          # and a metrics entry of
+          #   {"type"=>"read", "name"=>"global_command-parse-time", "mbean"=>"puppetlabs.puppetdb.mq:name=global.command-parse-time"}
+          # the result is that 'name' entry is added to the metris_output hash
+          m.merge!(metrics.find { |n| n['mbean'] == m['request']['mbean'] })
+
+          status = m['status']
+          if status == 200
+            { 'name' => m['name'], 'data' => m['value'] }
+          elsif status == 404
+            { 'name' => m['name'], 'data' => nil }
+          end
+        end
+      end
+
+      def filter_metrics(dataset, filters)
+        return dataset if filters.empty?
+
+        case dataset
+        when Hash
+          dataset = dataset.each_with_object({}) { |(k, v), m| m[k] = filter_metrics(v, filters) unless filters.include? k; }
+        when Array
+          dataset.map! { |e| filter_metrics(e, filters) }
+        end
+
+        dataset
+      end
     end
   end
-  endpoint_data
-rescue Exception => e
-  $error_array << e.to_s
-  endpoint_data = {}
-end
-
-def post_endpoint(url, use_ssl, post_data)
-  http, uri = setup_connection(url, use_ssl)
-
-  request = Net::HTTP::Post.new(uri.request_uri)
-  request.content_type = 'application/json'
-  request.body = post_data
-
-  endpoint_data = JSON.parse(http.request(request).body)
-  endpoint_data
-rescue Exception => e
-  $error_array << e.to_s
-  endpoint_data = {}
-end
-
-def retrieve_additional_metrics(host, port, use_ssl, metrics_type, metrics)
-  if metrics_type == 'puppetdb'
-    host = '127.0.0.1' if host == CERTNAME && !REMOTE_METRICS_ENABLED
-    unless REMOTE_METRICS_ENABLED || ['127.0.0.1', 'localhost'].include?(host)
-      # Puppet services released between May, 2020 and Feb 2021 had
-      # the /metrics API disabled due to:
-      #   https://puppet.com/security/cve/CVE-2020-7943/
-      return []
-    end
-  end
-
-  host_url = generate_host_url(host, port, use_ssl)
-
-  metrics_array = []
-  endpoint = "#{host_url}/metrics/v2/read"
-  metrics_output = post_endpoint(endpoint, use_ssl, metrics.to_json)
-  return metrics_array if metrics_output.empty?
-
-  metrics.each_index do |index|
-    metric_name = metrics[index]['name']
-    metric_data = metrics_output[index]
-
-    metric_status = metric_data ? metric_data.dig('status') : nil
-    next unless metric_status
-
-    if metric_status == 200
-      metrics_array << { 'name' => metric_name, 'data' => metric_data['value'] }
-    elsif metric_status == 404
-      metrics_array << { 'name' => metric_name, 'data' => nil }
-    else
-      metric_mbean = metrics[index]['mbean']
-      $error_array << "HTTP Error #{metric_status} for #{metric_mbean}"
-    end
-  end
-
-  metrics_array
-end
-
-def filter_metrics(dataset, filters)
-  return dataset if filters.empty?
-
-  case dataset
-  when Hash
-    dataset = dataset.each_with_object({}) { |(k, v), m| m[k] = filter_metrics(v, filters) unless filters.include? k; }
-  when Array
-    dataset.map! { |e| filter_metrics(e, filters) }
-  end
-
-  dataset
 end