sensu-plugins-graphite 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8331eec9eb6a5f9cf9247c209a05cbd4735c67c4
-  data.tar.gz: a0add0a78abe919a5c43f8df3241f1123ce09ffa
+  metadata.gz: d927f5d0696a7ae2fd4e5b80737c2dd04871dcf5
+  data.tar.gz: 00a59e69564492be952412b9fa7ee085cebe7217
 SHA512:
-  metadata.gz: 7e0ada3c1be5f354b91f03955036e15efbc79a180dfcece3135d743a148eac9fd5ae9c5698d6c5050ff9a82fdbe92cf86a759bb5b59b5805a448aae012c3a9d7
-  data.tar.gz: 928b1e29800fe91a4f951a4059786179a19b8954f37f244c6cd74dae05a0982ec2f25b67f3abe36e86fd73a98a4f1e3d405a60a81e920e90ecdbdd365850337e
+  metadata.gz: e99c76be15977f9ba3423c5fd42fd4b6b121d4670dcd8ccda431bed1ccf93e275c9edd1336b49d73cc2cb8714db2c09897d3a42bf39434701a4befc49ffa3c57
+  data.tar.gz: d5c6ca351b7a3f13e5433a2492f7cd6132c746be4ed76ff71d50d741fee2c3b1b3e539ccceae71656735a9a504f479867cbfffad49dde28757a41980d1c3f16f

data/CHANGELOG.md

@@ -4,12 +4,15 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachangelog.com/)
 
 ## [Unreleased]
+
 ## [2.1.0]
 ### Changed
 - Disable filtering for handler-graphite-status.rb
 ### Fixed
 - Error handling in graphite handlers
 - Duplicate short option in check-graphite.rb
+### Removed
+- check-graphite-data.rb: Removed unused method `retrieve_data` since it's duplicate from graphite_proxy
 
 ## [2.0.0] - 2016-06-21
 ### Added
@@ -68,7 +71,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/2.1.0...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-graphite/compare/2.2.0...HEAD
+[2.2.0]: https://github.com/sensu-plugins/sensu-plugins-graphite/compare/2.1.0...2.2.0
 [2.1.0]: https://github.com/sensu-plugins/sensu-plugins-graphite/compare/2.0.0...2.1.0
 [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

data/bin/check-graphite-data.rb

@@ -84,70 +84,6 @@ class CheckGraphiteData < Sensu::Plugin::Check::CLI
     end
   end
 
-  # grab data from graphite
-  def retrieve_data
-    unless @raw_data
-      begin
-        unless config[:server].start_with?('https://', 'http://')
-          config[:server].prepend('http://')
-        end
-
-        url = "#{config[:server]}/render?format=json&target=#{formatted_target}&from=#{config[:from]}&until=#{config[:until]}"
-
-        url_opts = {}
-
-        if config[:no_ssl_verify]
-          url_opts[:ssl_verify_mode] = OpenSSL::SSL::VERIFY_NONE
-        end
-
-        if config[:username] && (config[:password] || config[:passfile])
-          if config[:passfile]
-            pass = File.open(config[:passfile]).readline
-          elsif config[:password]
-            pass = config[:password]
-          end
-
-          url_opts[:http_basic_authentication] = [config[:username], pass.chomp]
-        end # we don't have both username and password trying without
-
-        handle = open(url, url_opts)
-
-        @raw_data = handle.gets
-        if @raw_data == '[]'
-          unknown 'Empty data received from Graphite - metric probably doesn\'t exist'
-        else
-          @json_data = JSON.parse(@raw_data)
-          output = {}
-          @json_data.each do |raw|
-            raw['datapoints'].delete_if { |v| v.first.nil? }
-            next if raw['datapoints'].empty?
-            target = raw['target']
-            data = raw['datapoints'].map(&:first)
-            start = raw['datapoints'].first.last
-            dend = raw['datapoints'].last.last
-            step = ((dend - start) / raw['datapoints'].size.to_f).ceil
-            output[target] = { 'target' => target, 'data' => data, 'start' => start, 'end' => dend, 'step' => step }
-          end
-          output
-        end
-      rescue SocketError
-        unknown 'Failed to connect to graphite server'
-      rescue OpenURI::HTTPError
-        unknown 'Server error or invalid graphite expression'
-      rescue NoMethodError
-        unknown 'No data for time period and/or target'
-      rescue Errno::ECONNREFUSED
-        unknown 'Connection refused when connecting to Graphite server'
-      rescue Errno::ECONNRESET
-        unknown 'Connection reset by peer when connecting to Graphite server'
-      rescue EOFError
-        unknown 'End of file error when reading from Graphite server'
-      rescue => e
-        unknown "An unknown error occurred: #{e.inspect}"
-      end
-    end
-  end
-
   # type:: :warning or :critical
   # Return alert if required
   def check(type)

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

@@ -1,7 +1,7 @@
 module SensuPluginsGraphite
   module Version
     MAJOR = 2
-    MINOR = 1
+    MINOR = 2
     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: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Sensu Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-10 00:00:00.000000000 Z
+date: 2017-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: array_stats