sensu-plugins-eventstore 0.0.19 → 0.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f59afdbc50e0e95fbc595615582987d47d6dca6
-  data.tar.gz: 615a56334db39ed7c1b80ab9ba11ae81b2f5a8a5
+  metadata.gz: 44ce8ee38b05a664487437ab2a4189d98d00cb00
+  data.tar.gz: b1218bfc2002119abc86a77bdcb1dfd3873fc424
 SHA512:
-  metadata.gz: 080dea02b3ceb5b850d636c8d5bd781b637cb2234b8280b429bb8b14c0d21425cca849b5e255e296a68a017de447ebba77fcb110c379054b44aa3f0fa5937901
-  data.tar.gz: a76409d78377d11ca11fb15f61fc89e5d11f455d0691babf5e012325ac1cde70d43f55e95c294c9b444fef01085c414cf4fa6476f4a3aff0304c836716037202
+  metadata.gz: 83c33f31f05742991bfaf64477844f4dfd465e2782418e78b923120079d64af33fda27e5c17e1cc0272f16d236f97b8f82bbe21e0c03856ddfdfdaf729b78252
+  data.tar.gz: 93c55fa469ce20a031eac3a6c59af23a6a121577ff80e50b3b8669dfda021ceddd0a6c7af8bda13be8d6a577067b81c378fed68b19f0a59463e2a439566dfc67

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

@@ -21,6 +21,7 @@
 #   for details.
 #
 
+require 'date'
 require 'nokogiri'
 require 'sensu-plugin/metric/cli'
 require 'ip-helper.rb'
@@ -79,7 +80,7 @@ class Stats < Sensu::Plugin::Metric::CLI::Graphite
          description: 'What to prepend to output queue metrics (Default "<cluster_dns>.eventstore")',
          short: '-q',
          long: '--queue_scheme queue_scheme',
-         default: "#{config[:cluster_dns]}.eventstore"
+         default: ""
 
   option :verbose,
            description: 'output extra messaging (Default false)',
@@ -87,6 +88,11 @@ class Stats < Sensu::Plugin::Metric::CLI::Graphite
            long: '--verbose verbose',
            default: 'false'
 
+  def get_queue_scheme
+    return config[:queue_scheme] unless config[:queue_scheme].empty?
+    "#{config[:cluster_dns]}.eventstore"
+  end
+
   def run
     discover_via_dns = config[:discover_via_dns]
     address = config[:address]
@@ -123,7 +129,7 @@ class Stats < Sensu::Plugin::Metric::CLI::Graphite
 
     xml_doc = Nokogiri::XML xml_stream_without_namespace
 
-    puts xml_doc  if config_is_true config[:verbose]
+    puts xml_doc if verbose?
 
     latest_entry = xml_doc.xpath('.//entry')
                        .sort  { |node| DateTime.parse node.xpath('.//updated').text }
@@ -135,7 +141,7 @@ class Stats < Sensu::Plugin::Metric::CLI::Graphite
 
     json_stats = JSON.parse element_temp_file.read
 
-    puts "json stats #{json_stats}"  if config_is_true config[:verbose]
+    puts "json stats #{json_stats}" if verbose?
 
     stats_dict = add_standard_metrics json_stats
 
@@ -143,15 +149,21 @@ class Stats < Sensu::Plugin::Metric::CLI::Graphite
 
     stat_time = latest_entry.at_xpath('.//updated').content
 
+    puts "stat retrived for time #{stat_time}" if verbose?
+
     parsed_date_time = DateTime.parse(stat_time)
 
-    stats_dict.each { |stat| output stat[0], stat[1], parsed_date_time}
+    stats_dict.each { |stat| output stat[0], stat[1], parsed_date_time.strftime('%s')}
 
     ok
   end
 
+  def verbose?
+    config_is_true config[:verbose]
+  end
+
   def get_stream(stream_url, accept_type)
-    puts "opening stream @ url #{stream_url}" if config_is_true config[:verbose]
+    puts "opening stream @ url #{stream_url}" if verbose?
 
     if config_is_true config[:use_authentication]
       username = config[:auth_user]
@@ -180,7 +192,7 @@ class Stats < Sensu::Plugin::Metric::CLI::Graphite
   def create_queue_mapping(source_name, target_name)
     {
         source_name: source_name,
-        target_name:"#{config[:queue_scheme]}.#{target_name}"
+        target_name:"#{get_queue_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.19
+  version: 0.0.20
 platform: ruby
 authors:
 - Jamie Wroe