Merge 349b524 into a8e97d0

fourTheorem · Jun 11, 2021 · 713091f · 713091f
2 parents a8e97d0 + 349b524
commit 713091f
Show file tree

Hide file tree

Showing 18 changed files with 18,356 additions and 17,302 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -5,7 +5,7 @@
   "main": "index.js",
   "scripts": {
     "install": "lerna bootstrap",
-    "audit": "npm audit && lerna exec npm audit -- --omit dev",
+    "audit": "npm audit --omit dev && lerna exec npm audit -- --omit dev",
     "lint": "eslint .",
     "lintfix": "eslint --cache --fix .",
     "test:lint": "eslint .",
@@ -42,4 +42,4 @@
   "dependencies": {
     "yaml": "^1.10.2"
   }
-}
+}
diff --git a/serverless-plugin/alarms-lambda.js b/serverless-plugin/alarms-lambda.js
@@ -194,9 +194,6 @@ module.exports = function LambdaAlarms (lambdaAlarmConfig, context) {
             Dimensions: [{ Name: 'FunctionName', Value: funcName }]
           },
           Period: period,
-          EvaluationPeriods: config.EvaluationPeriods,
-          TreatMissingData: config.TreatMissingData,
-          ComparisonOperator: config.ComparisonOperator,
           Stat: config.Statistic
         },
         ReturnData: false
@@ -210,9 +207,6 @@ module.exports = function LambdaAlarms (lambdaAlarmConfig, context) {
             Dimensions: [{ Name: 'FunctionName', Value: funcName }]
           },
           Period: period,
-          EvaluationPeriods: config.EvaluationPeriods,
-          TreatMissingData: config.TreatMissingData,
-          ComparisonOperator: config.ComparisonOperator,
           Stat: config.Statistic
         },
         ReturnData: false
@@ -222,12 +216,17 @@ module.exports = function LambdaAlarms (lambdaAlarmConfig, context) {
     return {
       resourceName: `slicWatchLambdaThrottlesAlarm${funcResourceName}`,
       resource: createLambdaAlarm(
-        `LambdaThrottles_${funcName}`,
-        `Throttles % for ${funcName} exceeds ${threshold}`,
-        funcName,
-        config.ComparisonOperator,
-        threshold,
-        metrics
+        `LambdaThrottles_${funcName}`, // alarmName
+        `Throttles % for ${funcName} exceeds ${threshold}`, // alarmDescription
+        funcName, // funcName
+        config.ComparisonOperator, // comparisonOperator
+        threshold, // threshold
+        metrics, // metrics
+        null, // metricName
+        config.Statistic, // statistic
+        config.Period, // period
+        config.EvaluationPeriods, // evaluationPeriods
+        config.TreatMissingData // treatMissingData
       )
     }
   }

diff --git a/serverless-plugin/alarms-step-functions.js b/serverless-plugin/alarms-step-functions.js
@@ -19,7 +19,7 @@ module.exports = function StatesAlarms (sfAlarmConfig, context) {
       'AWS::StepFunctions::StateMachine'
     )
     const executionMetrics = [
-      'ExecutionsThrottled',
+      'ExecutionThrottled',
       'ExecutionsFailed',
       'ExecutionsTimedOut'
     ]

diff --git a/serverless-plugin/config-schema.js b/serverless-plugin/config-schema.js
@@ -14,7 +14,7 @@ const statisticType = {
 const supportedAlarms = {
   Lambda: ['Errors', 'ThrottlesPc', 'DurationPc', 'Invocations', 'IteratorAge'],
   ApiGateway: ['5XXError', '4XXError', 'Latency'],
-  States: ['ExecutionsThrottled', 'ExecutionsFailed', 'ExecutionsTimedOut'],
+  States: ['ExecutionThrottled', 'ExecutionsFailed', 'ExecutionsTimedOut'],
   DynamoDB: ['ReadThrottleEvents', 'WriteThrottleEvents', 'UserErrors', 'SystemErrors'],
   Kinesis: ['GetRecords.IteratorAgeMilliseconds', 'ReadProvisionedThroughputExceeded', 'WriteProvisionedThroughputExceeded', 'PutRecord.Success', 'PutRecords.Success', 'GetRecords.Success'],
   SQS: ['AgeOfOldestMessage', 'InFlightMessagesPc']
@@ -23,7 +23,7 @@ const supportedAlarms = {
 const supportedWidgets = {
   Lambda: ['Errors', 'Throttles', 'Duration', 'Invocations', 'ConcurrentExecutions', 'IteratorAge'],
   ApiGateway: ['5XXError', '4XXError', 'Latency', 'Count'],
-  States: ['ExecutionsThrottled', 'ExecutionsFailed', 'ExecutionsTimedOut'],
+  States: ['ExecutionThrottled', 'ExecutionsFailed', 'ExecutionsTimedOut'],
   DynamoDB: ['ReadThrottleEvents', 'WriteThrottleEvents'],
   Kinesis: ['GetRecords.IteratorAgeMilliseconds', 'ReadProvisionedThroughputExceeded', 'WriteProvisionedThroughputExceeded', 'PutRecord.Success', 'PutRecords.Success', 'GetRecords.Success']
 }

diff --git a/serverless-plugin/default-config.yaml b/serverless-plugin/default-config.yaml
@@ -33,7 +33,7 @@ alarms:
       Threshold: 5000
   States: # Step Functions
     Statistic: Sum
-    ExecutionsThrottled:
+    ExecutionThrottled:
       Threshold: 0
     ExecutionsFailed:
       Threshold: 0
@@ -86,7 +86,7 @@ alarms:
     # approximate number of messages in flight above threshold (in percentage of hard limit: 120000 for regular queues and 18000 for FIFO queues)
     InFlightMessagesPc:
       Statistic: Maximum
-      Threshold: 80 # 80% of 120.000 for regular queues or 80% of 18000 for FIFO queues
+      Threshold: 80 # 80% of 120000 for regular queues or 80% of 18000 for FIFO queues
 
 dashboard:
   timeRange:
@@ -124,7 +124,7 @@ dashboard:
       # Step Functions
       ExecutionsFailed:
         Statistic: ["Sum"]
-      ExecutionsThrottled:
+      ExecutionThrottled:
         Statistic: ["Sum"]
       ExecutionsTimedOut:
         Statistic: ["Sum"]