malsh 0.3.1 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '04893527ed6c71386b40145b68b31ae4bacce444e5d3edce147327789b18349b'
-  data.tar.gz: 1ef47a2b0df230ca310900b2036c3ea63ca8ce4f4058e572f9c3154069142563
+  metadata.gz: ac84ac7dfd01868083d18c3e6be4fecba347d7a748e96033bc49e6b2d0b25c35
+  data.tar.gz: 88e91d32de344e8416c57d0e86bb8983a67db9c46d9e4639ff6402648694f238
 SHA512:
-  metadata.gz: ea062a8de9ff0d9b425b042b7aff1bb1bbaf43bc4aad3c9f020a936496f07cece395ccb1d0fd4c15fb90789437c95933d0d5287a34f897e43c4339978d394d1c
-  data.tar.gz: 7fbc8dc08cee0e942531086f53640653ca4cf27b7a66b0e836fa19396ae6a53cb20d1466f50ca5c6cb2725031b7541f430b2b2c00d5efd1b08d7acb4e551d021
+  metadata.gz: 11cab119d65d791bfa156646c3891795af92125f62095694e9edbcfd53efc16a403505876d6941aaa1228d310cecdb888a437f904e879a4ea36f3e1760c8ee03
+  data.tar.gz: 15b728424b65bb9080773210f4737e45416a7b00f6cc2c3036060df061115d6ee489801f79859788f87fcbec8007566a920d3b8103637fafdad2ed6bfbe63b98

data/lib/malsh/cli.rb

@@ -24,7 +24,7 @@ module Malsh
           Time.now.to_i - 86400,
           Time.now.to_i
         )
-        h if !m || m["metrics"].size == 0
+        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,18 +1,19 @@
 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)
       puts "#{subject}: "
       alerts.each do |alert|
-        title = case alert.type
-                when 'external'
-                  alert.monitor.name
-                else
+        title = if Malsh.alert_has_host?(alert)
                   alert.host.name
+                else
+                  alert.monitor.name
                 end
         puts "#{title}: #{alert.message}"
       end

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.1"
+  VERSION = "0.3.5"
 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
@@ -91,5 +91,11 @@ module Malsh
         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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: malsh
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.5
 platform: ruby
 authors:
 - kazuhiko yamahsita
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-07-15 00:00:00.000000000 Z
+date: 2021-09-13 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.0.6
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: mackerel tools.