riemann-tools 1.0.0 → 1.1.0

data/tools/riemann-riak/riak_status/riak_status.rb

@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby
-Process.setproctitle($0)
+# frozen_string_literal: true
+
+Process.setproctitle($PROGRAM_NAME)
 
 $LOAD_PATH.unshift File.expand_path("#{File.dirname(__FILE__)}/../vodpod-common/lib")
 require 'rubygems'
@@ -15,17 +17,17 @@ class RiakStatus
   INTERVAL = 10
 
   FSM_LIMITS = {
-    :get => {
+    get: {
       50 => 1000,
       95 => 2000,
-      99 => 10000
+      99 => 10_000,
     },
-    :put => {
-       50 => 1000,
-       95 => 2000,
-       99 => 10000
-    }
-  }
+    put: {
+      50 => 1000,
+      95 => 2000,
+      99 => 10_000,
+    },
+  }.freeze
 
   def initialize(opts = {})
     @host = opts[:host] || `hostname`.chomp
@@ -35,15 +37,15 @@ class RiakStatus
 
   def alert(subservice, state, metric, description)
     Vodpod.alert(
-      :service => "riak #{subservice}",
-      :state => state,
-      :metric => metric,
-      :description => description
+      service: "riak #{subservice}",
+      state: state,
+      metric: metric,
+      description: description,
     )
   end
 
   def check_ring
-    str = `#{File.expand_path(File.dirname(__FILE__))}/ringready.erl riak@#{`hostname`}`.chomp
+    str = %x(#{__dir__}/ringready.erl riak@#{`hostname`}).chomp
     if str =~ /^TRUE/
       alert 'ring', :ok, nil, str
     else
@@ -52,7 +54,7 @@ class RiakStatus
   end
 
   def check_keys
-    keys = `#{File.expand_path(File.dirname(__FILE__))}/key_count.erl riak@#{`hostname`}`.chomp
+    keys = %x(#{__dir__}/key_count.erl riak@#{`hostname`}).chomp
     if keys =~ /^\d+$/
       alert 'keys', :ok, keys.to_i, keys
     else
@@ -74,9 +76,9 @@ class RiakStatus
   def fsm_state(type, percentile, val)
     limit = FSM_LIMITS[type][percentile]
     case val
-    when 0 .. limit
+    when 0..limit
       :ok
-    when limit .. limit * 2
+    when limit..limit * 2
       :warning
     else
       :critical
@@ -88,11 +90,11 @@ class RiakStatus
       res = Net::HTTP.start(@host, @port) do |http|
         http.get('/stats')
       end
-    rescue => e
+    rescue StandardError => e
       Vodpod.alert(
-        :service => 'riak',
-        :state => :critical,
-        :description => "error fetching /stats: #{e.class}, #{e.message}"
+        service: 'riak',
+        state: :critical,
+        description: "error fetching /stats: #{e.class}, #{e.message}",
       )
       return
     end
@@ -101,36 +103,36 @@ class RiakStatus
       stats = JSON.parse(res.body)
     else
       Vodpod.alert(
-        :service => 'riak',
-        :state => :critical,
-        :description => "stats returned HTTP #{res.code}:\n\n#{res.body}"
+        service: 'riak',
+        state: :critical,
+        description: "stats returned HTTP #{res.code}:\n\n#{res.body}",
       )
       return
     end
 
     Vodpod.alert(
-      :service => 'riak',
-      :state => :ok
+      service: 'riak',
+      state: :ok,
     )
 
     # Gets/puts/rr
-    [
-      'vnode_gets', 
-      'vnode_puts', 
-      'node_gets', 
-      'node_puts', 
-      'read_repairs' 
+    %w[
+      vnode_gets
+      vnode_puts
+      node_gets
+      node_puts
+      read_repairs
     ].each do |s|
-      alert s, :ok, stats[s]/60.0, "#{stats[s]/60.0}/sec"
+      alert s, :ok, stats[s] / 60.0, "#{stats[s] / 60.0}/sec"
     end
 
     # FSMs
-    [:get, :put].each do |type|
+    %i[get put].each do |type|
       [50, 95, 99].each do |percentile|
         val = stats[fsm_stat(type, percentile)] || 0
         val = 0 if val == 'undefined'
         val /= 1000.0 # Convert us to ms
-        state = fsm_state(type, percentile, val) 
+        state = fsm_state(type, percentile, val)
         alert "#{type} #{percentile}", state, val, "#{val} ms"
       end
     end
@@ -138,7 +140,7 @@ class RiakStatus
 
   def run
     loop do
-#      check_keys
+      #      check_keys
       check_stats
       check_ring
       check_disk
@@ -147,6 +149,4 @@ class RiakStatus
   end
 end
 
-if $0 == __FILE__
-  RiakStatus.new.run
-end
+RiakStatus.new.run if $PROGRAM_NAME == __FILE__

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: riemann-tools
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Kyle Kingsbury
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-22 00:00:00.000000000 Z
+date: 2022-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -100,6 +100,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Collection of utilities which submit events to Riemann,
 email:
 - aphyr@aphyr.com
@@ -129,9 +171,12 @@ extra_rdoc_files: []
 files:
 - ".docker/Dockerfile"
 - ".docker/publish.sh"
+- ".github/dependabot.yml"
 - ".github/workflows/ci.yml"
+- ".github/workflows/codeql-analysis.yml"
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
@@ -139,6 +184,7 @@ files:
 - LICENSE
 - README.markdown
 - Rakefile
+- SECURITY.md
 - bin/riemann-apache-status
 - bin/riemann-bench
 - bin/riemann-cloudant
@@ -160,12 +206,15 @@ files:
 - bin/riemann-varnish
 - bin/riemann-zookeeper
 - lib/riemann/tools.rb
+- lib/riemann/tools/health.rb
+- lib/riemann/tools/net.rb
+- lib/riemann/tools/ntp.rb
 - lib/riemann/tools/utils.rb
 - lib/riemann/tools/version.rb
 - riemann-tools.gemspec
 - tools/riemann-aws/LICENSE
 - tools/riemann-aws/README.md
-- tools/riemann-aws/Rakefile.rb
+- tools/riemann-aws/Rakefile
 - tools/riemann-aws/bin/riemann-aws-billing
 - tools/riemann-aws/bin/riemann-aws-rds-status
 - tools/riemann-aws/bin/riemann-aws-sqs-status
@@ -175,35 +224,35 @@ files:
 - tools/riemann-aws/bin/riemann-s3-status
 - tools/riemann-chronos/LICENSE
 - tools/riemann-chronos/README.md
-- tools/riemann-chronos/Rakefile.rb
+- tools/riemann-chronos/Rakefile
 - tools/riemann-chronos/bin/riemann-chronos
 - tools/riemann-docker/LICENSE
 - tools/riemann-docker/README.md
-- tools/riemann-docker/Rakefile.rb
+- tools/riemann-docker/Rakefile
 - tools/riemann-docker/bin/riemann-docker
 - tools/riemann-elasticsearch/LICENSE
 - tools/riemann-elasticsearch/README.md
-- tools/riemann-elasticsearch/Rakefile.rb
+- tools/riemann-elasticsearch/Rakefile
 - tools/riemann-elasticsearch/bin/riemann-elasticsearch
 - tools/riemann-marathon/LICENSE
 - tools/riemann-marathon/README.md
-- tools/riemann-marathon/Rakefile.rb
+- tools/riemann-marathon/Rakefile
 - tools/riemann-marathon/bin/riemann-marathon
 - tools/riemann-mesos/LICENSE
 - tools/riemann-mesos/README.md
-- tools/riemann-mesos/Rakefile.rb
+- tools/riemann-mesos/Rakefile
 - tools/riemann-mesos/bin/riemann-mesos
 - tools/riemann-munin/LICENSE
 - tools/riemann-munin/README.md
-- tools/riemann-munin/Rakefile.rb
+- tools/riemann-munin/Rakefile
 - tools/riemann-munin/bin/riemann-munin
 - tools/riemann-rabbitmq/LICENSE
 - tools/riemann-rabbitmq/README.md
-- tools/riemann-rabbitmq/Rakefile.rb
+- tools/riemann-rabbitmq/Rakefile
 - tools/riemann-rabbitmq/bin/riemann-rabbitmq
 - tools/riemann-riak/LICENSE
 - tools/riemann-riak/README.md
-- tools/riemann-riak/Rakefile.rb
+- tools/riemann-riak/Rakefile
 - tools/riemann-riak/bin/riemann-riak
 - tools/riemann-riak/bin/riemann-riak-keys
 - tools/riemann-riak/bin/riemann-riak-ring
@@ -218,7 +267,7 @@ metadata:
   homepage_uri: https://github.com/aphyr/riemann-tools
   source_code_uri: https://github.com/aphyr/riemann-tools
   changelog_uri: https://github.com/aphyr/riemann-tools
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -226,15 +275,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.5
-signing_key: 
+rubygems_version: 3.3.16
+signing_key:
 specification_version: 4
 summary: Utilities which submit events to Riemann.
 test_files: []