malsh 0.3.0 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7618152e48a3184a6f9f031a40fc3d1ff48bc16541a545fb27aaf18664d17a8a
-  data.tar.gz: 061b00940628b739d6b59dc38efd20fad83ab1f061774436450d09dad2a6c198
+  metadata.gz: 0ba6b10739e65fa9b65e4cd60cd399ccdc4fc688d69bbaca61f0d032e9fd2c3d
+  data.tar.gz: 521295added941774b5ba85b0a2c3777747569552f5c94b6926259a050c812c2
 SHA512:
-  metadata.gz: 7dc99e3b6b1afc7f72ad041d873803a4aa77b23d0443b6684bdcef79702163ba306f02987d1afa2e161a65a7e5413f76b8d0de57ec24b164e66ee44b55adf5ea
-  data.tar.gz: be5c086daa10999317afd36754b576d4812e301624291c5bbf041a92055003843822cf932caa774faec1fcbe04f41cfff8b5efa460ed91c8181017239212174e
+  metadata.gz: '050824909ff8d3d653b0e7a864b403002560386d217f02de354a6829d38890f439c2950bc6ac443bde5165e1ae0aed03097d91e604368af0acafc8f9158a417a'
+  data.tar.gz: 77b19f42a100da11c7e29c79f00a438bbe6488817f478be5b0fa9363cabab365415e810dc0d98ce0b310d033b10f563ad92b22e0d26e8416a5a86b24112711d6

data/lib/malsh/cli.rb

@@ -17,11 +17,15 @@ module Malsh
     def retire
       Malsh.init options
 
-      hosts = Parallel.map(Malsh.metrics('memory.used')) do|memory|
-        host = Malsh.host_by_id memory.first
-        host if (!memory.last["memory.used"].respond_to?(:value) || !memory.last["memory.used"].value)
+      hosts = Parallel.map(Malsh.hosts) do |h|
+        m = Malsh.host_metrics(
+          h.id,
+          Malsh.host_metric_names(h.id).first,
+          Time.now.to_i - 86400,
+          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"]))
       end.flatten.compact
-
       Malsh.notify_host("退役未了ホスト一覧", hosts)
     end
 

data/lib/malsh/notification/base.rb

@@ -1,8 +1,10 @@
 module Malsh::Notification
   class Base
     def self.notify_host(subject, hosts)
-      names = hosts.map(&:name)
-      puts "#{subject}: \n#{names.join("\n")}" if names.size > 0 && doit?
+      puts "#{subject}:"
+      hosts.map do |h|
+        puts "#{h.name}(#{h.roles.keys.join(",")})"
+      end if doit?
     end
 
     def self.notify_alert(subject, alerts)

data/lib/malsh/notification/slack.rb

@@ -5,7 +5,7 @@ module Malsh::Notification
       return unless doit?
       lists = if Malsh.options[:org]
                 hosts.map do |h|
-                  "<https://mackerel.io/orgs/#{Malsh.options[:org]}/hosts/#{h.id}/-/setting|#{h.name}>"
+                  "<https://mackerel.io/orgs/#{Malsh.options[:org]}/hosts/#{h.id}/-/setting|#{h.name}(#{h.roles.keys.join(",")})>"
                 end
               else
                 hosts.map(&:name)
@@ -30,16 +30,16 @@ module Malsh::Notification
                   ''
                 end
 
-        title = if alert.type == 'external'
-                  alert.monitor.name
-                else
+        title = if Malsh.alert_has_host?(alert)
                   alert.host.name
+                else
+                  alert.monitor.name
                 end
 
-        author_name = if alert.type == 'external'
-                        ''
-                      else
+        author_name = if Malsh.alert_has_host?(alert)
                         alert.host.roles.map{|k, v| v.map{|r| "#{k}: #{r}"}}.flatten.join(" ")
+                      else
+                        ''
                       end
 
         attachments << {

data/lib/malsh/version.rb

@@ -1,3 +1,3 @@
 module Malsh
-  VERSION = "0.3.0"
+  VERSION = "0.3.4"
 end

data/lib/malsh.rb

@@ -51,10 +51,10 @@ module Malsh
 
     def alerts()
       @_alerts ||= Mackerel.alerts.map do |alert|
-        if alert.type == 'external'
-          alert['monitor'] = Mackerel.monitor(alert.monitorId)
-        else
+        if alert_has_host?(alert)
           alert['host'] = Malsh.host_by_id(alert.hostId)
+        else
+          alert['monitor'] = Mackerel.monitor(alert.monitorId)
         end
         alert
       end
@@ -83,5 +83,19 @@ module Malsh
         puts e
       end
     end
+
+    def host_metric_names(id)
+      begin
+        Mackerel.host_metric_names(id)
+      rescue => e
+        puts e
+      end
+    end
+
+    def alert_has_host?(alert)
+      exclude_types = ['external', 'service']
+      return false if exclude_types.include?(alert.type)
+      true
+    end
   end
 end

data/malsh.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'mackerel-rb'
   spec.add_dependency 'slack-notifier'
   spec.add_dependency 'parallel'
-  spec.add_development_dependency "bundler", "~> 1.9"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: malsh
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.4
 platform: ruby
 authors:
 - kazuhiko yamahsita
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2018-11-30 00:00:00.000000000 Z
+date: 2021-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -70,30 +70,30 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -141,7 +141,7 @@ homepage: http://ten-snapon.com.
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -156,9 +156,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.5
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: mackerel tools.
 test_files: []