Merge pull request #349 from code-dot-org/molly/update-alarms

Update error rate alarms

Author: molly-moen

beta-template.yml.erb

@@ -700,7 +700,10 @@ Resources:
             MetricStat:
                 Metric:
                     Namespace: Javabuilder
-                    MetricName: Javabuilder <%=name%> "SEVERE" errors
+                    MetricName: SevereError
+                    Dimensions:
+                      - Name: functionName
+                        Value: !Ref BuildAndRunJava<%=name%>ProjectFunction
                 Period: 300
                 Stat: Sum
           - Id: m2
@@ -734,7 +737,7 @@ Resources:
           - Id: e1
             Label: Errors / Invocations
             ReturnData: true
-            Expression: (m1 / m2) * 100
+            Expression: ((m1 - m3) / m2) * 100
           - Id: m1
             ReturnData: false
             MetricStat:
@@ -757,6 +760,17 @@ Resources:
                           Value: !Ref BuildAndRunJava<%=name%>ProjectFunction
                 Period: 300
                 Stat: Sum
+          - Id: m3
+            ReturnData: false
+            MetricStat:
+                Metric:
+                    Namespace: AWS/Lambda
+                    MetricName: Duration
+                    Dimensions:
+                        - Name: FunctionName
+                          Value: !Ref BuildAndRunJava<%=name%>ProjectFunction
+                Period: 300
+                Stat: TC(89000:)
 
   <%=name%>SlowCleanupTimeAlarm:
     Type: AWS::CloudWatch::Alarm

cicd/2-cicd/deploy-cicd.sh

@@ -20,7 +20,7 @@ if [ "$TARGET_BRANCH" == "main" ]
 then
   STACK_NAME="javabuilder-cicd"
 else
-  STACK_NAME=${"javabuilder-$TARGET_BRANCH-cicd"}
+  STACK_NAME="javabuilder-${TARGET_BRANCH}-cicd"
 fi
 
 MODE=${MODE-'standard'}

cicd/3-app/javabuilder/template.yml.erb

@@ -694,7 +694,10 @@ Resources:
             MetricStat:
                 Metric:
                     Namespace: Javabuilder
-                    MetricName: Javabuilder <%=name%> "SEVERE" errors
+                    MetricName: SevereError
+                    Dimensions:
+                      - Name: functionName
+                        Value: !Ref BuildAndRunJava<%=name%>ProjectFunction
                 Period: 300
                 Stat: Sum
           - Id: m2
@@ -728,7 +731,7 @@ Resources:
           - Id: e1
             Label: Errors / Invocations
             ReturnData: true
-            Expression: (m1 / m2) * 100
+            Expression: ((m1 - m3) / m2) * 100
           - Id: m1
             ReturnData: false
             MetricStat:
@@ -751,6 +754,17 @@ Resources:
                           Value: !Ref BuildAndRunJava<%=name%>ProjectFunction
                 Period: 300
                 Stat: Sum
+          - Id: m3
+            ReturnData: false
+            MetricStat:
+                Metric:
+                    Namespace: AWS/Lambda
+                    MetricName: Duration
+                    Dimensions:
+                        - Name: FunctionName
+                          Value: !Ref BuildAndRunJava<%=name%>ProjectFunction
+                Period: 300
+                Stat: TC(89000:)
 
   <%=name%>SlowCleanupTimeAlarm:
     Type: AWS::CloudWatch::Alarm

cicd/README.md

@@ -58,6 +58,7 @@ TARGET_BRANCH=mybranch cicd/2-cicd/deploy-cicd.sh
 ### Deploying an Adhoc environment
 
 You can create an Adhoc environment by setting the `MODE` flag on the cicd deploy script. This will create a CI/CD pipeline that will watch for updates to your `TARGET_BRANCH`. The difference between a standard deployment and an adhoc pipeline can be seen in "cicd.template.yml" by following where the `Conditions` are used. In short, an adhoc creates an adhoc environment using "adhoc.config.yml", while a standard deployment will create a Test environment and a Prod environment using the relevent config files.
+Note: your branch name cannot contain the character `\`, as this causes issues in AWS.
 
 ```
 TARGET_BRANCH=mybranch MODE=adhoc cicd/2-cicd/deploy-cicd.sh