cfn-guardian 0.6.2 → 0.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dbe63daad265c8b1868992f73fbb38fd68a65833745264f2a276ea1cbe9a4cda
-  data.tar.gz: d3bb8f9a33a80d6e56b8040b712ffcfca3b0d5c958e22cc7d6983c204cbd65d4
+  metadata.gz: 53722b34244bb95ed843872058e736248af2c62c0ca574542cf92fffa19ac851
+  data.tar.gz: 82761250e49f3246c115b89a60d2e6c2bceb62b1e555f69fc1d3d2aff523d92c
 SHA512:
-  metadata.gz: 3135ca24580cbdbf1d361f3c4ada2e0fcf5b401d3a9a1aaf01d0ac366e51375d6de4251d41254cdfe5153f190ec339c7f79e5d79917cc31a502a9d216a8bee33
-  data.tar.gz: f8f9b8a6846747ff1e5cb2ae38c07302d2ef10ee0c5b8d617461c958f68316e36d93f2a8fb7cec4308023861ef70b48d26e212248f96b53e0988589e6d57fb41
+  metadata.gz: f9c9a209b886d4988c7b8174000b9513212d173e51ccb35e29dd1ea859c3f666c74fef108457483ba0af9a96cf2c636e79858c92c69801f01d53a512d4361bc9
+  data.tar.gz: 22b7fd68e38bdb54cfe6a28f936182a4aa79c895e283a17afe31746f55ee2c4c6a149914d5870ac378a69147f53381da3e589b261d581036197bb9fcf03bd46e

data/Dockerfile

@@ -1,6 +1,6 @@
 FROM ruby:2.7-alpine
 
-ARG GUARDIAN_VERSION="0.2.2"
+ARG GUARDIAN_VERSION="0.6.6"
 
 COPY . /src
 
@@ -16,4 +16,4 @@ RUN addgroup -g 1000 guardian && \
 
 USER guardian
 
-RUN cfndsl -u 11.5.0
+RUN cfndsl -u 11.5.0

data/README.md

@@ -23,7 +23,7 @@ CfnGuardian is a AWS monitoring tool with a few capabilities:
 
 **Supported AWS Resources**
 
-- AmazonMq
+- AmazonMq(RabbitMQ and ActiveMQ)
 - ApiGateway
 - Application Targetgroups
 - Network TargetGroups

data/lib/cfnguardian.rb

@@ -50,7 +50,7 @@ module CfnGuardian
       compiler = CfnGuardian::Compile.new(options[:config])
       compiler.get_resources
       compiler.compile_templates(s3.bucket,s3.path)
-      logger.info "Clouformation templates compiled successfully in out/ directory"
+      logger.info "Cloudformation templates compiled successfully in out/ directory"
       if options[:validate]
         s3.create_bucket_if_not_exists()
         validator = CfnGuardian::Validate.new(s3.bucket)
@@ -58,7 +58,7 @@ module CfnGuardian
           logger.error("One or more templates failed to validate")
           exit(1)
         else
-          logger.info "Clouformation templates were validated successfully"
+          logger.info "Cloudformation templates were validated successfully"
         end
       end
       logger.warn "AWS cloudwatch alarms defined in the templates will cost roughly $#{'%.2f' % compiler.cost} per month"
@@ -96,7 +96,7 @@ module CfnGuardian
       compiler.get_resources
       compiler.compile_templates(s3.bucket,s3.path)
       parameters = compiler.load_parameters(options)
-      logger.info "Clouformation templates compiled successfully in out/ directory"
+      logger.info "Cloudformation templates compiled successfully in out/ directory"
 
       s3.create_bucket_if_not_exists
       validator = CfnGuardian::Validate.new(s3.bucket)
@@ -104,7 +104,7 @@ module CfnGuardian
         logger.error("One or more templates failed to validate")
         exit(1)
       else
-        logger.info "Clouformation templates were validated successfully"
+        logger.info "Cloudformation templates were validated successfully"
       end
       
       deployer = CfnGuardian::Deploy.new(options,s3.bucket,parameters)
@@ -299,14 +299,18 @@ module CfnGuardian
     LONG
     method_option :region, aliases: :r, type: :string, desc: "set the AWS region"
     method_option :repository, type: :string, default: 'guardian', desc: "codecommit repository name"
+    method_option :branch, type: :string, default: 'master', desc: "codecommit branch"
+    method_option :count, type: :numeric, default: 10, desc: "number of last commits to retrieve"
     
     def show_config_history
       set_region(options[:region],true)
     
-      history = CfnGuardian::CodeCommit.new(options[:repository]).get_commit_history()
-      puts Terminal::Table.new(
-        :headings => history.first.keys.map{|h| h.to_s.to_heading}, 
-        :rows => history.map(&:values))
+      history = CfnGuardian::CodeCommit.new(options[:repository]).get_commit_history(options[:branch], options[:count])
+      if history.any?
+        puts Terminal::Table.new(
+          :headings => history.first.keys.map{|h| h.to_s.to_heading}, 
+          :rows => history.map(&:values))
+      end
     end
     
     desc "show-pipeline", "Shows the current state of the AWS code pipeline"

data/lib/cfnguardian/codecommit.rb

@@ -19,9 +19,18 @@ module CfnGuardian
       return resp.branch.commit_id
     end
     
-    def get_commit_history(branch='master',count=10)
+    def get_commit_history(branch,count)
       history = []
-      commit = get_last_commit(branch)
+
+      begin
+        commit = get_last_commit(branch)
+      rescue Aws::CodeCommit::Errors::BranchDoesNotExistException => e
+        logger.error "Branch #{branch} does not exist in the #{@repo_name} repository"
+        return []
+      rescue Aws::CodeCommit::Errors::RepositoryDoesNotExistException => e
+        logger.error "Respository #{@repo_name} does not exist in this AWS account or region"
+        return []
+      end
       
       count.times do
         

data/lib/cfnguardian/compile.rb

@@ -36,6 +36,10 @@ require 'cfnguardian/resources/sftp'
 require 'cfnguardian/resources/internal_sftp'
 require 'cfnguardian/resources/tls'
 require 'cfnguardian/resources/azure_file'
+require 'cfnguardian/resources/amazonmq_rabbitmq'
+require 'cfnguardian/resources/batch'
+require 'cfnguardian/resources/glue'
+require 'cfnguardian/resources/step_functions'
 require 'cfnguardian/version'
 require 'cfnguardian/error'
 

data/lib/cfnguardian/config/defaults.yaml

@@ -1,6 +1,15 @@
 Resources:
   AmazonMQBroker:
   - Id: Default
+  AmazonMQRabbitMQBroker:
+  - Id: Default
+  AmazonMQRabbitMQNode:
+  - Id: Default
+    Node: Default
+  AmazonMQRabbitMQQueue:
+  - Id: Default
+    Queue: Default
+    Vhost: Default
   ApiGateway:
   - Id: Default
   ApplicationTargetGroup:

data/lib/cfnguardian/models/alarm.rb

@@ -94,6 +94,40 @@ module CfnGuardian
         @dimensions = { Broker: resource['Id'] }
       end
     end
+
+    class AmazonMQRabbitMQBrokerAlarm < BaseAlarm
+      def initialize(resource)
+        super(resource)
+        @group = 'AmazonMQRabbitMQBroker'
+        @namespace = 'AWS/AmazonMQ'
+        @dimensions = { Broker: resource['Id'] }
+      end
+    end
+
+    class AmazonMQRabbitMQNodeAlarm < BaseAlarm
+      def initialize(resource)
+        super(resource)
+        @group = 'AmazonMQRabbitMQNode'
+        @namespace = 'AWS/AmazonMQ'
+        @dimensions = { 
+          Broker: resource['Id'],
+          Node: resource['Node']
+        }
+      end
+    end
+
+    class AmazonMQRabbitMQQueueAlarm < BaseAlarm
+      def initialize(resource)
+        super(resource)
+        @group = 'AmazonMQRabbitMQQueue'
+        @namespace = 'AWS/AmazonMQ'
+        @dimensions = { 
+          Broker: resource['Id'],
+          Queue: resource['Queue'],
+          VirtualHost: resource['Vhost']
+        }
+      end
+    end
     
     class CloudFrontDistributionAlarm < BaseAlarm
       def initialize(resource)
@@ -309,7 +343,31 @@ module CfnGuardian
         @dimensions = { DBInstanceIdentifier: resource['Id'] }
       end
     end
-    
+
+    class StepFunctionsAlarm < BaseAlarm
+      def initialize(resource)
+        super(resource)
+        @group = 'StepFunctions'
+        @namespace = 'AWS/States'
+        @dimensions = { StateMachineArn: { "Fn::Sub" => "arn:aws:states:${AWS::Region}:${AWS::AccountId}:stateMachine:#{resource['Id']}"} }
+      end
+    end
+
+    class BatchAlarm < BaseAlarm
+      def initialize(resource)
+        super(resource)
+        @group = 'Batch'
+      end
+    end
+
+    class GlueAlarm < BaseAlarm
+      def initialize(resource)
+        super(resource)
+        @group = 'Batch'
+        @namespace = 'Glue'
+      end
+    end
+
     class SqlAlarm < BaseAlarm
       def initialize(resource)
         super(resource)

data/lib/cfnguardian/models/event_subscription.rb

@@ -1,96 +1,111 @@
 module CfnGuardian
-    module Models
-        class BaseEventSubscription
-            
-            attr_reader :type, :group
-            attr_writer :detail
-            attr_accessor :name,
-                :enabled,
-                :hash,
-                :topic,
-                :resource_id,
-                :resource_arn,
-                :source,
-                :detail_type,
-                :detail
+  module Models
+    class BaseEventSubscription
+        
+      attr_reader :type, :group
+      attr_writer :detail
+      attr_accessor :name,
+        :enabled,
+        :hash,
+        :topic,
+        :resource_id,
+        :resource_arn,
+        :source,
+        :detail_type,
+        :detail
 
-            def initialize(resource)
-                @type = 'EventSubscription'
-                @group = self.class.name.split('::').last
-                @name = ''
-                @hash = Digest::MD5.hexdigest resource['Id']
-                @enabled = true
-                @events = []
-                @topic = 'Events'
-                @resource_id = resource['Id']
-                @resource_arn = ''
-                @source = ''
-                @detail_type = ''
-                @detail = {}
-            end
+      def initialize(resource)
+        @type = 'EventSubscription'
+        @group = self.class.name.split('::').last
+        @name = ''
+        @hash = Digest::MD5.hexdigest resource['Id']
+        @enabled = true
+        @events = []
+        @topic = 'Events'
+        @resource_id = resource['Id']
+        @resource_arn = ''
+        @source = ''
+        @detail_type = ''
+        @detail = {}
+      end
 
-            def detail
-                return @detail
-            end
-        end
+      def detail
+        return @detail
+      end
+    end
+
+    class RDSEventSubscription < BaseEventSubscription
+      attr_accessor :source_id, :rds_event_category, :message
 
-        class RDSEventSubscription < BaseEventSubscription
-            attr_accessor :source_id, :rds_event_category, :message
+      def initialize(resource)
+        super(resource)
+        @source = 'aws.rds'
+        @detail_type = 'RDS DB Instance Event'
+        @source_id = ''
+        @rds_event_category = ''
+        @message = ''
+      end
 
-            def initialize(resource)
-                super(resource)
-                @source = 'aws.rds'
-                @detail_type = 'RDS DB Instance Event'
-                @source_id = ''
-                @rds_event_category = ''
-                @message = ''
-            end
+      def detail
+        return {
+          EventCategories: [@rds_event_category],
+          SourceType: [@source_type],
+          SourceIdentifier: ["rds:#{@resource_id}"],
+          Message: [@message]
+        }
+      end
+    end
 
-            def detail
-                return {
-                    EventCategories: [@rds_event_category],
-                    SourceType: [@source_type],
-                    SourceIdentifier: ["rds:#{@resource_id}"],
-                    Message: [@message]
-                }
-            end
-        end
+    class RDSInstanceEventSubscription < RDSEventSubscription
+      def initialize(resource)
+        super(resource)
+        @source_type = 'DB_INSTANCE'
+      end
+    end
 
-        class RDSInstanceEventSubscription < RDSEventSubscription
-            def initialize(resource)
-                super(resource)
-                @source_type = 'DB_INSTANCE'
-            end
-        end
+    class RDSClusterEventSubscription < RDSEventSubscription
+      def initialize(resource)
+        super(resource)
+        @source_type = 'DB_CLUSTER'
+      end
+    end
 
-        class RDSClusterEventSubscription < RDSEventSubscription
-            def initialize(resource)
-                super(resource)
-                @source_type = 'DB_CLUSTER'
-            end
-        end
+    class Ec2InstanceEventSubscription < BaseEventSubscription
+      def initialize(resource)
+        super(resource)
+        @source = 'aws.ec2'
+      end
+    end
 
-        class Ec2InstanceEventSubscription < BaseEventSubscription
-            def initialize(resource)
-                super(resource)
-                @source = 'aws.ec2'
-            end
-        end
+    class BatchEventSubscription < BaseEventSubscription
+      def initialize(resource)
+        super(resource)
+        @source = 'aws.batch'
+      end
+    end
 
-        class ApiGatewayEventSubscription < BaseEventSubscription; end
-        class ApplicationTargetGroupEventSubscription < BaseEventSubscription; end
-        class AmazonMQBrokerEventSubscription < BaseEventSubscription; end
-        class CloudFrontDistributionEventSubscription < BaseEventSubscription; end
-        class AutoScalingGroupEventSubscription < BaseEventSubscription; end
-        class DynamoDBTableEventSubscription < BaseEventSubscription; end
-        class Ec2InstanceEventSubscription < BaseEventSubscription; end
-        class ECSClusterEventSubscription < BaseEventSubscription; end
-        class ECSServiceEventSubscription < BaseEventSubscription; end
-        class ElastiCacheReplicationGroupEventSubscription < BaseEventSubscription; end
-        class ElasticLoadBalancerEventSubscription < BaseEventSubscription; end
-        class ElasticFileSystemEventSubscription < BaseEventSubscription; end
-        class LambdaEventSubscription < BaseEventSubscription; end
-        class NetworkTargetGroupEventSubscription < BaseEventSubscription; end
-        class RedshiftClusterEventSubscription < BaseEventSubscription; end
+    class GlueEventSubscription < BaseEventSubscription
+      def initialize(resource)
+        super(resource)
+        @source = 'aws.glue'
+      end
     end
+
+    class ApiGatewayEventSubscription < BaseEventSubscription; end
+    class ApplicationTargetGroupEventSubscription < BaseEventSubscription; end
+    class AmazonMQBrokerEventSubscription < BaseEventSubscription; end
+    class CloudFrontDistributionEventSubscription < BaseEventSubscription; end
+    class AutoScalingGroupEventSubscription < BaseEventSubscription; end
+    class DynamoDBTableEventSubscription < BaseEventSubscription; end
+    class Ec2InstanceEventSubscription < BaseEventSubscription; end
+    class ECSClusterEventSubscription < BaseEventSubscription; end
+    class ECSServiceEventSubscription < BaseEventSubscription; end
+    class ElastiCacheReplicationGroupEventSubscription < BaseEventSubscription; end
+    class ElasticLoadBalancerEventSubscription < BaseEventSubscription; end
+    class ElasticFileSystemEventSubscription < BaseEventSubscription; end
+    class LambdaEventSubscription < BaseEventSubscription; end
+    class NetworkTargetGroupEventSubscription < BaseEventSubscription; end
+    class RedshiftClusterEventSubscription < BaseEventSubscription; end
+    class StepFunctionsSubscription < BaseEventSubscription; end
+  end
 end

data/lib/cfnguardian/resources/amazonmq_rabbitmq.rb

@@ -0,0 +1,136 @@
+module CfnGuardian::Resource
+  class AmazonMQRabbitMQBroker < Base
+      
+    def default_alarms
+      alarm = CfnGuardian::Models::AmazonMQRabbitMQBrokerAlarm.new(@resource)
+      alarm.name = 'ConnectionCountCritical'
+      alarm.metric_name = 'ConnectionCount'
+      alarm.comparison_operator = 'GreaterThanThreshold'
+      alarm.statistic = 'Maximum'
+      alarm.threshold = 50
+      alarm.evaluation_periods = 5
+      alarm.treat_missing_data = 'notBreaching'
+      @alarms.push(alarm)
+
+      alarm = CfnGuardian::Models::AmazonMQRabbitMQBrokerAlarm.new(@resource)
+      alarm.name = 'ConnectionCountWarn'
+      alarm.metric_name = 'ConnectionCount'
+      alarm.comparison_operator = 'GreaterThanThreshold'
+      alarm.statistic = 'Maximum'
+      alarm.threshold = 25
+      alarm.evaluation_periods = 5
+      alarm.treat_missing_data = 'notBreaching'
+      alarm.alarm_action = 'Warning'
+      @alarms.push(alarm)
+
+      alarm = CfnGuardian::Models::AmazonMQRabbitMQBrokerAlarm.new(@resource)
+      alarm.name = 'MessageCountCritical'
+      alarm.metric_name = 'MessageCount'
+      alarm.comparison_operator = 'GreaterThanThreshold'
+      alarm.statistic = 'Maximum'
+      alarm.threshold = 500
+      alarm.evaluation_periods = 5
+      alarm.treat_missing_data = 'notBreaching'
+      @alarms.push(alarm)
+
+      alarm = CfnGuardian::Models::AmazonMQRabbitMQBrokerAlarm.new(@resource)
+      alarm.name = 'MessageCountWarn'
+      alarm.metric_name = 'MessageCount'
+      alarm.comparison_operator = 'GreaterThanThreshold'
+      alarm.statistic = 'Maximum'
+      alarm.threshold = 250
+      alarm.evaluation_periods = 5
+      alarm.treat_missing_data = 'notBreaching'
+      alarm.alarm_action = 'Warning'
+      @alarms.push(alarm)
+
+    end
+  end
+
+  class AmazonMQRabbitMQQueue < Base
+      
+    def default_alarms
+
+      alarm = CfnGuardian::Models::AmazonMQRabbitMQQueueAlarm.new(@resource)
+      alarm.name = 'MessageCountHighWarn'
+      alarm.metric_name = 'MessageCount'
+      alarm.comparison_operator = 'GreaterThanThreshold'
+      alarm.statistic = 'Maximum'
+      alarm.threshold = 100
+      alarm.evaluation_periods = 5
+      alarm.treat_missing_data = 'notBreaching'
+      alarm.alarm_action = 'Warning'
+      @alarms.push(alarm)
+
+    end
+  end
+
+  class AmazonMQRabbitMQNode < Base
+
+    def default_alarms
+      alarm = CfnGuardian::Models::AmazonMQRabbitMQNodeAlarm.new(@resource)
+      alarm.name = 'SystemCpuUtilizationCritical'
+      alarm.metric_name = 'SystemCpuUtilization'
+      alarm.comparison_operator = 'GreaterThanThreshold'
+      alarm.statistic = 'Maximum'
+      alarm.threshold = 95
+      alarm.evaluation_periods = 10
+      alarm.treat_missing_data = 'notBreaching'
+      @alarms.push(alarm)
+
+      alarm = CfnGuardian::Models::AmazonMQRabbitMQNodeAlarm.new(@resource)
+      alarm.name = 'SystemCpuUtilizationHighBase'
+      alarm.metric_name = 'SystemCpuUtilization'
+      alarm.comparison_operator = 'GreaterThanThreshold'
+      alarm.statistic = 'Maximum'
+      alarm.threshold = 75
+      alarm.evaluation_periods = 30
+      alarm.treat_missing_data = 'notBreaching'
+      alarm.alarm_action = 'Warning'
+      @alarms.push(alarm)
+
+      alarm = CfnGuardian::Models::AmazonMQRabbitMQNodeAlarm.new(@resource)
+      alarm.name = 'RabbitMQMemUsedCritical'
+      alarm.metric_name = 'RabbitMQMemUsed'
+      alarm.comparison_operator = 'GreaterThanThreshold'
+      alarm.statistic = 'Maximum'
+      alarm.threshold = 390000000
+      alarm.evaluation_periods = 5
+      alarm.treat_missing_data = 'notBreaching'
+      @alarms.push(alarm)
+
+      alarm = CfnGuardian::Models::AmazonMQRabbitMQNodeAlarm.new(@resource)
+      alarm.name = 'RabbitMQMemUsedWarn'
+      alarm.metric_name = 'RabbitMQMemUsed'
+      alarm.comparison_operator = 'GreaterThanThreshold'
+      alarm.statistic = 'Maximum'
+      alarm.threshold = 350000000
+      alarm.evaluation_periods = 5
+      alarm.treat_missing_data = 'notBreaching'
+      alarm.alarm_action = 'Warning'
+      @alarms.push(alarm)
+
+      alarm = CfnGuardian::Models::AmazonMQRabbitMQNodeAlarm.new(@resource)
+      alarm.name = 'RabbitMQDiskFreeLimitCritical'
+      alarm.metric_name = 'RabbitMQDiskFreeLimit'
+      alarm.comparison_operator = 'LessThanThreshold'
+      alarm.statistic = 'Maximum'
+      alarm.threshold = 1200000000
+      alarm.evaluation_periods = 5
+      alarm.treat_missing_data = 'notBreaching'
+      @alarms.push(alarm)
+
+      alarm = CfnGuardian::Models::AmazonMQRabbitMQNodeAlarm.new(@resource)
+      alarm.name = 'RabbitMQDiskFreeLimitWarn'
+      alarm.metric_name = 'RabbitMQDiskFreeLimit'
+      alarm.comparison_operator = 'LessThanThreshold'
+      alarm.statistic = 'Maximum'
+      alarm.threshold = 1200000000
+      alarm.evaluation_periods = 5
+      alarm.treat_missing_data = 'notBreaching'
+      alarm.alarm_action = 'Warning'
+      @alarms.push(alarm)
+
+    end
+  end
+end

data/lib/cfnguardian/resources/base.rb

@@ -108,7 +108,7 @@ module CfnGuardian::Resource
       @alarms.each do |alarm|
         next if alarm.dimensions.nil?
         alarm.dimensions.each do |k,v|
-          if v.match?(/^\${Resource::.*[A-Za-z]}$/)
+          if v.is_a?(String) && v.match?(/^\${Resource::.*[A-Za-z]}$/)
             resource_key = v.tr('${}', '').split('Resource::').last
             if @resource.has_key?(resource_key)
               logger.debug "overriding alarm #{alarm.name} dimension key '#{k}' with value '#{@resource[resource_key]}'" 

data/lib/cfnguardian/resources/batch.rb

@@ -0,0 +1,14 @@
+module CfnGuardian::Resource
+  class Batch < Base
+    def default_event_subscriptions()
+      event_subscription = CfnGuardian::Models::BatchEventSubscription.new(@resource)
+      event_subscription.name = 'FailedBatch'
+      event_subscription.detail_type = 'Batch Job State Change'
+      event_subscription.detail = {
+        'status': ['FAILED'],
+        'jobQueue': ["arn:aws:batch:${AWS::Region}:${AWS::AccountId}:job-queue/#{@resource['Id']}"]
+      }
+      @event_subscriptions.push(event_subscription)
+    end
+  end
+end

data/lib/cfnguardian/resources/glue.rb

@@ -0,0 +1,23 @@
+module CfnGuardian::Resource
+  class Glue < Base
+    def default_event_subscriptions()
+      event_subscription = CfnGuardian::Models::BatchEventSubscription.new(@resource)
+      event_subscription.name = 'FailedGlueJob'
+      event_subscription.detail_type = 'Glue Job State Change'
+      event_subscription.detail = {
+        'state': ['FAILED'],
+        'jobName': [{'prefix': @resource['Id']}]
+      }
+      @event_subscriptions.push(event_subscription)
+
+      event_subscription = CfnGuardian::Models::BatchEventSubscription.new(@resource)
+      event_subscription.name = 'TimeoutGlueJob'
+      event_subscription.detail_type = 'Glue Job State Change'
+      event_subscription.detail = {
+        'state': ['TIMEOUT'],
+        'jobName': [{'prefix': @resource['Id']}]
+      }
+      @event_subscriptions.push(event_subscription)
+    end
+  end
+end

data/lib/cfnguardian/resources/rds_instance.rb

@@ -41,6 +41,15 @@ module CfnGuardian::Resource
       alarm.threshold = 45
       alarm.evaluation_periods = 10
       @alarms.push(alarm)
+
+      alarm = CfnGuardian::Models::RDSInstanceAlarm.new(@resource)
+      alarm.name = 'ReplicaLag'
+      alarm.metric_name = 'ReplicaLag'
+      alarm.threshold = 30 # seconds
+      alarm.evaluation_periods = 5
+      alarm.alarm_action = 'Warning'
+      alarm.enabled = false
+      @alarms.push(alarm)
     end
     
     def default_event_subscriptions()

data/lib/cfnguardian/resources/redshift_cluster.rb

@@ -1,14 +1,14 @@
 module CfnGuardian::Resource
   class RedshiftCluster < Base
-      
-    def default_alarms    
+
+    def default_alarms
       alarm = CfnGuardian::Models::RedshiftClusterAlarm.new(@resource)
       alarm.name = 'CPUUtilizationHighSpike'
       alarm.metric_name = 'CPUUtilization'
       alarm.threshold = 95
       alarm.evaluation_periods = 10
       @alarms.push(alarm)
-      
+
       alarm = CfnGuardian::Models::RedshiftClusterAlarm.new(@resource)
       alarm.name = 'CPUUtilizationHighBase'
       alarm.metric_name = 'CPUUtilization'
@@ -16,15 +16,32 @@ module CfnGuardian::Resource
       alarm.evaluation_periods = 60
       alarm.alarm_action = 'Warning'
       @alarms.push(alarm)
-      
+
       alarm = CfnGuardian::Models::RedshiftClusterAlarm.new(@resource)
       alarm.name = 'UnHealthyCluster'
       alarm.metric_name = 'HealthStatus'
-      alarm.threshold = 0
+      alarm.comparison_operator = 'LessThanThreshold'
+      alarm.threshold = 1
       alarm.evaluation_periods = 10
-      alarm.treat_missing_data = 'notBreaching'
+      @alarms.push(alarm)
+
+      alarm = CfnGuardian::Models::RedshiftClusterAlarm.new(@resource)
+      alarm.name = 'DiskSpaceUsedCrit'
+      alarm.metric_name = 'PercentageDiskSpaceUsed'
+      alarm.comparison_operator = 'GreaterThanThreshold'
+      alarm.threshold = 90
+      alarm.evaluation_periods = 10
+      @alarms.push(alarm)
+
+      alarm = CfnGuardian::Models::RedshiftClusterAlarm.new(@resource)
+      alarm.name = 'DiskSpaceUsedWarm'
+      alarm.metric_name = 'PercentageDiskSpaceUsed'
+      alarm.comparison_operator = 'GreaterThanThreshold'
+      alarm.threshold = 80
+      alarm.evaluation_periods = 10
+      alarm.alarm_action = 'Warning'
       @alarms.push(alarm)
     end
-    
+
   end
 end

data/lib/cfnguardian/resources/step_functions.rb

@@ -0,0 +1,41 @@
+module CfnGuardian::Resource
+  class StepFunctions < Base
+      
+    def default_alarms    
+      alarm = CfnGuardian::Models::StepFunctionsAlarm.new(@resource)
+      alarm.name = 'ExecutionsFailed'
+      alarm.metric_name = 'ExecutionsFailed'
+      alarm.threshold = 1
+      alarm.evaluation_periods = 5
+      alarm.treat_missing_data = 'notBreaching'
+      @alarms.push(alarm)
+
+      alarm = CfnGuardian::Models::StepFunctionsAlarm.new(@resource)
+      alarm.name = 'ExecutionsTimedOut'
+      alarm.metric_name = 'ExecutionsTimedOut'
+      alarm.threshold = 1
+      alarm.evaluation_periods = 5
+      alarm.treat_missing_data = 'notBreaching'
+      @alarms.push(alarm)
+
+      alarm = CfnGuardian::Models::StepFunctionsAlarm.new(@resource)
+      alarm.name = 'ExecutionThrottled'
+      alarm.metric_name = 'ExecutionThrottled'
+      alarm.threshold = 1
+      alarm.evaluation_periods = 5
+      alarm.alarm_action = 'Warning'
+      alarm.treat_missing_data = 'notBreaching'
+      @alarms.push(alarm)
+
+      alarm = CfnGuardian::Models::StepFunctionsAlarm.new(@resource)
+      alarm.name = 'ExecutionTime'
+      alarm.metric_name = 'ExecutionTime'
+      alarm.threshold = 60
+      alarm.evaluation_periods = 5
+      alarm.alarm_action = 'Warning'
+      alarm.treat_missing_data = 'notBreaching'
+      @alarms.push(alarm)
+    end
+      
+  end
+end

data/lib/cfnguardian/stacks/resources.rb

@@ -132,7 +132,7 @@ module CfnGuardian
           Events_Rule("#{subscription.group}#{subscription.name}#{subscription.hash}"[0..255]) do
             State subscription.enabled ? 'ENABLED' : 'DISABLED'
             Description "Guardian event subscription #{subscription.group} #{subscription.name} for resource #{subscription.resource_id}"
-            EventPattern event_pattern
+            EventPattern FnSub(event_pattern.to_json)
             Targets [
               {
                 Arn: Ref(subscription.topic),

data/lib/cfnguardian/version.rb

@@ -1,4 +1,4 @@
 module CfnGuardian
-  VERSION = "0.6.2"
+  VERSION = "0.6.7"
   CHANGE_SET_VERSION = VERSION.gsub('.', '-').freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cfn-guardian
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.7
 platform: ruby
 authors:
 - Guslington
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-02-04 00:00:00.000000000 Z
+date: 2021-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -271,11 +271,13 @@ files:
 - lib/cfnguardian/models/event_subscription.rb
 - lib/cfnguardian/models/metric_filter.rb
 - lib/cfnguardian/resources/amazonmq_broker.rb
+- lib/cfnguardian/resources/amazonmq_rabbitmq.rb
 - lib/cfnguardian/resources/apigateway.rb
 - lib/cfnguardian/resources/application_targetgroup.rb
 - lib/cfnguardian/resources/autoscaling_group.rb
 - lib/cfnguardian/resources/azure_file.rb
 - lib/cfnguardian/resources/base.rb
+- lib/cfnguardian/resources/batch.rb
 - lib/cfnguardian/resources/cloudfront_distribution.rb
 - lib/cfnguardian/resources/domain_expiry.rb
 - lib/cfnguardian/resources/dynamodb_table.rb
@@ -285,6 +287,7 @@ files:
 - lib/cfnguardian/resources/elastic_file_system.rb
 - lib/cfnguardian/resources/elastic_loadbalancer.rb
 - lib/cfnguardian/resources/elasticache_replication_group.rb
+- lib/cfnguardian/resources/glue.rb
 - lib/cfnguardian/resources/http.rb
 - lib/cfnguardian/resources/internal_http.rb
 - lib/cfnguardian/resources/internal_port.rb
@@ -301,6 +304,7 @@ files:
 - lib/cfnguardian/resources/sftp.rb
 - lib/cfnguardian/resources/sql.rb
 - lib/cfnguardian/resources/sqs_queue.rb
+- lib/cfnguardian/resources/step_functions.rb
 - lib/cfnguardian/resources/tls.rb
 - lib/cfnguardian/s3.rb
 - lib/cfnguardian/stacks/main.rb
@@ -330,7 +334,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Manages AWS cloudwatch alarms with default templates using cloudformation