malsh 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 858533993fc700f1d6b4fc20d5d5c441ae037f0f
-  data.tar.gz: 15bdd45140ce7f0fb3faadbd94da1cf051886f45
+SHA256:
+  metadata.gz: 7618152e48a3184a6f9f031a40fc3d1ff48bc16541a545fb27aaf18664d17a8a
+  data.tar.gz: 061b00940628b739d6b59dc38efd20fad83ab1f061774436450d09dad2a6c198
 SHA512:
-  metadata.gz: a5bbf854b5e324f132626028a63d1d0487f361463d8c7045be77b6e95cb7c7eb7cf7f5f29b45eee34df931e59996dfdeef48bc3533d69b7de93a4b488e5974e7
-  data.tar.gz: 2acfb0ef1aa9e8558f18b62b05cb4717300fb32c50e72158e7c2b7fa9658aa40aa753b34127cc5bbef8dca695654feb8dda3df76c1ddcb89410b02ec508cbffc
+  metadata.gz: 7dc99e3b6b1afc7f72ad041d873803a4aa77b23d0443b6684bdcef79702163ba306f02987d1afa2e161a65a7e5413f76b8d0de57ec24b164e66ee44b55adf5ea
+  data.tar.gz: be5c086daa10999317afd36754b576d4812e301624291c5bbf041a92055003843822cf932caa774faec1fcbe04f41cfff8b5efa460ed91c8181017239212174e

data/lib/malsh.rb

@@ -7,9 +7,15 @@ require "malsh/host_metrics"
 
 module Malsh
   class << self
-    def notify(subject, host)
+    def notify_host(subject, host)
       Malsh::Notification.constants.each do |c|
-        Object.const_get("Malsh::Notification::#{c}").notify(options[:subject] || subject, host)
+        Object.const_get("Malsh::Notification::#{c}").notify_host(options[:subject] || subject, host)
+      end
+    end
+
+    def notify_alert(subject, alerts)
+      Malsh::Notification.constants.each do |c|
+        Object.const_get("Malsh::Notification::#{c}").notify_alert(options[:subject] || subject, alerts)
       end
     end
 
@@ -43,6 +49,17 @@ module Malsh
       end
     end
 
+    def alerts()
+      @_alerts ||= Mackerel.alerts.map do |alert|
+        if alert.type == 'external'
+          alert['monitor'] = Mackerel.monitor(alert.monitorId)
+        else
+          alert['host'] = Malsh.host_by_id(alert.hostId)
+        end
+        alert
+      end
+    end
+
     def host_name(host)
       host.displayName || host.name
     end

data/lib/malsh/cli.rb

@@ -22,7 +22,7 @@ module Malsh
         host if (!memory.last["memory.used"].respond_to?(:value) || !memory.last["memory.used"].value)
       end.flatten.compact
 
-      Malsh.notify("退役未了ホスト一覧", hosts)
+      Malsh.notify_host("退役未了ホスト一覧", hosts)
     end
 
     desc 'maverick', 'check no role'
@@ -33,7 +33,7 @@ module Malsh
         h if h.roles.keys.size < 1
       end.flatten.compact
 
-      Malsh.notify("ロール無所属ホスト一覧", hosts)
+      Malsh.notify_host("ロール無所属ホスト一覧", hosts)
     end
 
     desc 'search', 'search hosts'
@@ -48,7 +48,14 @@ module Malsh
       Object.const_get("Malsh::HostMetrics").constants.each do |c|
         hosts = Object.const_get("Malsh::HostMetrics::#{c}").check(hosts)
       end
-      Malsh.notify("ホスト一覧", hosts.compact)
+      Malsh.notify_host("ホスト一覧", hosts.compact)
+    end
+
+    desc 'alert', 'list alerts'
+    def alert
+      Malsh.init options
+      alerts = Malsh.alerts
+      Malsh.notify_alert('アラート一覧', alerts)
     end
 
     map %w[--version -v] => :__print_version

data/lib/malsh/notification/base.rb

@@ -1,10 +1,23 @@
 module Malsh::Notification
   class Base
-    def self.notify(subject, hosts)
+    def self.notify_host(subject, hosts)
       names = hosts.map(&:name)
       puts "#{subject}: \n#{names.join("\n")}" if names.size > 0 && doit?
     end
 
+    def self.notify_alert(subject, alerts)
+      puts "#{subject}: "
+      alerts.each do |alert|
+        title = case alert.type
+                when 'external'
+                  alert.monitor.name
+                else
+                  alert.host.name
+                end
+        puts "#{title}: #{alert.message}"
+      end
+    end
+
     def self.doit?
       true
     end

data/lib/malsh/notification/slack.rb

@@ -1,7 +1,7 @@
 require 'slack-notifier'
 module Malsh::Notification
   class Slack < Base
-    def self.notify(subject, hosts)
+    def self.notify_host(subject, hosts)
       return unless doit?
       lists = if Malsh.options[:org]
                 hosts.map do |h|
@@ -17,6 +17,52 @@ module Malsh::Notification
       notifier.ping "*#{subject}*", attachments: [note]
     end
 
+    def self.notify_alert(subject, alerts)
+      org = Mackerel.org.name
+      attachments = []
+      alerts.each do |alert|
+        color = case alert.status
+                when 'CRITICAL'
+                  'danger'
+                when 'WARNING'
+                  'warning'
+                else
+                  ''
+                end
+
+        title = if alert.type == 'external'
+                  alert.monitor.name
+                else
+                  alert.host.name
+                end
+
+        author_name = if alert.type == 'external'
+                        ''
+                      else
+                        alert.host.roles.map{|k, v| v.map{|r| "#{k}: #{r}"}}.flatten.join(" ")
+                      end
+
+        attachments << {
+            author_name: author_name,
+            title: title,
+            title_link: "https://mackerel.io/orgs/#{org}/alerts/#{alert.id}",
+            text: alert.message,
+            color: color,
+            fields: [
+                {
+                    title: 'Type',
+                    value: alert.type
+                },
+                {
+                    title: 'OpenedAt',
+                    value: Time.at(alert.openedAt).strftime("%Y/%m/%d %H:%M:%S")
+                }
+            ]
+        }
+      end
+      notifier.ping "*#{subject}*", attachments: attachments
+    end
+
     def self.doit?
       %i(slack_webhook slack_channel).all? {|k| Malsh.options.key?(k) || ENV[k.to_s.upcase] }
     end

data/lib/malsh/version.rb

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

data/malsh.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency 'thor'
-  spec.add_dependency 'mackerel-rb', "~> 0.1.5"
+  spec.add_dependency 'mackerel-rb'
   spec.add_dependency 'slack-notifier'
   spec.add_dependency 'parallel'
   spec.add_development_dependency "bundler", "~> 1.9"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: malsh
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - kazuhiko yamahsita
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-26 00:00:00.000000000 Z
+date: 2018-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -28,16 +28,16 @@ dependencies:
   name: mackerel-rb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.5
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.5
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: slack-notifier
   requirement: !ruby/object:Gem::Requirement
@@ -157,7 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.7.5
 signing_key: 
 specification_version: 4
 summary: mackerel tools.