as-combined-metrics 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87337b3355528621a41b176c53446558e81ed5b5
-  data.tar.gz: a50a19f111920635d6a98c3533ec073af3cbc9cc
+  metadata.gz: 860f7bd0212371eb68b2b88c4848fbce9abb6b74
+  data.tar.gz: e3b13e84240628a148855adbfb3db42e71113015
 SHA512:
-  metadata.gz: f5a47ede4391c655c1c96f2c3f70bb24df963794c55b99c4d4e7ae132aee9af3273b91d89c496cd25058a7236a77f323dc709d9114803440b0def6b69fd1be07
-  data.tar.gz: a5c4cddc166fdcdcc264e2c41ccebae77342b81b0dbae4f628f2bd658d1f42582ea7d2867196005e845f134a780ba36cad1c781a8aadefdbf727104799385d49
+  metadata.gz: e60393b591a44e014bcae4516aa3c3f79de1c6e60d1369153fbef7eb7ed63a5be4505acf2a785979e27fff1790ac6831d5d4e5f77b586a2d0d4a46881bba9029
+  data.tar.gz: eb2e60d5c85f5d1ad9a5fbc627ed62e8acdee918437252e6943dc26064d891dbc50589df3c78e70b9fcf0285ee21e223afc38a079093ff06a74db61d751fc53f

data/combinedMetrics-sample.yml

@@ -5,7 +5,8 @@ cloudformation:
   logical_resource_ids: 
   - CloudFormation_RESOURCE_ID 
 
-autoscale_group_name: GROUP_NAME-X
+autoscale_group_name:
+  - GROUP_NAME-X
 
 ScaleIn:
 - metric_name: CPUUtilization

data/lib/as-combined-metrics.rb

@@ -1,5 +1,5 @@
 module AsCombinedMetrics
-  VERSION   = "1.0.1"
+  VERSION   = "1.0.2"
   ABOUT     = "as-combined-metrics v#{VERSION} (c) #{Time.now.strftime("2015-%Y")} @innovia"
 
   $:.unshift File.expand_path(File.join(File.dirname(__FILE__), %w[.. lib]))

data/lib/as-combined-metrics/aws.rb

@@ -35,7 +35,7 @@ module AsCombinedMetrics::Cli::Aws
       logger.info { set_color "STACK_NAME was found in the config file #{@config[:cloudformation][:stack_name]}", :cyan }
       @stack_name = @config[:cloudformation][:stack_name]
     else
-      logger.fatal { set_color "verify_stack_name_env Env variable STACK_NAME was not found or does not have a value, exiting now...", :red }
+      logger.fatal { set_color "verify_stack_name_env Can't find Env variable STACK_NAME or a setting (stack_name: STACK_NAME_X) in the config file , exiting now...", :red }
       exit 1  
     end
   end

data/lib/as-combined-metrics/cloudformation.rb

@@ -16,7 +16,8 @@ module AsCombinedMetrics::Cli::CloudFormation
 
         if !stack_info.nil?
           @autoscale_group_name = stack_info.stack_resource_detail.physical_resource_id
-          @config["autoscale_group_name"] = @autoscale_group_name
+          @config[:autoscale_group_name] ||= []
+          @config[:autoscale_group_name] << @autoscale_group_name
           File.open(options[:config_file], "w") { |f| f.write(@config.to_yaml) }
           logger.info { set_color  "AutoScale Group Name: #{@autoscale_group_name}", :cyan }
         end
@@ -27,7 +28,7 @@ module AsCombinedMetrics::Cli::CloudFormation
         end
 
         if @print_log
-          logger.error { set_color  "Unable to find the resource - #{e}", :yellow }
+          logger.error { set_color  "Unable to find the resource - #{e}, maybe wrong region or wrong AWS account?", :yellow }
           logger.info { "Will retry every 5 seconds up to maximum of #{options[:timeout]} seconds" } 
         end
 

data/lib/as-combined-metrics/cloudwatch.rb

@@ -42,7 +42,7 @@ module AsCombinedMetrics::Cli::CloudWatch
     end
   end
 
-  def publish_metric(mode, combined_metric_value)
+  def publish_metric(mode, asg, combined_metric_value)
     logger.progname = "#{Module.nesting.first.to_s} #{__method__}"
 
     cw_options = {
@@ -51,7 +51,7 @@ module AsCombinedMetrics::Cli::CloudWatch
         metric_name: combined_metrics_name(mode),
          dimensions: [{
           name: 'AutoScalingGroupName',
-          value: @config[:autoscale_group_name]
+          value: asg
         }],
         value: combined_metric_value,
         unit: 'None'
@@ -60,8 +60,12 @@ module AsCombinedMetrics::Cli::CloudWatch
     logger.info { set_color "Options to be sent to cloudwatch: #{cw_options}", :white }
     
     begin
-      logger.info { set_color "Publishing Combined Metrics to CloudWatch...", :white }
-      @cw.put_metric_data(cw_options)      
+      if options[:dryrun]
+        logger.info { set_color "DryRun! Not Publishing Combined Metrics to CloudWatch...", :white }
+      else
+        logger.info { set_color "Publishing Combined Metrics to CloudWatch...", :white }
+        @cw.put_metric_data(cw_options)
+      end
     rescue Exception => e
       logger.error { set_color "An error occured #{e}, SDK will retry up to 3 times", :red }
     end

data/lib/as-combined-metrics/config.rb

@@ -1,5 +1,4 @@
 require 'digest/sha1'
-
 class ConfigError < StandardError
 end
 
@@ -49,9 +48,8 @@ module AsCombinedMetrics::Cli::Config
 
   def process
     logger.progname = "#{Module.nesting.first.to_s} #{__method__}"
-
     if @config.has_key?(:autoscale_group_name)
-      validate_as_group(@config[:autoscale_group_name])
+      @config[:autoscale_group_name].each {|g| validate_as_group(g)}
     elsif @config[:cloudformation][:enabled]
       verify_stack_name
 

data/lib/as-combined-metrics/poller.rb

@@ -13,31 +13,32 @@ module AsCombinedMetrics::Cli::Poller
 
     loop do
       modes.each do |mode|
-        logger.info "Polling metrics for #{mode}"
-        
-        @config[mode].each do |metric|
-          logger.debug "Getting stats for metric #{metric}"
-          @combined_metrics[metric[:metric_name]] ||= {}
+        @config[:autoscale_group_name].each do |autoscale_group|
+        logger.info "Polling metrics for #{autoscale_group} AutoScale Group on #{mode}"
+          @config[mode].each do |metric|
+            logger.debug "Getting stats for #{autoscale_group} AutoScale Group on metric #{metric}"
+            @combined_metrics[metric[:metric_name]] ||= {}
           
-          if metric.has_key?(:aggregate_as_group)
-            logger.debug "Aggregating autoscale group metrics"
-            @combined_metrics[metric[:metric_name]][:measure] = aggregate_instances_per_as_group(metric)
-          else
-            metric[:dimensions] = [{ name: "AutoScalingGroupName", value: @config[:autoscale_group_name]}]
-            @combined_metrics[metric[:metric_name]][:measure] = fetch_metric(metric) unless @combined_metrics[metric[:metric_name]].has_key?(:measure)
-          end
+            if metric.has_key?(:aggregate_as_group)
+              logger.debug "Aggregating autoscale group metrics"
+              @combined_metrics[metric[:metric_name]][:measure] = aggregate_instances_per_as_group(metric)
+            else
+              metric[:dimensions] = [{ name: "AutoScalingGroupName", value: autoscale_group}]
+              @combined_metrics[metric[:metric_name]][:measure] = fetch_metric(metric) unless @combined_metrics[metric[:metric_name]].has_key?(:measure)
+            end
         
-          @combined_metrics[metric[:metric_name]][:threshold] = metric[:threshold]
-          @combined_metrics[metric[:metric_name]][:comparison_operator] = metric[:comparison_operator]
-        end
+            @combined_metrics[metric[:metric_name]][:threshold] = metric[:threshold]
+            @combined_metrics[metric[:metric_name]][:comparison_operator] = metric[:comparison_operator]
+          end
       
-        logger.info { set_color  "Combined metrics attributes for #{mode}: #{@combined_metrics}", :cyan }
-        combined_metric_value = check_combined_metrics(mode)
+          logger.info { set_color  "Combined metrics attributes for #{autoscale_group} AutoScale Group on #{mode}: #{@combined_metrics}", :cyan }
+          combined_metric_value = check_combined_metrics(mode)
         
-        logger.info { set_color "Combined metrics value: #{combined_metric_value} => [0 = Do Not #{mode}, 1 = OK To #{mode}]" }
+          logger.info { set_color "Combined metrics value for #{autoscale_group} AutoScale Group: #{combined_metric_value} => [0 = Do Not #{mode}, 1 = OK To #{mode}]", :yellow, :bold }
 
-        publish_metric(mode, combined_metric_value)  unless options[:dryrun]
+          publish_metric(mode, autoscale_group, combined_metric_value)
         end
+      end
         
         if options[:once]
           logger.info { set_color "Ran Once - Exiting now..." }

data/lib/as-combined-metrics/stats.rb

@@ -31,7 +31,7 @@ module AsCombinedMetrics::Cli::Stats
       exit
     end
       
-    logger.info { set_color "Combined results of #{results_array} for #{mode} is: #{combined_metric_value}", :yellow, :bold }
+    logger.info { set_color "Combined results of #{results_array} for #{mode} is: #{combined_metric_value}", :magenta }
 
     return combined_metric_value
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: as-combined-metrics
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Ami Mahloof
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-14 00:00:00.000000000 Z
+date: 2015-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor