cfn-guardian 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dbe63daad265c8b1868992f73fbb38fd68a65833745264f2a276ea1cbe9a4cda
-  data.tar.gz: d3bb8f9a33a80d6e56b8040b712ffcfca3b0d5c958e22cc7d6983c204cbd65d4
+  metadata.gz: 7998606f2ce8404ce0b55dddb9e5d1f4936cd5529364e0b909b1ea3133163ac8
+  data.tar.gz: 82f582858ae75993fc77966e2ae42d9142a1b16a428f74f67f5c1afb2b74854e
 SHA512:
-  metadata.gz: 3135ca24580cbdbf1d361f3c4ada2e0fcf5b401d3a9a1aaf01d0ac366e51375d6de4251d41254cdfe5153f190ec339c7f79e5d79917cc31a502a9d216a8bee33
-  data.tar.gz: f8f9b8a6846747ff1e5cb2ae38c07302d2ef10ee0c5b8d617461c958f68316e36d93f2a8fb7cec4308023861ef70b48d26e212248f96b53e0988589e6d57fb41
+  metadata.gz: f3bda3d2c3c6665749843206c10f3260a5862d87b9f8e066c17eb2b52b996a2911dd619435a16f52336c6aa534a2a0cc39caa03859f1f5f32f6b31182736b44c
+  data.tar.gz: '0665209c6f4e74710383cf37be0a63446e38ed1b89fe6072b8efd030b0b4a010e31f7b54bfed456ea0bd866929b8d769b77506de2e4b5199357bd91fc8ae6213'

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)

data/lib/cfnguardian/compile.rb

@@ -36,6 +36,7 @@ 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/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)

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/redshift_cluster.rb

@@ -20,9 +20,9 @@ module CfnGuardian::Resource
       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)
     end
     

data/lib/cfnguardian/version.rb

@@ -1,4 +1,4 @@
 module CfnGuardian
-  VERSION = "0.6.2"
+  VERSION = "0.6.3"
   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.3
 platform: ruby
 authors:
 - Guslington
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-02-04 00:00:00.000000000 Z
+date: 2021-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -271,6 +271,7 @@ 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