sensu-plugins-outlyer 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a52cd273a16bb979d729d59b18b362fea57a28e2735b66b3a4b85cf210d8d4da
-  data.tar.gz: 57bbeafe4ee42dd5cdd9eebb8ce32382e10270b10cb8d048f3d967159d3851dd
+  metadata.gz: 9a52863d6578923ee7abae3281e4bed498e6bae4c6ec66ebbffdfc8632f98bc4
+  data.tar.gz: 81c623f83b9e79fbf4af84dfdc8a13b33c27fd604a89b1643184bf0bed1bc05e
 SHA512:
-  metadata.gz: 9bcb06a1122343f198587265b870a38c1518a1cb52590f59c8f577fd97bfdd65fed132616e5ea8535d9f9086e4ab10add59e90ac4972e77d38092f138ee851da
-  data.tar.gz: d7ff052d31f96d246b5ba5d09f03df74797c30c76172176939a740abc5b4cf30f61eef459bff0e8ae32d479096fe600df6505fbf009ece055f7f829e6b8097de
+  metadata.gz: 18aa3e82c81931a8336a2b1f609770e9abbd166fa0f0a8434b063faafab5f6182e00a63718ebebf8b71f194596bca9fada9266302b2572a66899d9c0d4f84af3
+  data.tar.gz: b602dcb494dcae20291440d5bea058c298231b78d37e2bb95ebc03eba3fe04169cf6c905d15b555100c1f72786b5d0379da2aea2e99f505dffdbafcb33b5d0e7

data/CHANGELOG.md

@@ -3,7 +3,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachangelog.com/)
 
-## [0.6.0] - 2018-07-16
+## [0.7.0] - 2018-07-16
 - Made debug flag boolean
 - Added additional debug logging for troubleshooting
 - Added Unit Tests

data/bin/outlyer-metrics.rb

@@ -71,11 +71,9 @@ class OutlyerMetrics < Sensu::Handler
   def handle
 
     output = @event['check']['output']
-    check_status = @event['check']['status'].to_f
     @check_name = @event['check']['name']
     @host = @event['client']['name'].strip.to_s
     @environment = @event['client']['environment']
-    timestamp = @event['check']['executed'].to_i * 1000
     
     if config[:debug]
       puts "Handling check #{@check_name} for host #{@host} in environment #{@environment}"
@@ -88,31 +86,9 @@ class OutlyerMetrics < Sensu::Handler
              parse_graphite_output(output)
           end 
       
-    # Add a service status metric
-    metrics.push(create_datapoint('service.status', check_status, timestamp, {service: "sensu.#{sanitize_value(@check_name)}"}))
     # Post metrics to Outlyer
     push_metrics(metrics)
   end
-  
-  # Create a single data point
-  #
-  # @param name         [String] metric name
-  # @param value        [Float] metric value
-  # @param time         [Integer] epoch timestamp of metric in milliseconds
-  # @param labels       [HashMap] (Optional) Additional labels to append to data point
-  # @param metric_host  [String] (Optional) Set a host for the metric
-  #
-  def create_datapoint(name, value, time, labels = {}, metric_host=@host)
-    datapoint = {
-                  host: metric_host,
-                  labels: labels,
-                  name: name,
-                  timestamp: time,
-                  type: 'gauge',
-                  value: value
-                }
-    datapoint
-  end
 
   # Parse the Nagios output format:
   #   <message> | <metric path 1>=<metric value 1>, <metric path 2>=<metric value 2>...
@@ -141,6 +117,7 @@ class OutlyerMetrics < Sensu::Handler
         puts "The Nagios metric '#{metric}' could not be parsed: #{error.message}"
       end 
     end
+    data.push(create_status_metric(@event['check']['status'].to_f))
     data
   end
   
@@ -161,15 +138,15 @@ class OutlyerMetrics < Sensu::Handler
     end
     
     # Parse the metric on each line in graphite format
+    metric_host = @host
     output.split("\n").each do |metric|
       m = metric.split
       next unless m.count == 3
         labels = {service: "sensu.#{sanitize_value(@check_name)}"}
-        metric_host = @host
         
         # Check to see if we have a scheme filter that matches the metric name
-        template = nil
         if schemes
+          template = nil
           schemes.each do |scheme|
             filter = Regexp.new("^#{Regexp.escape(scheme['filter']).gsub('\*','[^\.]*?')}$")
             if m[0] =~ filter
@@ -215,8 +192,8 @@ class OutlyerMetrics < Sensu::Handler
             puts "No scheme was found that matches the metric '#{m[0]}.'"
             puts "Please configure a scheme for the check '#{@check_name}' "\
               "on the Sensu client '#{@host}'."
-            exit(2)
-            metric_name = sanitize_value(m[0])
+            data.push(create_status_metric(3))
+            return data
           end
         else
           metric_name = sanitize_value(m[0])
@@ -227,9 +204,30 @@ class OutlyerMetrics < Sensu::Handler
       point = create_datapoint(metric_name, value, time, labels, metric_host)
       data.push(point)
     end
+    if config[:debug]
+      puts "Parsed #{data.length} of #{output.split("\n").length} metrics"
+    end 
+    data.push(create_status_metric(@event['check']['status'].to_f, metric_host))
     data
   end
   
+  # Create the status metric for the check with status:
+  #   
+  #   0 - OK
+  #   1 - WARN
+  #   2 - CRITICAL
+  #   3 - UNKNOWN
+  # 
+  # Unknown is used to tell Outlyer there was a parsing error for the check
+  # 
+  # @param check_status   [Integer] Check status code
+  # @param host           [String] (Optional) hostname of host that ran the check
+  # @param timestamp      [Integer] (Optional) timestamp of when host ran the check
+  #
+  def create_status_metric(check_status, host=@host, timestamp=@event['check']['executed'].to_i * 1000)
+    return create_datapoint('service.status', check_status, timestamp, {service: "sensu.#{sanitize_value(@check_name)}"}, host)
+  end
+  
   # Ensures all label values conform to Outlyer's data format requirements:
   #   
   #   * values can only contain the characters `-._A-Za-z0-9`, other characters 
@@ -250,6 +248,26 @@ class OutlyerMetrics < Sensu::Handler
     end
     value
   end
+  
+  # Create a single data point
+  #
+  # @param name         [String] metric name
+  # @param value        [Float] metric value
+  # @param time         [Integer] epoch timestamp of metric in milliseconds
+  # @param labels       [HashMap] (Optional) Additional labels to append to data point
+  # @param metric_host  [String] (Optional) Set a host for the metric
+  #
+  def create_datapoint(name, value, time, labels = {}, metric_host=@host)
+    datapoint = {
+                  host: metric_host,
+                  labels: labels,
+                  name: name,
+                  timestamp: time,
+                  type: 'gauge',
+                  value: value
+                }
+    datapoint
+  end
 
   # Post check metrics to Outlyer's Series API:
   #   

data/lib/sensu-plugins-outlyer/version.rb

@@ -1,7 +1,7 @@
 module SensuPluginsOutlyer
   module Version
     MAJOR = 0
-    MINOR = 6
+    MINOR = 7
     PATCH = 0
 
     VER_STRING = [MAJOR, MINOR, PATCH].compact.join('.')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-outlyer
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Dataloop Software, INC. Trading as Outlyer
@@ -175,7 +175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.4
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Sensu plugins for Outlyer