sensu-plugins-cassandra 1.1.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 925b77d90a0a879862525458336631c6e50b4619
-  data.tar.gz: a6e20356742ac90f24f7e58f54f6dac45f7c9513
+SHA256:
+  metadata.gz: 5175210590aa992233aaf2396f1a29783f2afdaed02c9850231b29e63320f69a
+  data.tar.gz: 90056fde694e649374cef94d4774ae6e0c0ee895e988e575bbe5f61e6227a5a4
 SHA512:
-  metadata.gz: 436a0469608a8b4718f5e7d3d65e35ca177aa30817f54c3919872d72d7a00147fc84e7ed72d71ee95d3f1f3ee3771d12d38e40ea76dc781542d93f49e3d3735f
-  data.tar.gz: 90196137f354d5b47446e1f2465856dec2968cdac84cf62aeec57f5e74b4df873873445b4aa3d6c27b6d479c8682496dbc7e8fc4f3881db9e28877af9f89688a
+  metadata.gz: 5b6e523c3b04f370a4b3bd2780724b171c7dda40bf07c20a8dfadb069965f2e05e1a2b00d3d562a309d120ee230c38ef82359f3162a8f9c9029843389ee3dd5c
+  data.tar.gz: 5ccec39942326f27674f94331da83aa7a0327588e138d172aea6645298df58d5d1312b68568f9f6a2ffac5f5f3010cdc940839c6059872d50e5c15c4578925a8

data/CHANGELOG.md

@@ -1,10 +1,24 @@
 # Change Log
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachangelog.com/)
+This CHANGELOG follows the format listed [here](https://github.com/sensu-plugins/community/blob/master/HOW_WE_CHANGELOG.md)
 
 ## [Unreleased]
 
+## [2.0.1] - 2018-01-23
+### Changed
+- no-op change (@majormoses)
+
+## [2.0.0] - 2018-01-23
+### Security
+- updated `rubocop` dependency to `~> 0.51.0` per: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-8418. (@majormoses)
+
+### Breaking Changes
+- in order to bring in new rubocop dependency we need to drop ruby 2.0 support as it is EOL and aligns with out support policy. (@majormoses)
+
+### Changed
+- updated Changelog guideline location (@majormoses)
+
 ## [1.1.0] 2017-07-26
 ### Added
 - Test Ruby 2.4.1 (@thomasriley)
@@ -43,7 +57,9 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 ### Added
 - initial release
 
-[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-cassandra/compare/1.0.0...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-cassandra/compare/2.0.1...HEAD
+[2.0.1]: https://github.com/sensu-plugins/sensu-plugins-cassandra/compare/2.0.0...2.0.1
+[2.0.0]: https://github.com/sensu-plugins/sensu-plugins-cassandra/compare/1.0.0...2.0.0
 [1.0.0]: https://github.com/sensu-plugins/sensu-plugins-cassandra/compare/0.0.5...1.0.0
 [0.0.5]: https://github.com/sensu-plugins/sensu-plugins-cassandra/compare/0.0.4...0.0.5
 [0.0.4]: https://github.com/sensu-plugins/sensu-plugins-cassandra/compare/0.0.3...0.0.4

data/bin/metrics-cassandra-graphite.rb

@@ -189,29 +189,30 @@ class CassandraMetrics < Sensu::Plugin::Metric::CLI::Graphite
   # According to io/util/FileUtils.java units for load are:
   # TB/GB/MB/KB/bytes
   #
-  def parse_info# rubocop:disable all
+  def parse_info
     info = nodetool_cmd('info')
     # #YELLOW
-    info.each_line do |line|
-      if m = line.match(/^Exceptions\s*:\s+([0-9]+)$/)# rubocop:disable all
+    # TODO: come back and refactor me to be better
+    info.each_line do |line| # rubocop:disable Metrics/BlockLength
+      if m == line.match(/^Exceptions\s*:\s+([0-9]+)$/)
         output "#{config[:scheme]}.exceptions", m[1], @timestamp
       end
 
-      if m = line.match(/^Load\s*:\s+([0-9.]+)\s+([KMGT]i?B|bytes)$/)# rubocop:disable all
+      if m =+ line.match(/^Load\s*:\s+([0-9.]+)\s+([KMGT]i?B|bytes)$/)# rubocop:disable all
         output "#{config[:scheme]}.load", convert_to_bytes(m[1], m[2]), @timestamp
       end
 
-      if m = line.match(/^Uptime[^:]+:\s+(\d+)$/)# rubocop:disable all
+      if m == line.match(/^Uptime[^:]+:\s+(\d+)$/)
         output "#{config[:scheme]}.uptime", m[1], @timestamp
       end
 
-      if m = line.match(/^Heap Memory[^:]+:\s+([0-9.]+)\s+\/\s+([0-9.]+)$/)# rubocop:disable all
+      if m == line.match(/^Heap Memory[^:]+:\s+([0-9.]+)\s+\/\s+([0-9.]+)$/)# rubocop:disable all
         output "#{config[:scheme]}.heap.used", convert_to_bytes(m[1], 'MB'), @timestamp
         output "#{config[:scheme]}.heap.total", convert_to_bytes(m[2], 'MB'), @timestamp
       end
 
       # v1.1+
-      if m = line.match(/^Key Cache[^:]+: size ([0-9]+) \(bytes\), capacity ([0-9]+) \(bytes\), ([0-9]+) hits, ([0-9]+) requests/)# rubocop:disable all
+      if m == line.match(/^Key Cache[^:]+: size ([0-9]+) \(bytes\), capacity ([0-9]+) \(bytes\), ([0-9]+) hits, ([0-9]+) requests/)# rubocop:disable all
         output "#{config[:scheme]}.key_cache.size", m[1], @timestamp
         output "#{config[:scheme]}.key_cache.capacity", m[2], @timestamp
         output "#{config[:scheme]}.key_cache.hits", m[3], @timestamp
@@ -221,7 +222,7 @@ class CassandraMetrics < Sensu::Plugin::Metric::CLI::Graphite
       # cassandra nodetool v3.0+  Changed the key cache output
       # Key Cache : entries 569669, size 100 MiB, capacity 100 MiB, 35689224 hits, 70654365 requests, 0.505 recent hit rate, 14400 save period in seconds
       # Key Cache : entries 13291, size 7.83 MB, capacity 50 MB, 119444 hits, 139720 requests, 0.855 recent hit rate, 14400 save period in seconds
-      if m = line.match(/^Key Cache[^:]+: entries ([0-9]+), size ([-+]?[0-9]*\.?[0-9]+) ([KMGT]i?B|bytes), capacity ([-+]?[0-9]*\.?[0-9]+) ([KMGT]i?B|bytes), ([0-9]+) hits, ([0-9]+) requests, ([-+]?[0-9]*\.?[0-9]+) recent hit rate/)# rubocop:disable all
+      if m == line.match(/^Key Cache[^:]+: entries ([0-9]+), size ([-+]?[0-9]*\.?[0-9]+) ([KMGT]i?B|bytes), capacity ([-+]?[0-9]*\.?[0-9]+) ([KMGT]i?B|bytes), ([0-9]+) hits, ([0-9]+) requests, ([-+]?[0-9]*\.?[0-9]+) recent hit rate/)# rubocop:disable all
         output "#{config[:scheme]}.key_cache.size", convert_to_bytes(m[2], m[3]), @timestamp
         output "#{config[:scheme]}.key_cache.capacity", convert_to_bytes(m[4], m[5]), @timestamp
         output "#{config[:scheme]}.key_cache.hits", m[6], @timestamp
@@ -229,7 +230,7 @@ class CassandraMetrics < Sensu::Plugin::Metric::CLI::Graphite
         output "#{config[:scheme]}.key_cache.hit_rate", m[8], @timestamp
       end
 
-      if m = line.match(/^Row Cache[^:]+: size ([0-9]+) \(bytes\), capacity ([0-9]+) \(bytes\), ([0-9]+) hits, ([0-9]+) requests/)# rubocop:disable all
+      if m == line.match(/^Row Cache[^:]+: size ([0-9]+) \(bytes\), capacity ([0-9]+) \(bytes\), ([0-9]+) hits, ([0-9]+) requests/)# rubocop:disable all
         output "#{config[:scheme]}.row_cache.size", m[1], @timestamp
         output "#{config[:scheme]}.row_cache.capacity", m[2], @timestamp
         output "#{config[:scheme]}.row_cache.hits", m[3], @timestamp
@@ -362,7 +363,7 @@ class CassandraMetrics < Sensu::Plugin::Metric::CLI::Graphite
         keyspace = m[1]
       elsif m = line.match(/\t\tColumn Family[^:]*:\s+(\w+)$/)# rubocop:disable all
         cf = m[1]
-      elsif num_indents == 0
+      elsif num_indents.zero?
         # keyspace = nil
         cf = nil
       elsif num_indents == 2 && !cf.nil?

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-cassandra
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Sensu Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-26 00:00:00.000000000 Z
+date: 2018-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: english
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.40.0
+        version: 0.51.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.40.0
+        version: 0.51.0
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -203,7 +203,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -211,7 +211,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.7.4
 signing_key: 
 specification_version: 4
 summary: Sensu plugins for the Cassandra NoSQL database server