enable management of monitoring policies for autoscaling groups

lucidsoftware · Apr 4, 2018 · 9c60ddf · 9c60ddf
1 parent 7021ac1
commit 9c60ddf
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/lib/autoscaling/models/AutoScalingDiff.rb b/lib/autoscaling/models/AutoScalingDiff.rb
@@ -1,6 +1,7 @@
 require "common/models/Diff"
 require "common/models/TagsDiff"
 require "common/models/ListChange"
+require "deepsort"
 require "util/Colors"
 
 module Cumulus
@@ -146,15 +147,15 @@ def aws_name
  #
  # Returns an array of metrics
  def metrics_to_disable
- @aws.enabled_metrics - @local.enabled_metrics
+ @aws.enabled_metrics.map { |k| k.metric }.deep_sort - @local.enabled_metrics.deep_sort
  end
 
  # Public: Get the metrics to enable, ie. are in local configuration, but not
  # AWS.
  #
  # Returns an array of metrics
  def metrics_to_enable
- @local.enabled_metrics - @aws.enabled_metrics
+ @local.enabled_metrics.deep_sort - @aws.enabled_metrics.map { |k| k.metric }.deep_sort
  end
 
  # Public: Get the load balancers to remove, ie. are in AWS and not local

diff --git a/lib/autoscaling/models/GroupConfig.rb b/lib/autoscaling/models/GroupConfig.rb
@@ -5,6 +5,7 @@
 require "autoscaling/models/ScheduledActionDiff"
 require "autoscaling/models/ScheduledConfig"
 require "common/models/UTCTimeSource"
+require "deepsort"
 require "ec2/EC2"
 
 require "parse-cron"
@@ -131,7 +132,7 @@ def diff(aws, autoscaling)
  if @cooldown != aws.default_cooldown
  diffs << AutoScalingDiff.new(AutoScalingChange::COOLDOWN, aws, self)
  end
- if @enabled_metrics != aws.enabled_metrics
+ if @enabled_metrics.deep_sort != aws.enabled_metrics.map { |k| k.metric }.deep_sort
  diffs << AutoScalingDiff.new(AutoScalingChange::METRICS, aws, self)
  end
  if @check_type != aws.health_check_type