malsh 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 347a943b1a31d9e96ce868829ed7244ee1f9b7e4
-  data.tar.gz: d8292cf71492b05ec754738f8674af60160c806d
+  metadata.gz: 858533993fc700f1d6b4fc20d5d5c441ae037f0f
+  data.tar.gz: 15bdd45140ce7f0fb3faadbd94da1cf051886f45
 SHA512:
-  metadata.gz: 8063808bd39e8639033f6586ea3df71dd820221e228e9c6cb6ca937fc2c41ebed7df0de82e8a0b0fb23936836516ffe78030cd376315862302aa74b16eddd47e
-  data.tar.gz: 27656b665489d656235323d93015cb915e8c212646510885f4f66c555288ddf9669e51b98dbfb9f84fb028ed18b46cb89c49b7554ac727cc91efc227716971b7
+  metadata.gz: a5bbf854b5e324f132626028a63d1d0487f361463d8c7045be77b6e95cb7c7eb7cf7f5f29b45eee34df931e59996dfdeef48bc3533d69b7de93a4b488e5974e7
+  data.tar.gz: 2acfb0ef1aa9e8558f18b62b05cb4717300fb32c50e72158e7c2b7fa9658aa40aa753b34127cc5bbef8dca695654feb8dda3df76c1ddcb89410b02ec508cbffc

data/lib/malsh/cli.rb

@@ -8,6 +8,7 @@ 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
@@ -16,23 +17,23 @@ module Malsh
     def retire
       Malsh.init options
 
-      host_names = Parallel.map(Malsh.metrics('memory.used')) do|memory|
+      hosts = 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)
+        host if (!memory.last["memory.used"].respond_to?(:value) || !memory.last["memory.used"].value)
       end.flatten.compact
 
-      Malsh.notify("退役未了ホスト一覧", host_names)
+      Malsh.notify("退役未了ホスト一覧", 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("ロール無所属ホスト一覧", hosts)
     end
 
     desc 'search', 'search hosts'
@@ -41,14 +42,13 @@ 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("ホスト一覧", hosts.compact)
     end
 
     map %w[--version -v] => :__print_version

data/lib/malsh/notification/base.rb

@@ -1,7 +1,8 @@
 module Malsh::Notification
   class Base
     def self.notify(subject, hosts)
-      puts "#{subject}: \n#{hosts.join("\n")}" if hosts.size > 0 && doit?
+      names = hosts.map(&:name)
+      puts "#{subject}: \n#{names.join("\n")}" if names.size > 0 && doit?
     end
 
     def self.doit?

data/lib/malsh/notification/slack.rb

@@ -3,8 +3,15 @@ module Malsh::Notification
   class Slack < Base
     def self.notify(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}>"
+                end
+              else
+                hosts.map(&:name)
+              end
       note = {
-        text: hosts.join("\n"),
+        text: lists.join("\n"),
         color: "warning"
       }
       notifier.ping "*#{subject}*", attachments: [note]

data/lib/malsh/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: malsh
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - kazuhiko yamahsita
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-07 00:00:00.000000000 Z
+date: 2017-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -157,7 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: mackerel tools.