sensu-plugins-outlyer 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b0ed94d0467ef520453c752e6e826c9a698303e3
-  data.tar.gz: 3d8a2558a51d4db142df3019bd36299c7a7ce5cf
+  metadata.gz: 00e6cf84c928223961b1c067386b24560ad898c3
+  data.tar.gz: 66768c9f5f7500b47caa5b7e7d759634a93bbc4f
 SHA512:
-  metadata.gz: 3aafa1c88a6c0dd5075bbc6a3bf44f24d93bc50b094fce91f042be39f4dfa51c7672b16927c91110312da879ec04546ceef4c3f0304c2cec0f7a99b9a14eb7c4
-  data.tar.gz: f528a0d4fbcaa5c2a1aa792649dc79fef52d021a2535090563bc2e8c9e1a0beaa2045a5e6e373a6842d0f7ba6494f7eb9d6b249fd99d9359ae5bbe3e3c99a8dc
+  metadata.gz: 5c55c068f0d9710beea2a1bf1d0b5ca9be2fe66fba39eac687e79a753a879241cae83196839c486105f0c92a315b76a1532adad229055a70befc7da95ba340a9
+  data.tar.gz: 9b0fa05ac20330bc11bcb2ad725844350e8e3dc049be0bb688a64592071ba50aa1f4acbc470c34afcb7ba1d2334fc664b0011712162f22cd03994e687f4bc8e6

data/CHANGELOG.md

@@ -3,8 +3,8 @@ 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
+## [0.9.0] - 2018-07-18
+- Added `source:sensu` label to metrics
 - Fixed bug with Nagios parsing
 
 ## [0.7.0] - 2018-07-16

data/bin/outlyer-metrics.rb

@@ -109,7 +109,8 @@ class OutlyerMetrics < Sensu::Handler
       begin
         name = metric_parts[0]
         value = metric_parts[1].split(";")[0].to_f
-        labels = {service: "sensu.#{sanitize_value(@check_name)}"}
+        labels = {service: sanitize_value(@check_name),
+                  source: 'sensu'}
         data.push(create_datapoint(name, value, @event['check']['executed'].to_i * 1000, labels))
       rescue => error
         # Raised when any metrics could not be parsed
@@ -141,7 +142,8 @@ class OutlyerMetrics < Sensu::Handler
     output.split("\n").each do |metric|
       m = metric.split
       next unless m.count == 3
-        labels = {service: "sensu.#{sanitize_value(@check_name)}"}
+        labels = {service: sanitize_value(@check_name),
+                  source: 'sensu'}
         
         # Check to see if we have a scheme filter that matches the metric name
         if schemes
@@ -220,15 +222,19 @@ class OutlyerMetrics < Sensu::Handler
   # 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 hostname       [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)
+  def create_status_metric(check_status, hostname=@host, timestamp=@event['check']['executed'].to_i * 1000)
     labels = {
       service: sanitize_value(@check_name),
       source: 'sensu'      
     }
-    return create_datapoint('service.status', check_status, timestamp, labels, host)
+    point = create_datapoint('service.status', check_status, timestamp, labels, hostname)
+    if config[:debug]
+      puts "Created status datapoint with properties #{point}"
+    end
+    point
   end
   
   # Ensures all label values conform to Outlyer's data format requirements:
@@ -258,11 +264,11 @@ class OutlyerMetrics < Sensu::Handler
   # @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
+  # @param hostname     [String] (Optional) Set a hostname for the metric
   #
-  def create_datapoint(name, value, time, labels = {}, metric_host=@host)
+  def create_datapoint(name, value, time, labels = {}, hostname=@host)
     datapoint = {
-                  host: metric_host,
+                  host: hostname,
                   labels: labels,
                   name: name,
                   timestamp: time,

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

@@ -1,7 +1,7 @@
 module SensuPluginsOutlyer
   module Version
     MAJOR = 0
-    MINOR = 8
+    MINOR = 9
     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.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Dataloop Software, INC. Trading as Outlyer