sensu-plugins-solr 0.0.3 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 446671209495f29684b67d65a95eded05bd0ec1e
-  data.tar.gz: 3b59bdc532a6f50ab14bd22499ab780d5745b379
+  metadata.gz: 11992ac5ed0b5c14db0c4a7e437907b8c2fe49a3
+  data.tar.gz: 049087c16e741bb495152c093b6a0e70c438db9d
 SHA512:
-  metadata.gz: 2b928e16bf9a177942e17c1ee14690615b310e85c2d74d1f9fa315885642a41872014a7ec557d25952149e79cba9a1f44b225ce1d22ba8da20c1183deb8533a0
-  data.tar.gz: a12224be6a12ad8c3232ffda5410b03f92d85d597727e88b8b842f50ac1b80ca9dc25d3d5325b2c0d0c83bc71d99e6211f68742a1ad4c5ceb4deca87cc2d0e85
+  metadata.gz: 2ec1725e02692f00ff41f3c66454fc2bf4704c71a538a5f85d332e514f8397ca367b708772bdfd1c1c2a689c2268b30d685d820d9fde07580ce81ae3d1c11fab
+  data.tar.gz: 4430bf7a967284a10121d4b1a97a57b60dc208b508a291ebddfa1107832533904f38cf27f9bcbb8137213fbab892674139df292f2b178c733026cb490251ac57

data/CHANGELOG.md

@@ -1,16 +1,25 @@
-#Change Log
+# Change Log
 This project adheres to [Semantic Versioning](http://semver.org/).
 
 This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachangelog.com/)
 
-## Unreleased][unreleased]
+## [Unreleased]
+
+## [1.0.0] - 2017-05-10
+### Added
+- Ruby 2.3 and 2.4 support (@eheydrick)
+
+### Removed
+- Ruby 1.9.3 support (@eheydrick)
+
+### Changed
+- Update to nokogiri `1.6.8.1` to address security issues (@eheydrick)
 
 ## [0.0.3] - 2015-07-14
 ### Changed
 - updated sensu-plugin gem to 1.2.0
 
 ## [0.0.2] - 2015-06-03
-
 ### Fixed
 - added binstubs
 
@@ -18,7 +27,10 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 - removed cruft from /lib
 
 ## 0.0.1 - 2015-05-20
-
 ### Added
 - initial release
 
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-solr/compare/1.0.0...HEAD
+[1.0.0]: https://github.com/sensu-plugins/sensu-plugins-solr/compare/0.0.3...1.0.0
+[0.0.3]: https://github.com/sensu-plugins/sensu-plugins-solr/compare/0.0.2...0.0.3
+[0.0.2]: https://github.com/sensu-plugins/sensu-plugins-solr/compare/0.0.1...0.0.2

data/README.md

@@ -5,7 +5,6 @@
 [![Code Climate](https://codeclimate.com/github/sensu-plugins/sensu-plugins-solr/badges/gpa.svg)](https://codeclimate.com/github/sensu-plugins/sensu-plugins-solr)
 [![Test Coverage](https://codeclimate.com/github/sensu-plugins/sensu-plugins-solr/badges/coverage.svg)](https://codeclimate.com/github/sensu-plugins/sensu-plugins-solr)
 [![Dependency Status](https://gemnasium.com/sensu-plugins/sensu-plugins-solr.svg)](https://gemnasium.com/sensu-plugins/sensu-plugins-solr)
-[ ![Codeship Status for sensu-plugins/sensu-plugins-solr](https://codeship.com/projects/b42f3150-dc04-0132-8e5a-1e3fe125131b/status?branch=master)](https://codeship.com/projects/79861)
 
 ## Functionality
 
@@ -18,6 +17,6 @@
 
 ## Installation
 
-[Installation and Setup](https://github.com/sensu-plugins/documentation/blob/master/user_docs/installation_instructions.md)
+[Installation and Setup](http://sensu-plugins.io/docs/installation_instructions.html)
 
 ## Notes

data/bin/metrics-solr-graphite.rb

@@ -42,7 +42,7 @@ class SolrGraphite < Sensu::Plugin::Metric::CLI::Graphite
          long: '--scheme SCHEME',
          default: "#{Socket.gethostname}.solr"
 
-  def run # rubocop:disable all
+  def run # rubocop:disable Metrics/AbcSize
     cores = []
     if config[:core]
       cores = [config[:core]]
@@ -55,12 +55,12 @@ class SolrGraphite < Sensu::Plugin::Metric::CLI::Graphite
     end
 
     cores.each do |core|
-      if config[:core]
-        # Don't include core name in scheme to match previous functionality
-        graphitepath = config[:scheme]
-      else
-        graphitepath = "#{config[:scheme]}.#{core}"
-      end
+      graphitepath = if config[:core]
+                       # Don't include core name in scheme to match previous functionality
+                       config[:scheme]
+                     else
+                       "#{config[:scheme]}.#{core}"
+                     end
       ping_url = "http://#{config[:host]}:#{config[:port]}/solr/#{core}/admin/ping?wt=json"
 
       resp = Net::HTTP.get_response(URI.parse(ping_url))
@@ -71,8 +71,8 @@ class SolrGraphite < Sensu::Plugin::Metric::CLI::Graphite
 
       stats_url = "http://#{config[:host]}:#{config[:port]}/solr/#{core}/admin/stats.jsp"
 
-      xml_data = Net::HTTP.get_response(URI.parse(stats_url)).body.gsub("\n", '')
-      stats  = Crack::XML.parse(xml_data)
+      xml_data = Net::HTTP.get_response(URI.parse(stats_url)).body.delete("\n")
+      stats = Crack::XML.parse(xml_data)
 
       # this xml is an ugly beast.
       core_searcher = stats['solr']['solr_info']['CORE']['entry'].find { |v| v['name'].strip! == 'searcher' }['stats']['stat']

data/bin/metrics-solr-v1.4graphite.rb

@@ -12,7 +12,7 @@ class SolrGraphite < Sensu::Plugin::Metric::CLI::Graphite
          short: '-h HOST',
          long: '--host HOST',
          description: 'Solr host to connect to',
-         default: "#{Socket.gethostname}"
+         default: Socket.gethostname.to_s
 
   option :port,
          short: '-p PORT',
@@ -24,11 +24,11 @@ class SolrGraphite < Sensu::Plugin::Metric::CLI::Graphite
   option :scheme,
          short: '-s SCHEME',
          long: '--scheme',
-         default: "#{Socket.gethostname}"
+         default: Socket.gethostname.to_s
 
   def lookingfor(needle, haystack)
     haystack.each_with_index do |element, index|
-      if element.css('name').text.strip == needle
+      if element.css('name').text.strip == needle # rubocop:disable Style/GuardClause
         return index
       else
         next
@@ -43,7 +43,7 @@ class SolrGraphite < Sensu::Plugin::Metric::CLI::Graphite
     end
   end
 
-  def run # rubocop:disable all
+  def run
     # Capture initial stats page XML data. Sol4 1.4 takes a while to load stats page, the timeout accomidates that.
     doc = Nokogiri::XML(open("http://#{config[:host]}:#{config[:port]}/solr/admin/stats.jsp", read_timeout: 300))
 
@@ -60,7 +60,7 @@ class SolrGraphite < Sensu::Plugin::Metric::CLI::Graphite
     ind_standard   = lookingfor('standard', doc.css('QUERYHANDLER entry'))
     ind_update     = lookingfor('/update', doc.css('QUERYHANDLER entry'))
     ind_update_hand = lookingfor('updateHandler', doc.css('UPDATEHANDLER entry'))
-    ind_cache      = lookingfor('queryResultCache', doc.css('CACHE entry'))
+    ind_cache = lookingfor('queryResultCache', doc.css('CACHE entry'))
     ind_doc_cache   = lookingfor('documentCache', doc.css('CACHE entry'))
     ind_fil_cache   = lookingfor('filterCache', doc.css('CACHE entry'))
 

data/bin/metrics-solr4-graphite.rb

@@ -99,7 +99,7 @@ class Solr4Graphite < Sensu::Plugin::Metric::CLI::Graphite
       end
 
       mbeans_json['solr-mbeans']['UPDATEHANDLER']['updateHandler']['stats'].each do |stat, value|
-        output "#{graphite_path}.updateHandler.#{stat.gsub(' ', '_')}", value if value.is_a?(Numeric)
+        output "#{graphite_path}.updateHandler.#{stat.tr(' ', '_')}", value if value.is_a?(Numeric)
       end
 
       # cache stats

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

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

metadata

@@ -1,51 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-solr
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 1.0.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
-cert_chain:
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIDgDCCAmigAwIBAgIBATANBgkqhkiG9w0BAQUFADBDMRIwEAYDVQQDDAltYXR0
-  am9uZXMxGDAWBgoJkiaJk/IsZAEZFgh5aWVsZGJvdDETMBEGCgmSJomT8ixkARkW
-  A2NvbTAeFw0xNTAxMjgyMTAyNTFaFw0xNjAxMjgyMTAyNTFaMEMxEjAQBgNVBAMM
-  CW1hdHRqb25lczEYMBYGCgmSJomT8ixkARkWCHlpZWxkYm90MRMwEQYKCZImiZPy
-  LGQBGRYDY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyTSzVYnO
-  CLgyrIyT1mBQakArQyW8xhi6MlDqyzXHJGeERT790U6EgoBVeS4XoK0ptFZNR8Tf
-  zko0w+Nv47TarSCgkPOaxY+mxWnAVR10dOmfeLr7huiMyps+YD56/EF2FqQ3jf/+
-  qohENfKD91qy1ieEy+Fn7Pf74ltbNKUdkb9a9eFXQ0DQ4ip5vik7DzjQkUTj4lca
-  k6ArwnmHX4YDhZoYtrQJ8jVktN0/+NtA40M5qkCYHNe5tUW25b/tKVYuioxG6b2Z
-  oIzaZxRLxf6HVAWpCVRT/F5+/yjigkX4u++eYacfLGleXQzoK7BL65vHGMJygWEE
-  0TKGqFOrl/L0AQIDAQABo38wfTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNV
-  HQ4EFgQUEf6a8Td7MrSZc8ImbLFZAENPbz0wIQYDVR0RBBowGIEWbWF0dGpvbmVz
-  QHlpZWxkYm90LmNvbTAhBgNVHRIEGjAYgRZtYXR0am9uZXNAeWllbGRib3QuY29t
-  MA0GCSqGSIb3DQEBBQUAA4IBAQBbzXAYA3BVGw8DZ0YYoY1VHPNEcH5qPIApmHO8
-  rvSmuUT0yMEi7u00H/5uHRFf4LleGT/+sTdyXKsNPGT9kdRuQEgwi+vf7Zfvd8aX
-  UF/+4VkEYf/8rV8Ere6u2QaWPgApdMV6JjKr1fAwCTd8AuGXNaWItiPPMseSQzLJ
-  JKP4hVvbc1d+oS925B1lcBiqn2aYvElbyNAVmQPywNNqkWmvtlqj9ZVJfV5HQLdu
-  8sHuVruarogxxKPBzlL2is4EUb6oN/RdpGx2l4254+nyR+abg//Ed27Ym0PkB4lk
-  HP0m8WSjZmFr109pE/sVsM5jtOCvogyujQOjNVGN4gz1wwPr
-  -----END CERTIFICATE-----
-date: 2015-07-14 00:00:00.000000000 Z
+cert_chain: []
+date: 2017-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   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: crack
   requirement: !ruby/object:Gem::Requirement
@@ -80,14 +58,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.6.6.2
+        version: 1.6.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.6.6.2
+        version: 1.6.8.1
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
@@ -106,16 +84,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.30'
+        version: 0.40.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.30'
+        version: 0.40.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -214,12 +192,15 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
-description: Sensu plugins for solr
+description: |-
+  This plugin provides native Apache Solr instrumentation for monitoring
+                                and metrics collection, including: service health, service connetivity, replication
+                                status, and a variety of metrics including memory consumption, open file counts, and more.
 email: "<sensu-users@googlegroups.com>"
 executables:
-- metrics-solr4-graphite.rb
-- metrics-solr-v1.4graphite.rb
 - metrics-solr-graphite.rb
+- metrics-solr-v1.4graphite.rb
+- metrics-solr4-graphite.rb
 extensions: []
 extra_rdoc_files: []
 files:
@@ -249,7 +230,7 @@ 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:
   - - ">="
@@ -257,7 +238,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Sensu plugins for solr

checksums.yaml.gz.sig

@@ -1 +0,0 @@
-�=�㻝�J��\�����U`~�Q\o^:5�(��