sensu-plugins-outlyer 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 9a52863d6578923ee7abae3281e4bed498e6bae4c6ec66ebbffdfc8632f98bc4
-  data.tar.gz: 81c623f83b9e79fbf4af84dfdc8a13b33c27fd604a89b1643184bf0bed1bc05e
+SHA1:
+  metadata.gz: b0ed94d0467ef520453c752e6e826c9a698303e3
+  data.tar.gz: 3d8a2558a51d4db142df3019bd36299c7a7ce5cf
 SHA512:
-  metadata.gz: 18aa3e82c81931a8336a2b1f609770e9abbd166fa0f0a8434b063faafab5f6182e00a63718ebebf8b71f194596bca9fada9266302b2572a66899d9c0d4f84af3
-  data.tar.gz: b602dcb494dcae20291440d5bea058c298231b78d37e2bb95ebc03eba3fe04169cf6c905d15b555100c1f72786b5d0379da2aea2e99f505dffdbafcb33b5d0e7
+  metadata.gz: 3aafa1c88a6c0dd5075bbc6a3bf44f24d93bc50b094fce91f042be39f4dfa51c7672b16927c91110312da879ec04546ceef4c3f0304c2cec0f7a99b9a14eb7c4
+  data.tar.gz: f528a0d4fbcaa5c2a1aa792649dc79fef52d021a2535090563bc2e8c9e1a0beaa2045a5e6e373a6842d0f7ba6494f7eb9d6b249fd99d9359ae5bbe3e3c99a8dc

data/CHANGELOG.md

@@ -3,6 +3,10 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachangelog.com/)
 
+## [0.8.0] - 2018-07-18
+- Added `source:sensu` label to `service.status` metric
+- Fixed bug with Nagios parsing
+
 ## [0.7.0] - 2018-07-16
 - Made debug flag boolean
 - Added additional debug logging for troubleshooting

data/bin/outlyer-metrics.rb

@@ -81,7 +81,7 @@ class OutlyerMetrics < Sensu::Handler
     
     # Parse output for metric data
     metrics = if config[:output_format] == 'nagios' then
-             parse_nagios_output(output, timestamp)
+             parse_nagios_output(output)
           else
              parse_graphite_output(output)
           end 
@@ -94,9 +94,8 @@ class OutlyerMetrics < Sensu::Handler
   #   <message> | <metric path 1>=<metric value 1>, <metric path 2>=<metric value 2>...
   #
   # @param output   [String] The full check output
-  # @param timestamp[Integer] The epoch timestamp in milliseconds the check was executed
   #
-  def parse_nagios_output(output, timestamp)
+  def parse_nagios_output(output)
     data = []
     parts = output.strip.split('|')
     
@@ -111,7 +110,7 @@ class OutlyerMetrics < Sensu::Handler
         name = metric_parts[0]
         value = metric_parts[1].split(";")[0].to_f
         labels = {service: "sensu.#{sanitize_value(@check_name)}"}
-        data.push(create_datapoint(name, value, timestamp, labels))
+        data.push(create_datapoint(name, value, @event['check']['executed'].to_i * 1000, labels))
       rescue => error
         # Raised when any metrics could not be parsed
         puts "The Nagios metric '#{metric}' could not be parsed: #{error.message}"
@@ -189,7 +188,7 @@ class OutlyerMetrics < Sensu::Handler
           else
             # If no template found, ignore metric and put warning in handler
             # this avoids un-configured checks sending bad data to Outlyer
-            puts "No scheme was found that matches the metric '#{m[0]}.'"
+            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}'."
             data.push(create_status_metric(3))
@@ -225,7 +224,11 @@ class OutlyerMetrics < Sensu::Handler
   # @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)
+    labels = {
+      service: sanitize_value(@check_name),
+      source: 'sensu'      
+    }
+    return create_datapoint('service.status', check_status, timestamp, labels, host)
   end
   
   # Ensures all label values conform to Outlyer's data format requirements:

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-outlyer
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Dataloop Software, INC. Trading as Outlyer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-16 00:00:00.000000000 Z
+date: 2018-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin
@@ -175,7 +175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Sensu plugins for Outlyer