sensu-plugins-eventstore 0.0.16 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 333339c77111196383ca1ef8c087d10bf48d9dad
-  data.tar.gz: 3d5c1dd690a1d4cb9050425986157bceaff2d1db
+  metadata.gz: 30289602da4bc203c72500ac66fddcb192b3accd
+  data.tar.gz: ce128c99260de932b2af913e6e3f35c4934e21cc
 SHA512:
-  metadata.gz: d0c0d2fea45b9375180342b2377b3c2602cdebe71237b9ef060417854525e7959a26da0494457c64259468dc6faebcf5987343b3e084710df223faca8f260411
-  data.tar.gz: d7a8181db6d29de9678d2daa01609ceac1f58c26c18c92ef98dd9b05830703518de19c4dd4d632faa98e2b9e3351efb9b9e3048d02f4a846b6880281a80032d9
+  metadata.gz: 560349cfc128cfb95df04630805a7c64177bcc4411f1d785ffb08fabc9bf32f2d1d51860f8cbb8ada2b0f0ebb9dcbc0f756cdb896d203952c6b3319f2bf33b9e
+  data.tar.gz: 59db0795947bf561b35a739ef98a1f52055cfd9ea514a39fb097d088e56b8d0ce4730b300495409784c30289d16295629d3f9d40065e452b8dbbf26673aa7193

data/bin/metrics-eventstore-stats-stream.rb

@@ -29,7 +29,7 @@ require 'json'
 class Stats < Sensu::Plugin::Metric::CLI::Graphite
   option :discover_via_dns,
          description: 'Whether to use DNS lookup to discover other cluster nodes. (Default: true)',
-         short: '-v',
+         short: '-k',
          long: '--discover_via_dns discover_via_dns',
          default: 'true'
 
@@ -69,6 +69,18 @@ class Stats < Sensu::Plugin::Metric::CLI::Graphite
          long: '--auth_password auth_password',
          default: 'changeit'
 
+  option :scheme,
+         description: 'What to prepend to output metrics (Default "<hostname>.eventstore")',
+         short: '-s',
+         long: '--scheme scheme',
+         default: "#{Socket.gethostname}.eventstore"
+
+  option :verbose,
+           description: 'output extra messaging (Default false)',
+           short: '-v',
+           long: '--verbose verbose',
+           default: 'false'
+
   def run
     discover_via_dns = config[:discover_via_dns]
     address = config[:address]
@@ -105,7 +117,7 @@ class Stats < Sensu::Plugin::Metric::CLI::Graphite
 
     xml_doc = Nokogiri::XML xml_stream_without_namespace
 
-    puts xml_doc
+    puts xml_doc  if config_is_true config[:verbose]
 
     latest_entry = xml_doc.xpath('.//entry')
                        .sort  { |node| DateTime.parse node.xpath('.//updated').text }
@@ -117,21 +129,19 @@ class Stats < Sensu::Plugin::Metric::CLI::Graphite
 
     json_stats = JSON.parse element_temp_file.read
 
-    puts "json stats #{json_stats}"
+    puts "json stats #{json_stats}"  if config_is_true config[:verbose]
 
     stats_dict = parse_json_stats json_stats
 
     stats_dict.each { |stat| output stat[0], stat[1]}
 
-    ok
+    ok "metrics collected successfully"
   end
 
   def get_stream(stream_url, accept_type)
-    puts "opening stream @ url #{stream_url}"
-
-    use_auth = config[:use_authentication]
+    puts "opening stream @ url #{stream_url}" if config_is_true config[:verbose]
 
-    if "true".casecmp(use_auth) == 0
+    if config_is_true config[:use_authentication]
       username = config[:auth_user]
       password = config[:auth_password]
       return open stream_url, http_basic_authentication:[username, password], "Accept" => accept_type
@@ -140,6 +150,10 @@ class Stats < Sensu::Plugin::Metric::CLI::Graphite
     end
   end
 
+  def config_is_true(config)
+    return "true".casecmp(config) == 0
+  end
+
   def add_metric(json_stats, stats_dict, stat_name_mapping)
     stat_value = json_stats[stat_name_mapping[:source_name]]
     stats_dict[stat_name_mapping[:target_name]] = stat_value
@@ -152,7 +166,7 @@ class Stats < Sensu::Plugin::Metric::CLI::Graphite
   def create_metric_mapping(source_name, target_name)
     {
       source_name: source_name,
-      target_name:"#{Socket.gethostname}.eventstore.#{target_name}"
+      target_name:"#{config[:scheme]}.#{target_name}"
     }
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-eventstore
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.17
 platform: ruby
 authors:
 - Jamie Wroe