sensu-plugins-cassandra 2.1.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a336e5efa785f31b5ab636f723dc38b2affccc07dd3770b3774372a2391df9d
-  data.tar.gz: d765b454aea378392de15d4e96e0f92c051d566a6685e6199c7ed0f6458eb168
+  metadata.gz: 40b659004dfe25d35fb353d9590464be6a5996ba37cd41b4b6f3fb171c1b1232
+  data.tar.gz: c22c1ae94208d57d757d41477ed0bb0aadbeff00b00a268215e084df8b18adb5
 SHA512:
-  metadata.gz: 8877d02a82239b29647861b52210ca36e3b4adf73f9f5ec2e71e0f32f122b43981b57350e2ac56e329d3dd7b68cab5734193f4eb12ef28ad8bf2ef8f4ce82801
-  data.tar.gz: 80211b68feb8fb6bc2d551f7b114ef5fffd5960ad1eefd36f421127b8504763135d131d13177dc79a139650e2cbd5343766dad2e0f55e343cf732b4979d726e3
+  metadata.gz: b75435763bcbb1e4757685b2dd87148c970fc3e5cb2985b9267bfe2d23b6490515322e00ba2be68b30cfd53295d9d0a425b838b8b9485836bfdd0f6a48fa9a07
+  data.tar.gz: 9dd068db1a9fe080a36122e8663b881ca784d314d9b9263961d849beabd51f1206471819c777c0683801263b91f5e3a6d7f842f631f992b1405d7ddac7b609f8

data/CHANGELOG.md

@@ -5,6 +5,23 @@ This CHANGELOG follows the format listed [here](https://github.com/sensu-plugins
 
 ## [Unreleased]
 
+## [3.0.0] - 2020-05-12
+### Breaking Changes
+- Update minimum required ruby version to 2.3. Drop unsupported ruby versions.
+- Bump `sensu-plugin` dependency to `~> 4.0`
+
+### Added
+- Bonsai asset support
+
+### Changed
+- Updated english dependency to '0.7.0'
+- Updated bundler dependency to '~> 2.1'
+- Updated rubocop dependency to '~> 0.81.0'
+- Remediated rubocop issues
+- Updated rake dependency to '~> 13.0'
+- Update codeclimate-test-reporter to '~> 1.0'
+- metrics-cassandra-graphite.rb: Added support for Row Cache in Cassandra 3.0+
+
 ## [2.1.0] - 2019-03-04
 ### Added
 - metrics-cassandra-graphite.rb: Earlier versions of nodetool incorrectly append a `.` to the `ms` SI unit. In newer versions where this has been corrected, the missing `.` failed to match causing a missed `chomp` operation. (@zenmetsu)
@@ -68,7 +85,8 @@ This CHANGELOG follows the format listed [here](https://github.com/sensu-plugins
 ### Added
 - initial release
 
-[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-cassandra/compare/2.1.0...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-cassandra/compare/3.0.0...HEAD
+[3.0.0]: https://github.com/sensu-plugins/sensu-plugins-cassandra/compare/2.1.0...3.0.0
 [2.1.0]: https://github.com/sensu-plugins/sensu-plugins-cassandra/compare/2.0.2...2.1.0
 [2.0.2]: https://github.com/sensu-plugins/sensu-plugins-cassandra/compare/2.0.1...2.0.2
 [2.0.1]: https://github.com/sensu-plugins/sensu-plugins-cassandra/compare/2.0.0...2.0.1

data/bin/check-cassandra-schema.rb

@@ -1,4 +1,6 @@
 #! /usr/bin/env ruby
+# frozen_string_literal: true
+
 #
 # check-cassandra-schema
 #
@@ -68,14 +70,14 @@ class CheckCassandraSchema < Sensu::Plugin::Check::CLI
         bad_nodes << m[2]
         next
       end
-      if bad_nodes.count > 0
+      if bad_nodes.count > 0 # rubocop: disable Style/NumericPredicate
         if m = line.match(/\s+(.*)\[(.*)\]\s+$/)# rubocop:disable all
           bad_nodes << m[2]
         end
       end
     end
 
-    if bad_nodes.count > 0
+    if bad_nodes.count > 0 # rubocop: disable Style/NumericPredicate
       critical('nodes ' + bad_nodes.join(', ') + ' are in schema disagreement')
     else
       ok

data/bin/metrics-cassandra-graphite.rb

@@ -1,4 +1,6 @@
 #! /usr/bin/env ruby
+# frozen_string_literal: true
+
 #
 #   cassandra-graphite
 #
@@ -222,7 +224,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 Metrics/LineLength
+      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 Layout/LineLength
         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
@@ -236,6 +238,17 @@ class CassandraMetrics < Sensu::Plugin::Metric::CLI::Graphite
         output "#{config[:scheme]}.row_cache.hits", m[3], @timestamp
         output "#{config[:scheme]}.row_cache.requests", m[4], @timestamp
       end
+
+      # cassandra nodetool v3.0+  Changed the row cache output
+      # Row Cache : entries 569669, size 100 MiB, capacity 100 MiB, 35689224 hits, 70654365 requests, 0.505 recent hit rate, 14400 save period in seconds
+      # Row 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(/^Row 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 Layout/LineLength
+        output "#{config[:scheme]}.row_cache.size", convert_to_bytes(m[2], m[3]), @timestamp
+        output "#{config[:scheme]}.row_cache.capacity", convert_to_bytes(m[4], m[5]), @timestamp
+        output "#{config[:scheme]}.row_cache.hits", m[6], @timestamp
+        output "#{config[:scheme]}.row_cache.requests", m[7], @timestamp
+        output "#{config[:scheme]}.row_cache.hit_rate", m[8], @timestamp
+      end
     end
   end
 
@@ -335,7 +348,7 @@ class CassandraMetrics < Sensu::Plugin::Metric::CLI::Graphite
   # - a line preceeded by 1 tab contains keyspace metrics
   # - a line preceeded by 2 tabs contains column family metrics
   def parse_cfstats
-    def get_metric(string) # rubocop:disable NestedMethodDefinition
+    def get_metric(string) # rubocop:disable Lint/NestedMethodDefinition
       string.strip!
       (metric, value) = string.split(': ')
       if metric.nil? || value.nil? # rubocop:disable Style/GuardClause
@@ -350,6 +363,7 @@ class CassandraMetrics < Sensu::Plugin::Metric::CLI::Graphite
         # some versions of nodetool omit the '.' following the 'ms' unit.
         value = value.chomp(' ms.').chomp(' ms')
       end
+
       [metric, value]
     end
 

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

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 module SensuPluginsCassandra
   module Version
-    MAJOR = 2
-    MINOR = 1
+    MAJOR = 3
+    MINOR = 0
     PATCH = 0
 
     VER_STRING = [MAJOR, MINOR, PATCH].compact.join('.')

data/lib/sensu-plugins-cassandra.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require 'sensu-plugins-cassandra/version'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-cassandra
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Sensu Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-05 00:00:00.000000000 Z
+date: 2020-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: english
@@ -16,56 +16,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.3
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.3
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: sensu-plugin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: github-markup
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.51.0
+        version: 0.81.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.51.0
+        version: 0.81.0
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -203,14 +203,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.0
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Sensu plugins for the Cassandra NoSQL database server