sensu-plugins-graphite 1.1.0 → 2.0.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NWFmMjk2MzYxMGVkZmVlYTNjNzZiZmUyMmU3MDUzOTAwODU1NWFlYQ==
-  data.tar.gz: !binary |-
-    NzJjY2JlYjBkMDc1ZDY2MDgzNGRmMGYyNDMwMzQzYTJjMTNlNWJhYQ==
+SHA1:
+  metadata.gz: 6a7efb937f12618e44c6e26727cb375e1a6b8e03
+  data.tar.gz: 2788478ba370507eedb8d162dfc54e11dc43bdcf
 SHA512:
-  metadata.gz: !binary |-
-    OGE3OGJkYmEwMTBiZjI4N2Q5M2UxOWM2YzBmMWM4ZmY4YmZjZDNiMTI1NjU4
-    ZjJkMzZkZWQ5NzI4ZTUyNTMxZmZhZDZjNmYwNjFiZmY2ZjRiNWM1YmE0NTY0
-    NTY0MjU1ZGFmZjhmNmIyMDMxNjY1MDhiMTlkZjQwMGVhZjQxOWQ=
-  data.tar.gz: !binary |-
-    ZGNlZjQ5OThmNjNkMjYwMDkyMWVmYTE3MTIyMDQxNmVlZjg3NjgzYTNlMDE0
-    Nzg5MTNiNjM1MzQ1ODhlODJlMjQxOGNmM2NjNWE4YTIzYzMyMGY5YTUzYjcw
-    YzkyNDcxZThkYzA3MzE1YjU4MDUzZjhhYTI1MjY0NWQ1MjE2MWE=
+  metadata.gz: 37266b0ff1aecee96edad07b21765cb66198ba2166220622658c21ac605f5be2ec25b0c4c3983f18897d095667ed70181d68dc2fb9ae9576f0e59f36d9aed679
+  data.tar.gz: 6db3acba2e2794d4c87dedfec5499f11625638716652b68bc57bfe029d3a0a031a58e76bac98cf7e44410dcc7b1a29859435177d9b7d0533909506472bc8d5e5

data/CHANGELOG.md

@@ -5,6 +5,19 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 
 ## [Unreleased]
 
+## [2.0.0] - 2016-06-21
+### Added
+- Added handler-graphite-status.rb to create metric which gives the status of the sensu check when it changes state (0,1,2,3)
+
+### Changed
+- Updated sensu-plugin dependency to use a pessimistic version constraint
+
+### Fixed
+- Correct error message for incorrect graphite expression
+
+### Removed
+- Remove Ruby 1.9.3 support; add Ruby 2.3.0 support
+
 ## [1.1.0] - 2016-04-26
 ### Fixed
 - fix comparison of number against array in --last.
@@ -49,7 +62,8 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 ### Added
 - initial release
 
-[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-graphite/compare/1.1.0...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-graphite/compare/2.0.0...HEAD
+[2.0.0]: https://github.com/sensu-plugins/sensu-plugins-graphite/compare/1.1.0...2.0.0
 [1.1.0]: https://github.com/sensu-plugins/sensu-plugins-graphite/compare/1.0.0...1.1.0
 [1.0.0]: https://github.com/sensu-plugins/sensu-plugins-graphite/compare/0.0.7...1.0.0
 [0.0.7]: https://github.com/sensu-plugins/sensu-plugins-graphite/compare/0.0.6...0.0.7

data/README.md

@@ -44,6 +44,28 @@
 }
 ```
 
+**handler-graphite-notify**
+```
+{
+ "graphite_notify": {
+    "host":"graphite.example.com",
+    "port":"2003",
+    "prefix":"sensu.events"
+ }
+}
+```
+
+**handler-graphite-status**
+```
+{
+ "graphite_notify": {
+    "host":"graphite.example.com",
+    "port":"2003",
+    "prefix":"sensu.events"
+ }
+}
+```
+
 ## Installation
 
 [Installation and Setup](http://sensu-plugins.io/docs/installation_instructions.html)

data/bin/check-graphite-data.rb

@@ -130,8 +130,10 @@ class CheckGraphiteData < Sensu::Plugin::Check::CLI
           end
           output
         end
+      rescue SocketError
+        unknown 'Failed to connect to graphite server'
       rescue OpenURI::HTTPError
-        unknown 'Failed to connect to Graphite server'
+        unknown 'Server error or invalid graphite expression'
       rescue NoMethodError
         unknown 'No data for time period and/or target'
       rescue Errno::ECONNREFUSED

data/bin/handler-graphite-status.rb

@@ -0,0 +1,30 @@
+#!/usr/bin/env ruby
+#
+# Released under the same terms as Sensu (the MIT license); see LICENSE
+# for details
+#
+# This will send the check status (0,1,2,3) to a graphite metric when a check event state changes
+# Based on handler-graphite-notify.rb
+# See http://imansson.wordpress.com/2012/11/26/why-sensu-is-a-monitoring-router-some-cool-handlers/
+
+require 'sensu-handler'
+require 'simple-graphite'
+
+class Resolve < Sensu::Handler
+  def handle
+    port = settings['graphite_notify']['port'] ? settings['graphite_notify']['port'].to_s : '2003'
+    graphite = Graphite.new(host: settings['graphite_notify']['host'], port: port)
+    return unless graphite
+    prop = @event['check']['status']
+    message = "#{settings['graphite_notify']['prefix']}.#{@event['client']['name'].tr('.', '_')}.#{@event['check']['name']}"
+    message += " #{prop} #{graphite.time_now + rand(100)}"
+    begin
+      graphite.push_to_graphite do |graphite_socket|
+        graphite_socket.puts message
+      end
+    rescue ETIMEDOUT
+      error_msg = "Can't connect to #{settings['graphite_notify']['host']}:#{port} and send message #{message}'"
+      raise error_msg
+    end
+  end
+end

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-graphite
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Sensu Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-27 00:00:00.000000000 Z
+date: 2016-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: array_stats
@@ -56,16 +56,16 @@ dependencies:
   name: sensu-plugin
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: simple-graphite
   requirement: !ruby/object:Gem::Requirement
@@ -84,132 +84,133 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
 - !ruby/object:Gem::Dependency
   name: github-markup
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.37'
+        version: 0.40.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.37'
+        version: 0.40.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
-description: ! "This plugin provides native Graphite instrumentation\n                              for
-  monitoring, including: replication status,\n                              various
-  Graphite data queries, mutators, and handlers"
-email: <sensu-users@googlegroups.com>
+description: |-
+  This plugin provides native Graphite instrumentation
+                                for monitoring, including: replication status,
+                                various Graphite data queries, mutators, and handlers
+email: "<sensu-users@googlegroups.com>"
 executables:
 - check-graphite-data.rb
 - check-graphite-hosts.rb
@@ -219,6 +220,7 @@ executables:
 - handler-graphite-event.rb
 - handler-graphite-notify.rb
 - handler-graphite-occurrences.rb
+- handler-graphite-status.rb
 - mutator-graphite.rb
 extensions: []
 extra_rdoc_files: []
@@ -234,6 +236,7 @@ files:
 - bin/handler-graphite-event.rb
 - bin/handler-graphite-notify.rb
 - bin/handler-graphite-occurrences.rb
+- bin/handler-graphite-status.rb
 - bin/mutator-graphite.rb
 - lib/sensu-plugins-graphite.rb
 - lib/sensu-plugins-graphite/graphite_proxy/options.rb
@@ -243,7 +246,7 @@ homepage: https://github.com/sensu-plugins/sensu-plugins-graphite
 licenses:
 - MIT
 metadata:
-  maintainer: ! '@mattyjones'
+  maintainer: "@mattyjones"
   development_status: active
   production_status: unstable - testing recommended
   release_draft: 'false'
@@ -255,18 +258,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Sensu plugins for graphite
 test_files: []
+has_rdoc: