cfn_monitor 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83c0c905a435c5f898ebcfaa505db758d92cc3527fd170e67b001bef38dedcbd
-  data.tar.gz: ed28eef1615dc18c2a6a09b0ba76a65067cb2229f766272793eb064f3307ade5
+  metadata.gz: d9ad46a04c973e8e513a89fa1a6aaa774c55680e6d23b3a86d295107420cfe79
+  data.tar.gz: 2004bfad14bb93e09873f4d048d24a03333b43c489da972be5525ab3f402f669
 SHA512:
-  metadata.gz: a4dae73aed3500adee7b9b80a5e86e730c0c35ee23a780ee34c5765188adaaedc9e45c9dbaae9f8ed582a5a6d3edcd9c4dc1b21617854d85f8d56109aef35270
-  data.tar.gz: 87d68f547c4826dc1efad61a9fbb7d84a6bb295e6bbb0f1fc1f87bc4f3ecafa4e5b521ca5a8f89511467d88dc552474df8cd9e9f0e0491893f39a94236bd0982
+  metadata.gz: e10aa44c6904f4f2e669ebd4d30ff1876c1bab5d6b79a6672591cf7003f762b830d744695864b8de89c7b99ddd7f7db55adf6c019d357f59d21df3003fcbc896
+  data.tar.gz: 4a99599700015475d0df8ae6e2822763c07b343c94a325167b838c09e0cc1644a3403e6a1e4cefc16659b0c65795e6ee07f63953a8cbc666b2c891037603a2af

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cfn_monitor (0.3.2)
+    cfn_monitor (0.4.0)
       aws-sdk-cloudformation (~> 1, < 2)
       aws-sdk-elasticloadbalancingv2 (~> 1, < 2)
       aws-sdk-s3 (~> 1, < 2)
@@ -12,28 +12,28 @@ GEM
   remote: https://rubygems.org/
   specs:
     aws-eventstream (1.0.3)
-    aws-partitions (1.168.0)
-    aws-sdk-cloudformation (1.22.0)
-      aws-sdk-core (~> 3, >= 3.53.0)
+    aws-partitions (1.176.0)
+    aws-sdk-cloudformation (1.23.0)
+      aws-sdk-core (~> 3, >= 3.56.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-core (3.54.0)
+    aws-sdk-core (3.56.0)
       aws-eventstream (~> 1.0, >= 1.0.2)
       aws-partitions (~> 1.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-elasticloadbalancingv2 (1.29.0)
-      aws-sdk-core (~> 3, >= 3.53.0)
+    aws-sdk-elasticloadbalancingv2 (1.30.0)
+      aws-sdk-core (~> 3, >= 3.56.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-kms (1.21.0)
-      aws-sdk-core (~> 3, >= 3.53.0)
+    aws-sdk-kms (1.22.0)
+      aws-sdk-core (~> 3, >= 3.56.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.40.0)
-      aws-sdk-core (~> 3, >= 3.53.0)
+    aws-sdk-s3 (1.43.0)
+      aws-sdk-core (~> 3, >= 3.56.0)
       aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.0)
+      aws-sigv4 (~> 1.1)
     aws-sigv4 (1.1.0)
       aws-eventstream (~> 1.0, >= 1.0.2)
-    cfndsl (0.16.13)
+    cfndsl (0.17.0)
     diff-lcs (1.3)
     jmespath (1.4.0)
     rake (10.5.0)

data/lib/cfn_monitor/query.rb

@@ -116,11 +116,19 @@ module CfnMonitor
             end
             stackResources[:template]["#{location[1..-1]}.#{resource['logical_resource_id']}/#{tg['target_groups'][0]['load_balancer_arns'][0]}"] = config['resource_defaults'][resource['resource_type']]
           else
-            stackResources[:template]["#{location[1..-1]}.#{resource['logical_resource_id']}"] = config['resource_defaults'][resource['resource_type']]
+            if location[1..-1].nil?
+                stackResources[:template]["#{stack}::#{resource['logical_resource_id']}"] = config['resource_defaults'][resource['resource_type']]
+            else
+                stackResources[:template]["#{location[1..-1]}.#{resource['logical_resource_id']}"] = config['resource_defaults'][resource['resource_type']]
+            end
           end
           stackResourceCount += 1
           stackResourceCountLocal += 1
-          print "#{location[1..-1]}: Found #{stackResourceCount} resource#{"s" if stackResourceCount != 1}\r"
+          if location[1..-1].nil?
+            print "#{stack}: Found #{stackResourceCount} resource#{"s" if stackResourceCount != 1}\r"
+           else
+            print "#{location[1..-1]}: Found #{stackResourceCount} resource#{"s" if stackResourceCount != 1}\r"
+           end
           sleep 0.2
         elsif resource['resource_type'] == 'AWS::ElasticLoadBalancingV2::LoadBalancer'
           stackResources[:physical_resource_id][resource['physical_resource_id']] = "#{location[1..-1]}.#{resource['logical_resource_id']}"

data/lib/cfn_monitor/version.rb

@@ -1,3 +1,3 @@
 module CfnMonitor
-  VERSION = "0.3.2".freeze
+  VERSION = "0.4.0".freeze
 end

data/lib/config/config.yml

@@ -13,3 +13,6 @@ resource_defaults:
   AWS::DynamoDB::Table: DynamoDBTable
   AWS::ApiGateway::RestApi: ApiGateway
   AWS::AmazonMQ::Broker: AmazonMQBroker
+  AWS::Lambda::Function: LambdaFunction
+  AWS::SQS::Queue: SQSQueue
+  AWS::CloudFront::Distribution: CloudFrontDistribution

data/lib/config/templates.yml

@@ -85,18 +85,18 @@ templates:
       ComparisonOperator: LessThanThreshold
       Dimensions: [ { Name: 'URL', Value: '${resource}' } ]
       Statistic: Maximum
-      Threshold: 30   # 30 days
+      Threshold: 5   # 5 days
       Period: 60
       EvaluationPeriods: 1
       MetricName: ExpiresInDays
       AlarmDescription: { 'Fn::Join': [ ' ', [ '${resource}', '${templateName}' ] ] }
-    Warn:
-      AlarmActions: warn
+    Task:
+      AlarmActions: task
       Namespace: SSL
       ComparisonOperator: LessThanThreshold
       Dimensions: [ { Name: 'URL', Value: '${resource}' } ]
       Statistic: Maximum
-      Threshold: 60   # 60 days
+      Threshold: 30   # 30 days
       Period: 60
       EvaluationPeriods: 1
       MetricName: ExpiresInDays
@@ -108,18 +108,18 @@ templates:
       ComparisonOperator: LessThanThreshold
       Dimensions: [ { Name: 'Domain', Value: '${resource}' } ]
       Statistic: Maximum
-      Threshold: 30   # 30 days
+      Threshold: 5 # 5 days
       Period: 60
       EvaluationPeriods: 1
       MetricName: ExpiresInDays
       AlarmDescription: { 'Fn::Join': [ ' ', [ '${resource}', '${templateName}' ] ] }
-    Warn:
-      AlarmActions: warn
+    Task:
+      AlarmActions: task
       Namespace: DNS
       ComparisonOperator: LessThanThreshold
       Dimensions: [ { Name: 'Domain', Value: '${resource}' } ]
       Statistic: Maximum
-      Threshold: 60   # 60 days
+      Threshold: 30   # 30 days
       Period: 60
       EvaluationPeriods: 1
       MetricName: ExpiresInDays
@@ -461,10 +461,31 @@ templates:
       Namespace: AWS/ApiGateway
       MetricName: 5XXError
       ComparisonOperator: GreaterThanThreshold
-      DimensionsName: ApiName
+      #DimensionsName: ApiName
+      Dimensions: [ { Name: 'ApiName', Value: '${name}' }]
+      Statistic: Sum
+      Threshold: 5
+      EvaluationPeriods: 2
+    ApiEndpoint4xx:
+      AlarmActions: warn
+      Namespace: AWS/ApiGateway
+      MetricName: 4XXError
+      ComparisonOperator: GreaterThanThreshold
+      #DimensionsName: ApiName
+      Dimensions: [ { Name: 'ApiName', Value: '${name}' }]
       Statistic: Sum
       Threshold: 5
       EvaluationPeriods: 2
+    Latency:
+      AlarmActions: warn
+      Namespace: AWS/ApiGateway
+      MetricName: Latency
+      ComparisonOperator: GreaterThanThreshold
+      #DimensionsName: ApiName
+      Dimensions: [ { Name: 'ApiName', Value: '${name}' }]
+      Statistic: Average
+      Threshold: 5
+      EvaluationPeriods: 2
   DynamoDBTable: #AWS::DynamoDB::Table
     DynamoDBReadUsage:
       AlarmActions: warn
@@ -637,3 +658,119 @@ templates:
       Period: 60
       EvaluationPeriods: 3
       TreatMissingData: notBreaching
+  SQSQueue:
+    ApproximateAgeOfOldestMessage:
+      AlarmActions: crit
+      Namespace: AWS/SQS
+      ComparisonOperator: GreaterThanThreshold
+      DimensionsName: QueueName
+      Statistic: Average
+      Threshold: 0.5
+      Period: 60
+      EvaluationPeriods: 5
+      MetricName: ApproximateAgeOfOldestMessage
+      TreatMissingData: breaching
+    ApproximateNumberOfMessagesVisible:
+      AlarmActions: crit
+      Namespace: AWS/SQS
+      ComparisonOperator: GreaterThanThreshold
+      DimensionsName: QueueName
+      Statistic: Average
+      Threshold: 0.5
+      Period: 60
+      EvaluationPeriods: 5
+      MetricName: ApproximateNumberOfMessagesVisible
+      TreatMissingData: breaching
+  LambdaFunction: #AWS::Lambda::Function
+    Throttles:
+      AlarmActions: crit
+      Namespace: AWS/Lambda
+      ComparisonOperator: GreaterThanThreshold
+      DimensionsName: FunctionName
+      Statistic: Average
+      Threshold: 0.5
+      Period: 60
+      EvaluationPeriods: 5
+      MetricName: Throttles
+      TreatMissingData: notBreaching
+    DeadLetterErrors:
+      AlarmActions: crit
+      Namespace: AWS/Lambda
+      ComparisonOperator: GreaterThanThreshold
+      DimensionsName: FunctionName
+      Statistic: Average
+      Threshold: 0.5
+      Period: 60
+      EvaluationPeriods: 5
+      MetricName: DeadLetterErrors
+      TreatMissingData: notBreaching
+  LambdaFunctionIteratorAge:
+    IteratorAge:
+      AlarmActions: crit
+      Namespace: AWS/Lambda
+      ComparisonOperator: GreaterThanThreshold
+      DimensionsName: FunctionName
+      Statistic: Average
+      Threshold: 600000
+      Period: 60
+      EvaluationPeriods: 5
+      MetricName: IteratorAge
+      TreatMissingData: notBreaching
+  LambdaFunctionDuration:
+    Duration:
+      AlarmActions: crit
+      Namespace: AWS/Lambda
+      ComparisonOperator: GreaterThanThreshold
+      DimensionsName: FunctionName
+      Statistic: Average
+      Threshold: 30
+      Period: 60
+      EvaluationPeriods: 5
+      MetricName: Duration
+      TreatMissingData: notBreaching
+  LambdaFunctionErrors:
+    Errors:
+      AlarmActions: crit
+      Namespace: AWS/Lambda
+      ComparisonOperator: GreaterThanThreshold
+      DimensionsName: FunctionName
+      Statistic: Average
+      Threshold: 0.5
+      Period: 60
+      EvaluationPeriods: 5
+      MetricName: Errors
+      TreatMissingData: notBreaching
+  CloudFrontDistribution:
+    4xxErrorRate:
+      AlarmActions: warn
+      Namespace: AWS/CloudFront
+      ComparisonOperator: GreaterThanThreshold
+      DimensionsName: DistributionId
+      SecondaryDimensions: [ { Name: 'Region', Value: 'Global' }]
+      Statistic: Sum
+      Threshold: 5
+      EvaluationPeriods: 2
+      MetricName: 4xxErrorRate
+      TreatMissingData: breaching
+    5xxErrorRate:
+      AlarmActions: warn
+      Namespace: AWS/CloudFront
+      ComparisonOperator: GreaterThanThreshold
+      SecondaryDimensions: [ { Name: 'Region', Value: 'Global' }]
+      DimensionsName: DistributionId
+      Statistic: Average
+      Threshold: 5
+      EvaluationPeriods: 2
+      MetricName: 5xxErrorRate
+      TreatMissingData: breaching
+    TotalErrorRate:
+      AlarmActions: warn
+      Namespace: AWS/CloudFront
+      ComparisonOperator: GreaterThanThreshold
+      SecondaryDimensions: [ { Name: 'Region', Value: 'Global' }]
+      DimensionsName: DistributionId
+      Statistic: Average
+      Threshold: 5
+      EvaluationPeriods: 5
+      MetricName: TotalErrorRate
+      TreatMissingData: breaching

data/lib/templates/alarms.rb

@@ -126,9 +126,15 @@ CloudFormation do
         dimensionValue = FnSelect('1',FnSplit('loadbalancer/',Ref("GetPhysicalId#{resourceHash}"))) if dimensionsNames[index] == 'LoadBalancer'
         dimensionValue = FnSelect('1',FnSplit('service/',Ref("GetPhysicalId#{resourceHash}"))) if dimensionsNames[index] == 'ServiceName'
         dimensionValue = FnJoin('', [Ref("GetPhysicalId#{resourceHash}"),'-001']) if dimensionsNames[index] == 'CacheClusterId'
+        dimensionValue = FnSelect('4',FnSplit('/',Ref("GetPhysicalId#{resourceHash}"))) if dimensionsNames[index] == 'QueueName'
         # Prepare conditions based on physical resource ID values
         conditions << FnNot(FnEquals(Ref("GetPhysicalId#{resourceHash}"),'null'))
         dimensions << { Name: dimensionsNames[index], Value: dimensionValue }
+        if params.key?('SecondaryDimensions')
+            params['SecondaryDimensions'].each do |secondaryDimension|
+                dimensions << secondaryDimension
+            end
+        end
       end
       params['Dimensions'] = dimensions
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cfn_monitor
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Base2Services
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-29 00:00:00.000000000 Z
+date: 2019-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -247,7 +247,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: Configure and generate a cloudwatch monitoring cloudformation stack