malsh 0.3.5 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac84ac7dfd01868083d18c3e6be4fecba347d7a748e96033bc49e6b2d0b25c35
-  data.tar.gz: 88e91d32de344e8416c57d0e86bb8983a67db9c46d9e4639ff6402648694f238
+  metadata.gz: d2921c475fe2f506e5112d5516ce9edd3dced93b747d54e201e75b501ce08e07
+  data.tar.gz: 667793ad29f16f1f5da072262f7a20ae568e991cf893ac4acff1ab5eec4bf945
 SHA512:
-  metadata.gz: 11cab119d65d791bfa156646c3891795af92125f62095694e9edbcfd53efc16a403505876d6941aaa1228d310cecdb888a437f904e879a4ea36f3e1760c8ee03
-  data.tar.gz: 15b728424b65bb9080773210f4737e45416a7b00f6cc2c3036060df061115d6ee489801f79859788f87fcbec8007566a920d3b8103637fafdad2ed6bfbe63b98
+  metadata.gz: ef60cccc6ff2ed471f23b2abb54e4976f405f9e923eab9e6c2f52d8dcb44c7abe82f63628d4ff568664ec3cc4a4d77a517a5ea22acde800fc0b5902747600eac
+  data.tar.gz: dbd026c600590927df289db850dc278a9698b2296b91b9a295848978eb975adc93d648b86d034073a1cced56f6b9e37bdbd69ccac7793b84325dbeb626906608

data/lib/malsh/cli.rb

@@ -1,17 +1,16 @@
 require 'malsh'
 require 'parallel'
-require 'pp'
 module Malsh
   class CLI < Thor
-    class_option :slack_webhook, :type => :string, :aliases => :sw
-    class_option :slack_channel, :type => :string, :aliases => :sc
-    class_option :slack_user, :type => :string, :aliases => :su
-    class_option :api_key, :type => :string, :aliases => :k
-    class_option :subject, :type => :string, :aliases => :s
-    class_option :org, :type => :string, :aliases => :o
-    class_option :invert_match, :type => :array, :aliases => :v
-    class_option :invert_role, :type => :array, :aliases => :r
-    class_option :regexp,:type => :array, :aliases => :e
+    class_option :slack_webhook, type: :string, aliases: :sw
+    class_option :slack_channel, type: :string, aliases: :sc
+    class_option :slack_user, type: :string, aliases: :su
+    class_option :api_key, type: :string, aliases: :k
+    class_option :subject, type: :string, aliases: :s
+    class_option :org, type: :string, aliases: :o
+    class_option :invert_match, type: :array, aliases: :v
+    class_option :invert_role, type: :array, aliases: :r
+    class_option :regexp, type: :array, aliases: :e
 
     desc 'retire', 'check forget retire host'
     def retire
@@ -21,12 +20,13 @@ module Malsh
         m = Malsh.host_metrics(
           h.id,
           Malsh.host_metric_names(h.id).first,
-          Time.now.to_i - 86400,
+          Time.now.to_i - 86_400,
           Time.now.to_i
         )
-        h if (!m || (m["metrics"] && m["metrics"].size == 0)) && !(h["meta"].has_key?("cloud") && %w(elb rds cloudfront).include?(h["meta"]["cloud"]["provider"]))
+        h if (!m || (m['metrics'] && m['metrics'].size == 0)) &&
+             !(h['meta'].has_key?('cloud') && %w[elb rds cloudfront kubernetes].include?(h['meta']['cloud']['provider']))
       end.flatten.compact
-      Malsh.notify_host("退役未了ホスト一覧", hosts)
+      Malsh.notify_host('退役未了ホスト一覧', hosts)
     end
 
     desc 'maverick', 'check no role'
@@ -37,22 +37,22 @@ module Malsh
         h if h.roles.keys.size < 1
       end.flatten.compact
 
-      Malsh.notify_host("ロール無所属ホスト一覧", hosts)
+      Malsh.notify_host('ロール無所属ホスト一覧', hosts)
     end
 
     desc 'search', 'search hosts'
-    option :past_date , :type => :numeric, :aliases => :p
-    option :cpu_threshold, :type => :numeric, :aliases => :c
-    option :memory_threshold, :type => :numeric, :aliases => :m
-    option :status, :type => :string, :aliases => :st
+    option :past_date, type: :numeric, aliases: :p
+    option :cpu_threshold, type: :numeric, aliases: :c
+    option :memory_threshold, type: :numeric, aliases: :m
+    option :status, type: :string, aliases: :st
     def search
       Malsh.init options
       o = options[:status] ? { status: options[:status] } : {}
       hosts = Malsh.hosts(o)
-      Object.const_get("Malsh::HostMetrics").constants.each do |c|
+      Object.const_get('Malsh::HostMetrics').constants.each do |c|
         hosts = Object.const_get("Malsh::HostMetrics::#{c}").check(hosts)
       end
-      Malsh.notify_host("ホスト一覧", hosts.compact)
+      Malsh.notify_host('ホスト一覧', hosts.compact)
     end
 
     desc 'alert', 'list alerts'
@@ -63,7 +63,7 @@ module Malsh
     end
 
     map %w[--version -v] => :__print_version
-    desc "--version, -v", "print the version"
+    desc '--version, -v', 'print the version'
     def __print_version
       puts Malsh::VERSION
     end

data/lib/malsh/version.rb

@@ -1,3 +1,3 @@
 module Malsh
-  VERSION = "0.3.5"
+  VERSION = '0.3.7'
 end

data/lib/malsh.rb

@@ -1,9 +1,9 @@
-require "malsh/version"
+require 'malsh/version'
 require 'thor'
 require 'mackerel-rb'
-require "malsh/cli"
-require "malsh/notification"
-require "malsh/host_metrics"
+require 'malsh/cli'
+require 'malsh/notification'
+require 'malsh/host_metrics'
 
 module Malsh
   class << self
@@ -19,7 +19,7 @@ module Malsh
       end
     end
 
-    def options(ops=nil)
+    def options(ops = nil)
       @_options = ops if ops
       @_options
     end
@@ -38,9 +38,9 @@ module Malsh
 
     def hosts(options = {})
       @_hosts ||= Mackerel.hosts(options).reject do |h|
-        Malsh.options[:invert_match] && Malsh.options[:invert_match].find {|v| host_name(h).match(/#{v}/) }
+        Malsh.options[:invert_match] && Malsh.options[:invert_match].find { |v| host_name(h).match(/#{v}/) }
       end.reject do |h|
-        Malsh.options[:regexp] && Malsh.options[:regexp].all? {|r| !host_name(h).match(/#{r}/)}
+        Malsh.options[:regexp] && Malsh.options[:regexp].all? { |r| !host_name(h).match(/#{r}/) }
       end.reject do |h|
         Malsh.options[:invert_role] && Malsh.options[:invert_role].find do |r|
           service, role = r.split(/:/)
@@ -49,7 +49,7 @@ module Malsh
       end
     end
 
-    def alerts()
+    def alerts
       @_alerts ||= Mackerel.alerts.map do |alert|
         if alert_has_host?(alert)
           alert['host'] = Malsh.host_by_id(alert.hostId)
@@ -71,30 +71,27 @@ module Malsh
     def metrics(name)
       hash = {}
       hosts.map(&:id).each_slice(200) do |ids|
-        hash.merge!(Mackerel.latest_tsdb({hostId: ids, name: name}))
+        hash.merge!(Mackerel.latest_tsdb({ hostId: ids, name: name }))
       end
       hash
     end
 
     def host_metrics(id, name, from, to)
-      begin
-        Mackerel.host_metrics(id, name: name, from: from, to: to)
-      rescue => e
-        puts e
-      end
+      Mackerel.host_metrics(id, name: name, from: from, to: to)
+    rescue StandardError => e
+      puts e
     end
 
     def host_metric_names(id)
-      begin
-        Mackerel.host_metric_names(id)
-      rescue => e
-        puts e
-      end
+      Mackerel.host_metric_names(id)
+    rescue StandardError => e
+      puts e
     end
 
     def alert_has_host?(alert)
-      exclude_types = ['external', 'service']
+      exclude_types = %w[external service expression]
       return false if exclude_types.include?(alert.type)
+
       true
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: malsh
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.7
 platform: ruby
 authors:
 - kazuhiko yamahsita
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-09-13 00:00:00.000000000 Z
+date: 2023-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -156,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: mackerel tools.