cfn_monitor 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f82fba1b0a02e6030b91b9edda8a57a64521771cec555774f454d5f744e7b90a
-  data.tar.gz: e5418101905069220eee2c3f2125be30a6082544bec2767297ef4e42b457a287
+  metadata.gz: 5eb7a9ec110ec59c924741f75f73f51fe4adcfd8e721607f25161c4591173dbc
+  data.tar.gz: a75e7a68d8be164a3792d1588fe12b707be29df411986ea929fca972b5e10032
 SHA512:
-  metadata.gz: '0186c8bc6f63540f48798cc32a1947bf36279226600ba758834155ba3a9e5ad574f4877972681d781969f10dab08aabb0dba2388d712d64ef7cabf79d6212ee7'
-  data.tar.gz: 00ac7ac7ceae22e0828ef760805799079a362f076e7f694ce097306a26e07f3b8a2c5f446e52b2bbebe7315b482e653abb9d666218f10e028cfc91d2429a0c8c
+  metadata.gz: f9ba5341adf013866a399c30ab6279b54a2c0007796c927f45a3643d245b7de985312c32bec7c34388ed521a5f9031314e669b6dac2c294d9f5d8714ae398a69
+  data.tar.gz: 3debd964f85d66c8f80c1046b266aca364793eeb8e997b0d2c7b7d50ea819da3ed4804ca5c4e1bcc6b65e1c3b0c28444ec0dc719c9f8e033a482e2f241884fbf

data/Gemfile.lock

@@ -0,0 +1,65 @@
+PATH
+  remote: .
+  specs:
+    cfn_monitor (0.3.1)
+      aws-sdk-cloudformation (~> 1, < 2)
+      aws-sdk-elasticloadbalancingv2 (~> 1, < 2)
+      aws-sdk-s3 (~> 1, < 2)
+      cfndsl (~> 0.16)
+      thor (~> 0.19)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    aws-eventstream (1.0.2)
+    aws-partitions (1.147.0)
+    aws-sdk-cloudformation (1.18.0)
+      aws-sdk-core (~> 3, >= 3.48.2)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-core (3.48.3)
+      aws-eventstream (~> 1.0, >= 1.0.2)
+      aws-partitions (~> 1.0)
+      aws-sigv4 (~> 1.1)
+      jmespath (~> 1.0)
+    aws-sdk-elasticloadbalancingv2 (1.26.0)
+      aws-sdk-core (~> 3, >= 3.48.2)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-kms (1.16.0)
+      aws-sdk-core (~> 3, >= 3.48.2)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-s3 (1.36.0)
+      aws-sdk-core (~> 3, >= 3.48.2)
+      aws-sdk-kms (~> 1)
+      aws-sigv4 (~> 1.0)
+    aws-sigv4 (1.1.0)
+      aws-eventstream (~> 1.0, >= 1.0.2)
+    cfndsl (0.16.13)
+    diff-lcs (1.3)
+    jmespath (1.4.0)
+    rake (10.5.0)
+    rspec (0.9.4)
+    rspec-core (3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.0)
+    thor (0.20.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 2)
+  cfn_monitor!
+  rake (~> 10.0)
+  rspec (~> 0.9)
+  rspec-core (~> 3.8)
+  rspec-expectations (~> 3.8)
+  rspec-mocks (~> 3.8)
+
+BUNDLED WITH
+   2.0.1

data/cfn_monitor.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "aws-sdk-s3", "~> 1", "<2"
   spec.add_dependency "aws-sdk-elasticloadbalancingv2", "~> 1", "<2"
 
-  spec.add_development_dependency "bundler", "~> 1.16"
+  spec.add_development_dependency "bundler", "~> 2"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 0.9"
   spec.add_development_dependency "rspec-core", "~> 3.8"

data/lib/cfn_monitor/version.rb

@@ -1,3 +1,3 @@
 module CfnMonitor
-  VERSION = "0.3.0".freeze
+  VERSION = "0.3.1".freeze
 end

data/lib/config/config.yml

@@ -11,4 +11,5 @@ resource_defaults:
   AWS::EC2::Instance: Ec2Instance
   AWS::Redshift::Cluster: RedshiftCluster
   AWS::DynamoDB::Table: DynamoDBTable
-  AWS::ApiGateway::RestApi: ApiGateway
+  AWS::ApiGateway::RestApi: ApiGateway
+  AWS::AmazonMQ::Broker: AmazonMQBroker

data/lib/config/templates.yml

@@ -484,6 +484,24 @@ templates:
       Statistic: Sum
       Threshold: 80
       EvaluationPeriods: 2
+    DynamoDBReadThrottleEvents:
+      AlarmActions: warn
+      Namespace: AWS/DynamoDB
+      MetricName: ReadThrottleEvents
+      ComparisonOperator: GreaterThanOrEqualToThreshold
+      DimensionsName: TableName
+      Statistic: Sum
+      Threshold: 1
+      EvaluationPeriods: 2
+    DynamoDBWriteThrottleEvents:
+      AlarmActions: warn
+      Namespace: AWS/DynamoDB
+      MetricName: WriteThrottleEvents
+      ComparisonOperator: GreaterThanOrEqualToThreshold
+      DimensionsName: TableName
+      Statistic: Sum
+      Threshold: 1
+      EvaluationPeriods: 2
   ElasticLoadBalancerSingleInstance: # AWS::ElasticLoadBalancing::LoadBalancer
     HealthyHosts:
       AlarmActions: crit
@@ -506,6 +524,7 @@ templates:
       Threshold: 0
       EvaluationPeriods: 10
       TreatMissingData: notBreaching
+
   # Custom metric checks. The dimensions are configured in the CloudWatch agent's config on the instance.
   DiskSpaceCheck:
     CritLowDiskSpaceRootPath:
@@ -519,7 +538,6 @@ templates:
       EvaluationPeriods: 1
       MetricName: DiskSpaceUsedPercent
       TreatMissingData: breaching
-
     WarnLowDiskSpaceRootPath:
       AlarmActions: warn
       Namespace: CWAgent
@@ -531,7 +549,6 @@ templates:
       EvaluationPeriods: 1
       MetricName: DiskSpaceUsedPercent
       TreatMissingData: breaching
-
     CritLowDiskSpaceDataPath:
       AlarmActions: crit
       Namespace: CWAgent
@@ -543,7 +560,6 @@ templates:
       EvaluationPeriods: 1
       MetricName: DiskSpaceUsedPercent
       TreatMissingData: breaching
-
     WarnLowDiskSpaceDataPath:
       AlarmActions: warn
       Namespace: CWAgent
@@ -555,7 +571,6 @@ templates:
       EvaluationPeriods: 1
       MetricName: DiskSpaceUsedPercent
       TreatMissingData: breaching
-
     CritLowDiskSpaceDockerPath:
       AlarmActions: crit
       Namespace: CWAgent
@@ -567,7 +582,6 @@ templates:
       EvaluationPeriods: 1
       MetricName: DiskSpaceUsedPercent
       TreatMissingData: breaching
-
     WarnLowDiskSpaceDockerPath:
       AlarmActions: warn
       Namespace: CWAgent
@@ -579,3 +593,47 @@ templates:
       EvaluationPeriods: 1
       MetricName: DiskSpaceUsedPercent
       TreatMissingData: breaching
+
+  AmazonMQBroker: # AWS::AmazonMQ::Broker
+    CpuCreditBalanceCrit:
+      AlarmActions: crit
+      Namespace: AWS/AmazonMQ
+      MetricName: CpuCreditBalance
+      ComparisonOperator: LessThanThreshold
+      Dimensions: [ { Name: 'Broker', Value: "${metric}" } ]
+      Statistic: Minimum
+      Threshold: 15
+      EvaluationPeriods: 1
+      TreatMissingData: notBreaching
+    CpuCreditBalanceWarn:
+      AlarmActions: warn
+      Namespace: AWS/AmazonMQ
+      MetricName: CpuCreditBalance
+      ComparisonOperator: LessThanThreshold
+      Dimensions: [ { Name: 'Broker', Value: "${metric}" } ]
+      Statistic: Minimum
+      Threshold: 30
+      EvaluationPeriods: 1
+      TreatMissingData: notBreaching
+    CpuUtilizationCrit:
+      AlarmActions: crit
+      Namespace: AWS/AmazonMQ
+      MetricName: CpuUtilization
+      ComparisonOperator: GreaterThanThreshold
+      Dimensions: [ { Name: 'Broker', Value: "${metric}" } ]
+      Statistic: Maximum
+      Threshold: 95
+      Period: 60
+      EvaluationPeriods: 3
+      TreatMissingData: notBreaching
+    CpuUtilizationWarn:
+      AlarmActions: warn
+      Namespace: AWS/AmazonMQ
+      MetricName: CpuUtilization
+      ComparisonOperator: GreaterThanThreshold
+      Dimensions: [ { Name: 'Broker', Value: "${metric}" } ]
+      Statistic: Maximum
+      Threshold: 80
+      Period: 60
+      EvaluationPeriods: 3
+      TreatMissingData: notBreaching

data/lib/templates/alarms.rb

@@ -16,6 +16,9 @@ CloudFormation do
   Parameter("SnsTopicTask"){
     Type 'String'
   }
+  Parameter("SnsTopicInfo"){
+    Type 'String'
+  }
   Parameter("MonitoringDisabled"){
     Type 'String'
   }
@@ -30,11 +33,13 @@ CloudFormation do
   Condition('CritSNS', FnNot(FnEquals(Ref("SnsTopicCrit"),'')))
   Condition('WarnSNS', FnNot(FnEquals(Ref("SnsTopicWarn"),'')))
   Condition('TaskSNS', FnNot(FnEquals(Ref("SnsTopicTask"),'')))
+  Condition('InfoSNS', FnNot(FnEquals(Ref("SnsTopicInfo"),'')))
 
   actionsEnabledMap = {
     crit: FnIf('CritSNS',[ Ref('SnsTopicCrit') ], [ ]),
     warn: FnIf('WarnSNS',[ Ref('SnsTopicWarn') ], [ ]),
-    task: FnIf('TaskSNS',[ Ref('SnsTopicTask') ], [ ])
+    task: FnIf('TaskSNS',[ Ref('SnsTopicTask') ], [ ]),
+    info: FnIf('InfoSNS',[ Ref('SnsTopicInfo') ], [ ]),
   }
 
   alarms.each do |alarm|
@@ -162,12 +167,13 @@ CloudFormation do
       Property('EvaluateLowSampleCountPercentile', params['EvaluateLowSampleCountPercentile']) unless params['EvaluateLowSampleCountPercentile'].nil?
       Property('EvaluationPeriods', FnFindInMap("#{alarmHash}",'EvaluationPeriods',Ref('EnvironmentType')))
       Property('ExtendedStatistic', params['ExtendedStatistic']) unless params['ExtendedStatistic'].nil?
+      Property('DatapointsToAlarm', params['DatapointsToAlarm']) unless params['DatapointsToAlarm'].nil?
       Property('InsufficientDataActions', insufficientDataActions)
       Property('MetricName', FnFindInMap("#{alarmHash}",'MetricName',Ref('EnvironmentType')))
       Property('Namespace', FnFindInMap("#{alarmHash}",'Namespace',Ref('EnvironmentType')))
       Property('OKActions', oKActions)
       Property('Period', FnFindInMap("#{alarmHash}",'Period',Ref('EnvironmentType')))
-      Property('Statistic', FnFindInMap("#{alarmHash}",'Statistic',Ref('EnvironmentType')))
+      Property('Statistic', FnFindInMap("#{alarmHash}",'Statistic',Ref('EnvironmentType'))) unless !params['ExtendedStatistic'].nil?
       Property('Threshold', FnFindInMap("#{alarmHash}",'Threshold',Ref('EnvironmentType')))
       Property('TreatMissingData',FnFindInMap("#{alarmHash}",'TreatMissingData',Ref('EnvironmentType')))
       Property('Unit', params['Unit']) unless params['Unit'].nil?

data/lib/templates/master.rb

@@ -19,6 +19,9 @@ CloudFormation do
   Parameter("SnsTopicTask"){
     Type 'String'
   }
+  Parameter("SnsTopicInfo"){
+    Type 'String'
+  }
   Parameter("MonitoringDisabled"){
     Type 'String'
     Default false
@@ -228,6 +231,7 @@ CloudFormation do
     SnsTopicCrit: Ref('SnsTopicCrit'),
     SnsTopicWarn: Ref('SnsTopicWarn'),
     SnsTopicTask: Ref('SnsTopicTask'),
+    SnsTopicInfo: Ref('SnsTopicInfo'),
     MonitoringDisabled: Ref('MonitoringDisabled'),
     EnvironmentType: Ref('EnvironmentType'),
     GetPhysicalIdFunctionArn: FnGetAtt('GetPhysicalIdFunction','Arn'),

data/lib/templates/resources.rb

@@ -15,6 +15,9 @@ CloudFormation do
   Parameter("SnsTopicTask"){
     Type 'String'
   }
+  Parameter("SnsTopicInfo"){
+    Type 'String'
+  }
   Parameter("MonitoringDisabled"){
     Type 'String'
   }
@@ -66,6 +69,7 @@ CloudFormation do
     SnsTopicCrit: Ref('SnsTopicCrit'),
     SnsTopicWarn: Ref('SnsTopicWarn'),
     SnsTopicTask: Ref('SnsTopicTask'),
+    SnsTopicInfo: Ref('SnsTopicInfo'),
     MonitoringDisabled: Ref('MonitoringDisabled'),
     EnvironmentType: Ref('EnvironmentType'),
     EnvironmentName: Ref('EnvironmentName')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cfn_monitor
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Base2Services
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-10 00:00:00.000000000 Z
+date: 2019-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -106,14 +106,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -201,6 +201,7 @@ files:
 - ".travis.yml"
 - Dockerfile
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -246,7 +247,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Configure and generate a cloudwatch monitoring cloudformation stack