cassandra-utils 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e37957c030dfb9729a4d2b98df7db3acc002f68
-  data.tar.gz: b56baf5d6d2a88963a0803e1f0abfd1931ea7f77
+  metadata.gz: 7669e6c8e65ba8d0f99b6f6e0a3d851b2d331206
+  data.tar.gz: e4e42e9f78743fe47a245407a28cbaee51e5a725
 SHA512:
-  metadata.gz: ce642b41f5a82d32cf9005a7fa263dd00be640c747b2dd70266d9876ce476845db347301dbe52a74707bafddd1b1d42186cdaa4301a1370578e2b9be8f403b65
-  data.tar.gz: ec1f02d0538917e2a6b64ffbeaeddce83c226b68e27215b21bfdd8602706208c71a1a1f573a7030372c65861e6854fa0ddac493007d4e2656166760e0c4106cd
+  metadata.gz: ae0b349f3ad4ecbe8eadf7cb93c9194f5870a1bc98531b4e05bd7c98008794e1ac4aead9159805d380256d800fb5c3e79a499908ba1b2c36ae1f7e0179f61bfc
+  data.tar.gz: 99a46df29e78d2df53daaeb8ab14a653e2cba623746f829cca96e51685f11c3d74740cc308722e7151442c858954405f99fa7fd3c379cbd64ac719ec3c0af50f

data/Gemfile.lock

@@ -55,3 +55,6 @@ DEPENDENCIES
   minitest (~> 5.0)
   rake (~> 10.0)
   thor-scmversion (= 1.7.0)
+
+BUNDLED WITH
+   1.12.5

data/lib/cassandra/utils/stats/health.rb

@@ -5,8 +5,8 @@ module Cassandra
         def run!
           running = true
           if state == :normal
-            running &&= nodetool_statusgossip.strip == 'running'
-            running &&= nodetool_statusthrift.strip == 'running'
+            running &&= gossipstate == 'true'
+            running &&= thriftstate == 'true'
           end
           Utils::Statsd.new(metric_name).to_dd(running).push!
           running
@@ -16,11 +16,42 @@ module Cassandra
           'cassandra.service.running'
         end
 
+        # Return the state of nodetool info gossip
+        #
+        # The returned state is reported by "nodetool info".
+        #
+        # @return [String, nil]
+       def gossipstate
+          results = (nodetool_info || '').split("\n")
+          results.map! { |line| line.strip }
+          results.select! { |line| line.include? 'Gossip active' }
+          results.map! { |line| line.split(':')[1] }
+          results.compact!
+          return nil if results.size != 1
+          results.first.strip.downcase
+        end
+
+
+        # Return the state of nodetool info thrift
+        #
+        # The returned state is reported by "nodetool info".
+        #
+        # @return [String, nil]
+        def thriftstate
+          results = (nodetool_info || '').split("\n")
+          results.map! { |line| line.strip }
+          results.select! { |line| line.include? 'Thrift active' }
+          results.map! { |line| line.split(':')[1] }
+          results.compact!
+          return nil if results.size != 1
+          results.first.strip.downcase
+        end
+
         # Return the state of the Cassandra node
         #
         # The returned state is reported by "nodetool netstats".
         #
-        # @return [state, nil]
+        # @return [Symbol, nil]
         #
         def state
           results = (nodetool_netstats || '').split("\n")
@@ -38,25 +69,16 @@ module Cassandra
 
         private
 
-        # Run the "nodetool statusgossip' command and return the output
+        # Shell out via DaemonRunner to run 'nodetool info'
         #
-        # @return [String, nil] Output from the "nodetool statusgossip" command
+        # The returned state is either true or false
         #
-        def nodetool_statusgossip
-          @nodetool_statusgossip ||= DaemonRunner::ShellOut.new(command: 'nodetool statusgossip')
-          @nodetool_statusgossip.run!
-          @nodetool_statusgossip.stdout
-        end
-
-        # Run the "nodetool statusthrift' command and return the output
-        #
-        # @return [String, nil] Output from the "nodetool statusthrift" command
-        #
-        def nodetool_statusthrift
-          @nodetool_statusthrift||= DaemonRunner::ShellOut.new(command: 'nodetool statusthrift')
-          @nodetool_statusthrift.run!
-          @nodetool_statusthrift.stdout
-        end
+        # @return [String, nil] Output from the "nodetool info" command 
+       def nodetool_info
+            @nodetool_info ||= DaemonRunner::ShellOut.new(command: 'nodetool info')
+            @nodetool_info.run!
+            @nodetool_info.stdout
+          end
 
         # Run the "nodetool netstats' command and return the output
         #

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cassandra-utils
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Andrew Thompson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-05 00:00:00.000000000 Z
+date: 2017-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout