malsh 0.1.9 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 909e9f89338418efa785be0451d5ac92efde5d8c
-  data.tar.gz: 49af40c47f81489fecbfadfa21ef39f4008dc607
+SHA256:
+  metadata.gz: f7f1081b9a67afe8ff4e228f5070dcf491a507b2165ac51490a17817640a1712
+  data.tar.gz: 6bb4a33106d0c9847b2d2073dfe2e30c2b65542885e9c30a133ebba78581635b
 SHA512:
-  metadata.gz: bcc02b83833ad620e47ab21c3cc5a99c8ecb4a74ccf95e788b7fc13f3a1ac2c187ad5a5c5ba4af36e3dd528645b6c267fca2b27d87571450dc7d3f3e8e1cf754
-  data.tar.gz: 5627a26be7a04d0bd7ed5fe5eebdf713bac8251da1a7dbb7a9f4a94b78b469f930c328882e845dce24891577d31b993494b6194fe6d08fd3d4789a419da62f23
+  metadata.gz: 135c8b2509f0fb9b3738469cb7f5bb19d357faa71b7b1f5c36c27a2202872f58d824f68303bb846f7dcd5bcdbf9133fc7fea876cfa3463294676144de7d934f6
+  data.tar.gz: c32b5fe8280c1bd682cb361bf61eee792bb865ea9e3eb44ed34bd00b8d143370522761a8df93ac9cb01cbe5b887b0444edd74e08be8c555be965d2ff94bd26db

data/README.md

@@ -54,6 +54,8 @@ $ malsh search --past_date 7 --cpu 40 --memory 40 --subject 過去7日間のCPU
  * 除外したいホスト名を正規表現で指定します。
 * --regex
  * 特定したいホスト名を正規表現で指定します。
+* --invert-role
+ * 除外したいロール名を`service:role`で指定します。
 
 ## Author
 pyama86

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
 
@@ -35,6 +41,22 @@ module Malsh
         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}/)}
+      end.reject do |h|
+        Malsh.options[:invert_role] && Malsh.options[:invert_role].find do |r|
+          service, role = r.split(/:/)
+          h.roles[service] && h.roles[service].include?(role)
+        end
+      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
 
@@ -61,5 +83,13 @@ module Malsh
         puts e
       end
     end
+
+    def host_metric_names(id)
+      begin
+        Mackerel.host_metric_names(id)
+      rescue => e
+        puts e
+      end
+    end
   end
 end

data/lib/malsh/cli.rb

@@ -8,30 +8,36 @@ module Malsh
     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
       Malsh.init options
 
-      host_names = Parallel.map(Malsh.metrics('memory.used')) do|memory|
-        host = Malsh.host_by_id memory.first
-        host.name 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"].size == 0
       end.flatten.compact
-
-      Malsh.notify("退役未了ホスト一覧", host_names)
+      Malsh.notify_host("退役未了ホスト一覧", hosts)
     end
 
     desc 'maverick', 'check no role'
     def maverick
       Malsh.init options
 
-      host_names = Parallel.map(Malsh.hosts) do |h|
-        h.name if h.roles.keys.size < 1
+      hosts = Parallel.map(Malsh.hosts) do |h|
+        h if h.roles.keys.size < 1
       end.flatten.compact
 
-      Malsh.notify("ロール無所属ホスト一覧", host_names)
+      Malsh.notify_host("ロール無所属ホスト一覧", hosts)
     end
 
     desc 'search', 'search hosts'
@@ -40,14 +46,20 @@ module Malsh
     option :memory_threshold, :type => :numeric, :aliases => :m
     option :status, :type => :string, :aliases => :st
     def search
-      _host_names = {}
       Malsh.init options
       o = options[:status] ? { status: options[:status] } : {}
       hosts = Malsh.hosts(o)
       Object.const_get("Malsh::HostMetrics").constants.each do |c|
         hosts = Object.const_get("Malsh::HostMetrics::#{c}").check(hosts)
       end
-      Malsh.notify("ホスト一覧", hosts.compact.map {|h| h["name"]})
+      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,7 +1,23 @@
 module Malsh::Notification
   class Base
-    def self.notify(subject, hosts)
-      puts "#{subject}: \n#{hosts.join("\n")}" if hosts.size > 0 && doit?
+    def self.notify_host(subject, hosts)
+      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
+                  alert.host.name
+                end
+        puts "#{title}: #{alert.message}"
+      end
     end
 
     def self.doit?

data/lib/malsh/notification/slack.rb

@@ -1,15 +1,68 @@
 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|
+                  "<https://mackerel.io/orgs/#{Malsh.options[:org]}/hosts/#{h.id}/-/setting|#{h.name}(#{h.roles.keys.join(",")})>"
+                end
+              else
+                hosts.map(&:name)
+              end
       note = {
-        text: hosts.join("\n"),
+        text: lists.join("\n"),
         color: "warning"
       }
       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.1.9"
+  VERSION = "0.3.2"
 end

data/malsh.gemspec

@@ -23,10 +23,10 @@ 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"
-  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.1.9
+  version: 0.3.2
 platform: ruby
 authors:
 - kazuhiko yamahsita
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2016-04-11 00:00:00.000000000 Z
+date: 2020-07-28 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
@@ -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.4.8
-signing_key: 
+rubygems_version: 3.0.6
+signing_key:
 specification_version: 4
 summary: mackerel tools.
 test_files: []