malsh 0.3.3 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53560007bf799b565171bcfb12e482e6b197b55114259f6df3795df69f1427cf
-  data.tar.gz: 71469c9e09c80c1386b31b5a06a0d3fb80bc38850fa225d36ef7ebc02e3d471d
+  metadata.gz: 496b75cce4bfa94893f699050d52c6eb43b56cf3863fd9f0bfe0e07748961b8d
+  data.tar.gz: 84f4216c6c2e56b81332d2a777b6953413f43a09a5216ad0a5aaed1a14421271
 SHA512:
-  metadata.gz: a62d25c6b1906f595cc816765cbd38957b03393826e46def774ea348d440978cd6f223e8a9ad98769b3a66561ff3f1d6cbc2efaf13545fc860be522fc683fd77
-  data.tar.gz: 884c91493164eae6609000338255ccd8dcd78083c25410c437cf1a718a3b8f115a2699aae44d56e15b6f60ffc1d9e98ba12fe1265aad22a74c05adac9388df0a
+  metadata.gz: bf1876097f304d5a5a6736f24c474de58beab2609f70c5ba4a9d955fb6e2183a53f48f86aaf8e067979cac67f495fbce2147d3b110bec460aa5f920ffc874df3
+  data.tar.gz: cf51581d01a034a937bd46fa5b80336d247713185e05806b5444e0137fee4d485af18f2171bf4038c94bd678b013461a3a582db89865343fe0c591af2e7cc79d

data/lib/malsh/notification/base.rb

@@ -10,11 +10,10 @@ module Malsh::Notification
     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

@@ -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.3"
+  VERSION = '0.3.6'
 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,12 +49,12 @@ module Malsh
       end
     end
 
-    def alerts()
+    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
@@ -71,25 +71,28 @@ 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 = %w[external service expression]
+      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.3
+  version: 0.3.6
 platform: ruby
 authors:
 - kazuhiko yamahsita
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-11 00:00:00.000000000 Z
+date: 2022-07-25 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.4
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: mackerel tools.