sensu-plugins-sensu 2.5.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9aa75ea723585cc7af3f900c4e22ee869a96e6200469ab098c40a5d8e7eeafa9
-  data.tar.gz: 2dd6b40d04e074df31497dce630d0a74bef06fc848782decefc0a59a73945802
+  metadata.gz: 74be22e9979ca4bce08680ae287bbdc861afff3afc3783fccd98a1d0a9fbd528
+  data.tar.gz: bd7f1ed317662a1892ed771d7d74b3e8e6a7f8936fa0efd93942631b62b34821
 SHA512:
-  metadata.gz: bd8a4fd76eb42ca0efbeab04a7bb73af2f9578ce8ac2af490d8ebb8eecae60b64535299389ee261ca77cf66c5532a06a8b0a126d74f92f4debc2413e30104cd3
-  data.tar.gz: 5ce1de20012311c1eac79c174f636e769ef1e3b43504ed9fecf2e4e1f83cf5288c4732550615555f1457fc5be201c135383bb6e5d5e62825fe00f0a702cf262b
+  metadata.gz: bc717f238a82fcd66675ff1b5b4c441c2f065f2d90f92c89d784f84262d4dbdcebb0c74f91f7be9700b129f98fdc9c765c319d93fe13f83d02c57242c2836fbc
+  data.tar.gz: c2c3a8b78237a623c30484fbdb8e193abced393ae1cbf4e9055cfa0d358c9435d9faddeee4afa58a5896a55262b501f5cf7774c794d392593251409d56061c8a

data/CHANGELOG.md

@@ -6,6 +6,12 @@ Which is based on [Keep A Changelog](http://keepachangelog.com/)
 
 ## [Unreleased]
 
+### Breaking Change
+- bumped dependency of `sensu-plugin` to 2.x you can read about it [here](https://github.com/sensu-plugins/sensu-plugin/blob/master/CHANGELOG.md#v200---2017-03-29)
+
+### Changed
+- `bin/metrics-*`: Used `Sensu::Plugin::Metric::CLI::Generic` class instead of Graphite specific class for metrics. (@bergerx)
+
 ## [2.5.0] - 2018-03-06
 ### Changed
 - check-stale-results.rb: support https protocol via api/host declaration
@@ -116,7 +122,8 @@ Which is based on [Keep A Changelog](http://keepachangelog.com/)
 ### Added
 - initial release
 
-[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-sensu/compare/2.4.1...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-sensu/compare/3.0.0...HEAD
+[3.0.0]: https://github.com/sensu-plugins/sensu-plugins-sensu/compare/2.5.0...3.0.0
 [2.5.0]: https://github.com/sensu-plugins/sensu-plugins-sensu/compare/2.4.1...2.5.0
 [2.4.1]: https://github.com/sensu-plugins/sensu-plugins-sensu/compare/2.4.0...2.4.1
 [2.4.0]: https://github.com/sensu-plugins/sensu-plugins-sensu/compare/2.3.1...2.4.0

data/bin/metrics-aggregate.rb

@@ -5,11 +5,14 @@
 # Walks the /aggregates API to return metrics for
 # the aggregated output states of each check.
 #
+# sensu.aggregates.some_aggregated_check.clients 1 1380251999
+# sensu.aggregates.some_aggregated_check.checks 125 1380251999
 # sensu.aggregates.some_aggregated_check.ok 125 1380251999
 # sensu.aggregates.some_aggregated_check.warning  0 1380251999
 # sensu.aggregates.some_aggregated_check.critical 0 1380251999
 # sensu.aggregates.some_aggregated_check.unknown  0 1380251999
 # sensu.aggregates.some_aggregated_check.total  125 1380251999
+# sensu.aggregates.some_aggregated_check.stale  0 1380251999
 # ===
 #
 # Authors
@@ -28,7 +31,7 @@ require 'json'
 require 'net/http'
 require 'net/https'
 
-class AggregateMetrics < Sensu::Plugin::Metric::CLI::Graphite
+class AggregateMetrics < Sensu::Plugin::Metric::CLI::Generic
   option :api,
          short: '-a URL',
          long: '--api URL',
@@ -60,10 +63,15 @@ class AggregateMetrics < Sensu::Plugin::Metric::CLI::Graphite
          proc: proc(&:to_i)
 
   option :scheme,
-         description: 'Metric naming scheme',
+         description: 'Metric naming scheme for graphite format',
          long: '--scheme SCHEME',
          default: "#{Socket.gethostname}.sensu.aggregates"
 
+  option :measurement,
+         description: 'Measurement for influxdb format',
+         long: '--measurement MEASUREMENT',
+         default: 'sensu.aggregates'
+
   option :debug,
          long: '--debug',
          description: 'Verbose output'
@@ -76,12 +84,12 @@ class AggregateMetrics < Sensu::Plugin::Metric::CLI::Graphite
     end
     req = Net::HTTP::Get.new(resource)
     r = http.request(req)
-    JSON.parse(r.body)
+    ::JSON.parse(r.body)
   rescue Errno::ECONNREFUSED
     warning 'Connection refused'
   rescue Timeout::Error
     warning 'Connection timed out'
-  rescue JSON::ParserError
+  rescue ::JSON::ParserError
     warning 'Sensu API returned invalid JSON'
   end
 
@@ -112,10 +120,28 @@ class AggregateMetrics < Sensu::Plugin::Metric::CLI::Graphite
         # maintain backwards compatibility with 0.23 and newer versions.
         if count.is_a?(Hash)
           count.each do |x, y|
-            output "#{config[:scheme]}.#{check['name']}.#{x}", y, timestamp
+            output metric_name: x,
+                   value: y,
+                   graphite_metric_path: "#{config[:scheme]}.#{check['name']}.#{x}",
+                   statsd_metric_name: "#{config[:scheme]}.#{check['name']}.#{x}",
+                   influxdb_measurement: config[:measurement],
+                   tags: {
+                     check: check['name'],
+                     host: Socket.gethostname
+                   },
+                   timestamp: timestamp
           end
         else
-          output "#{config[:scheme]}.#{check['name']}.#{result}", count, timestamp
+          output metric_name: result,
+                 value: count,
+                 graphite_metric_path: "#{config[:scheme]}.#{check['name']}.#{result}",
+                 statsd_metric_name: "#{config[:scheme]}.#{check['name']}.#{result}",
+                 influxdb_measurement: config[:measurement],
+                 tags: {
+                   check: check['name'],
+                   host: Socket.gethostname
+                 },
+                 timestamp: timestamp
         end
       end
     end

data/bin/metrics-delete-expired-stashes.rb

@@ -16,7 +16,7 @@ require 'socket'
 
 include Sensu::Plugin::Utils
 
-class CheckSilenced < Sensu::Plugin::Metric::CLI::Graphite
+class CheckSilenced < Sensu::Plugin::Metric::CLI::Generic
   default_host = begin
                    settings['api']['host']
                  rescue
@@ -59,6 +59,11 @@ class CheckSilenced < Sensu::Plugin::Metric::CLI::Graphite
          description: 'Do not delete expired stashes',
          default: false
 
+  option :measurement,
+         description: 'Measurement for influxdb format',
+         long: '--measurement MEASUREMENT',
+         default: 'sensu.stashes'
+
   def api
     endpoint = URI.parse("http://#{@config[:host]}:#{@config[:port]}")
     endpoint.scheme = if @config[:use_ssl?]
@@ -71,7 +76,7 @@ class CheckSilenced < Sensu::Plugin::Metric::CLI::Graphite
   end
 
   def acquire_stashes
-    all_stashes = JSON.parse(api['/stashes'].get)
+    all_stashes = ::JSON.parse(api['/stashes'].get)
     filtered_stashes = []
     all_stashes.each do |stash|
       filtered_stashes << stash if stash['path'] =~ /^#{@config[:filter]}\/.*/
@@ -81,7 +86,7 @@ class CheckSilenced < Sensu::Plugin::Metric::CLI::Graphite
     warning 'Connection refused'
   rescue RestClient::RequestTimeout
     warning 'Connection timed out'
-  rescue JSON::ParserError
+  rescue ::JSON::ParserError
     warning 'Sensu API returned invalid JSON'
   end
 
@@ -102,6 +107,13 @@ class CheckSilenced < Sensu::Plugin::Metric::CLI::Graphite
         end
       end
     end
-    ok "#{config[:scheme]}.sensu.stashes.expired", @count
+    ok metric_name: 'expired',
+       value: @count,
+       graphite_metric_path: "#{config[:scheme]}.sensu.stashes.expired",
+       statsd_metric_name: "#{config[:scheme]}.sensu.stashes.expired",
+       influxdb_measurement: config[:measurement],
+       tags: {
+         host: Socket.gethostname
+       }
   end
 end

data/bin/metrics-events.rb

@@ -4,9 +4,11 @@
 #
 # Use the /events API to collect events and their severity.
 #
-# sensu.events.total 2 1234535436
-# sensu.events.warning 0 1234535436
-# sensu.events.critical 0 1234535436
+# sensu.events.total 156 1518300288
+# sensu.events.warning 6 1518300288
+# sensu.events.critical 64 1518300288
+# sensu.events.status.3 79 1518300288
+# sensu.events.status.127 7 1518300288
 #
 # ===
 #
@@ -23,7 +25,7 @@ require 'sensu-plugin/metric/cli'
 require 'rest-client'
 require 'json'
 
-class AggregateMetrics < Sensu::Plugin::Metric::CLI::Graphite
+class EventMetrics < Sensu::Plugin::Metric::CLI::Generic
   option :api,
          short: '-a URL',
          long: '--api URL',
@@ -52,6 +54,11 @@ class AggregateMetrics < Sensu::Plugin::Metric::CLI::Graphite
          long: '--scheme SCHEME',
          default: "#{Socket.gethostname}.sensu.events"
 
+  option :measurement,
+         description: 'Measurement for influxdb format',
+         long: '--measurement MEASUREMENT',
+         default: 'sensu.events'
+
   option :debug,
          long: '--debug',
          description: 'Verbose output'
@@ -60,7 +67,7 @@ class AggregateMetrics < Sensu::Plugin::Metric::CLI::Graphite
     request = RestClient::Resource.new(config[:api] + resource, timeout: config[:timeout],
                                                                 user: config[:user],
                                                                 password: config[:password])
-    JSON.parse(request.get, symbolize_names: true)
+    ::JSON.parse(request.get, symbolize_names: true)
   rescue RestClient::ResourceNotFound
     warning "Resource not found: #{resource}"
   rescue Errno::ECONNREFUSED
@@ -71,7 +78,7 @@ class AggregateMetrics < Sensu::Plugin::Metric::CLI::Graphite
     warning 'Connection timed out'
   rescue RestClient::Unauthorized
     warning 'Missing or incorrect Sensu API credentials'
-  rescue JSON::ParserError
+  rescue ::JSON::ParserError
     warning 'Sensu API returned invalid JSON'
   end
 
@@ -100,14 +107,28 @@ class AggregateMetrics < Sensu::Plugin::Metric::CLI::Graphite
       status_count[event[:check][:status]] += 1
     end
 
-    output "#{config[:scheme]}.total", total_count, timestamp
+    output metric_name: 'total_events_count',
+           value: total_count,
+           graphite_metric_path: "#{config[:scheme]}.total",
+           statsd_metric_name: "#{config[:scheme]}.total",
+           influxdb_measurement: config[:measurement],
+           tags: {
+             host: Socket.gethostname
+           },
+           timestamp: timestamp
+
     status_count.each do |status, count|
-      name = status_names[status]
-      if name
-        output "#{config[:scheme]}.#{name}", count, timestamp
-      else
-        output "#{config[:scheme]}.status.#{status}", count, timestamp
-      end
+      name = status_names[status] || "status.#{status}"
+      output metric_name: 'event_count',
+             value: count,
+             graphite_metric_path: "#{config[:scheme]}.#{name}",
+             statsd_metric_name: "#{config[:scheme]}.#{name}",
+             influxdb_measurement: config[:measurement],
+             tags: {
+               host: Socket.gethostname,
+               event_status: name
+             },
+             timestamp: timestamp
     end
 
     ok

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

@@ -1,8 +1,8 @@
 module SensuPluginsSensu
   # This defines the version of the gem
   module Version
-    MAJOR = 2
-    MINOR = 5
+    MAJOR = 3
+    MINOR = 0
     PATCH = 0
 
     VER_STRING = [MAJOR, MINOR, PATCH].compact.join('.')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-sensu
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-07 00:00:00.000000000 Z
+date: 2018-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '2.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement