cloudwatch-metrics-linux 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e9a200fc1d494bbe9d953c572647db72663a910d
-  data.tar.gz: fdef96b0ddba387525294b9b5560220e1dadd826
+  metadata.gz: 6594499ef6096ad115765e158314e3a08335c617
+  data.tar.gz: 3511cb052b53c85e6c11365211a475cc5d4dea85
 SHA512:
-  metadata.gz: 40a73c129523bda8609620705d9c06f8d4abbbe8226c6fb4ba0ac32860c329d4beb3657b5f6f027d1f4bf2ce6c8929ca16f03ca7d33c9c3461a3e4d231fbdc4a
-  data.tar.gz: f3379a74ad2f791d0776a178e232f52a16653f22f714af67f307209ecfc74d6e6813b0efb2ad88a0f548e09d4b0fc4bca755f6dab5c237d12c585e1a89999198
+  metadata.gz: 6fddf3eea38c07fcbec608deafca3ffa0ceaa8f1d65d7b63eed7322236b9af08d0e753f9b07976630662a05acdf44cdd7f43a764f674778badd1988682a953ca
+  data.tar.gz: 85415ec8297e2eebe4a73ee4f57758cdf40dd1756705c5764f0c0b612b25386f5824172f9d8bc4a87e80c01aa46786187e29e1ebce7db4ae057b4e9d4e352b07

data/README.md

@@ -32,8 +32,15 @@ Or use Docker:
 Usage: cloudwatch-metrics-linux [options]
         --namespace <namespace>
         --dimensions <name1=value1,name2=value2,...>
+        --[no-]memory-used
+        --[no-]memory-utilization
+        --[no-]swap-used
+        --[no-]swap-utilization
+        --[no-]load-average-1min
+        --[no-]load-average-5min
+        --[no-]load-average-15min
         --interval <seconds>
-        --dryrun
+        --dry-run
 ```
 
 ## Development

data/docker/Gemfile.lock

@@ -5,7 +5,7 @@ GEM
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
     aws-sigv4 (1.0.0)
-    cloudwatch-metrics-linux (0.1.0)
+    cloudwatch-metrics-linux (0.2.0)
       aws-sdk-core (~> 2)
     jmespath (1.3.1)
 

data/lib/cloud_watch_metrics/base.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'timeout'
+
 module CloudWatchMetrics
   module Base
     def self.included(mod)

data/lib/cloud_watch_metrics/linux.rb

@@ -14,12 +14,25 @@ module CloudWatchMetrics
     include Base
 
     DEFAULT_NAMESPACE = 'System/Linux'
+    DEFAULT_METRICS = {
+      memory_used:        true,
+      memory_utilization: true,
+      swap_used:          true,
+      swap_utilization:   true,
+      load_average_1min:  false,
+      load_average_5min:  true,
+      load_average_15min: false,
+    }.freeze
 
     class << self
       private
 
       def parse_arguments(args)
-        {}.tap { |options| option_parser.parse(args, into: options) }
+        {}.tap do |options|
+          option_parser.parse(args, into: options)
+          Util.convert_symbol_keys_from_dash_to_underscore!(options)
+          options[:metrics] = Util.delete_keys!(options, DEFAULT_METRICS.keys)
+        end
       end
 
       def option_parser
@@ -27,8 +40,13 @@ module CloudWatchMetrics
           Util.accept_hash(opt)
           opt.on('--namespace <namespace>', String)
           opt.on('--dimensions <name1=value1,name2=value2,...>', Hash)
+
+          DEFAULT_METRICS.each_key do |key|
+            opt.on("--[no-]#{key.to_s.tr('_', '-')}", TrueClass)
+          end
+
           opt.on('--interval <seconds>', Float)
-          opt.on('--dryrun', TrueClass)
+          opt.on('--dry-run', TrueClass)
         end
       end
     end
@@ -36,24 +54,26 @@ module CloudWatchMetrics
     def initialize(
       namespace:  DEFAULT_NAMESPACE,
       dimensions: {},
+      metrics:    {},
       interval:   nil,
-      dryrun:     false
+      dry_run:    false
     )
       @namespace = namespace
       @dimensions = dimensions
+      @metrics = DEFAULT_METRICS.merge(metrics)
       @interval = interval
-      @dryrun = dryrun
+      @dry_run = dry_run
     end
 
     private
 
     def run_once
       metric_data = builder.build(MemInfo.new, LoadAvg.new)
-      Util.put_metric_data(@namespace, metric_data, dryrun: @dryrun)
+      Util.put_metric_data(@namespace, metric_data, dry_run: @dry_run)
     end
 
     def builder
-      @_builder ||= Builder.new(@dimensions)
+      @_builder ||= Builder.new(@dimensions, @metrics)
     end
   end
 end

data/lib/cloud_watch_metrics/linux/builder.rb

@@ -3,13 +3,18 @@
 module CloudWatchMetrics
   class Linux
     class Builder
-      def initialize(dimensions)
+      def initialize(dimensions, metrics)
         @dimensions_array = [Dimensions.new(InstanceId: MetaData.instance_id)]
         @dimensions_array << Dimensions.new(dimensions) unless dimensions.empty?
+
+        @metric_names = metrics.select { |_, v| v }.keys
       end
 
       def build(meminfo, loadavg)
-        build_without_dimensions(meminfo, loadavg).flat_map do |metric_datum|
+        @meminfo = meminfo
+        @loadavg = loadavg
+
+        build_without_dimensions.flat_map do |metric_datum|
           @dimensions_array.map do |dimensions|
             metric_datum.merge(dimensions: dimensions.to_cloudwatch)
           end
@@ -18,57 +23,71 @@ module CloudWatchMetrics
 
       private
 
-      def build_without_dimensions(meminfo, loadavg)
-        metric_data = [memory_used(meminfo), memory_utilization(meminfo)]
-
-        if meminfo.swap?
-          metric_data << swap_used(meminfo) << swap_utilization(meminfo)
-        end
-
-        metric_data << load_average_1min(loadavg)
+      def build_without_dimensions
+        @metric_names.map { |key| __send__(key) }.compact
       end
 
-      def memory_used(meminfo)
+      def memory_used
         {
           metric_name: 'MemoryUsed',
-          timestamp:   meminfo.time,
-          value:       meminfo.mem_used / 1024,
+          timestamp:   @meminfo.time,
+          value:       @meminfo.mem_used / 1024,
           unit:        'Megabytes',
         }
       end
 
-      def memory_utilization(meminfo)
+      def memory_utilization
         {
           metric_name: 'MemoryUtilization',
-          timestamp:   meminfo.time,
-          value:       (meminfo.mem_util * 100).round(3),
+          timestamp:   @meminfo.time,
+          value:       (@meminfo.mem_util * 100).round(3),
           unit:        'Percent',
         }
       end
 
-      def swap_used(meminfo)
+      def swap_used
+        return unless @meminfo.swap?
         {
           metric_name: 'SwapUsed',
-          timestamp:   meminfo.time,
-          value:       meminfo.swap_used / 1024,
+          timestamp:   @meminfo.time,
+          value:       @meminfo.swap_used / 1024,
           unit:        'Megabytes',
         }
       end
 
-      def swap_utilization(meminfo)
+      def swap_utilization
+        return unless @meminfo.swap?
         {
           metric_name: 'SwapUtilization',
-          timestamp:   meminfo.time,
-          value:       (meminfo.swap_util * 100).round(3),
+          timestamp:   @meminfo.time,
+          value:       (@meminfo.swap_util * 100).round(3),
           unit:        'Percent',
         }
       end
 
-      def load_average_1min(loadavg)
+      def load_average_1min
         {
           metric_name: 'LoadAverage1Min',
-          timestamp:   loadavg.time,
-          value:       loadavg.loadavg1,
+          timestamp:   @loadavg.time,
+          value:       @loadavg.loadavg1,
+          unit:        'Count',
+        }
+      end
+
+      def load_average_5min
+        {
+          metric_name: 'LoadAverage5Min',
+          timestamp:   @loadavg.time,
+          value:       @loadavg.loadavg5,
+          unit:        'Count',
+        }
+      end
+
+      def load_average_15min
+        {
+          metric_name: 'LoadAverage15Min',
+          timestamp:   @loadavg.time,
+          value:       @loadavg.loadavg15,
           unit:        'Count',
         }
       end

data/lib/cloud_watch_metrics/linux/version.rb

@@ -2,6 +2,6 @@
 
 module CloudWatchMetrics
   class Linux
-    VERSION = '0.1.0'
+    VERSION = '0.2.0'
   end
 end

data/lib/cloud_watch_metrics/util.rb

@@ -10,6 +10,20 @@ module CloudWatchMetrics
     MAX_METRIC_DATA_PER_PUT = 20
 
     class << self
+      def convert_symbol_keys_from_dash_to_underscore!(hash)
+        hash.keys.each do |key|
+          if key.match?('-')
+            hash[key.to_s.tr('-', '_').to_sym] = hash.delete(key)
+          end
+        end
+      end
+
+      def delete_keys!(hash, keys)
+        hash
+          .select { |key,| keys.include?(key) }
+          .each_key { |key| hash.delete(key) }
+      end
+
       def accept_hash(option_parser)
         option_parser.accept(Hash) do |s,|
           break s unless s
@@ -21,8 +35,8 @@ module CloudWatchMetrics
       end
 
       # @return [void]
-      def put_metric_data(namespace, metric_data, dryrun: false)
-        return dump_metric_data(namespace, metric_data) if dryrun
+      def put_metric_data(namespace, metric_data, dry_run: false)
+        return dump_metric_data(namespace, metric_data) if dry_run
 
         metric_data.each_slice(MAX_METRIC_DATA_PER_PUT).map do |data|
           Thread.start(data, cloudwatch) do |data_, cloudwatch_|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudwatch-metrics-linux
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Masaki Takeuchi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-09 00:00:00.000000000 Z
+date: 2017-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core