kumome 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d19fed3e49c4cb68d55f9fa5bb5976ea2335fa9
-  data.tar.gz: 219dc319da11e3f505db7c0491e6875493fc5e77
+  metadata.gz: 0d531a4c895d7032e6518b119de7e29e19a1d998
+  data.tar.gz: 94812a46d6b0ad26c69a6bcf8a28a2eba9912bbc
 SHA512:
-  metadata.gz: 0bc743522c27a6f97c49227f0c6c904f0d6596ce357e3f3e7c3cccfcce6c04cf25fa787ed4cb74e434c832f4cc2a229928426334eee9b7fa2bb45755636db13a
-  data.tar.gz: 6d20b87efba92f0b5244c1fdb6274bb4150f0834d0e6d2ef4bd959847dd8a941746395d815eb97e6b2d79b88eff1af1677828ff042ede698976c0c0919d0936c
+  metadata.gz: cb88c9241f107709668f4809e4883cfced4c6a8d9480c3d80010db936367b2dc97cf9bbe849cf9fc9799cd7683352bac1be536ec9028cbfc3323dbe4714ff755
+  data.tar.gz: e41aba002f7b1887c43dc14913ae6026dfb62113fab8fbc97682ebeae0d5cb63318a9865209b4bf7b423a068feb6a42fa44a1023844c66e4ac97d60a8004c18e

data/README.md

@@ -2,7 +2,7 @@
 
 Resource statistics tool via AWS CloudWatch.
 
-[![asciicast](https://asciinema.org/a/35035.png)](https://asciinema.org/a/35035?speed=5&autoplay=1)
+[![asciicast](https://asciinema.org/a/35090.png)](https://asciinema.org/a/35090?speed=5&autoplay=1)
 
 ## Installation
 
@@ -22,7 +22,7 @@ Or install it yourself as:
 
 ## Getting Started
 
-### STEP 1. Set AWS credentials
+### STEP 1. Set AWS config
 
 #### 1-1. Use Shared Credentials
 
@@ -32,6 +32,8 @@ $ aws configure
 ...
 ```
 
+(See http://docs.aws.amazon.com/ja_jp/cli/latest/userguide/cli-chap-getting-started.html#config-settings-and-precedence)
+
 #### 1-2. Use secrets.yml
 
 ```sh
@@ -67,6 +69,54 @@ Options:
 Show AWS resource statistics
 ```
 
+If you show command config YAML, run `kumome config`.
+
+## Custom command options
+
+Write `custom.yml`.
+
+```yaml
+---
+resources:
+  lambda: # "command option name"
+    namespace: AWS/Lambda # required
+    dimensions_name: FunctionName # required
+    metrics:
+      count:
+        metric_name: Invocations # required
+        statistic: Sum # required
+        unit: Count
+        alarm: '>=100' # "metric alarm name" or "operator and number"
+      error:
+        metric_name: Errors
+        statistic: Sum
+        unit: Count
+        alarm: '>=5'
+      duration:
+        metric_name: Duration
+        statistic: Average
+```
+( See https://docs.aws.amazon.com/lambda/latest/dg/monitoring-functions-metrics.html )
+
+And use `--config` option.
+
+```sh
+$ kumome --config=./custom.yml
+Usage:
+kumome    # OR: `kumome stat`
+
+Options:
+[--lambda=FunctionName,..]
+[--profile=PROFILE]
+[--period=N]
+                    # Default: 300
+[--config=CONFIG]
+
+Show AWS resource statistics
+
+$ kumome --config=./custom.yml --lambda=my-lambda-func-name,hook-lambda-func-name --profile mycreds
+```
+
 ## TODO
 
 - `tailf` option

data/kumome.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_runtime_dependency 'aws-sdk', '~> 2.1'
-  spec.add_runtime_dependency 'awsecrets'
+  spec.add_runtime_dependency 'awsecrets', '~> 1'
   spec.add_runtime_dependency 'thor'
   spec.add_runtime_dependency 'activesupport'
   spec.add_runtime_dependency 'terminal-table'

data/lib/kumome/cli.rb

@@ -38,29 +38,13 @@ module Kumome
     private
 
     def out_table(data)
-      ids = {}
-      metrics_header = {}
-      Kumome::Config.config['resources'].each do |resource_name, resource|
-        next if options[resource_name.to_sym].nil?
-        options[resource_name.to_sym].split(',').each do |id|
-          ids[id] = resource['metrics'].size
-          resource['metrics'].each do |name, _metric|
-            key = resource_name + id + name.to_s
-            metrics_header[key] = name.to_s
-          end
-        end
-      end
-      header = ['']
-      ids.each do |id, colspan|
-        header << { value: id, colspan: colspan, alignment: :center }
-      end
-      t = table(header)
+      t = table(build_header)
       t.style = { alignment: :right, border_x: '-' }
-      t << metrics_header.values.unshift(:timestamp)
+      t << @metrics_header.values.unshift(:timestamp)
       t << :separator
       data.sort_by { |k, _| k.to_i }.each do |timestamp, d|
         line = [timestamp]
-        metrics_header.each_key do |h|
+        @metrics_header.each_key do |h|
           l = if d.key?(h)
                 d[h]
               else
@@ -76,5 +60,25 @@ module Kumome
         puts line
       end
     end
+
+    def build_header
+      resource_header = {}
+      @metrics_header = {}
+      Kumome::Config.config['resources'].each do |resource_name, resource|
+        next if options[resource_name.to_sym].nil?
+        options[resource_name.to_sym].split(',').each do |id|
+          resource_header[id] = resource['metrics'].size
+          resource['metrics'].each do |name, _metric|
+            key = resource_name + id + name.to_s
+            @metrics_header[key] = name.to_s
+          end
+        end
+      end
+      header = ['']
+      resource_header.each do |id, colspan|
+        header << { value: id, colspan: colspan, alignment: :center }
+      end
+      header
+    end
   end
 end

data/lib/kumome/default.yml

@@ -1,6 +1,6 @@
 ---
 resources:
-  ec2:
+  ec2: # "command option name"
     namespace: AWS/EC2 # required
     dimensions_name: InstanceId # required
     metrics:

data/lib/kumome/version.rb

@@ -1,3 +1,3 @@
 module Kumome
-  VERSION = '0.0.2'
+  VERSION = '0.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kumome
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - k1LoW
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-29 00:00:00.000000000 Z
+date: 2016-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -28,16 +28,16 @@ dependencies:
   name: awsecrets
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement