malsh 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f57d61ecea6999ff0d35382a91d7e75bfddb89fd
-  data.tar.gz: 54e68023c18a8986a7ed2ed622b2a269e846fd40
+  metadata.gz: 7bc1c3a356c2adcf0d6fe93e26215d5ec733b762
+  data.tar.gz: 3f647317f7a914ce6c0409972c22effa21ff8a69
 SHA512:
-  metadata.gz: b180f61a9316c5743588af5266b7c9af0ef5a5ec62b67f209c8a25036da224833d182b67b4eac5dc3148dea82a5e44a3ff5d2a10c8b31a07dbd02a5d5811370b
-  data.tar.gz: 698feecf25f60f438b40da1d41dc5a4497d214330fc8a33230a6eff0a95b6ce6a6139df6931cf91fc9dfc1e55c498c2047c6d1bb763b3029880cd1611c99f540
+  metadata.gz: 5d09534b84899e65215a60a6a3fbf977c5e21988b1187157c3812b7435b6c6da62cdf37e0be6c5b5240551139a289d9b5fdb96a60f2306e75e28488bbf606198
+  data.tar.gz: 486cb75698d3d3a2e17321275c03977cdd014b3c33bec5b11ad16d792401cb0aa49a2e5c2f48b1dff161fea30f0a776b2d0e5fcebc93df7ce5c9ef17eef3f011

data/README.md

@@ -36,7 +36,7 @@ $ malsh maverick --subject 無所属ホスト
 $ malsh search --regex dev local$ --subject developmentホスト
 
 # CPUとメモリの過去7日間の最高使用率が40%以下のホストをを検知
-$ malsh search --cpu 40 --memory 40 --subject 過去7日間のCPU、メモリがの最高使用率が40%以下
+$ malsh search --past_date 7 --cpu 40 --memory 40 --subject 過去7日間のCPU、メモリがの最高使用率が40%以下
 ```
 
 ## options

data/lib/malsh/cli.rb

@@ -38,11 +38,12 @@ module Malsh
     option :past_date , :type => :numeric, :aliases => :p
     option :cpu_threshold, :type => :numeric, :aliases => :c
     option :memory_threshold, :type => :numeric, :aliases => :m
+    option :status, :type => :string, :aliases => :st
     def search
       _host_names = {}
       Malsh.init options
-
-      hosts = Malsh.hosts
+      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

data/lib/malsh/version.rb

@@ -1,3 +1,3 @@
 module Malsh
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

data/lib/malsh.rb

@@ -30,8 +30,8 @@ module Malsh
       end
     end
 
-    def hosts
-      @_hosts ||= Mackerel.hosts.reject do |h|
+    def hosts(options = {})
+      @_hosts ||= Mackerel.hosts(options).reject do |h|
         Malsh.options[:invert_match] && Malsh.options[:invert_match].find {|v| h.name.match(/#{v}/) }
       end.reject do |h|
         Malsh.options[:regexp] && Malsh.options[:regexp].all? {|r| !h.name.match(/#{r}/)}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: malsh
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - kazuhiko yamahsita
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-12-11 00:00:00.000000000 Z
+date: 2016-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor